1030 files changed, 75915 insertions, 5270 deletions

diff --git a/subprojects/frontend/build.gradle.kts b/subprojects/frontend/build.gradle.kts
index d0839371..286dd05c 100644
--- a/subprojects/frontend/build.gradle.kts
+++ b/subprojects/frontend/build.gradle.kts
@@ -16,9 +16,9 @@ frontend {
         assembleScript.set("run build")
 }
 
-val viteOutputDir = "$buildDir/vite"
+val viteOutputDir = layout.buildDirectory.dir("vite")
 
-val productionResources = file("$viteOutputDir/production")
+val productionResources = viteOutputDir.map { it.dir("production") }
 
 val productionAssets: Configuration by configurations.creating {
         isCanBeConsumed = true
@@ -81,7 +81,7 @@ tasks {
                 dependsOn(installFrontend)
                 dependsOn(generateXStateTypes)
                 inputs.files(lintingFiles)
-                outputs.dir("$buildDir/typescript")
+                outputs.dir(layout.buildDirectory.dir("typescript"))
                 script.set("run typecheck")
                 group = "verification"
                 description = "Check for TypeScript type errors."
@@ -92,7 +92,7 @@ tasks {
                 dependsOn(generateXStateTypes)
                 dependsOn(typeCheckFrontend)
                 inputs.files(lintingFiles)
-                outputs.file("$buildDir/eslint.json")
+                outputs.file(layout.buildDirectory.file("eslint.json"))
                 script.set("run lint")
                 group = "verification"
                 description = "Check for TypeScript lint errors and warnings."
@@ -140,5 +140,5 @@ artifacts {
 sonarqube.properties {
         SonarPropertiesUtils.addToList(properties, "sonar.sources", "src")
         property("sonar.nodejs.executable", "${frontend.nodeInstallDirectory.get()}/bin/node")
-        property("sonar.eslint.reportPaths", "$buildDir/eslint.json")
+        property("sonar.eslint.reportPaths", "${layout.buildDirectory.get()}/eslint.json")
 }
diff --git a/subprojects/frontend/config/detectDevModeOptions.ts b/subprojects/frontend/config/detectDevModeOptions.ts
index 665204dc..6052e047 100644
--- a/subprojects/frontend/config/detectDevModeOptions.ts
+++ b/subprojects/frontend/config/detectDevModeOptions.ts
@@ -30,8 +30,8 @@ function detectListenOptions(
   fallbackHost: string,
   fallbackPort: number,
 ): ListenOptions {
-  const host = process.env[`${name}_HOST`] ?? fallbackHost;
-  const rawPort = process.env[`${name}_PORT`];
+  const host = process.env[`REFINERY_${name}_HOST`] ?? fallbackHost;
+  const rawPort = process.env[`REFINERY_${name}_PORT`];
   const port = rawPort === undefined ? fallbackPort : parseInt(rawPort, 10);
   const secure = port === 443;
   return { host, port, secure };
diff --git a/subprojects/frontend/config/graphvizUMDVitePlugin.ts b/subprojects/frontend/config/graphvizUMDVitePlugin.ts
new file mode 100644
index 00000000..9c60a84e
--- /dev/null
+++ b/subprojects/frontend/config/graphvizUMDVitePlugin.ts
@@ -0,0 +1,69 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import { readFile } from 'node:fs/promises';
+import path from 'node:path';
+
+import pnpapi from 'pnpapi';
+import type { PluginOption, ResolvedConfig } from 'vite';
+
+// Use a CJS file as the PnP resolution issuer to force resolution to a non-ESM export.
+const issuerFileName = 'worker.cjs';
+
+export default function graphvizUMDVitePlugin(): PluginOption {
+  let command: ResolvedConfig['command'] = 'build';
+  let root: string | undefined;
+  let url: string | undefined;
+
+  return {
+    name: 'graphviz-umd',
+    enforce: 'post',
+    configResolved(config) {
+      ({ command, root } = config);
+    },
+    async buildStart() {
+      const issuer =
+        root === undefined ? issuerFileName : path.join(issuerFileName);
+      const resolvedPath = pnpapi.resolveRequest(
+        '@hpcc-js/wasm/graphviz',
+        issuer,
+      );
+      if (resolvedPath === null) {
+        return;
+      }
+      if (command === 'serve') {
+        url = `/@fs/${resolvedPath}`;
+      } else {
+        const content = await readFile(resolvedPath, null);
+        url = this.emitFile({
+          name: path.basename(resolvedPath),
+          type: 'asset',
+          source: content,
+        });
+      }
+    },
+    renderStart() {
+      if (url !== undefined && command !== 'serve') {
+        url = this.getFileName(url);
+      }
+    },
+    transformIndexHtml() {
+      if (url === undefined) {
+        return undefined;
+      }
+      return [
+        {
+          tag: 'script',
+          attrs: {
+            src: url,
+            type: 'javascript/worker',
+          },
+          injectTo: 'head',
+        },
+      ];
+    },
+  };
+}
diff --git a/subprojects/frontend/index.html b/subprojects/frontend/index.html
index 1bf3472e..8992d538 100644
--- a/subprojects/frontend/index.html
+++ b/subprojects/frontend/index.html
@@ -18,7 +18,8 @@
     <meta name="theme-color" media="(prefers-color-scheme:light)" content="#f5f5f5">
     <meta name="theme-color" media="(prefers-color-scheme:dark)" content="#21252b">
     <style>
-      @import '@fontsource-variable/inter/wght.css';
+      @import '@fontsource-variable/open-sans/wdth.css';
+      @import '@fontsource-variable/open-sans/wdth-italic.css';
       @import '@fontsource-variable/jetbrains-mono/wght.css';
       @import '@fontsource-variable/jetbrains-mono/wght-italic.css';
     </style>
diff --git a/subprojects/frontend/package.json b/subprojects/frontend/package.json
index ba8a0a58..179e09d9 100644
--- a/subprojects/frontend/package.json
+++ b/subprojects/frontend/package.json
@@ -28,71 +28,84 @@
   },
   "homepage": "https://refinery.tools",
   "dependencies": {
-    "@codemirror/autocomplete": "^6.8.0",
-    "@codemirror/commands": "^6.2.4",
-    "@codemirror/language": "^6.8.0",
-    "@codemirror/lint": "^6.2.2",
-    "@codemirror/search": "^6.5.0",
+    "@codemirror/autocomplete": "^6.9.0",
+    "@codemirror/commands": "^6.2.5",
+    "@codemirror/language": "^6.9.0",
+    "@codemirror/lint": "^6.4.1",
+    "@codemirror/search": "^6.5.2",
     "@codemirror/state": "^6.2.1",
-    "@codemirror/view": "^6.13.2",
+    "@codemirror/view": "^6.17.0",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@fontsource-variable/inter": "^5.0.3",
-    "@fontsource-variable/jetbrains-mono": "^5.0.3",
-    "@lezer/common": "^1.0.3",
+    "@fontsource-variable/jetbrains-mono": "^5.0.9",
+    "@fontsource-variable/open-sans": "^5.0.9",
+    "@hpcc-js/wasm": "^2.13.1",
+    "@lezer/common": "^1.0.4",
     "@lezer/highlight": "^1.1.6",
-    "@lezer/lr": "^1.3.6",
+    "@lezer/lr": "^1.3.10",
     "@material-icons/svg": "^1.0.33",
-    "@mui/icons-material": "5.11.16",
-    "@mui/material": "5.13.5",
-    "@vitejs/plugin-react-swc": "^3.3.2",
+    "@mui/icons-material": "5.14.7",
+    "@mui/material": "5.14.7",
+    "@mui/system": "^5.14.7",
+    "@mui/x-data-grid": "^6.10.0 <6.10.1",
     "ansi-styles": "^6.2.1",
     "csstype": "^3.1.2",
+    "d3": "^7.8.5",
+    "d3-graphviz": "patch:d3-graphviz@npm%3A5.1.0#~/.yarn/patches/d3-graphviz-npm-5.1.0-ba6bed3fec.patch",
+    "d3-selection": "^3.0.0",
+    "d3-zoom": "patch:d3-zoom@npm%3A3.0.0#~/.yarn/patches/d3-zoom-npm-3.0.0-18f706a421.patch",
     "escape-string-regexp": "^5.0.0",
     "lodash-es": "^4.17.21",
     "loglevel": "^1.8.1",
     "loglevel-plugin-prefix": "^0.8.4",
-    "mobx": "^6.9.0",
-    "mobx-react-lite": "^3.4.3",
+    "mobx": "^6.10.2",
+    "mobx-react-lite": "^4.0.4",
     "ms": "^2.1.3",
     "nanoid": "^4.0.2",
     "notistack": "^3.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "xstate": "^4.37.2",
-    "zod": "^3.21.4"
+    "react-resize-detector": "^9.1.0",
+    "xstate": "^4.38.2",
+    "zod": "^3.22.2"
   },
   "devDependencies": {
-    "@lezer/generator": "^1.3.0",
-    "@types/eslint": "^8.40.2",
+    "@lezer/generator": "^1.5.0",
+    "@types/d3": "^7.4.0",
+    "@types/d3-graphviz": "^2.6.7",
+    "@types/d3-selection": "^3.0.6",
+    "@types/d3-zoom": "^3.0.4",
+    "@types/eslint": "^8.44.2",
     "@types/html-minifier-terser": "^7.0.0",
-    "@types/lodash-es": "^4.17.7",
+    "@types/lodash-es": "^4.17.9",
     "@types/micromatch": "^4.0.2",
     "@types/ms": "^0.7.31",
-    "@types/node": "^18.16.18",
-    "@types/prettier": "^2.7.3",
-    "@types/react": "^18.2.12",
-    "@types/react-dom": "^18.2.5",
-    "@typescript-eslint/eslint-plugin": "^5.59.11",
-    "@typescript-eslint/parser": "^5.59.11",
-    "@xstate/cli": "^0.5.1",
+    "@types/node": "^18.17.12",
+    "@types/pnpapi": "^0.0.2",
+    "@types/react": "^18.2.21",
+    "@types/react-dom": "^18.2.7",
+    "@typescript-eslint/eslint-plugin": "^6.5.0",
+    "@typescript-eslint/parser": "^6.5.0",
+    "@vitejs/plugin-react-swc": "^3.3.2",
+    "@xstate/cli": "^0.5.2",
     "cross-env": "^7.0.3",
-    "eslint": "^8.43.0",
+    "eslint": "^8.48.0",
     "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-import-resolver-typescript": "^3.5.5",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-config-airbnb-typescript": "^17.1.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-import-resolver-typescript": "^3.6.0",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-mobx": "^0.0.9",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "html-minifier-terser": "^7.2.0",
     "micromatch": "^4.0.5",
-    "prettier": "^2.8.8",
-    "typescript": "5.1.3",
-    "vite": "^4.3.9",
+    "pnpapi": "^0.0.0",
+    "prettier": "^3.0.3",
+    "typescript": "5.2.2",
+    "vite": "^4.4.9",
     "vite-plugin-pwa": "^0.16.4",
     "workbox-window": "^7.0.0"
   }
diff --git a/subprojects/frontend/src/DirectionalSplitPane.tsx b/subprojects/frontend/src/DirectionalSplitPane.tsx
new file mode 100644
index 00000000..59c8b739
--- /dev/null
+++ b/subprojects/frontend/src/DirectionalSplitPane.tsx
@@ -0,0 +1,159 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import MoreHorizIcon from '@mui/icons-material/MoreHoriz';
+import MoreVertIcon from '@mui/icons-material/MoreVert';
+import Box from '@mui/material/Box';
+import Stack from '@mui/material/Stack';
+import { alpha, useTheme } from '@mui/material/styles';
+import { useCallback, useRef, useState } from 'react';
+import { useResizeDetector } from 'react-resize-detector';
+
+export default function DirectionalSplitPane({
+  primary: left,
+  secondary: right,
+  primaryOnly: showLeftOnly,
+  secondaryOnly: showRightOnly,
+}: {
+  primary: React.ReactNode;
+  secondary: React.ReactNode;
+  primaryOnly?: boolean;
+  secondaryOnly?: boolean;
+}): JSX.Element {
+  const theme = useTheme();
+  const stackRef = useRef<HTMLDivElement | null>(null);
+  const { ref: resizeRef, width, height } = useResizeDetector();
+  const sliderRef = useRef<HTMLDivElement>(null);
+  const [resizing, setResizing] = useState(false);
+  const [fraction, setFraction] = useState(0.5);
+
+  const horizontalSplit =
+    width !== undefined && height !== undefined && height > width;
+  const direction = horizontalSplit ? 'column' : 'row';
+  const axis = horizontalSplit ? 'height' : 'width';
+  const primarySize = showLeftOnly
+    ? '100%'
+    : `calc(${fraction * 100}% - 0.5px)`;
+  const secondarySize = showRightOnly
+    ? '100%'
+    : `calc(${(1 - fraction) * 100}% - 0.5px)`;
+  const ref = useCallback(
+    (element: HTMLDivElement | null) => {
+      resizeRef(element);
+      stackRef.current = element;
+    },
+    [resizeRef],
+  );
+
+  return (
+    <Stack
+      direction={direction}
+      height="100%"
+      width="100%"
+      overflow="hidden"
+      ref={ref}
+    >
+      {!showRightOnly && <Box {...{ [axis]: primarySize }}>{left}</Box>}
+      <Box
+        sx={{
+          overflow: 'visible',
+          position: 'relative',
+          [axis]: '0px',
+          display: showLeftOnly || showRightOnly ? 'none' : 'flex',
+          flexDirection: direction,
+          [horizontalSplit
+            ? 'borderBottom'
+            : 'borderRight']: `1px solid ${theme.palette.outer.border}`,
+        }}
+      >
+        <Box
+          ref={sliderRef}
+          sx={{
+            display: 'flex',
+            position: 'absolute',
+            [axis]: theme.spacing(2),
+            ...(horizontalSplit
+              ? {
+                  top: theme.spacing(-1),
+                  left: 0,
+                  right: 0,
+                  transform: 'translateY(0.5px)',
+                }
+              : {
+                  left: theme.spacing(-1),
+                  top: 0,
+                  bottom: 0,
+                  transform: 'translateX(0.5px)',
+                }),
+            zIndex: 999,
+            alignItems: 'center',
+            justifyContent: 'center',
+            color: theme.palette.text.secondary,
+            cursor: horizontalSplit ? 'ns-resize' : 'ew-resize',
+            '.MuiSvgIcon-root': {
+              opacity: resizing ? 1 : 0,
+            },
+            ...(resizing
+              ? {
+                  background: alpha(
+                    theme.palette.text.primary,
+                    theme.palette.action.activatedOpacity,
+                  ),
+                }
+              : {
+                  '&:hover': {
+                    background: alpha(
+                      theme.palette.text.primary,
+                      theme.palette.action.hoverOpacity,
+                    ),
+                    '.MuiSvgIcon-root': {
+                      opacity: 1,
+                    },
+                  },
+                }),
+          }}
+          onPointerDown={(event) => {
+            if (event.button !== 0) {
+              return;
+            }
+            sliderRef.current?.setPointerCapture(event.pointerId);
+            setResizing(true);
+          }}
+          onPointerUp={(event) => {
+            if (event.button !== 0) {
+              return;
+            }
+            sliderRef.current?.releasePointerCapture(event.pointerId);
+            setResizing(false);
+          }}
+          onPointerMove={(event) => {
+            if (!resizing) {
+              return;
+            }
+            const container = stackRef.current;
+            if (container === null) {
+              return;
+            }
+            const rect = container.getBoundingClientRect();
+            const newFraction = horizontalSplit
+              ? (event.clientY - rect.top) / rect.height
+              : (event.clientX - rect.left) / rect.width;
+            setFraction(Math.min(0.9, Math.max(0.1, newFraction)));
+          }}
+          onDoubleClick={() => setFraction(0.5)}
+        >
+          {horizontalSplit ? <MoreHorizIcon /> : <MoreVertIcon />}
+        </Box>
+      </Box>
+      {!showLeftOnly && <Box {...{ [axis]: secondarySize }}>{right}</Box>}
+    </Stack>
+  );
+}
+
+DirectionalSplitPane.defaultProps = {
+  primaryOnly: false,
+  secondaryOnly: false,
+};
diff --git a/subprojects/frontend/src/PaneButtons.tsx b/subprojects/frontend/src/PaneButtons.tsx
new file mode 100644
index 00000000..7e884ab0
--- /dev/null
+++ b/subprojects/frontend/src/PaneButtons.tsx
@@ -0,0 +1,144 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import CodeIcon from '@mui/icons-material/Code';
+import SchemaRoundedIcon from '@mui/icons-material/SchemaRounded';
+import TableChartIcon from '@mui/icons-material/TableChart';
+import ToggleButton from '@mui/material/ToggleButton';
+import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
+import { alpha, styled } from '@mui/material/styles';
+import { observer } from 'mobx-react-lite';
+
+import type ThemeStore from './theme/ThemeStore';
+
+const PaneButtonGroup = styled(ToggleButtonGroup, {
+  name: 'PaneButtons-Group',
+  shouldForwardProp: (prop) => prop !== 'hideLabel',
+})<{ hideLabel: boolean }>(({ theme, hideLabel }) => {
+  const color =
+    theme.palette.mode === 'dark'
+      ? theme.palette.primary.main
+      : theme.palette.text.primary;
+  return {
+    gap: theme.spacing(1),
+    '.MuiToggleButton-root': {
+      fontSize: '1rem',
+      lineHeight: '1.5',
+      border: 'none',
+      ...(hideLabel ? {} : { paddingBlock: 6 }),
+      '&::before': {
+        content: '" "',
+        position: 'absolute',
+        bottom: 0,
+        left: 0,
+        width: '0%',
+        height: '2px',
+        background: color,
+        transition: theme.transitions.create('width', {
+          duration: theme.transitions.duration.standard,
+        }),
+      },
+      '&.MuiToggleButtonGroup-grouped': {
+        borderTopLeftRadius: theme.shape.borderRadius,
+        borderTopRightRadius: theme.shape.borderRadius,
+        borderBottomLeftRadius: 0,
+        borderBottomRightRadius: 0,
+      },
+      '&:not(.Mui-selected)': {
+        color: theme.palette.text.secondary,
+      },
+      '&.Mui-selected': {
+        color,
+        '&::before': {
+          width: '100%',
+        },
+        '&:not(:active)': {
+          background: 'transparent',
+        },
+        '&:hover': {
+          background: alpha(
+            theme.palette.text.primary,
+            theme.palette.action.hoverOpacity,
+          ),
+          '@media (hover: none)': {
+            background: 'transparent',
+          },
+        },
+      },
+    },
+    ...(hideLabel
+      ? {}
+      : {
+          '& svg': {
+            margin: '0 6px 0 -4px',
+          },
+        }),
+  };
+});
+
+function PaneButtons({
+  themeStore,
+  hideLabel,
+}: {
+  themeStore: ThemeStore;
+  hideLabel?: boolean;
+}): JSX.Element {
+  return (
+    <PaneButtonGroup
+      size={hideLabel ? 'small' : 'medium'}
+      hideLabel={hideLabel ?? PaneButtons.defaultProps.hideLabel}
+    >
+      <ToggleButton
+        value="code"
+        selected={themeStore.showCode}
+        onClick={(event) => {
+          if (event.shiftKey || event.ctrlKey) {
+            themeStore.setSelectedPane('code');
+          } else {
+            themeStore.toggleCode();
+          }
+        }}
+      >
+        <CodeIcon fontSize="small" />
+        {!hideLabel && 'Code'}
+      </ToggleButton>
+      <ToggleButton
+        value="graph"
+        selected={themeStore.showGraph}
+        onClick={(event) => {
+          if (event.shiftKey || event.ctrlKey) {
+            themeStore.setSelectedPane('graph', event.shiftKey);
+          } else {
+            themeStore.toggleGraph();
+          }
+        }}
+      >
+        <SchemaRoundedIcon fontSize="small" />
+        {!hideLabel && 'Graph'}
+      </ToggleButton>
+      <ToggleButton
+        value="table"
+        selected={themeStore.showTable}
+        onClick={(event) => {
+          if (event.shiftKey || event.ctrlKey) {
+            themeStore.setSelectedPane('table', event.shiftKey);
+          } else {
+            themeStore.toggleTable();
+          }
+        }}
+      >
+        <TableChartIcon fontSize="small" />
+        {!hideLabel && 'Table'}
+      </ToggleButton>
+    </PaneButtonGroup>
+  );
+}
+
+PaneButtons.defaultProps = {
+  hideLabel: false,
+};
+
+export default observer(PaneButtons);
diff --git a/subprojects/frontend/src/Refinery.tsx b/subprojects/frontend/src/Refinery.tsx
index b5ff94e1..5ad16000 100644
--- a/subprojects/frontend/src/Refinery.tsx
+++ b/subprojects/frontend/src/Refinery.tsx
@@ -10,7 +10,7 @@ import { SnackbarProvider } from 'notistack';
 
 import TopBar from './TopBar';
 import UpdateNotification from './UpdateNotification';
-import EditorPane from './editor/EditorPane';
+import WorkArea from './WorkArea';
 
 export default function Refinery(): JSX.Element {
   return (
@@ -18,7 +18,7 @@ export default function Refinery(): JSX.Element {
       <UpdateNotification />
       <Stack direction="column" height="100%" overflow="auto">
         <TopBar />
-        <EditorPane />
+        <WorkArea />
       </Stack>
     </SnackbarProvider>
   );
diff --git a/subprojects/frontend/src/TopBar.tsx b/subprojects/frontend/src/TopBar.tsx
index f2542b14..867a24a0 100644
--- a/subprojects/frontend/src/TopBar.tsx
+++ b/subprojects/frontend/src/TopBar.tsx
@@ -6,7 +6,6 @@
 
 import GitHubIcon from '@mui/icons-material/GitHub';
 import AppBar from '@mui/material/AppBar';
-import Button from '@mui/material/Button';
 import IconButton from '@mui/material/IconButton';
 import Stack from '@mui/material/Stack';
 import Toolbar from '@mui/material/Toolbar';
@@ -17,6 +16,7 @@ import { throttle } from 'lodash-es';
 import { observer } from 'mobx-react-lite';
 import { useEffect, useMemo, useState } from 'react';
 
+import PaneButtons from './PaneButtons';
 import { useRootStore } from './RootStoreProvider';
 import ToggleDarkModeButton from './ToggleDarkModeButton';
 import GenerateButton from './editor/GenerateButton';
@@ -65,11 +65,12 @@ const DevModeBadge = styled('div')(({ theme }) => ({
 }));
 
 export default observer(function TopBar(): JSX.Element {
-  const { editorStore } = useRootStore();
+  const { editorStore, themeStore } = useRootStore();
   const overlayVisible = useWindowControlsOverlayVisible();
   const { breakpoints } = useTheme();
-  const small = useMediaQuery(breakpoints.down('sm'));
+  const medium = useMediaQuery(breakpoints.up('sm'));
   const large = useMediaQuery(breakpoints.up('md'));
+  const veryLarge = useMediaQuery(breakpoints.up('lg'));
 
   return (
     <AppBar
@@ -100,50 +101,46 @@ export default observer(function TopBar(): JSX.Element {
           py: 0.5,
         }}
       >
-        <Typography variant="h6" component="h1" flexGrow={1}>
+        <Typography variant="h6" component="h1">
           Refinery {import.meta.env.DEV && <DevModeBadge>Dev</DevModeBadge>}
         </Typography>
-        <Stack direction="row" marginRight={1}>
-          <GenerateButton editorStore={editorStore} hideWarnings={small} />
+        <Stack direction="row" alignItems="center" flexGrow={1} marginLeft={1}>
+          {medium && !large && (
+            <PaneButtons themeStore={themeStore} hideLabel />
+          )}
+        </Stack>
+        {large && (
+          <Stack
+            direction="row"
+            alignItems="center"
+            sx={{
+              position: 'absolute',
+              top: 0,
+              bottom: 0,
+              left: '50%',
+              transform: 'translateX(-50%)',
+            }}
+          >
+            <PaneButtons themeStore={themeStore} />
+          </Stack>
+        )}
+        <Stack
+          direction="row"
+          marginLeft={1}
+          marginRight={1}
+          gap={1}
+          alignItems="center"
+        >
+          <GenerateButton editorStore={editorStore} hideWarnings={!veryLarge} />
           {large && (
-            <>
-              <Button
-                arial-label="Budapest University of Technology and Economics, Critical Systems Research Group"
-                className="rounded"
-                color="inherit"
-                href="https://ftsrg.mit.bme.hu"
-                target="_blank"
-                sx={{ marginLeft: 1 }}
-              >
-                BME FTSRG
-              </Button>
-              <Button
-                aria-label="McGill University, Department of Electrical and Computer Engineering"
-                className="rounded"
-                color="inherit"
-                href="https://www.mcgill.ca/ece/daniel-varro"
-                target="_blank"
-              >
-                McGill ECE
-              </Button>
-              <Button
-                aria-label="2022 Amazon Research Awards recipent"
-                className="rounded"
-                color="inherit"
-                href="https://www.amazon.science/research-awards/recipients/daniel-varro-fall-2021"
-                target="_blank"
-              >
-                Amazon Science
-              </Button>
-              <IconButton
-                aria-label="GitHub"
-                href="https://github.com/graphs4value/refinery"
-                target="_blank"
-                color="inherit"
-              >
-                <GitHubIcon />
-              </IconButton>
-            </>
+            <IconButton
+              aria-label="GitHub"
+              href="https://github.com/graphs4value/refinery"
+              target="_blank"
+              color="inherit"
+            >
+              <GitHubIcon />
+            </IconButton>
           )}
         </Stack>
         <ToggleDarkModeButton />
diff --git a/subprojects/frontend/src/WorkArea.tsx b/subprojects/frontend/src/WorkArea.tsx
new file mode 100644
index 00000000..adb29a50
--- /dev/null
+++ b/subprojects/frontend/src/WorkArea.tsx
@@ -0,0 +1,33 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import { observer } from 'mobx-react-lite';
+
+import DirectionalSplitPane from './DirectionalSplitPane';
+import { useRootStore } from './RootStoreProvider';
+import EditorPane from './editor/EditorPane';
+import GraphPane from './graph/GraphPane';
+import TablePane from './table/TablePane';
+
+export default observer(function WorkArea(): JSX.Element {
+  const { themeStore } = useRootStore();
+
+  return (
+    <DirectionalSplitPane
+      primary={<EditorPane />}
+      secondary={
+        <DirectionalSplitPane
+          primary={<GraphPane />}
+          secondary={<TablePane />}
+          primaryOnly={!themeStore.showTable}
+          secondaryOnly={!themeStore.showGraph}
+        />
+      }
+      primaryOnly={!themeStore.showGraph && !themeStore.showTable}
+      secondaryOnly={!themeStore.showCode}
+    />
+  );
+});
diff --git a/subprojects/frontend/src/editor/AnalysisErrorNotification.tsx b/subprojects/frontend/src/editor/AnalysisErrorNotification.tsx
new file mode 100644
index 00000000..591a3600
--- /dev/null
+++ b/subprojects/frontend/src/editor/AnalysisErrorNotification.tsx
@@ -0,0 +1,74 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import { reaction } from 'mobx';
+import { type SnackbarKey, useSnackbar } from 'notistack';
+import { useEffect, useState } from 'react';
+
+import type EditorStore from './EditorStore';
+
+function MessageObserver({
+  editorStore,
+}: {
+  editorStore: EditorStore;
+}): React.ReactNode {
+  const [message, setMessage] = useState(
+    editorStore.delayedErrors.semanticsError ?? '',
+  );
+  // Instead of making this component an `observer`,
+  // we only update the message is one is present to make sure that the
+  // disappear animation has a chance to complete.
+  useEffect(
+    () =>
+      reaction(
+        () => editorStore.delayedErrors.semanticsError,
+        (newMessage) => {
+          if (newMessage !== undefined) {
+            setMessage(newMessage);
+          }
+        },
+        { fireImmediately: false },
+      ),
+    [editorStore],
+  );
+  return message;
+}
+
+export default function AnalysisErrorNotification({
+  editorStore,
+}: {
+  editorStore: EditorStore;
+}): null {
+  const { enqueueSnackbar, closeSnackbar } = useSnackbar();
+  useEffect(() => {
+    let key: SnackbarKey | undefined;
+    const disposer = reaction(
+      () => editorStore.delayedErrors.semanticsError !== undefined,
+      (hasError) => {
+        if (hasError) {
+          if (key === undefined) {
+            key = enqueueSnackbar({
+              message: <MessageObserver editorStore={editorStore} />,
+              variant: 'error',
+              persist: true,
+            });
+          }
+        } else if (key !== undefined) {
+          closeSnackbar(key);
+          key = undefined;
+        }
+      },
+      { fireImmediately: true },
+    );
+    return () => {
+      disposer();
+      if (key !== undefined) {
+        closeSnackbar(key);
+      }
+    };
+  }, [editorStore, enqueueSnackbar, closeSnackbar]);
+  return null;
+}
diff --git a/subprojects/frontend/src/editor/AnimatedButton.tsx b/subprojects/frontend/src/editor/AnimatedButton.tsx
index dbbda618..24ec69be 100644
--- a/subprojects/frontend/src/editor/AnimatedButton.tsx
+++ b/subprojects/frontend/src/editor/AnimatedButton.tsx
@@ -48,7 +48,7 @@ export default function AnimatedButton({
   onClick?: () => void;
   color: 'error' | 'warning' | 'primary' | 'inherit';
   disabled?: boolean;
-  startIcon: JSX.Element;
+  startIcon?: JSX.Element;
   sx?: SxProps<Theme> | undefined;
   children?: ReactNode;
 }): JSX.Element {
@@ -79,7 +79,11 @@ export default function AnimatedButton({
       className="rounded shaded"
       disabled={disabled ?? false}
       startIcon={startIcon}
-      width={width === undefined ? 'auto' : `calc(${width} + 50px)`}
+      width={
+        width === undefined
+          ? 'auto'
+          : `calc(${width} + ${startIcon === undefined ? 28 : 50}px)`
+      }
     >
       <Box
         display="flex"
@@ -100,6 +104,7 @@ AnimatedButton.defaultProps = {
   'aria-label': undefined,
   onClick: undefined,
   disabled: false,
+  startIcon: undefined,
   sx: undefined,
   children: undefined,
 };
diff --git a/subprojects/frontend/src/editor/DiagnosticValue.ts b/subprojects/frontend/src/editor/DiagnosticValue.ts
index 20478262..410a46b7 100644
--- a/subprojects/frontend/src/editor/DiagnosticValue.ts
+++ b/subprojects/frontend/src/editor/DiagnosticValue.ts
@@ -14,6 +14,7 @@ export default class DiagnosticValue extends RangeValue {
     error: new DiagnosticValue('error'),
     warning: new DiagnosticValue('warning'),
     info: new DiagnosticValue('info'),
+    hint: new DiagnosticValue('hint'),
   };
 
   private constructor(public readonly severity: Severity) {
diff --git a/subprojects/frontend/src/editor/EditorButtons.tsx b/subprojects/frontend/src/editor/EditorButtons.tsx
index 9b187e5c..ca51f975 100644
--- a/subprojects/frontend/src/editor/EditorButtons.tsx
+++ b/subprojects/frontend/src/editor/EditorButtons.tsx
@@ -5,8 +5,8 @@
  */
 
 import type { Diagnostic } from '@codemirror/lint';
+import CancelIcon from '@mui/icons-material/Cancel';
 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';
@@ -28,7 +28,7 @@ import type EditorStore from './EditorStore';
 function getLintIcon(severity: Diagnostic['severity'] | undefined) {
   switch (severity) {
     case 'error':
-      return <ErrorIcon fontSize="small" />;
+      return <CancelIcon fontSize="small" />;
     case 'warning':
       return <WarningIcon fontSize="small" />;
     case 'info':
@@ -95,7 +95,7 @@ export default observer(function EditorButtons({
             })}
           value="show-lint-panel"
         >
-          {getLintIcon(editorStore?.highestDiagnosticLevel)}
+          {getLintIcon(editorStore?.delayedErrors?.highestDiagnosticLevel)}
         </ToggleButton>
       </ToggleButtonGroup>
       <IconButton
diff --git a/subprojects/frontend/src/editor/EditorErrors.tsx b/subprojects/frontend/src/editor/EditorErrors.tsx
new file mode 100644
index 00000000..40becf7e
--- /dev/null
+++ b/subprojects/frontend/src/editor/EditorErrors.tsx
@@ -0,0 +1,93 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import { Diagnostic } from '@codemirror/lint';
+import { type IReactionDisposer, makeAutoObservable, reaction } from 'mobx';
+
+import type EditorStore from './EditorStore';
+
+const HYSTERESIS_TIME_MS = 250;
+
+export interface State {
+  analyzing: boolean;
+  errorCount: number;
+  warningCount: number;
+  infoCount: number;
+  semanticsError: string | undefined;
+}
+
+export default class EditorErrors implements State {
+  private readonly disposer: IReactionDisposer;
+
+  private timer: number | undefined;
+
+  analyzing = false;
+
+  errorCount = 0;
+
+  warningCount = 0;
+
+  infoCount = 0;
+
+  semanticsError: string | undefined;
+
+  constructor(private readonly store: EditorStore) {
+    this.updateImmediately(this.getNextState());
+    makeAutoObservable<EditorErrors, 'disposer' | 'timer'>(this, {
+      disposer: false,
+      timer: false,
+    });
+    this.disposer = reaction(
+      () => this.getNextState(),
+      (nextState) => {
+        if (this.timer !== undefined) {
+          clearTimeout(this.timer);
+          this.timer = undefined;
+        }
+        if (nextState.analyzing) {
+          this.timer = setTimeout(
+            () => this.updateImmediately(nextState),
+            HYSTERESIS_TIME_MS,
+          );
+        } else {
+          this.updateImmediately(nextState);
+        }
+      },
+      { fireImmediately: true },
+    );
+  }
+
+  get highestDiagnosticLevel(): Diagnostic['severity'] | undefined {
+    if (this.errorCount > 0) {
+      return 'error';
+    }
+    if (this.warningCount > 0) {
+      return 'warning';
+    }
+    if (this.infoCount > 0) {
+      return 'info';
+    }
+    return undefined;
+  }
+
+  private getNextState(): State {
+    return {
+      analyzing: this.store.analyzing,
+      errorCount: this.store.errorCount,
+      warningCount: this.store.warningCount,
+      infoCount: this.store.infoCount,
+      semanticsError: this.store.semanticsError,
+    };
+  }
+
+  private updateImmediately(nextState: State) {
+    Object.assign(this, nextState);
+  }
+
+  dispose() {
+    this.disposer();
+  }
+}
diff --git a/subprojects/frontend/src/editor/EditorPane.tsx b/subprojects/frontend/src/editor/EditorPane.tsx
index 87f408fe..1125a0ec 100644
--- a/subprojects/frontend/src/editor/EditorPane.tsx
+++ b/subprojects/frontend/src/editor/EditorPane.tsx
@@ -13,6 +13,7 @@ import { useState } from 'react';
 
 import { useRootStore } from '../RootStoreProvider';
 
+import AnalysisErrorNotification from './AnalysisErrorNotification';
 import ConnectionStatusNotification from './ConnectionStatusNotification';
 import EditorArea from './EditorArea';
 import EditorButtons from './EditorButtons';
@@ -39,7 +40,7 @@ export default observer(function EditorPane(): JSX.Element {
   const { editorStore } = useRootStore();
 
   return (
-    <Stack direction="column" flexGrow={1} flexShrink={1} overflow="auto">
+    <Stack direction="column" height="100%" overflow="auto">
       <Toolbar variant="dense">
         <EditorButtons editorStore={editorStore} />
       </Toolbar>
@@ -48,6 +49,7 @@ export default observer(function EditorPane(): JSX.Element {
           <EditorLoading />
         ) : (
           <>
+            <AnalysisErrorNotification editorStore={editorStore} />
             <ConnectionStatusNotification editorStore={editorStore} />
             <SearchPanelPortal editorStore={editorStore} />
             <EditorArea editorStore={editorStore} />
diff --git a/subprojects/frontend/src/editor/EditorStore.ts b/subprojects/frontend/src/editor/EditorStore.ts
index b98f085e..b5989ad1 100644
--- a/subprojects/frontend/src/editor/EditorStore.ts
+++ b/subprojects/frontend/src/editor/EditorStore.ts
@@ -26,9 +26,12 @@ import { makeAutoObservable, observable, runInAction } from 'mobx';
 import { nanoid } from 'nanoid';
 
 import type PWAStore from '../PWAStore';
+import GraphStore from '../graph/GraphStore';
 import getLogger from '../utils/getLogger';
 import type XtextClient from '../xtext/XtextClient';
+import type { SemanticsSuccessResult } from '../xtext/xtextServiceResults';
 
+import EditorErrors from './EditorErrors';
 import LintPanelStore from './LintPanelStore';
 import SearchPanelStore from './SearchPanelStore';
 import createEditorState from './createEditorState';
@@ -54,13 +57,22 @@ export default class EditorStore {
 
   readonly lintPanel: LintPanelStore;
 
+  readonly delayedErrors: EditorErrors;
+
   showLineNumbers = false;
 
   disposed = false;
 
+  analyzing = false;
+
+  semanticsError: string | undefined;
+
+  graph: GraphStore;
+
   constructor(initialValue: string, pwaStore: PWAStore) {
     this.id = nanoid();
     this.state = createEditorState(initialValue, this);
+    this.delayedErrors = new EditorErrors(this);
     this.searchPanel = new SearchPanelStore(this);
     this.lintPanel = new LintPanelStore(this);
     (async () => {
@@ -75,6 +87,7 @@ export default class EditorStore {
     })().catch((error) => {
       log.error('Failed to load XtextClient', error);
     });
+    this.graph = new GraphStore();
     makeAutoObservable<EditorStore, 'client'>(this, {
       id: false,
       state: observable.ref,
@@ -213,19 +226,6 @@ export default class EditorStore {
     this.doCommand(nextDiagnostic);
   }
 
-  get highestDiagnosticLevel(): Diagnostic['severity'] | undefined {
-    if (this.errorCount > 0) {
-      return 'error';
-    }
-    if (this.warningCount > 0) {
-      return 'warning';
-    }
-    if (this.infoCount > 0) {
-      return 'info';
-    }
-    return undefined;
-  }
-
   updateSemanticHighlighting(ranges: IHighlightRange[]): void {
     this.dispatch(setSemanticHighlighting(ranges));
   }
@@ -282,8 +282,29 @@ export default class EditorStore {
     return true;
   }
 
+  analysisStarted() {
+    this.analyzing = true;
+  }
+
+  analysisCompleted(semanticAnalysisSkipped = false) {
+    this.analyzing = false;
+    if (semanticAnalysisSkipped) {
+      this.semanticsError = undefined;
+    }
+  }
+
+  setSemanticsError(semanticsError: string) {
+    this.semanticsError = semanticsError;
+  }
+
+  setSemantics(semantics: SemanticsSuccessResult) {
+    this.semanticsError = undefined;
+    this.graph.setSemantics(semantics);
+  }
+
   dispose(): void {
     this.client?.dispose();
+    this.delayedErrors.dispose();
     this.disposed = true;
   }
 }
diff --git a/subprojects/frontend/src/editor/EditorTheme.ts b/subprojects/frontend/src/editor/EditorTheme.ts
index e057ce18..055b62e2 100644
--- a/subprojects/frontend/src/editor/EditorTheme.ts
+++ b/subprojects/frontend/src/editor/EditorTheme.ts
@@ -4,15 +4,13 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-import errorSVG from '@material-icons/svg/svg/error/baseline.svg?raw';
+import cancelSVG from '@material-icons/svg/svg/cancel/baseline.svg?raw';
 import expandMoreSVG from '@material-icons/svg/svg/expand_more/baseline.svg?raw';
 import infoSVG from '@material-icons/svg/svg/info/baseline.svg?raw';
 import warningSVG from '@material-icons/svg/svg/warning/baseline.svg?raw';
 import { alpha, styled, type CSSObject } from '@mui/material/styles';
 
-function svgURL(svg: string): string {
-  return `url('data:image/svg+xml;utf8,${svg}')`;
-}
+import svgURL from '../utils/svgURL';
 
 export default styled('div', {
   name: 'EditorTheme',
@@ -56,15 +54,16 @@ export default styled('div', {
     '.cm-activeLineGutter': {
       background: 'transparent',
     },
-    '.cm-cursor, .cm-cursor-primary': {
+    '.cm-cursor, .cm-dropCursor, .cm-cursor-primary': {
       borderLeft: `2px solid ${theme.palette.info.main}`,
+      marginLeft: -1,
     },
     '.cm-selectionBackground': {
       background: theme.palette.highlight.selection,
     },
     '.cm-focused': {
       outline: 'none',
-      '.cm-selectionBackground': {
+      '& > .cm-scroller > .cm-selectionLayer .cm-selectionBackground': {
         background: theme.palette.highlight.selection,
       },
     },
@@ -106,7 +105,7 @@ export default styled('div', {
         color: theme.palette.text.primary,
       },
     },
-    '.tok-problem-abstract, .tok-problem-new': {
+    '.tok-problem-abstract': {
       fontStyle: 'italic',
     },
     '.tok-problem-containment': {
@@ -331,7 +330,7 @@ export default styled('div', {
     '.cm-lintRange-active': {
       background: theme.palette.highlight.activeLintRange,
     },
-    ...lintSeverityStyle('error', errorSVG, 120),
+    ...lintSeverityStyle('error', cancelSVG, 120),
     ...lintSeverityStyle('warning', warningSVG, 110),
     ...lintSeverityStyle('info', infoSVG, 100),
   };
diff --git a/subprojects/frontend/src/editor/GenerateButton.tsx b/subprojects/frontend/src/editor/GenerateButton.tsx
index 3837ef8e..5bac0464 100644
--- a/subprojects/frontend/src/editor/GenerateButton.tsx
+++ b/subprojects/frontend/src/editor/GenerateButton.tsx
@@ -4,10 +4,8 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-import DangerousOutlinedIcon from '@mui/icons-material/DangerousOutlined';
+import CancelIcon from '@mui/icons-material/Cancel';
 import PlayArrowIcon from '@mui/icons-material/PlayArrow';
-import Button from '@mui/material/Button';
-import type { SxProps, Theme } from '@mui/material/styles';
 import { observer } from 'mobx-react-lite';
 
 import AnimatedButton from './AnimatedButton';
@@ -18,26 +16,45 @@ const GENERATE_LABEL = 'Generate';
 const GenerateButton = observer(function GenerateButton({
   editorStore,
   hideWarnings,
-  sx,
 }: {
   editorStore: EditorStore | undefined;
   hideWarnings?: boolean | undefined;
-  sx?: SxProps<Theme> | undefined;
 }): JSX.Element {
   if (editorStore === undefined) {
     return (
-      <Button
-        color="inherit"
-        className="rounded shaded"
-        disabled
-        {...(sx === undefined ? {} : { sx })}
-      >
+      <AnimatedButton color="inherit" disabled>
         Loading&hellip;
-      </Button>
+      </AnimatedButton>
+    );
+  }
+
+  const { analyzing, errorCount, warningCount, semanticsError } =
+    editorStore.delayedErrors;
+
+  if (analyzing) {
+    return (
+      <AnimatedButton color="inherit" disabled>
+        Analyzing&hellip;
+      </AnimatedButton>
     );
   }
 
-  const { errorCount, warningCount } = editorStore;
+  if (semanticsError !== undefined && editorStore.opened) {
+    return (
+      <AnimatedButton
+        color="error"
+        disabled
+        startIcon={<CancelIcon />}
+        sx={(theme) => ({
+          '&.Mui-disabled': {
+            color: `${theme.palette.error.main} !important`,
+          },
+        })}
+      >
+        Analysis error
+      </AnimatedButton>
+    );
+  }
 
   const diagnostics: string[] = [];
   if (errorCount > 0) {
@@ -54,8 +71,7 @@ const GenerateButton = observer(function GenerateButton({
         aria-label={`Select next diagnostic out of ${summary}`}
         onClick={() => editorStore.nextDiagnostic()}
         color="error"
-        startIcon={<DangerousOutlinedIcon />}
-        {...(sx === undefined ? {} : { sx })}
+        startIcon={<CancelIcon />}
       >
         {summary}
       </AnimatedButton>
@@ -67,7 +83,6 @@ const GenerateButton = observer(function GenerateButton({
       disabled={!editorStore.opened}
       color={warningCount > 0 ? 'warning' : 'primary'}
       startIcon={<PlayArrowIcon />}
-      {...(sx === undefined ? {} : { sx })}
     >
       {summary === '' ? GENERATE_LABEL : `${GENERATE_LABEL} (${summary})`}
     </AnimatedButton>
@@ -76,7 +91,6 @@ const GenerateButton = observer(function GenerateButton({
 
 GenerateButton.defaultProps = {
   hideWarnings: false,
-  sx: undefined,
 };
 
 export default GenerateButton;
diff --git a/subprojects/frontend/src/graph/DotGraphVisualizer.tsx b/subprojects/frontend/src/graph/DotGraphVisualizer.tsx
new file mode 100644
index 00000000..eec72a7d
--- /dev/null
+++ b/subprojects/frontend/src/graph/DotGraphVisualizer.tsx
@@ -0,0 +1,162 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import * as d3 from 'd3';
+import { type Graphviz, graphviz } from 'd3-graphviz';
+import type { BaseType, Selection } from 'd3-selection';
+import { reaction, type IReactionDisposer } from 'mobx';
+import { observer } from 'mobx-react-lite';
+import { useCallback, useRef, useState } from 'react';
+
+import getLogger from '../utils/getLogger';
+
+import type GraphStore from './GraphStore';
+import GraphTheme from './GraphTheme';
+import { FitZoomCallback } from './ZoomCanvas';
+import dotSource from './dotSource';
+import postProcessSvg from './postProcessSVG';
+
+const LOG = getLogger('graph.DotGraphVisualizer');
+
+function ptToPx(pt: number): number {
+  return (pt * 4) / 3;
+}
+
+function DotGraphVisualizer({
+  graph,
+  fitZoom,
+  transitionTime,
+  animateThreshold,
+}: {
+  graph: GraphStore;
+  fitZoom?: FitZoomCallback;
+  transitionTime?: number;
+  animateThreshold?: number;
+}): JSX.Element {
+  const transitionTimeOrDefault =
+    transitionTime ?? DotGraphVisualizer.defaultProps.transitionTime;
+  const animateThresholdOrDefault =
+    animateThreshold ?? DotGraphVisualizer.defaultProps.animateThreshold;
+  const disposerRef = useRef<IReactionDisposer | undefined>();
+  const graphvizRef = useRef<
+    Graphviz<BaseType, unknown, null, undefined> | undefined
+  >();
+  const [animate, setAnimate] = useState(true);
+
+  const setElement = useCallback(
+    (element: HTMLDivElement | null) => {
+      if (disposerRef.current !== undefined) {
+        disposerRef.current();
+        disposerRef.current = undefined;
+      }
+      if (graphvizRef.current !== undefined) {
+        // `@types/d3-graphviz` does not contain the signature for the `destroy` method.
+        (graphvizRef.current as unknown as { destroy(): void }).destroy();
+        graphvizRef.current = undefined;
+      }
+      if (element !== null) {
+        element.replaceChildren();
+        const renderer = graphviz(element) as Graphviz<
+          BaseType,
+          unknown,
+          null,
+          undefined
+        >;
+        renderer.keyMode('id');
+        ['TRUE', 'UNKNOWN', 'ERROR'].forEach((icon) =>
+          renderer.addImage(`#${icon}`, 16, 16),
+        );
+        renderer.zoom(false);
+        renderer.tweenPrecision('5%');
+        renderer.tweenShapes(false);
+        renderer.convertEqualSidedPolygons(false);
+        if (animate) {
+          const transition = () =>
+            d3
+              .transition()
+              .duration(transitionTimeOrDefault)
+              .ease(d3.easeCubic);
+          /* eslint-disable-next-line @typescript-eslint/no-unsafe-argument,
+            @typescript-eslint/no-explicit-any --
+            Workaround for error in `@types/d3-graphviz`.
+          */
+          renderer.transition(transition as any);
+        } else {
+          renderer.tweenPaths(false);
+        }
+        let newViewBox = { width: 0, height: 0 };
+        renderer.onerror(LOG.error.bind(LOG));
+        renderer.on(
+          'postProcessSVG',
+          // @ts-expect-error Custom `d3-graphviz` hook not covered by typings.
+          (
+            svgSelection: Selection<SVGSVGElement, unknown, BaseType, unknown>,
+          ) => {
+            const svg = svgSelection.node();
+            if (svg !== null) {
+              postProcessSvg(svg);
+              newViewBox = {
+                width: ptToPx(svg.viewBox.baseVal.width),
+                height: ptToPx(svg.viewBox.baseVal.height),
+              };
+            } else {
+              // Do not trigger fit zoom.
+              newViewBox = { width: 0, height: 0 };
+            }
+          },
+        );
+        renderer.on('renderEnd', () => {
+          // `d3-graphviz` uses `<title>` elements for traceability,
+          // so we only remove them after the rendering is finished.
+          d3.select(element).selectAll('title').remove();
+        });
+        if (fitZoom !== undefined) {
+          if (animate) {
+            renderer.on('transitionStart', () => fitZoom(newViewBox));
+          } else {
+            renderer.on('end', () => fitZoom(false));
+          }
+        }
+        disposerRef.current = reaction(
+          () => dotSource(graph),
+          (result) => {
+            if (result === undefined) {
+              return;
+            }
+            const [source, size] = result;
+            // Disable tweening for large graphs to improve performance.
+            // See https://github.com/magjac/d3-graphviz/issues/232#issuecomment-1157555213
+            const newAnimate = size < animateThresholdOrDefault;
+            if (animate === newAnimate) {
+              renderer.renderDot(source);
+            } else {
+              setAnimate(newAnimate);
+            }
+          },
+          { fireImmediately: true },
+        );
+        graphvizRef.current = renderer;
+      }
+    },
+    [
+      graph,
+      fitZoom,
+      transitionTimeOrDefault,
+      animateThresholdOrDefault,
+      animate,
+    ],
+  );
+
+  return <GraphTheme ref={setElement} />;
+}
+
+DotGraphVisualizer.defaultProps = {
+  fitZoom: undefined,
+  transitionTime: 250,
+  animateThreshold: 100,
+};
+
+export default observer(DotGraphVisualizer);
diff --git a/subprojects/frontend/src/graph/GraphArea.tsx b/subprojects/frontend/src/graph/GraphArea.tsx
new file mode 100644
index 00000000..f8f40d22
--- /dev/null
+++ b/subprojects/frontend/src/graph/GraphArea.tsx
@@ -0,0 +1,54 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import Box from '@mui/material/Box';
+import { useTheme } from '@mui/material/styles';
+import { observer } from 'mobx-react-lite';
+import { useResizeDetector } from 'react-resize-detector';
+
+import Loading from '../Loading';
+import { useRootStore } from '../RootStoreProvider';
+
+import DotGraphVisualizer from './DotGraphVisualizer';
+import VisibilityPanel from './VisibilityPanel';
+import ZoomCanvas from './ZoomCanvas';
+
+function GraphArea(): JSX.Element {
+  const { editorStore } = useRootStore();
+  const { breakpoints } = useTheme();
+  const { ref, width, height } = useResizeDetector({
+    refreshMode: 'debounce',
+  });
+
+  if (editorStore === undefined) {
+    return <Loading />;
+  }
+
+  const { graph } = editorStore;
+  const breakpoint = breakpoints.values.sm;
+  const dialog =
+    width === undefined ||
+    height === undefined ||
+    width < breakpoint ||
+    height < breakpoint;
+
+  return (
+    <Box
+      width="100%"
+      height="100%"
+      overflow="hidden"
+      position="relative"
+      ref={ref}
+    >
+      <ZoomCanvas>
+        {(fitZoom) => <DotGraphVisualizer graph={graph} fitZoom={fitZoom} />}
+      </ZoomCanvas>
+      <VisibilityPanel graph={graph} dialog={dialog} />
+    </Box>
+  );
+}
+
+export default observer(GraphArea);
diff --git a/subprojects/frontend/src/graph/GraphPane.tsx b/subprojects/frontend/src/graph/GraphPane.tsx
new file mode 100644
index 00000000..c2ef8927
--- /dev/null
+++ b/subprojects/frontend/src/graph/GraphPane.tsx
@@ -0,0 +1,28 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import Stack from '@mui/material/Stack';
+import { Suspense, lazy } from 'react';
+
+import Loading from '../Loading';
+
+const GraphArea = lazy(() => import('./GraphArea'));
+
+export default function GraphPane(): JSX.Element {
+  return (
+    <Stack
+      direction="column"
+      height="100%"
+      overflow="auto"
+      alignItems="center"
+      justifyContent="center"
+    >
+      <Suspense fallback={<Loading />}>
+        <GraphArea />
+      </Suspense>
+    </Stack>
+  );
+}
diff --git a/subprojects/frontend/src/graph/GraphStore.ts b/subprojects/frontend/src/graph/GraphStore.ts
new file mode 100644
index 00000000..ecb016b5
--- /dev/null
+++ b/subprojects/frontend/src/graph/GraphStore.ts
@@ -0,0 +1,187 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import { makeAutoObservable, observable } from 'mobx';
+
+import type {
+  RelationMetadata,
+  SemanticsSuccessResult,
+} from '../xtext/xtextServiceResults';
+
+export type Visibility = 'all' | 'must' | 'none';
+
+export function getDefaultVisibility(
+  metadata: RelationMetadata | undefined,
+): Visibility {
+  if (metadata === undefined || metadata.arity <= 0 || metadata.arity > 2) {
+    return 'none';
+  }
+  const { detail } = metadata;
+  switch (detail.type) {
+    case 'class':
+    case 'reference':
+    case 'opposite':
+      return 'all';
+    case 'predicate':
+      return detail.error ? 'must' : 'none';
+    default:
+      return 'none';
+  }
+}
+
+export function isVisibilityAllowed(
+  metadata: RelationMetadata | undefined,
+  visibility: Visibility,
+): boolean {
+  if (metadata === undefined || metadata.arity <= 0 || metadata.arity > 2) {
+    return visibility === 'none';
+  }
+  const { detail } = metadata;
+  if (detail.type === 'predicate' && detail.error) {
+    // We can't display may matches of error predicates,
+    // because they have none by definition.
+    return visibility !== 'all';
+  }
+  return true;
+}
+
+export default class GraphStore {
+  semantics: SemanticsSuccessResult = {
+    nodes: [],
+    relations: [],
+    partialInterpretation: {},
+  };
+
+  relationMetadata = new Map<string, RelationMetadata>();
+
+  visibility = new Map<string, Visibility>();
+
+  abbreviate = true;
+
+  scopes = false;
+
+  selectedSymbol: RelationMetadata | undefined;
+
+  constructor() {
+    makeAutoObservable(this, {
+      semantics: observable.ref,
+    });
+  }
+
+  getVisibility(relation: string): Visibility {
+    const visibilityOverride = this.visibility.get(relation);
+    if (visibilityOverride !== undefined) {
+      return visibilityOverride;
+    }
+    return this.getDefaultVisibility(relation);
+  }
+
+  getDefaultVisibility(relation: string): Visibility {
+    const metadata = this.relationMetadata.get(relation);
+    return getDefaultVisibility(metadata);
+  }
+
+  isVisibilityAllowed(relation: string, visibility: Visibility): boolean {
+    const metadata = this.relationMetadata.get(relation);
+    return isVisibilityAllowed(metadata, visibility);
+  }
+
+  setVisibility(relation: string, visibility: Visibility): void {
+    const metadata = this.relationMetadata.get(relation);
+    if (metadata === undefined || !isVisibilityAllowed(metadata, visibility)) {
+      return;
+    }
+    const defaultVisiblity = getDefaultVisibility(metadata);
+    if (defaultVisiblity === visibility) {
+      this.visibility.delete(relation);
+    } else {
+      this.visibility.set(relation, visibility);
+    }
+  }
+
+  cycleVisibility(relation: string): void {
+    const metadata = this.relationMetadata.get(relation);
+    if (metadata === undefined) {
+      return;
+    }
+    switch (this.getVisibility(relation)) {
+      case 'none':
+        if (isVisibilityAllowed(metadata, 'must')) {
+          this.setVisibility(relation, 'must');
+        }
+        break;
+      case 'must':
+        {
+          const next = isVisibilityAllowed(metadata, 'all') ? 'all' : 'none';
+          this.setVisibility(relation, next);
+        }
+        break;
+      default:
+        this.setVisibility(relation, 'none');
+        break;
+    }
+  }
+
+  hideAll(): void {
+    this.relationMetadata.forEach((metadata, name) => {
+      if (getDefaultVisibility(metadata) === 'none') {
+        this.visibility.delete(name);
+      } else {
+        this.visibility.set(name, 'none');
+      }
+    });
+  }
+
+  resetFilter(): void {
+    this.visibility.clear();
+  }
+
+  getName({ name, simpleName }: { name: string; simpleName: string }): string {
+    return this.abbreviate ? simpleName : name;
+  }
+
+  toggleAbbrevaite(): void {
+    this.abbreviate = !this.abbreviate;
+  }
+
+  toggleScopes(): void {
+    this.scopes = !this.scopes;
+  }
+
+  setSelectedSymbol(option: RelationMetadata | undefined): void {
+    if (option === undefined) {
+      this.selectedSymbol = undefined;
+      return;
+    }
+    const metadata = this.relationMetadata.get(option.name);
+    if (metadata !== undefined) {
+      this.selectedSymbol = metadata;
+    } else {
+      this.selectedSymbol = undefined;
+    }
+  }
+
+  setSemantics(semantics: SemanticsSuccessResult) {
+    this.semantics = semantics;
+    this.relationMetadata.clear();
+    this.semantics.relations.forEach((metadata) => {
+      this.relationMetadata.set(metadata.name, metadata);
+    });
+    const toRemove = new Set<string>();
+    this.visibility.forEach((value, key) => {
+      if (
+        !this.isVisibilityAllowed(key, value) ||
+        this.getDefaultVisibility(key) === value
+      ) {
+        toRemove.add(key);
+      }
+    });
+    toRemove.forEach((key) => {
+      this.visibility.delete(key);
+    });
+    this.setSelectedSymbol(this.selectedSymbol);
+  }
+}
diff --git a/subprojects/frontend/src/graph/GraphTheme.tsx b/subprojects/frontend/src/graph/GraphTheme.tsx
new file mode 100644
index 00000000..989bd0c2
--- /dev/null
+++ b/subprojects/frontend/src/graph/GraphTheme.tsx
@@ -0,0 +1,120 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import cancelSVG from '@material-icons/svg/svg/cancel/baseline.svg?raw';
+import labelSVG from '@material-icons/svg/svg/label/baseline.svg?raw';
+import labelOutlinedSVG from '@material-icons/svg/svg/label/outline.svg?raw';
+import { alpha, styled, type CSSObject } from '@mui/material/styles';
+
+import svgURL from '../utils/svgURL';
+
+function createEdgeColor(
+  suffix: string,
+  stroke: string,
+  fill?: string,
+): CSSObject {
+  return {
+    [`.edge-${suffix}`]: {
+      '& text': {
+        fill: stroke,
+      },
+      '& [stroke="black"]': {
+        stroke,
+      },
+      '& [fill="black"]': {
+        fill: fill ?? stroke,
+      },
+    },
+  };
+}
+
+export default styled('div', {
+  name: 'GraphTheme',
+})(({ theme }) => ({
+  '& svg': {
+    userSelect: 'none',
+    '.node': {
+      '& text': {
+        fontFamily: theme.typography.fontFamily,
+        fill: theme.palette.text.primary,
+      },
+      '& [stroke="black"]': {
+        stroke: theme.palette.text.primary,
+      },
+      '& [fill="green"]': {
+        fill:
+          theme.palette.mode === 'dark'
+            ? theme.palette.primary.dark
+            : theme.palette.primary.light,
+      },
+      '& [fill="white"]': {
+        fill: theme.palette.background.default,
+      },
+    },
+    '.node-INDIVIDUAL': {
+      '& [stroke="black"]': {
+        strokeWidth: 2,
+      },
+    },
+    '.node-shadow[fill="white"]': {
+      fill: alpha(
+        theme.palette.text.primary,
+        theme.palette.mode === 'dark' ? 0.32 : 0.24,
+      ),
+    },
+    '.node-exists-UNKNOWN [stroke="black"]': {
+      strokeDasharray: '5 2',
+    },
+    '.node-exists-FALSE': {
+      '& [fill="green"]': {
+        fill: theme.palette.background.default,
+      },
+      '& [stroke="black"]': {
+        strokeDasharray: '1 3',
+        stroke: theme.palette.text.secondary,
+      },
+    },
+    '.edge': {
+      '& text': {
+        fontFamily: theme.typography.fontFamily,
+        fill: theme.palette.text.primary,
+      },
+      '& [stroke="black"]': {
+        stroke: theme.palette.text.primary,
+      },
+      '& [fill="black"]': {
+        fill: theme.palette.text.primary,
+      },
+    },
+    ...createEdgeColor('UNKNOWN', theme.palette.text.secondary, 'none'),
+    ...createEdgeColor('ERROR', theme.palette.error.main),
+    '.icon': {
+      maskSize: '12px 12px',
+      maskPosition: '50% 50%',
+      maskRepeat: 'no-repeat',
+      width: '100%',
+      height: '100%',
+    },
+    '.icon-TRUE': {
+      maskImage: svgURL(labelSVG),
+      background: theme.palette.text.primary,
+    },
+    '.icon-UNKNOWN': {
+      maskImage: svgURL(labelOutlinedSVG),
+      background: theme.palette.text.secondary,
+    },
+    '.icon-ERROR': {
+      maskImage: svgURL(cancelSVG),
+      background: theme.palette.error.main,
+    },
+    'text.label-UNKNOWN': {
+      fill: theme.palette.text.secondary,
+    },
+    'text.label-ERROR': {
+      fill: theme.palette.error.main,
+    },
+  },
+}));
diff --git a/subprojects/frontend/src/graph/RelationName.tsx b/subprojects/frontend/src/graph/RelationName.tsx
new file mode 100644
index 00000000..ec26fb21
--- /dev/null
+++ b/subprojects/frontend/src/graph/RelationName.tsx
@@ -0,0 +1,72 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import { styled } from '@mui/material/styles';
+import { observer } from 'mobx-react-lite';
+
+import { RelationMetadata } from '../xtext/xtextServiceResults';
+
+const Error = styled('span', {
+  name: 'RelationName-Error',
+})(({ theme }) => ({
+  color: theme.palette.error.main,
+}));
+
+const Qualifier = styled('span', {
+  name: 'RelationName-Qualifier',
+})(({ theme }) => ({
+  color: theme.palette.text.secondary,
+}));
+
+const FormattedName = observer(function FormattedName({
+  name,
+  metadata,
+}: {
+  name: string;
+  metadata: RelationMetadata;
+}): React.ReactNode {
+  const { detail } = metadata;
+  if (detail.type === 'class' && detail.abstractClass) {
+    return <i>{name}</i>;
+  }
+  if (detail.type === 'reference' && detail.containment) {
+    return <b>{name}</b>;
+  }
+  if (detail.type === 'predicate' && detail.error) {
+    return <Error>{name}</Error>;
+  }
+  return name;
+});
+
+function RelationName({
+  metadata,
+  abbreviate,
+}: {
+  metadata: RelationMetadata;
+  abbreviate?: boolean;
+}): JSX.Element {
+  const { name, simpleName } = metadata;
+  if (abbreviate ?? RelationName.defaultProps.abbreviate) {
+    return <FormattedName name={simpleName} metadata={metadata} />;
+  }
+  if (name.endsWith(simpleName)) {
+    return (
+      <>
+        <Qualifier>
+          {name.substring(0, name.length - simpleName.length)}
+        </Qualifier>
+        <FormattedName name={simpleName} metadata={metadata} />
+      </>
+    );
+  }
+  return <FormattedName name={name} metadata={metadata} />;
+}
+
+RelationName.defaultProps = {
+  abbreviate: false,
+};
+
+export default observer(RelationName);
diff --git a/subprojects/frontend/src/graph/VisibilityDialog.tsx b/subprojects/frontend/src/graph/VisibilityDialog.tsx
new file mode 100644
index 00000000..f1fef28b
--- /dev/null
+++ b/subprojects/frontend/src/graph/VisibilityDialog.tsx
@@ -0,0 +1,315 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import CloseIcon from '@mui/icons-material/Close';
+import FilterListIcon from '@mui/icons-material/FilterList';
+import LabelIcon from '@mui/icons-material/Label';
+import LabelOutlinedIcon from '@mui/icons-material/LabelOutlined';
+import SentimentVeryDissatisfiedIcon from '@mui/icons-material/SentimentVeryDissatisfied';
+import VisibilityOffIcon from '@mui/icons-material/VisibilityOff';
+import Button from '@mui/material/Button';
+import Checkbox from '@mui/material/Checkbox';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import IconButton from '@mui/material/IconButton';
+import Switch from '@mui/material/Switch';
+import Typography from '@mui/material/Typography';
+import { styled } from '@mui/material/styles';
+import { observer } from 'mobx-react-lite';
+import { useId } from 'react';
+
+import type GraphStore from './GraphStore';
+import { isVisibilityAllowed } from './GraphStore';
+import RelationName from './RelationName';
+
+const VisibilityDialogRoot = styled('div', {
+  name: 'VisibilityDialog-Root',
+  shouldForwardProp: (propName) => propName !== 'dialog',
+})<{ dialog: boolean }>(({ theme, dialog }) => {
+  const overlayOpacity = dialog ? 0.16 : 0.09;
+  return {
+    maxHeight: '100%',
+    maxWidth: '100%',
+    overflow: 'hidden',
+    display: 'flex',
+    flexDirection: 'column',
+    '.VisibilityDialog-title': {
+      display: 'flex',
+      flexDirection: 'row',
+      alignItems: 'center',
+      padding: theme.spacing(1),
+      paddingLeft: theme.spacing(2),
+      borderBottom: `1px solid ${theme.palette.divider}`,
+      '& h2': {
+        flexGrow: 1,
+      },
+      '.MuiIconButton-root': {
+        flexGrow: 0,
+        flexShrink: 0,
+        marginLeft: theme.spacing(2),
+      },
+    },
+    '.MuiFormControlLabel-root': {
+      marginLeft: 0,
+      paddingTop: theme.spacing(1),
+      paddingLeft: theme.spacing(1),
+      '& + .MuiFormControlLabel-root': {
+        paddingTop: 0,
+      },
+    },
+    '.VisibilityDialog-scroll': {
+      display: 'flex',
+      flexDirection: 'column',
+      height: 'auto',
+      overflowX: 'hidden',
+      overflowY: 'auto',
+      margin: `0 ${theme.spacing(2)}`,
+      '& table': {
+        // We use flexbox instead of `display: table` to get proper text-overflow
+        // behavior for overly long relation names.
+        display: 'flex',
+        flexDirection: 'column',
+      },
+      '& thead, & tbody': {
+        display: 'flex',
+        flexDirection: 'column',
+      },
+      '& thead': {
+        position: 'sticky',
+        top: 0,
+        zIndex: 999,
+        backgroundColor: theme.palette.background.paper,
+        ...(theme.palette.mode === 'dark'
+          ? {
+              // In dark mode, MUI Paper gets a lighter overlay.
+              backgroundImage: `linear-gradient(
+                rgba(255, 255, 255, ${overlayOpacity}),
+                rgba(255, 255, 255, ${overlayOpacity})
+              )`,
+            }
+          : {}),
+        '& tr': {
+          height: '44px',
+        },
+      },
+      '& tr': {
+        display: 'flex',
+        flexDirection: 'row',
+        maxWidth: '100%',
+      },
+      '& tbody tr': {
+        transition: theme.transitions.create('background', {
+          duration: theme.transitions.duration.shortest,
+        }),
+        '&:hover': {
+          background: theme.palette.action.hover,
+          '@media (hover: none)': {
+            background: 'transparent',
+          },
+        },
+      },
+      '& th, & td': {
+        display: 'flex',
+        flexDirection: 'row',
+        alignItems: 'center',
+        justifyContent: 'center',
+        // Set width in advance, since we can't rely on `display: table-cell`.
+        width: '44px',
+      },
+      '& th:nth-of-type(3), & td:nth-of-type(3)': {
+        justifyContent: 'start',
+        paddingLeft: theme.spacing(1),
+        paddingRight: theme.spacing(2),
+        // Only let the last column grow or shrink.
+        flexGrow: 1,
+        flexShrink: 1,
+        // Compute the maximum available space in advance to let the text overflow.
+        maxWidth: 'calc(100% - 88px)',
+        width: 'min-content',
+      },
+      '& td:nth-of-type(3)': {
+        cursor: 'pointer',
+        userSelect: 'none',
+        WebkitTapHighlightColor: 'transparent',
+      },
+
+      '& thead th, .VisibilityDialog-custom tr:last-child td': {
+        borderBottom: `1px solid ${theme.palette.divider}`,
+      },
+    },
+    // Hack to apply `text-overflow`.
+    '.VisibilityDialog-nowrap': {
+      maxWidth: '100%',
+      overflow: 'hidden',
+      wordWrap: 'nowrap',
+      textOverflow: 'ellipsis',
+    },
+    '.VisibilityDialog-buttons': {
+      padding: theme.spacing(1),
+      display: 'flex',
+      flexDirection: 'row',
+      justifyContent: 'flex-end',
+      ...(dialog
+        ? {
+            marginTop: theme.spacing(1),
+            borderTop: `1px solid ${theme.palette.divider}`,
+          }
+        : {}),
+    },
+    '.VisibilityDialog-empty': {
+      display: 'flex',
+      flexDirection: 'column',
+      alignItems: 'center',
+      color: theme.palette.text.secondary,
+    },
+    '.VisibilityDialog-emptyIcon': {
+      fontSize: '6rem',
+      marginBottom: theme.spacing(1),
+    },
+  };
+});
+
+function VisibilityDialog({
+  graph,
+  close,
+  dialog,
+}: {
+  graph: GraphStore;
+  close: () => void;
+  dialog?: boolean;
+}): JSX.Element {
+  const titleId = useId();
+
+  const builtinRows: JSX.Element[] = [];
+  const rows: JSX.Element[] = [];
+  graph.relationMetadata.forEach((metadata, name) => {
+    if (!isVisibilityAllowed(metadata, 'must')) {
+      return;
+    }
+    const visibility = graph.getVisibility(name);
+    const row = (
+      <tr key={metadata.name}>
+        <td>
+          <Checkbox
+            checked={visibility !== 'none'}
+            aria-label={`Show true and error values of ${metadata.simpleName}`}
+            onClick={() =>
+              graph.setVisibility(name, visibility === 'none' ? 'must' : 'none')
+            }
+          />
+        </td>
+        <td>
+          <Checkbox
+            checked={visibility === 'all'}
+            disabled={!isVisibilityAllowed(metadata, 'all')}
+            aria-label={`Show all values of ${metadata.simpleName}`}
+            onClick={() =>
+              graph.setVisibility(name, visibility === 'all' ? 'must' : 'all')
+            }
+          />
+        </td>
+        <td onClick={() => graph.cycleVisibility(name)}>
+          <div className="VisibilityDialog-nowrap">
+            <RelationName metadata={metadata} abbreviate={graph.abbreviate} />
+          </div>
+        </td>
+      </tr>
+    );
+    if (name.startsWith('builtin::')) {
+      builtinRows.push(row);
+    } else {
+      rows.push(row);
+    }
+  });
+
+  const hasRows = rows.length > 0 || builtinRows.length > 0;
+
+  return (
+    <VisibilityDialogRoot
+      dialog={dialog ?? VisibilityDialog.defaultProps.dialog}
+      aria-labelledby={dialog ? titleId : undefined}
+    >
+      {dialog && (
+        <div className="VisibilityDialog-title">
+          <Typography variant="h6" component="h2" id={titleId}>
+            Customize view
+          </Typography>
+          <IconButton aria-label="Close" onClick={close}>
+            <CloseIcon />
+          </IconButton>
+        </div>
+      )}
+      <FormControlLabel
+        control={
+          <Switch
+            checked={!graph.abbreviate}
+            onClick={() => graph.toggleAbbrevaite()}
+          />
+        }
+        label="Fully qualified names"
+      />
+      <FormControlLabel
+        control={
+          <Switch checked={graph.scopes} onClick={() => graph.toggleScopes()} />
+        }
+        label="Object scopes"
+      />
+      <div className="VisibilityDialog-scroll">
+        {hasRows ? (
+          <table cellSpacing={0}>
+            <thead>
+              <tr>
+                <th>
+                  <LabelIcon />
+                </th>
+                <th>
+                  <LabelOutlinedIcon />
+                </th>
+                <th>Symbol</th>
+              </tr>
+            </thead>
+            <tbody className="VisibilityDialog-custom">{...rows}</tbody>
+            <tbody className="VisibilityDialog-builtin">{...builtinRows}</tbody>
+          </table>
+        ) : (
+          <div className="VisibilityDialog-empty">
+            <SentimentVeryDissatisfiedIcon
+              className="VisibilityDialog-emptyIcon"
+              fontSize="inherit"
+            />
+            <div>Partial model is empty</div>
+          </div>
+        )}
+      </div>
+      <div className="VisibilityDialog-buttons">
+        <Button
+          color="inherit"
+          onClick={() => graph.hideAll()}
+          startIcon={<VisibilityOffIcon />}
+        >
+          Hide all
+        </Button>
+        <Button
+          color="inherit"
+          onClick={() => graph.resetFilter()}
+          startIcon={<FilterListIcon />}
+        >
+          Reset filter
+        </Button>
+        {!dialog && (
+          <Button color="inherit" onClick={close}>
+            Close
+          </Button>
+        )}
+      </div>
+    </VisibilityDialogRoot>
+  );
+}
+
+VisibilityDialog.defaultProps = {
+  dialog: false,
+};
+
+export default observer(VisibilityDialog);
diff --git a/subprojects/frontend/src/graph/VisibilityPanel.tsx b/subprojects/frontend/src/graph/VisibilityPanel.tsx
new file mode 100644
index 00000000..20c4ffca
--- /dev/null
+++ b/subprojects/frontend/src/graph/VisibilityPanel.tsx
@@ -0,0 +1,91 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import ChevronLeftIcon from '@mui/icons-material/ChevronLeft';
+import TuneIcon from '@mui/icons-material/Tune';
+import Badge from '@mui/material/Badge';
+import Dialog from '@mui/material/Dialog';
+import IconButton from '@mui/material/IconButton';
+import Paper from '@mui/material/Paper';
+import Slide from '@mui/material/Slide';
+import { styled } from '@mui/material/styles';
+import { observer } from 'mobx-react-lite';
+import { useCallback, useId, useState } from 'react';
+
+import type GraphStore from './GraphStore';
+import VisibilityDialog from './VisibilityDialog';
+
+const VisibilityPanelRoot = styled('div', {
+  name: 'VisibilityPanel-Root',
+})(({ theme }) => ({
+  position: 'absolute',
+  padding: theme.spacing(1),
+  top: 0,
+  left: 0,
+  maxHeight: '100%',
+  maxWidth: '100%',
+  overflow: 'hidden',
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'start',
+  '.VisibilityPanel-drawer': {
+    overflow: 'hidden',
+    display: 'flex',
+    maxWidth: '100%',
+    margin: theme.spacing(1),
+  },
+}));
+
+function VisibilityPanel({
+  graph,
+  dialog,
+}: {
+  graph: GraphStore;
+  dialog: boolean;
+}): JSX.Element {
+  const id = useId();
+  const [showFilter, setShowFilter] = useState(false);
+  const close = useCallback(() => setShowFilter(false), []);
+
+  return (
+    <VisibilityPanelRoot>
+      <IconButton
+        role="switch"
+        aria-checked={showFilter}
+        aria-controls={dialog ? undefined : id}
+        aria-label="Show filter panel"
+        onClick={() => setShowFilter(!showFilter)}
+      >
+        <Badge
+          color="primary"
+          variant="dot"
+          invisible={graph.visibility.size === 0}
+        >
+          {showFilter && !dialog ? <ChevronLeftIcon /> : <TuneIcon />}
+        </Badge>
+      </IconButton>
+      {dialog ? (
+        <Dialog open={showFilter} onClose={close} maxWidth="xl">
+          <VisibilityDialog graph={graph} close={close} dialog />
+        </Dialog>
+      ) : (
+        <Slide
+          direction="right"
+          in={showFilter}
+          id={id}
+          mountOnEnter
+          unmountOnExit
+        >
+          <Paper className="VisibilityPanel-drawer" elevation={4}>
+            <VisibilityDialog graph={graph} close={close} />
+          </Paper>
+        </Slide>
+      )}
+    </VisibilityPanelRoot>
+  );
+}
+
+export default observer(VisibilityPanel);
diff --git a/subprojects/frontend/src/graph/ZoomButtons.tsx b/subprojects/frontend/src/graph/ZoomButtons.tsx
new file mode 100644
index 00000000..83938cf4
--- /dev/null
+++ b/subprojects/frontend/src/graph/ZoomButtons.tsx
@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import AddIcon from '@mui/icons-material/Add';
+import CropFreeIcon from '@mui/icons-material/CropFree';
+import RemoveIcon from '@mui/icons-material/Remove';
+import IconButton from '@mui/material/IconButton';
+import Stack from '@mui/material/Stack';
+import ToggleButton from '@mui/material/ToggleButton';
+
+import type { ChangeZoomCallback, SetFitZoomCallback } from './ZoomCanvas';
+
+export default function ZoomButtons({
+  changeZoom,
+  fitZoom,
+  setFitZoom,
+}: {
+  changeZoom: ChangeZoomCallback;
+  fitZoom: boolean;
+  setFitZoom: SetFitZoomCallback;
+}): JSX.Element {
+  return (
+    <Stack
+      direction="column"
+      p={1}
+      sx={{ position: 'absolute', bottom: 0, right: 0 }}
+    >
+      <IconButton aria-label="Zoom in" onClick={() => changeZoom(2)}>
+        <AddIcon fontSize="small" />
+      </IconButton>
+      <IconButton aria-label="Zoom out" onClick={() => changeZoom(0.5)}>
+        <RemoveIcon fontSize="small" />
+      </IconButton>
+      <ToggleButton
+        value="show-replace"
+        selected={fitZoom}
+        onClick={() => setFitZoom(!fitZoom)}
+        aria-label="Fit screen"
+        size="small"
+        className="iconOnly"
+      >
+        <CropFreeIcon fontSize="small" />
+      </ToggleButton>
+    </Stack>
+  );
+}
diff --git a/subprojects/frontend/src/graph/ZoomCanvas.tsx b/subprojects/frontend/src/graph/ZoomCanvas.tsx
new file mode 100644
index 00000000..0254bc59
--- /dev/null
+++ b/subprojects/frontend/src/graph/ZoomCanvas.tsx
@@ -0,0 +1,224 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import Box from '@mui/material/Box';
+import * as d3 from 'd3';
+import { zoom as d3Zoom } from 'd3-zoom';
+import React, { useCallback, useRef, useState } from 'react';
+import { useResizeDetector } from 'react-resize-detector';
+
+import ZoomButtons from './ZoomButtons';
+
+declare module 'd3-zoom' {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars -- Redeclaring type parameters.
+  interface ZoomBehavior<ZoomRefElement extends Element, Datum> {
+    // `@types/d3-zoom` does not contain the `center` function, because it is
+    // only available as a pull request for `d3-zoom`.
+    center(callback: (event: MouseEvent | Touch) => [number, number]): this;
+
+    // Custom `centroid` method added via patch.
+    centroid(centroid: [number, number]): this;
+  }
+}
+
+interface Transform {
+  x: number;
+  y: number;
+  k: number;
+}
+
+export type ChangeZoomCallback = (factor: number) => void;
+
+export type SetFitZoomCallback = (fitZoom: boolean) => void;
+
+export type FitZoomCallback = ((newSize?: {
+  width: number;
+  height: number;
+}) => void) &
+  ((newSize: boolean) => void);
+
+export default function ZoomCanvas({
+  children,
+  fitPadding,
+  transitionTime,
+}: {
+  children?: React.ReactNode | ((fitZoom: FitZoomCallback) => React.ReactNode);
+  fitPadding?: number;
+  transitionTime?: number;
+}): JSX.Element {
+  const fitPaddingOrDefault = fitPadding ?? ZoomCanvas.defaultProps.fitPadding;
+  const transitionTimeOrDefault =
+    transitionTime ?? ZoomCanvas.defaultProps.transitionTime;
+
+  const canvasRef = useRef<HTMLDivElement | undefined>();
+  const elementRef = useRef<HTMLDivElement | undefined>();
+  const zoomRef = useRef<
+    d3.ZoomBehavior<HTMLDivElement, unknown> | undefined
+  >();
+  const [zoom, setZoom] = useState<Transform>({ x: 0, y: 0, k: 1 });
+  const [fitZoom, setFitZoom] = useState(true);
+  const fitZoomRef = useRef(fitZoom);
+
+  const makeTransition = useCallback(
+    (element: HTMLDivElement) =>
+      d3.select(element).transition().duration(transitionTimeOrDefault),
+    [transitionTimeOrDefault],
+  );
+
+  const fitZoomCallback = useCallback<FitZoomCallback>(
+    (newSize) => {
+      if (
+        !fitZoomRef.current ||
+        canvasRef.current === undefined ||
+        zoomRef.current === undefined ||
+        elementRef.current === undefined
+      ) {
+        return;
+      }
+      let width = 0;
+      let height = 0;
+      if (newSize === undefined || typeof newSize === 'boolean') {
+        const elementRect = elementRef.current.getBoundingClientRect();
+        const currentFactor = d3.zoomTransform(canvasRef.current).k;
+        width = elementRect.width / currentFactor;
+        height = elementRect.height / currentFactor;
+      } else {
+        ({ width, height } = newSize);
+      }
+      if (width === 0 || height === 0) {
+        return;
+      }
+      const canvasRect = canvasRef.current.getBoundingClientRect();
+      const factor = Math.min(
+        1.0,
+        (canvasRect.width - 2 * fitPaddingOrDefault) / width,
+        (canvasRect.height - 2 * fitPaddingOrDefault) / height,
+      );
+      const target =
+        newSize === false
+          ? d3.select(canvasRef.current)
+          : makeTransition(canvasRef.current);
+      zoomRef.current.transform(target, d3.zoomIdentity.scale(factor));
+    },
+    [fitPaddingOrDefault, makeTransition],
+  );
+
+  const setFitZoomCallback = useCallback<SetFitZoomCallback>(
+    (newFitZoom) => {
+      setFitZoom(newFitZoom);
+      fitZoomRef.current = newFitZoom;
+      if (newFitZoom) {
+        fitZoomCallback();
+      }
+    },
+    [fitZoomCallback],
+  );
+
+  const changeZoomCallback = useCallback<ChangeZoomCallback>(
+    (factor) => {
+      setFitZoomCallback(false);
+      if (canvasRef.current === undefined || zoomRef.current === undefined) {
+        return;
+      }
+      const zoomTransition = makeTransition(canvasRef.current);
+      const center: [number, number] = [0, 0];
+      zoomRef.current.scaleBy(zoomTransition, factor, center);
+    },
+    [makeTransition, setFitZoomCallback],
+  );
+
+  const onResize = useCallback(() => fitZoomCallback(), [fitZoomCallback]);
+
+  const { ref: resizeRef } = useResizeDetector({
+    onResize,
+    refreshMode: 'debounce',
+    refreshRate: transitionTimeOrDefault,
+  });
+
+  const setCanvas = useCallback(
+    (canvas: HTMLDivElement | null) => {
+      canvasRef.current = canvas ?? undefined;
+      resizeRef(canvas);
+      if (canvas === null) {
+        return;
+      }
+      const zoomBehavior = d3Zoom<HTMLDivElement, unknown>()
+        .duration(transitionTimeOrDefault)
+        .center((event) => {
+          const { width, height } = canvas.getBoundingClientRect();
+          const [x, y] = d3.pointer(event, canvas);
+          return [x - width / 2, y - height / 2];
+        })
+        .centroid([0, 0])
+        .scaleExtent([1 / 32, 8]);
+      zoomBehavior.on(
+        'zoom',
+        (event: d3.D3ZoomEvent<HTMLDivElement, unknown>) => {
+          setZoom(event.transform);
+          if (event.sourceEvent) {
+            setFitZoomCallback(false);
+          }
+        },
+      );
+      d3.select(canvas).call(zoomBehavior);
+      zoomRef.current = zoomBehavior;
+    },
+    [transitionTimeOrDefault, setFitZoomCallback, resizeRef],
+  );
+
+  return (
+    <Box
+      sx={{
+        width: '100%',
+        height: '100%',
+        position: 'relative',
+        overflow: 'hidden',
+      }}
+    >
+      <Box
+        sx={{
+          position: 'absolute',
+          overflow: 'hidden',
+          top: 0,
+          left: 0,
+          right: 0,
+          bottom: 0,
+        }}
+        ref={setCanvas}
+      >
+        <Box
+          sx={{
+            position: 'absolute',
+            top: '50%',
+            left: '50%',
+            transform: `
+              translate(${zoom.x}px, ${zoom.y}px)
+              scale(${zoom.k})
+              translate(-50%, -50%)
+            `,
+            transformOrigin: '0 0',
+          }}
+          ref={elementRef}
+        >
+          {typeof children === 'function'
+            ? children(fitZoomCallback)
+            : children}
+        </Box>
+      </Box>
+      <ZoomButtons
+        changeZoom={changeZoomCallback}
+        fitZoom={fitZoom}
+        setFitZoom={setFitZoomCallback}
+      />
+    </Box>
+  );
+}
+
+ZoomCanvas.defaultProps = {
+  children: undefined,
+  fitPadding: 8,
+  transitionTime: 250,
+};
diff --git a/subprojects/frontend/src/graph/dotSource.ts b/subprojects/frontend/src/graph/dotSource.ts
new file mode 100644
index 00000000..5e0b44c8
--- /dev/null
+++ b/subprojects/frontend/src/graph/dotSource.ts
@@ -0,0 +1,340 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import type {
+  NodeMetadata,
+  RelationMetadata,
+} from '../xtext/xtextServiceResults';
+
+import type GraphStore from './GraphStore';
+
+const EDGE_WEIGHT = 1;
+const CONTAINMENT_WEIGHT = 5;
+const UNKNOWN_WEIGHT_FACTOR = 0.5;
+
+function nodeName(graph: GraphStore, metadata: NodeMetadata): string {
+  const name = graph.getName(metadata);
+  switch (metadata.kind) {
+    case 'INDIVIDUAL':
+      return `<b>${name}</b>`;
+    default:
+      return name;
+  }
+}
+
+function relationName(graph: GraphStore, metadata: RelationMetadata): string {
+  const name = graph.getName(metadata);
+  const { detail } = metadata;
+  if (detail.type === 'class' && detail.abstractClass) {
+    return `<i>${name}</i>`;
+  }
+  if (detail.type === 'reference' && detail.containment) {
+    return `<b>${name}</b>`;
+  }
+  return name;
+}
+
+interface NodeData {
+  isolated: boolean;
+  exists: string;
+  equalsSelf: string;
+  unaryPredicates: Map<RelationMetadata, string>;
+  count: string;
+}
+
+function computeNodeData(graph: GraphStore): NodeData[] {
+  const {
+    semantics: { nodes, relations, partialInterpretation },
+  } = graph;
+
+  const nodeData = Array.from(Array(nodes.length)).map(() => ({
+    isolated: true,
+    exists: 'FALSE',
+    equalsSelf: 'FALSE',
+    unaryPredicates: new Map(),
+    count: '[0]',
+  }));
+
+  relations.forEach((relation) => {
+    const visibility = graph.getVisibility(relation.name);
+    if (visibility === 'none') {
+      return;
+    }
+    const { arity } = relation;
+    const interpretation = partialInterpretation[relation.name] ?? [];
+    interpretation.forEach((tuple) => {
+      const value = tuple[arity];
+      if (visibility !== 'all' && value === 'UNKNOWN') {
+        return;
+      }
+      for (let i = 0; i < arity; i += 1) {
+        const index = tuple[i];
+        if (typeof index === 'number') {
+          const data = nodeData[index];
+          if (data !== undefined) {
+            data.isolated = false;
+            if (arity === 1) {
+              data.unaryPredicates.set(relation, value);
+            }
+          }
+        }
+      }
+    });
+  });
+
+  partialInterpretation['builtin::exists']?.forEach(([index, value]) => {
+    if (typeof index === 'number' && typeof value === 'string') {
+      const data = nodeData[index];
+      if (data !== undefined) {
+        data.exists = value;
+      }
+    }
+  });
+
+  partialInterpretation['builtin::equals']?.forEach(([index, other, value]) => {
+    if (
+      typeof index === 'number' &&
+      index === other &&
+      typeof value === 'string'
+    ) {
+      const data = nodeData[index];
+      if (data !== undefined) {
+        data.equalsSelf = value;
+      }
+    }
+  });
+
+  partialInterpretation['builtin::count']?.forEach(([index, value]) => {
+    if (typeof index === 'number' && typeof value === 'string') {
+      const data = nodeData[index];
+      if (data !== undefined) {
+        data.count = value;
+      }
+    }
+  });
+
+  return nodeData;
+}
+
+function createNodes(graph: GraphStore, lines: string[]): void {
+  const nodeData = computeNodeData(graph);
+  const {
+    semantics: { nodes },
+    scopes,
+  } = graph;
+
+  nodes.forEach((node, i) => {
+    const data = nodeData[i];
+    if (data === undefined || data.isolated) {
+      return;
+    }
+    const classList = [
+      `node-${node.kind}`,
+      `node-exists-${data.exists}`,
+      `node-equalsSelf-${data.equalsSelf}`,
+    ];
+    if (data.unaryPredicates.size === 0) {
+      classList.push('node-empty');
+    }
+    const classes = classList.join(' ');
+    const name = nodeName(graph, node);
+    const border = node.kind === 'INDIVIDUAL' ? 2 : 1;
+    const count = scopes ? ` ${data.count}` : '';
+    lines.push(`n${i} [id="${node.name}", class="${classes}", label=<
+        <table border="${border}" cellborder="0" cellspacing="0" style="rounded" bgcolor="white">
+          <tr><td cellpadding="4.5" width="32" bgcolor="green">${name}${count}</td></tr>`);
+    if (data.unaryPredicates.size > 0) {
+      lines.push(
+        '<hr/><tr><td cellpadding="4.5"><table fixedsize="TRUE" align="left" border="0" cellborder="0" cellspacing="0" cellpadding="1.5">',
+      );
+      data.unaryPredicates.forEach((value, relation) => {
+        lines.push(
+          `<tr>
+              <td><img src="#${value}"/></td>
+              <td width="1.5"></td>
+              <td align="left" href="#${value}" id="${node.name},${
+                relation.name
+              },label">${relationName(graph, relation)}</td>
+            </tr>`,
+        );
+      });
+      lines.push('</table></td></tr>');
+    }
+    lines.push('</table>>]');
+  });
+}
+
+function compare(
+  a: readonly (number | string)[],
+  b: readonly number[],
+): number {
+  if (a.length !== b.length + 1) {
+    throw new Error('Tuple length mismatch');
+  }
+  for (let i = 0; i < b.length; i += 1) {
+    const aItem = a[i];
+    const bItem = b[i];
+    if (typeof aItem !== 'number' || typeof bItem !== 'number') {
+      throw new Error('Invalid tuple');
+    }
+    if (aItem < bItem) {
+      return -1;
+    }
+    if (aItem > bItem) {
+      return 1;
+    }
+  }
+  return 0;
+}
+
+function binarySerach(
+  tuples: readonly (readonly (number | string)[])[],
+  key: readonly number[],
+): string | undefined {
+  let lower = 0;
+  let upper = tuples.length - 1;
+  while (lower <= upper) {
+    const middle = Math.floor((lower + upper) / 2);
+    const tuple = tuples[middle];
+    if (tuple === undefined) {
+      throw new Error('Range error');
+    }
+    const result = compare(tuple, key);
+    if (result === 0) {
+      const found = tuple[key.length];
+      if (typeof found !== 'string') {
+        throw new Error('Invalid tuple value');
+      }
+      return found;
+    }
+    if (result < 0) {
+      lower = middle + 1;
+    } else {
+      // result > 0
+      upper = middle - 1;
+    }
+  }
+  return undefined;
+}
+
+function createRelationEdges(
+  graph: GraphStore,
+  relation: RelationMetadata,
+  showUnknown: boolean,
+  lines: string[],
+): void {
+  const {
+    semantics: { nodes, partialInterpretation },
+  } = graph;
+  const { detail } = relation;
+
+  let constraint: 'true' | 'false' = 'true';
+  let weight = EDGE_WEIGHT;
+  let penwidth = 1;
+  const name = graph.getName(relation);
+  let label = `"${name}"`;
+  if (detail.type === 'reference' && detail.containment) {
+    weight = CONTAINMENT_WEIGHT;
+    label = `<<b>${name}</b>>`;
+    penwidth = 2;
+  } else if (
+    detail.type === 'opposite' &&
+    graph.getVisibility(detail.opposite) !== 'none'
+  ) {
+    constraint = 'false';
+    weight = 0;
+  }
+
+  const tuples = partialInterpretation[relation.name] ?? [];
+  tuples.forEach(([from, to, value]) => {
+    const isUnknown = value === 'UNKNOWN';
+    if (
+      (!showUnknown && isUnknown) ||
+      typeof from !== 'number' ||
+      typeof to !== 'number' ||
+      typeof value !== 'string'
+    ) {
+      return;
+    }
+
+    const fromNode = nodes[from];
+    const toNode = nodes[to];
+    if (fromNode === undefined || toNode === undefined) {
+      return;
+    }
+
+    let dir = 'forward';
+    let edgeConstraint = constraint;
+    let edgeWeight = weight;
+    const opposite = binarySerach(tuples, [to, from]);
+    const oppositeUnknown = opposite === 'UNKNOWN';
+    const oppositeSet = opposite !== undefined;
+    const oppositeVisible = oppositeSet && (showUnknown || !oppositeUnknown);
+    if (opposite === value) {
+      if (to < from) {
+        // We already added this edge in the reverse direction.
+        return;
+      }
+      if (to > from) {
+        dir = 'both';
+      }
+    } else if (oppositeVisible && to < from) {
+      // Let the opposite edge drive the graph layout.
+      edgeConstraint = 'false';
+      edgeWeight = 0;
+    } else if (isUnknown && (!oppositeSet || oppositeUnknown)) {
+      // Only apply the UNKNOWN value penalty if we aren't the opposite
+      // edge driving the graph layout from above, or the penalty would
+      // be applied anyway.
+      edgeWeight *= UNKNOWN_WEIGHT_FACTOR;
+    }
+
+    lines.push(`n${from} -> n${to} [
+      id="${fromNode.name},${toNode.name},${relation.name}",
+      dir="${dir}",
+      constraint=${edgeConstraint},
+      weight=${edgeWeight},
+      xlabel=${label},
+      penwidth=${penwidth},
+      arrowsize=${penwidth >= 2 ? 0.875 : 1},
+      style="${isUnknown ? 'dashed' : 'solid'}",
+      class="edge-${value}"
+    ]`);
+  });
+}
+
+function createEdges(graph: GraphStore, lines: string[]): void {
+  const {
+    semantics: { relations },
+  } = graph;
+  relations.forEach((relation) => {
+    if (relation.arity !== 2) {
+      return;
+    }
+    const visibility = graph.getVisibility(relation.name);
+    if (visibility !== 'none') {
+      createRelationEdges(graph, relation, visibility === 'all', lines);
+    }
+  });
+}
+
+export default function dotSource(
+  graph: GraphStore | undefined,
+): [string, number] | undefined {
+  if (graph === undefined) {
+    return undefined;
+  }
+  const lines = [
+    'digraph {',
+    'graph [bgcolor=transparent];',
+    `node [fontsize=12, shape=plain, fontname="OpenSans"];`,
+    'edge [fontsize=10.5, color=black, fontname="OpenSans"];',
+  ];
+  createNodes(graph, lines);
+  createEdges(graph, lines);
+  lines.push('}');
+  return [lines.join('\n'), lines.length];
+}
diff --git a/subprojects/frontend/src/graph/parseBBox.ts b/subprojects/frontend/src/graph/parseBBox.ts
new file mode 100644
index 00000000..34df746b
--- /dev/null
+++ b/subprojects/frontend/src/graph/parseBBox.ts
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2017, Magnus Jacobsson
+ * Copyright 2023, The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * This file Incorporates patches from the Refinery authors.
+ *
+ * Redistribution and use is only permitted if neither
+ * the name of the copyright holder Magnus Jacobsson nor the names of other
+ * contributors to the d3-graphviz project are used to endorse or promote
+ * products derived from this software as per the 3rd clause of the
+ * 3-clause BSD license.
+ *
+ * See LICENSES/BSD-3-Clause.txt for more details.
+ */
+
+export interface BBox {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+
+function parsePoints(points: string[]): BBox {
+  const x = points.map((p) => Number(p.split(',')[0] ?? 0));
+  const y = points.map((p) => Number(p.split(',')[1] ?? 0));
+  const xmin = Math.min.apply(null, x);
+  const xmax = Math.max.apply(null, x);
+  const ymin = Math.min.apply(null, y);
+  const ymax = Math.max.apply(null, y);
+  return {
+    x: xmin,
+    y: ymin,
+    width: xmax - xmin,
+    height: ymax - ymin,
+  };
+}
+
+/**
+ * Compute the bounding box of a polygon without adding it to the DOM.
+ *
+ * Copyed from
+ * https://github.com/magjac/d3-graphviz/blob/81ab523fe5189a90da2d9d9cc9015c7079eea780/src/element.js#L36-L53
+ *
+ * @param path The polygon to compute the bounding box of.
+ * @returns The computed bounding box.
+ */
+export function parsePolygonBBox(polygon: SVGPolygonElement): BBox {
+  const points = (polygon.getAttribute('points') ?? '').split(' ');
+  return parsePoints(points);
+}
+
+/**
+ * Compute the bounding box of a path without adding it to the DOM.
+ *
+ * Copyed from
+ * https://github.com/magjac/d3-graphviz/blob/81ab523fe5189a90da2d9d9cc9015c7079eea780/src/element.js#L56-L75
+ *
+ * @param path The path to compute the bounding box of.
+ * @returns The computed bounding box.
+ */
+export function parsePathBBox(path: SVGPathElement): BBox {
+  const d = path.getAttribute('d') ?? '';
+  const points = d.split(/[A-Z ]/);
+  points.shift();
+  return parsePoints(points);
+}
diff --git a/subprojects/frontend/src/graph/postProcessSVG.ts b/subprojects/frontend/src/graph/postProcessSVG.ts
new file mode 100644
index 00000000..a580f5c6
--- /dev/null
+++ b/subprojects/frontend/src/graph/postProcessSVG.ts
@@ -0,0 +1,186 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import { type BBox, parsePolygonBBox, parsePathBBox } from './parseBBox';
+
+const SVG_NS = 'http://www.w3.org/2000/svg';
+const XLINK_NS = 'http://www.w3.org/1999/xlink';
+
+function modifyAttribute(element: Element, attribute: string, change: number) {
+  const valueString = element.getAttribute(attribute);
+  if (valueString === null) {
+    return;
+  }
+  const value = parseInt(valueString, 10);
+  element.setAttribute(attribute, String(value + change));
+}
+
+function addShadow(
+  node: SVGGElement,
+  container: SVGRectElement,
+  offset: number,
+): void {
+  const shadow = container.cloneNode() as SVGRectElement;
+  // Leave space for 1pt stroke around the original container.
+  const offsetWithStroke = offset - 0.5;
+  modifyAttribute(shadow, 'x', offsetWithStroke);
+  modifyAttribute(shadow, 'y', offsetWithStroke);
+  modifyAttribute(shadow, 'width', 1);
+  modifyAttribute(shadow, 'height', 1);
+  modifyAttribute(shadow, 'rx', 0.5);
+  modifyAttribute(shadow, 'ry', 0.5);
+  shadow.setAttribute('class', 'node-shadow');
+  shadow.id = `${node.id},shadow`;
+  node.insertBefore(shadow, node.firstChild);
+}
+
+function clipCompartmentBackground(node: SVGGElement) {
+  // Background rectangle of the node created by the `<table bgcolor="white">`
+  // HTML element in dot. It was transformed into a rounded rect by `fixNodeBackground`.
+  const container = node.querySelector<SVGRectElement>('rect[fill="white"]');
+  // Background rectangle of the lower compartment created by the `<td bgcolor="green">`
+  // HTML element in dot. It was transformed into a rounded rect by `fixNodeBackground`.
+  // Since dot doesn't round the coners of `<td>` background,
+  // we have to clip it ourselves.
+  const compartment = node.querySelector<SVGRectElement>('rect[fill="green"]');
+  // Make sure we provide traceability with IDs also for the border.
+  const border = node.querySelector<SVGRectElement>('rect[stroke="black"]');
+  if (container === null || compartment === null || border === null) {
+    return;
+  }
+  const copyOfContainer = container.cloneNode() as SVGRectElement;
+  const clipPath = document.createElementNS(SVG_NS, 'clipPath');
+  const clipId = `${node.id},,clip`;
+  clipPath.setAttribute('id', clipId);
+  clipPath.appendChild(copyOfContainer);
+  node.appendChild(clipPath);
+  compartment.setAttribute('clip-path', `url(#${clipId})`);
+  // Enlarge the compartment to completely cover the background.
+  modifyAttribute(compartment, 'y', -5);
+  modifyAttribute(compartment, 'x', -5);
+  modifyAttribute(compartment, 'width', 10);
+  const isEmpty = node.classList.contains('node-empty');
+  // Make sure that empty nodes are fully filled.
+  modifyAttribute(compartment, 'height', isEmpty ? 10 : 5);
+  if (node.classList.contains('node-equalsSelf-UNKNOWN')) {
+    addShadow(node, container, 6);
+  }
+  container.id = `${node.id},container`;
+  compartment.id = `${node.id},compartment`;
+  border.id = `${node.id},border`;
+}
+
+function createRect(
+  { x, y, width, height }: BBox,
+  original: SVGElement,
+): SVGRectElement {
+  const rect = document.createElementNS(SVG_NS, 'rect');
+  rect.setAttribute('fill', original.getAttribute('fill') ?? '');
+  rect.setAttribute('stroke', original.getAttribute('stroke') ?? '');
+  rect.setAttribute('x', String(x));
+  rect.setAttribute('y', String(y));
+  rect.setAttribute('width', String(width));
+  rect.setAttribute('height', String(height));
+  return rect;
+}
+
+function optimizeNodeShapes(node: SVGGElement) {
+  node.querySelectorAll('path').forEach((path) => {
+    const bbox = parsePathBBox(path);
+    const rect = createRect(bbox, path);
+    rect.setAttribute('rx', '12');
+    rect.setAttribute('ry', '12');
+    path.parentNode?.replaceChild(rect, path);
+  });
+  node.querySelectorAll('polygon').forEach((polygon) => {
+    const bbox = parsePolygonBBox(polygon);
+    if (bbox.height === 0) {
+      const polyline = document.createElementNS(SVG_NS, 'polyline');
+      polyline.setAttribute('stroke', polygon.getAttribute('stroke') ?? '');
+      polyline.setAttribute(
+        'points',
+        `${bbox.x},${bbox.y} ${bbox.x + bbox.width},${bbox.y}`,
+      );
+      polygon.parentNode?.replaceChild(polyline, polygon);
+    } else {
+      const rect = createRect(bbox, polygon);
+      polygon.parentNode?.replaceChild(rect, polygon);
+    }
+  });
+  clipCompartmentBackground(node);
+}
+
+function hrefToClass(node: SVGGElement) {
+  node.querySelectorAll<SVGAElement>('a').forEach((a) => {
+    if (a.parentNode === null) {
+      return;
+    }
+    const href = a.getAttribute('href') ?? a.getAttributeNS(XLINK_NS, 'href');
+    if (href === 'undefined' || !href?.startsWith('#')) {
+      return;
+    }
+    while (a.lastChild !== null) {
+      const child = a.lastChild;
+      a.removeChild(child);
+      if (child.nodeType === Node.ELEMENT_NODE) {
+        const element = child as Element;
+        element.classList.add('label', `label-${href.replace('#', '')}`);
+        a.after(child);
+      }
+    }
+    a.parentNode.removeChild(a);
+  });
+}
+
+function replaceImages(node: SVGGElement) {
+  node.querySelectorAll<SVGImageElement>('image').forEach((image) => {
+    const href =
+      image.getAttribute('href') ?? image.getAttributeNS(XLINK_NS, 'href');
+    if (href === 'undefined' || !href?.startsWith('#')) {
+      return;
+    }
+    const width = image.getAttribute('width')?.replace('px', '') ?? '';
+    const height = image.getAttribute('height')?.replace('px', '') ?? '';
+    const foreign = document.createElementNS(SVG_NS, 'foreignObject');
+    foreign.setAttribute('x', image.getAttribute('x') ?? '');
+    foreign.setAttribute('y', image.getAttribute('y') ?? '');
+    foreign.setAttribute('width', width);
+    foreign.setAttribute('height', height);
+    const div = document.createElement('div');
+    div.classList.add('icon', `icon-${href.replace('#', '')}`);
+    foreign.appendChild(div);
+    const sibling = image.nextElementSibling;
+    // Since dot doesn't respect the `id` attribute on table cells with a single image,
+    // compute the ID based on the ID of the next element (the label).
+    if (
+      sibling !== null &&
+      sibling.tagName.toLowerCase() === 'g' &&
+      sibling.id !== ''
+    ) {
+      foreign.id = `${sibling.id},icon`;
+    }
+    image.parentNode?.replaceChild(foreign, image);
+  });
+}
+
+export default function postProcessSvg(svg: SVGSVGElement) {
+  // svg
+  //   .querySelectorAll<SVGTitleElement>('title')
+  //   .forEach((title) => title.parentElement?.removeChild(title));
+  svg.querySelectorAll<SVGGElement>('g.node').forEach((node) => {
+    optimizeNodeShapes(node);
+    hrefToClass(node);
+    replaceImages(node);
+  });
+  // Increase padding to fit box shadows for multi-objects.
+  const viewBox = [
+    svg.viewBox.baseVal.x - 6,
+    svg.viewBox.baseVal.y - 6,
+    svg.viewBox.baseVal.width + 12,
+    svg.viewBox.baseVal.height + 12,
+  ];
+  svg.setAttribute('viewBox', viewBox.join(' '));
+}
diff --git a/subprojects/frontend/src/index.tsx b/subprojects/frontend/src/index.tsx
index cb11e6c3..e8a22e82 100644
--- a/subprojects/frontend/src/index.tsx
+++ b/subprojects/frontend/src/index.tsx
@@ -4,45 +4,46 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
+import { styled } from '@mui/material/styles';
 import { configure } from 'mobx';
 import { type Root, createRoot } from 'react-dom/client';
 
 import App from './App';
 import RootStore from './RootStore';
 
-const initialValue = `// Metamodel
+// Make sure `styled` ends up in the entry chunk.
+// https://github.com/mui/material-ui/issues/32727#issuecomment-1659945548
+(window as unknown as { fixViteIssue: unknown }).fixViteIssue = styled;
+
+const initialValue = `% Metamodel
 class Person {
+    contains Post[] posts opposite author
     Person[] friend opposite friend
 }
 
 class Post {
-    Person author
-    Post[0..1] replyTo
+    container Person author opposite posts
+    Post replyTo
 }
 
-// Constraints
+% Constraints
 error replyToNotFriend(Post x, Post y) <->
     replyTo(x, y),
     author(x, xAuthor),
     author(y, yAuthor),
+    xAuthor != yAuthor,
     !friend(xAuthor, yAuthor).
 
-error replyToCycle(Post x) <-> replyTo+(x,x).
+error replyToCycle(Post x) <-> replyTo+(x, x).
 
-// Instance model
-Person(a).
-Person(b).
+% Instance model
 friend(a, b).
-friend(b, a).
-Post(p1).
 author(p1, a).
-Post(p2).
 author(p2, b).
-replyTo(p2, p1).
 
-!author(Post::new, a). // Automatically inferred: author(Post::new, b).
+!author(Post::new, a).
 
-// Scope
+% Scope
 scope Post = 10..15, Person += 0.
 `;
 
diff --git a/subprojects/frontend/src/language/indentation.ts b/subprojects/frontend/src/language/indentation.ts
index 8446d7fa..6806147b 100644
--- a/subprojects/frontend/src/language/indentation.ts
+++ b/subprojects/frontend/src/language/indentation.ts
@@ -2,7 +2,7 @@
  * Copyright (C) 2018-2021 by Marijn Haverbeke <marijnh@gmail.com> and others
  * Copyright (C) 2021-2023 The Refinery Authors <https://refinery.tools/>
  *
- * SPDX-License-Identifier: MIT OR EPL-2.0
+ * SPDX-License-Identifier: MIT AND EPL-2.0
  */
 
 import type { TreeIndentContext } from '@codemirror/language';
diff --git a/subprojects/frontend/src/table/RelationGrid.tsx b/subprojects/frontend/src/table/RelationGrid.tsx
new file mode 100644
index 00000000..004982c9
--- /dev/null
+++ b/subprojects/frontend/src/table/RelationGrid.tsx
@@ -0,0 +1,109 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import Box from '@mui/material/Box';
+import {
+  DataGrid,
+  type GridRenderCellParams,
+  type GridColDef,
+} from '@mui/x-data-grid';
+import { observer } from 'mobx-react-lite';
+import { useMemo } from 'react';
+
+import type GraphStore from '../graph/GraphStore';
+
+import TableToolbar from './TableToolbar';
+import ValueRenderer from './ValueRenderer';
+
+interface Row {
+  nodes: string[];
+  value: string;
+}
+
+function RelationGrid({ graph }: { graph: GraphStore }): JSX.Element {
+  const {
+    selectedSymbol,
+    semantics: { nodes, partialInterpretation },
+  } = graph;
+  const symbolName = selectedSymbol?.name;
+  const arity = selectedSymbol?.arity ?? 0;
+
+  const columns = useMemo<GridColDef<Row>[]>(() => {
+    const defs: GridColDef<Row>[] = [];
+    for (let i = 0; i < arity; i += 1) {
+      defs.push({
+        field: `n${i}`,
+        headerName: String(i + 1),
+        valueGetter: (row) => row.row.nodes[i] ?? '',
+        flex: 1,
+      });
+    }
+    defs.push({
+      field: 'value',
+      headerName: 'Value',
+      flex: 1,
+      renderCell: ({ value }: GridRenderCellParams<Row, string>) => (
+        <ValueRenderer value={value} />
+      ),
+    });
+    return defs;
+  }, [arity]);
+
+  const rows = useMemo<Row[]>(() => {
+    if (symbolName === undefined) {
+      return [];
+    }
+    const interpretation = partialInterpretation[symbolName] ?? [];
+    return interpretation.map((tuple) => {
+      const nodeNames: string[] = [];
+      for (let i = 0; i < arity; i += 1) {
+        const index = tuple[i];
+        if (typeof index === 'number') {
+          const node = nodes[index];
+          if (node !== undefined) {
+            nodeNames.push(node.name);
+          }
+        }
+      }
+      return {
+        nodes: nodeNames,
+        value: String(tuple[arity]),
+      };
+    });
+  }, [arity, nodes, partialInterpretation, symbolName]);
+
+  return (
+    <Box
+      width="100%"
+      height="100%"
+      p={1}
+      sx={(theme) => ({
+        '.MuiDataGrid-withBorderColor': {
+          borderColor:
+            theme.palette.mode === 'dark'
+              ? theme.palette.divider
+              : theme.palette.outer.border,
+        },
+      })}
+    >
+      <DataGrid
+        slots={{ toolbar: TableToolbar }}
+        slotProps={{
+          toolbar: {
+            graph,
+          },
+        }}
+        density="compact"
+        rowSelection={false}
+        columns={columns}
+        rows={rows}
+        getRowId={(row) => row.nodes.join(',')}
+      />
+    </Box>
+  );
+}
+
+export default observer(RelationGrid);
diff --git a/subprojects/frontend/src/table/SymbolSelector.tsx b/subprojects/frontend/src/table/SymbolSelector.tsx
new file mode 100644
index 00000000..5272f8ed
--- /dev/null
+++ b/subprojects/frontend/src/table/SymbolSelector.tsx
@@ -0,0 +1,65 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import Autocomplete from '@mui/material/Autocomplete';
+import Box from '@mui/material/Box';
+import TextField from '@mui/material/TextField';
+import { observer } from 'mobx-react-lite';
+
+import type GraphStore from '../graph/GraphStore';
+import RelationName from '../graph/RelationName';
+
+function SymbolSelector({ graph }: { graph: GraphStore }): JSX.Element {
+  const {
+    selectedSymbol,
+    semantics: { relations },
+  } = graph;
+
+  return (
+    <Autocomplete
+      renderInput={(params) => (
+        <TextField
+          {...{
+            ...params,
+            InputLabelProps: {
+              ...params.InputLabelProps,
+              // Workaround for type errors.
+              className: params.InputLabelProps.className ?? '',
+              style: params.InputLabelProps.style ?? {},
+            },
+          }}
+          variant="standard"
+          size="medium"
+          placeholder="Symbol"
+        />
+      )}
+      options={relations}
+      getOptionLabel={(option) => option.name}
+      renderOption={(props, option) => (
+        <Box component="li" {...props}>
+          <RelationName metadata={option} />
+        </Box>
+      )}
+      value={selectedSymbol ?? null}
+      isOptionEqualToValue={(option, value) => option.name === value.name}
+      onChange={(_event, value) => graph.setSelectedSymbol(value ?? undefined)}
+      sx={(theme) => ({
+        flexBasis: 200,
+        maxWidth: 600,
+        flexGrow: 1,
+        flexShrink: 1,
+        '.MuiInput-underline::before': {
+          borderColor:
+            theme.palette.mode === 'dark'
+              ? theme.palette.divider
+              : theme.palette.outer.border,
+        },
+      })}
+    />
+  );
+}
+
+export default observer(SymbolSelector);
diff --git a/subprojects/frontend/src/table/TableArea.tsx b/subprojects/frontend/src/table/TableArea.tsx
new file mode 100644
index 00000000..cf37b96a
--- /dev/null
+++ b/subprojects/frontend/src/table/TableArea.tsx
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import { observer } from 'mobx-react-lite';
+
+import Loading from '../Loading';
+import { useRootStore } from '../RootStoreProvider';
+
+import RelationGrid from './RelationGrid';
+
+function TablePane(): JSX.Element {
+  const { editorStore } = useRootStore();
+
+  if (editorStore === undefined) {
+    return <Loading />;
+  }
+
+  return <RelationGrid graph={editorStore.graph} />;
+}
+
+export default observer(TablePane);
diff --git a/subprojects/frontend/src/table/TablePane.tsx b/subprojects/frontend/src/table/TablePane.tsx
new file mode 100644
index 00000000..01442c3a
--- /dev/null
+++ b/subprojects/frontend/src/table/TablePane.tsx
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import Stack from '@mui/material/Stack';
+import { Suspense, lazy } from 'react';
+
+import Loading from '../Loading';
+
+const TableArea = lazy(() => import('./TableArea'));
+
+export default function TablePane(): JSX.Element {
+  return (
+    <Stack direction="column" height="100%" overflow="auto" alignItems="center">
+      <Suspense fallback={<Loading />}>
+        <TableArea />
+      </Suspense>
+    </Stack>
+  );
+}
diff --git a/subprojects/frontend/src/table/TableToolbar.tsx b/subprojects/frontend/src/table/TableToolbar.tsx
new file mode 100644
index 00000000..b14e73c5
--- /dev/null
+++ b/subprojects/frontend/src/table/TableToolbar.tsx
@@ -0,0 +1,41 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import Stack from '@mui/material/Stack';
+import {
+  GridToolbarColumnsButton,
+  GridToolbarContainer,
+  GridToolbarExport,
+  GridToolbarFilterButton,
+} from '@mui/x-data-grid';
+
+import type GraphStore from '../graph/GraphStore';
+
+import SymbolSelector from './SymbolSelector';
+
+export default function TableToolbar({
+  graph,
+}: {
+  graph: GraphStore;
+}): JSX.Element {
+  return (
+    <GridToolbarContainer
+      sx={{
+        display: 'flex',
+        flexDirection: 'row',
+        flexWrap: 'wrap-reverse',
+        justifyContent: 'space-between',
+      }}
+    >
+      <Stack direction="row" flexWrap="wrap">
+        <GridToolbarColumnsButton />
+        <GridToolbarFilterButton />
+        <GridToolbarExport />
+      </Stack>
+      <SymbolSelector graph={graph} />
+    </GridToolbarContainer>
+  );
+}
diff --git a/subprojects/frontend/src/table/ValueRenderer.tsx b/subprojects/frontend/src/table/ValueRenderer.tsx
new file mode 100644
index 00000000..ac5700e4
--- /dev/null
+++ b/subprojects/frontend/src/table/ValueRenderer.tsx
@@ -0,0 +1,62 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import CancelIcon from '@mui/icons-material/Cancel';
+import LabelIcon from '@mui/icons-material/Label';
+import LabelOutlinedIcon from '@mui/icons-material/LabelOutlined';
+import { styled } from '@mui/material/styles';
+
+const Label = styled('div', {
+  name: 'ValueRenderer-Label',
+  shouldForwardProp: (prop) => prop !== 'value',
+})<{
+  value: 'TRUE' | 'UNKNOWN' | 'ERROR';
+}>(({ theme, value }) => ({
+  display: 'flex',
+  alignItems: 'center',
+  ...(value === 'UNKNOWN'
+    ? {
+        color: theme.palette.text.secondary,
+      }
+    : {}),
+  ...(value === 'ERROR'
+    ? {
+        color: theme.palette.error.main,
+      }
+    : {}),
+  '& svg': {
+    marginRight: theme.spacing(0.5),
+  },
+}));
+
+export default function ValueRenderer({
+  value,
+}: {
+  value: string | undefined;
+}): React.ReactNode {
+  switch (value) {
+    case 'TRUE':
+      return (
+        <Label value={value}>
+          <LabelIcon fontSize="small" /> true
+        </Label>
+      );
+    case 'UNKNOWN':
+      return (
+        <Label value={value}>
+          <LabelOutlinedIcon fontSize="small" /> unknown
+        </Label>
+      );
+    case 'ERROR':
+      return (
+        <Label value={value}>
+          <CancelIcon fontSize="small" /> error
+        </Label>
+      );
+    default:
+      return value;
+  }
+}
diff --git a/subprojects/frontend/src/theme/ThemeProvider.tsx b/subprojects/frontend/src/theme/ThemeProvider.tsx
index 78146f25..18310147 100644
--- a/subprojects/frontend/src/theme/ThemeProvider.tsx
+++ b/subprojects/frontend/src/theme/ThemeProvider.tsx
@@ -75,13 +75,15 @@ function createResponsiveTheme(
     ...options,
     typography: {
       fontFamily:
-        '"Inter Variable", "Inter", "Roboto", "Helvetica", "Arial", sans-serif',
-      fontWeightMedium: 600,
+        '"Open Sans Variable", "Open Sans", "Roboto", "Helvetica", "Arial", sans-serif',
+      fontWeightMedium: 500,
       fontWeightEditorNormal: 400,
       fontWeightEditorBold: 700,
       button: {
-        // 24px line height for 14px button text to fix browser rounding errors.
-        lineHeight: 1.714286,
+        fontWeight: 600,
+        fontVariationSettings: '"wdth" 87.5',
+        fontSize: '1rem',
+        lineHeight: 1.5,
       },
       editor: {
         fontFamily:
@@ -151,7 +153,7 @@ function createResponsiveTheme(
               }, {}),
             },
           },
-          sizeSmall: { fontSize: '0.75rem' },
+          sizeSmall: { fontSize: '0.875rem', lineHeight: '1.75' },
           sizeLarge: { fontSize: '1rem' },
           text: { '&.rounded': { padding: '6px 14px' } },
           textSizeSmall: { '&.rounded': { padding: '4px 8px' } },
@@ -287,7 +289,7 @@ const darkTheme = (() => {
           secondary: secondaryText,
           disabled: '#5c6370',
         },
-        divider: alpha(secondaryText, 0.24),
+        divider: alpha(primaryText, 0.24),
         outer: {
           background: darkBackground,
           border: '#181a1f',
diff --git a/subprojects/frontend/src/theme/ThemeStore.ts b/subprojects/frontend/src/theme/ThemeStore.ts
index 7c657449..12449b94 100644
--- a/subprojects/frontend/src/theme/ThemeStore.ts
+++ b/subprojects/frontend/src/theme/ThemeStore.ts
@@ -12,11 +12,19 @@ export enum ThemePreference {
   PreferDark,
 }
 
+export type SelectedPane = 'code' | 'graph' | 'table';
+
 export default class ThemeStore {
   preference = ThemePreference.System;
 
   systemDarkMode: boolean;
 
+  showCode = true;
+
+  showGraph = true;
+
+  showTable = false;
+
   constructor() {
     const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
     this.systemDarkMode = mediaQuery.matches;
@@ -48,4 +56,44 @@ export default class ThemeStore {
         : ThemePreference.PreferDark;
     }
   }
+
+  toggleCode(): void {
+    if (!this.showGraph && !this.showTable) {
+      return;
+    }
+    this.showCode = !this.showCode;
+  }
+
+  toggleGraph(): void {
+    if (!this.showCode && !this.showTable) {
+      return;
+    }
+    this.showGraph = !this.showGraph;
+  }
+
+  toggleTable(): void {
+    if (!this.showCode && !this.showGraph) {
+      return;
+    }
+    this.showTable = !this.showTable;
+  }
+
+  get selectedPane(): SelectedPane {
+    if (this.showCode) {
+      return 'code';
+    }
+    if (this.showGraph) {
+      return 'graph';
+    }
+    if (this.showTable) {
+      return 'table';
+    }
+    return 'code';
+  }
+
+  setSelectedPane(pane: SelectedPane, keepCode = true): void {
+    this.showCode = pane === 'code' || (keepCode && this.showCode);
+    this.showGraph = pane === 'graph';
+    this.showTable = pane === 'table';
+  }
 }
diff --git a/subprojects/frontend/src/utils/svgURL.ts b/subprojects/frontend/src/utils/svgURL.ts
new file mode 100644
index 00000000..9b8ecbd5
--- /dev/null
+++ b/subprojects/frontend/src/utils/svgURL.ts
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+export default function svgURL(svg: string): string {
+  return `url('data:image/svg+xml;utf8,${svg}')`;
+}
diff --git a/subprojects/frontend/src/xtext/BackendConfig.ts b/subprojects/frontend/src/xtext/BackendConfig.ts
index 4c7eac5f..e7043bd5 100644
--- a/subprojects/frontend/src/xtext/BackendConfig.ts
+++ b/subprojects/frontend/src/xtext/BackendConfig.ts
@@ -11,7 +11,7 @@ import { z } from 'zod';
 export const ENDPOINT = 'config.json';
 
 const BackendConfig = z.object({
-  webSocketURL: z.string().url(),
+  webSocketURL: z.string().url().optional(),
 });
 
 type BackendConfig = z.infer<typeof BackendConfig>;
diff --git a/subprojects/frontend/src/xtext/ContentAssistService.ts b/subprojects/frontend/src/xtext/ContentAssistService.ts
index fd30c4f9..ac8ab36a 100644
--- a/subprojects/frontend/src/xtext/ContentAssistService.ts
+++ b/subprojects/frontend/src/xtext/ContentAssistService.ts
@@ -248,10 +248,20 @@ export default class ContentAssistService {
     if (lastTo === undefined) {
       return true;
     }
-    const [transformedFrom, transformedTo] = this.mapRangeInclusive(
-      lastFrom,
-      lastTo,
-    );
+    let transformedFrom: number;
+    let transformedTo: number;
+    try {
+      [transformedFrom, transformedTo] = this.mapRangeInclusive(
+        lastFrom,
+        lastTo,
+      );
+    } catch (error) {
+      if (error instanceof RangeError) {
+        log.debug('Invalidating cache due to invalid range', error);
+        return true;
+      }
+      throw error;
+    }
     let invalidate = false;
     transaction.changes.iterChangedRanges((fromA, toA) => {
       if (fromA < transformedFrom || toA > transformedTo) {
diff --git a/subprojects/frontend/src/xtext/SemanticsService.ts b/subprojects/frontend/src/xtext/SemanticsService.ts
new file mode 100644
index 00000000..d68b87a9
--- /dev/null
+++ b/subprojects/frontend/src/xtext/SemanticsService.ts
@@ -0,0 +1,32 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import type EditorStore from '../editor/EditorStore';
+
+import type ValidationService from './ValidationService';
+import { SemanticsResult } from './xtextServiceResults';
+
+export default class SemanticsService {
+  constructor(
+    private readonly store: EditorStore,
+    private readonly validationService: ValidationService,
+  ) {}
+
+  onPush(push: unknown): void {
+    const result = SemanticsResult.parse(push);
+    if ('issues' in result) {
+      this.validationService.setSemanticsIssues(result.issues);
+    } else {
+      this.validationService.setSemanticsIssues([]);
+      if ('error' in result) {
+        this.store.setSemanticsError(result.error);
+      } else {
+        this.store.setSemantics(result);
+      }
+    }
+    this.store.analysisCompleted();
+  }
+}
diff --git a/subprojects/frontend/src/xtext/UpdateService.ts b/subprojects/frontend/src/xtext/UpdateService.ts
index ee5ebde2..1ac722e1 100644
--- a/subprojects/frontend/src/xtext/UpdateService.ts
+++ b/subprojects/frontend/src/xtext/UpdateService.ts
@@ -133,6 +133,7 @@ export default class UpdateService {
       return;
     }
     log.trace('Editor delta', delta);
+    this.store.analysisStarted();
     const result = await this.webSocketClient.send({
       resource: this.resourceName,
       serviceType: 'update',
@@ -157,6 +158,7 @@ export default class UpdateService {
   private async updateFullTextExclusive(): Promise<void> {
     log.debug('Performing full text update');
     this.tracker.prepareFullTextUpdateExclusive();
+    this.store.analysisStarted();
     const result = await this.webSocketClient.send({
       resource: this.resourceName,
       serviceType: 'update',
diff --git a/subprojects/frontend/src/xtext/ValidationService.ts b/subprojects/frontend/src/xtext/ValidationService.ts
index 64fb63eb..1a896db3 100644
--- a/subprojects/frontend/src/xtext/ValidationService.ts
+++ b/subprojects/frontend/src/xtext/ValidationService.ts
@@ -9,7 +9,7 @@ import type { Diagnostic } from '@codemirror/lint';
 import type EditorStore from '../editor/EditorStore';
 
 import type UpdateService from './UpdateService';
-import { ValidationResult } from './xtextServiceResults';
+import { Issue, ValidationResult } from './xtextServiceResults';
 
 export default class ValidationService {
   constructor(
@@ -17,11 +17,41 @@ export default class ValidationService {
     private readonly updateService: UpdateService,
   ) {}
 
+  private lastValidationIssues: Issue[] = [];
+
+  private lastSemanticsIssues: Issue[] = [];
+
   onPush(push: unknown): void {
-    const { issues } = ValidationResult.parse(push);
+    ({ issues: this.lastValidationIssues } = ValidationResult.parse(push));
+    this.lastSemanticsIssues = [];
+    this.updateDiagnostics();
+    if (
+      this.lastValidationIssues.some(({ severity }) => severity === 'error')
+    ) {
+      this.store.analysisCompleted(true);
+    }
+  }
+
+  onDisconnect(): void {
+    this.store.updateDiagnostics([]);
+    this.lastValidationIssues = [];
+    this.lastSemanticsIssues = [];
+  }
+
+  setSemanticsIssues(issues: Issue[]): void {
+    this.lastSemanticsIssues = issues;
+    this.updateDiagnostics();
+  }
+
+  private updateDiagnostics(): void {
     const allChanges = this.updateService.computeChangesSinceLastUpdate();
     const diagnostics: Diagnostic[] = [];
-    issues.forEach(({ offset, length, severity, description }) => {
+    function createDiagnostic({
+      offset,
+      length,
+      severity,
+      description,
+    }: Issue): void {
       if (severity === 'ignore') {
         return;
       }
@@ -31,11 +61,9 @@ export default class ValidationService {
         severity,
         message: description,
       });
-    });
+    }
+    this.lastValidationIssues.forEach(createDiagnostic);
+    this.lastSemanticsIssues.forEach(createDiagnostic);
     this.store.updateDiagnostics(diagnostics);
   }
-
-  onDisconnect(): void {
-    this.store.updateDiagnostics([]);
-  }
 }
diff --git a/subprojects/frontend/src/xtext/XtextClient.ts b/subprojects/frontend/src/xtext/XtextClient.ts
index e8181af0..87778084 100644
--- a/subprojects/frontend/src/xtext/XtextClient.ts
+++ b/subprojects/frontend/src/xtext/XtextClient.ts
@@ -17,6 +17,7 @@ import getLogger from '../utils/getLogger';
 import ContentAssistService from './ContentAssistService';
 import HighlightingService from './HighlightingService';
 import OccurrencesService from './OccurrencesService';
+import SemanticsService from './SemanticsService';
 import UpdateService from './UpdateService';
 import ValidationService from './ValidationService';
 import XtextWebSocketClient from './XtextWebSocketClient';
@@ -37,7 +38,12 @@ export default class XtextClient {
 
   private readonly occurrencesService: OccurrencesService;
 
-  constructor(store: EditorStore, private readonly pwaStore: PWAStore) {
+  private readonly semanticsService: SemanticsService;
+
+  constructor(
+    private readonly store: EditorStore,
+    private readonly pwaStore: PWAStore,
+  ) {
     this.webSocketClient = new XtextWebSocketClient(
       () => this.onReconnect(),
       () => this.onDisconnect(),
@@ -51,6 +57,7 @@ export default class XtextClient {
     );
     this.validationService = new ValidationService(store, this.updateService);
     this.occurrencesService = new OccurrencesService(store, this.updateService);
+    this.semanticsService = new SemanticsService(store, this.validationService);
   }
 
   start(): void {
@@ -64,6 +71,7 @@ export default class XtextClient {
   }
 
   private onDisconnect(): void {
+    this.store.analysisCompleted(true);
     this.highlightingService.onDisconnect();
     this.validationService.onDisconnect();
     this.occurrencesService.onDisconnect();
@@ -111,6 +119,9 @@ export default class XtextClient {
       case 'validate':
         this.validationService.onPush(push);
         return;
+      case 'semantics':
+        this.semanticsService.onPush(push);
+        return;
       default:
         throw new Error('Unknown service');
     }
diff --git a/subprojects/frontend/src/xtext/XtextWebSocketClient.ts b/subprojects/frontend/src/xtext/XtextWebSocketClient.ts
index 6bb7eec8..963c1d4c 100644
--- a/subprojects/frontend/src/xtext/XtextWebSocketClient.ts
+++ b/subprojects/frontend/src/xtext/XtextWebSocketClient.ts
@@ -282,7 +282,10 @@ export default class XtextWebSocketClient {
     log.debug('Creating WebSocket');
 
     (async () => {
-      const { webSocketURL } = await fetchBackendConfig();
+      let { webSocketURL } = await fetchBackendConfig();
+      if (webSocketURL === undefined) {
+        webSocketURL = `${window.origin.replace(/^http/, 'ws')}/xtext-service`;
+      }
       this.openWebSocketWithURL(webSocketURL);
     })().catch((error) => {
       log.error('Error while initializing connection', error);
diff --git a/subprojects/frontend/src/xtext/xtextMessages.ts b/subprojects/frontend/src/xtext/xtextMessages.ts
index bbbff064..971720e1 100644
--- a/subprojects/frontend/src/xtext/xtextMessages.ts
+++ b/subprojects/frontend/src/xtext/xtextMessages.ts
@@ -34,7 +34,11 @@ export const XtextWebErrorResponse = z.object({
 
 export type XtextWebErrorResponse = z.infer<typeof XtextWebErrorResponse>;
 
-export const XtextWebPushService = z.enum(['highlight', 'validate']);
+export const XtextWebPushService = z.enum([
+  'highlight',
+  'validate',
+  'semantics',
+]);
 
 export type XtextWebPushService = z.infer<typeof XtextWebPushService>;
 
diff --git a/subprojects/frontend/src/xtext/xtextServiceResults.ts b/subprojects/frontend/src/xtext/xtextServiceResults.ts
index d3b467ad..caf2cf0b 100644
--- a/subprojects/frontend/src/xtext/xtextServiceResults.ts
+++ b/subprojects/frontend/src/xtext/xtextServiceResults.ts
@@ -125,3 +125,49 @@ export const FormattingResult = DocumentStateResult.extend({
 });
 
 export type FormattingResult = z.infer<typeof FormattingResult>;
+
+export const NodeMetadata = z.object({
+  name: z.string(),
+  simpleName: z.string(),
+  kind: z.enum(['IMPLICIT', 'INDIVIDUAL', 'NEW']),
+});
+
+export type NodeMetadata = z.infer<typeof NodeMetadata>;
+
+export const RelationMetadata = z.object({
+  name: z.string(),
+  simpleName: z.string(),
+  arity: z.number().nonnegative(),
+  detail: z.union([
+    z.object({ type: z.literal('class'), abstractClass: z.boolean() }),
+    z.object({ type: z.literal('reference'), containment: z.boolean() }),
+    z.object({
+      type: z.literal('opposite'),
+      container: z.boolean(),
+      opposite: z.string(),
+    }),
+    z.object({ type: z.literal('predicate'), error: z.boolean() }),
+    z.object({ type: z.literal('builtin') }),
+  ]),
+});
+
+export type RelationMetadata = z.infer<typeof RelationMetadata>;
+
+export const SemanticsSuccessResult = z.object({
+  nodes: NodeMetadata.array(),
+  relations: RelationMetadata.array(),
+  partialInterpretation: z.record(
+    z.string(),
+    z.union([z.number(), z.string()]).array().array(),
+  ),
+});
+
+export type SemanticsSuccessResult = z.infer<typeof SemanticsSuccessResult>;
+
+export const SemanticsResult = z.union([
+  z.object({ error: z.string() }),
+  z.object({ issues: Issue.array() }),
+  SemanticsSuccessResult,
+]);
+
+export type SemanticsResult = z.infer<typeof SemanticsResult>;
diff --git a/subprojects/frontend/tsconfig.base.json b/subprojects/frontend/tsconfig.base.json
index 5ef50b5e..545eca35 100644
--- a/subprojects/frontend/tsconfig.base.json
+++ b/subprojects/frontend/tsconfig.base.json
@@ -2,7 +2,7 @@
  * Copyright (c) Microsoft Corporation.
  * Copyright (c) 2023 The Refinery Authors <https://refinery.tools/>
  *
- * SPDX-License-Identifier: MIT OR EPL-2.0
+ * SPDX-License-Identifier: MIT
  *
  * This file is based on
  * https://github.com/tsconfig/bases/blob/7db25a41bc5a9c0f66d91f6f3aa28438afcb2f18/bases/strictest.json
diff --git a/subprojects/frontend/types/ImportMeta.d.ts b/subprojects/frontend/types/ImportMeta.d.ts
index f5a32ef1..096f088b 100644
--- a/subprojects/frontend/types/ImportMeta.d.ts
+++ b/subprojects/frontend/types/ImportMeta.d.ts
@@ -2,7 +2,7 @@
  * Copyright (c) 2019-present, Yuxi (Evan) You and Vite contributors
  * Copyright (c) 2021-2023 The Refinery Authors <https://refinery.tools/>
  *
- * SPDX-License-Identifier: MIT OR EPL-2.0
+ * SPDX-License-Identifier: MIT
  */
 
 interface ImportMeta {
diff --git a/subprojects/frontend/types/grammar.d.ts b/subprojects/frontend/types/grammar.d.ts
index e7a7eebf..92f99ec3 100644
--- a/subprojects/frontend/types/grammar.d.ts
+++ b/subprojects/frontend/types/grammar.d.ts
@@ -2,7 +2,7 @@
  * Copyright (C) 2018 by Marijn Haverbeke <marijn@haverbeke.berlin> and others
  * Copyright (C) 2021-2023 The Refinery Authors <https://refinery.tools/>
  *
- * SPDX-License-Identifier: MIT OR EPL-2.0
+ * SPDX-License-Identifier: MIT
  */
 
 declare module '*.grammar' {
diff --git a/subprojects/frontend/types/node/@lezer-generator-rollup.d.ts b/subprojects/frontend/types/node/@lezer-generator-rollup.d.ts
index 4ef9f4e3..ce89a44c 100644
--- a/subprojects/frontend/types/node/@lezer-generator-rollup.d.ts
+++ b/subprojects/frontend/types/node/@lezer-generator-rollup.d.ts
@@ -2,7 +2,7 @@
  * Copyright (C) 2018 by Marijn Haverbeke <marijn@haverbeke.berlin> and others
  * Copyright (C) 2021-2023 The Refinery Authors <https://refinery.tools/>
  *
- * SPDX-License-Identifier: MIT OR EPL-2.0
+ * SPDX-License-Identifier: MIT
  */
 
 // We have to explicitly redeclare the type of the `./rollup` ESM export of `@lezer/generator`,
diff --git a/subprojects/frontend/vite.config.ts b/subprojects/frontend/vite.config.ts
index 9e08ccc4..63d5245f 100644
--- a/subprojects/frontend/vite.config.ts
+++ b/subprojects/frontend/vite.config.ts
@@ -17,6 +17,7 @@ import detectDevModeOptions, {
   API_ENDPOINT,
 } from './config/detectDevModeOptions';
 import fetchPackageMetadata from './config/fetchPackageMetadata';
+import graphvizUMDVitePlugin from './config/graphvizUMDVitePlugin';
 import manifest from './config/manifest';
 import minifyHTMLVitePlugin from './config/minifyHTMLVitePlugin';
 import preloadFontsVitePlugin from './config/preloadFontsVitePlugin';
@@ -29,8 +30,8 @@ const { mode, isDevelopment, devModePlugins, serverOptions } =
 process.env['NODE_ENV'] ??= mode;
 
 const fontsGlob = [
-  'inter-latin-variable-wghtOnly-normal-*.woff2',
-  'jetbrains-mono-latin-variable-wghtOnly-{normal,italic}-*.woff2',
+  'open-sans-latin-wdth-{normal,italic}-*.woff2',
+  'jetbrains-mono-latin-wght-{normal,italic}-*.woff2',
 ];
 
 const viteConfig: ViteConfig = {
@@ -43,6 +44,7 @@ const viteConfig: ViteConfig = {
     lezer(),
     preloadFontsVitePlugin(fontsGlob),
     minifyHTMLVitePlugin(),
+    graphvizUMDVitePlugin(),
     VitePWA({
       strategies: 'generateSW',
       registerType: 'prompt',
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
index e194ee31..ea90a82e 100644
--- 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
@@ -5,39 +5,60 @@
  */
 package tools.refinery.language.ide.contentassist;
 
-import java.util.Objects;
-
+import com.google.inject.Inject;
 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.naming.QualifiedName;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.resource.IEObjectDescription;
-
-import com.google.inject.Inject;
-
+import org.eclipse.xtext.scoping.IScope;
 import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.resource.ProblemResourceDescriptionStrategy;
 import tools.refinery.language.resource.ReferenceCounter;
 import tools.refinery.language.utils.ProblemUtil;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
+
 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;
+        protected Iterable<IEObjectDescription> queryScope(IScope scope, CrossReference crossReference,
+                                                                                                           ContentAssistContext context) {
+                var eObjectDescriptionsByName = new HashMap<QualifiedName, List<IEObjectDescription>>();
+                for (var candidate : super.queryScope(scope, crossReference, context)) {
+                        if (isExistingObject(candidate, crossReference, context)) {
+                                // {@code getQualifiedName()} will refer to the full name for objects that are loaded from the global
+                                // scope, but {@code getName()} returns the qualified name that we set in
+                                // {@code ProblemResourceDescriptionStrategy}.
+                                var qualifiedName = candidate.getName();
+                                var candidateList = eObjectDescriptionsByName.computeIfAbsent(qualifiedName,
+                                                ignored -> new ArrayList<>());
+                                candidateList.add(candidate);
+                        }
                 }
-                return super.createProposal(candidate, crossRef, context);
+                var eObjectDescriptions = new ArrayList<IEObjectDescription>();
+                for (var candidates : eObjectDescriptionsByName.values()) {
+                        if (candidates.size() == 1) {
+                                var candidate = candidates.get(0);
+                                if (shouldBeVisible(candidate)) {
+                                        eObjectDescriptions.add(candidate);
+                                }
+                        }
+                }
+                return eObjectDescriptions;
         }
 
-        protected boolean shouldCreateProposal(IEObjectDescription candidate, CrossReference crossRef,
-                        ContentAssistContext context) {
+        protected boolean isExistingObject(IEObjectDescription candidate, CrossReference crossRef,
+                                                                           ContentAssistContext context) {
                 var rootModel = context.getRootModel();
                 var eObjectOrProxy = candidate.getEObjectOrProxy();
                 if (!Objects.equals(rootModel.eResource(), eObjectOrProxy.eResource())) {
@@ -60,6 +81,11 @@ public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider
                 return true;
         }
 
+        protected boolean shouldBeVisible(IEObjectDescription candidate) {
+                var errorPredicate = candidate.getUserData(ProblemResourceDescriptionStrategy.ERROR_PREDICATE);
+                return !ProblemResourceDescriptionStrategy.ERROR_PREDICATE_TRUE.equals(errorPredicate);
+        }
+
         protected EObject getCurrentValue(CrossReference crossRef, ContentAssistContext context) {
                 var value = getCurrentValue(crossRef, context.getCurrentModel());
                 if (value != null) {
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
index e8f97d51..ae8c70e0 100644
--- 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
@@ -16,6 +16,7 @@ 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 org.jetbrains.annotations.NotNull;
 import tools.refinery.language.model.problem.*;
 import tools.refinery.language.utils.ProblemDesugarer;
 import tools.refinery.language.utils.ProblemUtil;
@@ -94,9 +95,16 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
         }
 
         protected String[] getHighlightClass(EObject eObject, EReference reference) {
+                boolean isError = ProblemUtil.isError(eObject);
                 if (ProblemUtil.isBuiltIn(eObject)) {
-                        return new String[] { BUILTIN_CLASS };
+                        var className = isError ? ERROR_CLASS : BUILTIN_CLASS;
+                        return new String[] { className };
                 }
+                return getUserDefinedElementHighlightClass(eObject, reference, isError);
+        }
+
+        @NotNull
+        private String[] getUserDefinedElementHighlightClass(EObject eObject, EReference reference, boolean isError) {
                 ImmutableList.Builder<String> classesBuilder = ImmutableList.builder();
                 if (eObject instanceof ClassDeclaration classDeclaration && classDeclaration.isAbstract()) {
                         classesBuilder.add(ABSTRACT_CLASS);
@@ -105,8 +113,7 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
                                 && desugarer.isContainmentReference(referenceDeclaration)) {
                         classesBuilder.add(CONTAINMENT_CLASS);
                 }
-                if (eObject instanceof PredicateDefinition predicateDefinition
-                                && predicateDefinition.getKind() == PredicateKind.ERROR) {
+                if (isError) {
                         classesBuilder.add(ERROR_CLASS);
                 }
                 if (eObject instanceof Node node) {
diff --git a/subprojects/language-model/problem.aird b/subprojects/language-model/problem.aird
index 286dabd6..a307ae83 100644
--- a/subprojects/language-model/problem.aird
+++ b/subprojects/language-model/problem.aird
@@ -7,7 +7,7 @@
     <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="declarations" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="f104e460-dce9-4947-b526-467cf8618336">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="declarations" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="7fa3b02a-a620-4e42-87d5-b2cc35ee8070">
         <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>
@@ -79,9 +79,9 @@
         <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="_id6DcDNoEe2fD4dIhR_vzA" type="3010" element="_ida7QDNoEe2fD4dIhR_vzA">
-              <styles xmi:type="notation:FontStyle" xmi:id="_id6DcTNoEe2fD4dIhR_vzA" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_id6DcjNoEe2fD4dIhR_vzA"/>
+            <children xmi:type="notation:Node" xmi:id="_bmoagDrQEe62Q_vL_UTCsA" type="3010" element="_blvCoDrQEe62Q_vL_UTCsA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_bmoagTrQEe62Q_vL_UTCsA" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_bmoagjrQEe62Q_vL_UTCsA"/>
             </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_fit3laA5EeuqkpDnuik1sg"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_fit3lqA5EeuqkpDnuik1sg"/>
@@ -92,10 +92,6 @@
         <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">
-            <children xmi:type="notation:Node" xmi:id="_ARsFYBjHEe2_erjsEmF9GQ" type="3010" element="_ARaYkBjHEe2_erjsEmF9GQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_ARsFYRjHEe2_erjsEmF9GQ" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_ARsFYhjHEe2_erjsEmF9GQ"/>
-            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_QKLK1aA6EeuqkpDnuik1sg"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_QKLK1qA6EeuqkpDnuik1sg"/>
           </children>
@@ -308,31 +304,6 @@
           <styles xmi:type="notation:ShapeStyle" xmi:id="_xp1icTNlEe2fD4dIhR_vzA" fontName="Noto Sans" fontHeight="8"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xp1icjNlEe2fD4dIhR_vzA" x="574" y="1280" width="120" height="100"/>
         </children>
-        <children xmi:type="notation:Node" xmi:id="_DFHboDNoEe2fD4dIhR_vzA" type="2003" element="_DD1pQDNoEe2fD4dIhR_vzA">
-          <children xmi:type="notation:Node" xmi:id="_DFICsDNoEe2fD4dIhR_vzA" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_DFICsTNoEe2fD4dIhR_vzA" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_FDz88DNoEe2fD4dIhR_vzA" type="3010" element="_FDOuIDNoEe2fD4dIhR_vzA">
-              <styles xmi:type="notation:FontStyle" xmi:id="_FDz88TNoEe2fD4dIhR_vzA" fontName="Noto Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_FDz88jNoEe2fD4dIhR_vzA"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_F3CwsDNoEe2fD4dIhR_vzA" type="3010" element="_F2glMDNoEe2fD4dIhR_vzA">
-              <styles xmi:type="notation:FontStyle" xmi:id="_F3CwsTNoEe2fD4dIhR_vzA" fontName="Noto Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_F3CwsjNoEe2fD4dIhR_vzA"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_GTcY0DNoEe2fD4dIhR_vzA" type="3010" element="_GS7bcDNoEe2fD4dIhR_vzA">
-              <styles xmi:type="notation:FontStyle" xmi:id="_GTcY0TNoEe2fD4dIhR_vzA" fontName="Noto Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_GTcY0jNoEe2fD4dIhR_vzA"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_GyKVIDNoEe2fD4dIhR_vzA" type="3010" element="_Gx7EkDNoEe2fD4dIhR_vzA">
-              <styles xmi:type="notation:FontStyle" xmi:id="_GyKVITNoEe2fD4dIhR_vzA" fontName="Noto Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_GyKVIjNoEe2fD4dIhR_vzA"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_DFICsjNoEe2fD4dIhR_vzA"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_DFICszNoEe2fD4dIhR_vzA"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_DFHboTNoEe2fD4dIhR_vzA" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DFHbojNoEe2fD4dIhR_vzA" x="1355" y="1280" width="120" height="100"/>
-        </children>
         <children xmi:type="notation:Node" xmi:id="_782skF9mEe2rXNsIDUvqhw" type="2003" element="_78pRMF9mEe2rXNsIDUvqhw">
           <children xmi:type="notation:Node" xmi:id="_783ToF9mEe2rXNsIDUvqhw" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_783ToV9mEe2rXNsIDUvqhw" type="7004">
@@ -1184,17 +1155,17 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_Nr78MGTzEe2qdtyPWAtoxA" type="4001" element="_NrtSzmTzEe2qdtyPWAtoxA" source="_c-HCQKA4EeuqkpDnuik1sg" target="_dzfLYGTvEe2qdtyPWAtoxA">
           <children xmi:type="notation:Node" xmi:id="_Nr78NGTzEe2qdtyPWAtoxA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nr78NWTzEe2qdtyPWAtoxA" x="81"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nr78NWTzEe2qdtyPWAtoxA" x="79"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Nr78NmTzEe2qdtyPWAtoxA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nr78N2TzEe2qdtyPWAtoxA" x="196" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nr78N2TzEe2qdtyPWAtoxA" x="193" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Nr78OGTzEe2qdtyPWAtoxA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nr78OWTzEe2qdtyPWAtoxA" x="20" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nr78OWTzEe2qdtyPWAtoxA" x="19" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_Nr78MWTzEe2qdtyPWAtoxA" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_Nr78MmTzEe2qdtyPWAtoxA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Nr78M2TzEe2qdtyPWAtoxA" points="[-60, 24, 24, 526]$[-84, 24, 0, 526]$[-84, -502, 0, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Nr78M2TzEe2qdtyPWAtoxA" points="[-60, 24, 24, 526]$[-80, 24, 4, 526]$[-80, -502, 4, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Nr78OmTzEe2qdtyPWAtoxA" id="(0.41379310344827586,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Nr78O2TzEe2qdtyPWAtoxA" id="(0.3305084745762712,1.0)"/>
         </edges>
@@ -1272,7 +1243,7 @@
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_WnX2AWg8Ee25oofngfVl_A" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_WnX2Amg8Ee25oofngfVl_A" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WnX2A2g8Ee25oofngfVl_A" points="[0, -56, 86, 383]$[0, -320, 86, 119]$[-85, -320, 1, 119]$[-85, -390, 1, 49]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WnX2A2g8Ee25oofngfVl_A" points="[0, -56, 44, 383]$[0, -316, 44, 123]$[-43, -316, 1, 123]$[-43, -390, 1, 49]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WnZEIGg8Ee25oofngfVl_A" id="(0.22950819672131148,0.5714285714285714)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WnZEIWg8Ee25oofngfVl_A" id="(0.5,0.5)"/>
         </edges>
@@ -1324,6 +1295,22 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mDflxmg8Ee25oofngfVl_A" id="(0.3644067796610169,0.16326530612244897)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mDflx2g8Ee25oofngfVl_A" id="(0.5,0.5)"/>
         </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_8s7BwDrXEe62Q_vL_UTCsA" type="4001" element="_8sdu2DrXEe62Q_vL_UTCsA" source="_c-HCQKA4EeuqkpDnuik1sg" target="_dzfLYGTvEe2qdtyPWAtoxA">
+          <children xmi:type="notation:Node" xmi:id="_8s-sIDrXEe62Q_vL_UTCsA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8s-sITrXEe62Q_vL_UTCsA" x="-155" y="-60"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8s-sIjrXEe62Q_vL_UTCsA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8s-sIzrXEe62Q_vL_UTCsA" x="69" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8s-sJDrXEe62Q_vL_UTCsA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8s-sJTrXEe62Q_vL_UTCsA" x="3" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_8s7BwTrXEe62Q_vL_UTCsA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_8s7BwjrXEe62Q_vL_UTCsA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8s7BwzrXEe62Q_vL_UTCsA" points="[-52, 40, 0, 542]$[-84, 40, -32, 542]$[-84, -502, -32, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8s_6QDrXEe62Q_vL_UTCsA" id="(0.3586206896551724,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8s_6QTrXEe62Q_vL_UTCsA" id="(0.5338983050847458,1.0)"/>
+        </edges>
       </data>
     </ownedAnnotationEntries>
     <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_Csiy8KA4EeuqkpDnuik1sg" source="DANNOTATION_CUSTOMIZATION_KEY">
@@ -1369,7 +1356,7 @@
         <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="_c-A7oKA4EeuqkpDnuik1sg" name="ReferenceDeclaration" tooltipText="" outgoingEdges="_0V3L1qA4EeuqkpDnuik1sg _p1JWcqBJEeuqkpDnuik1sg _NrtSzmTzEe2qdtyPWAtoxA _bNXJs2g8Ee25oofngfVl_A" incomingEdges="_0V3L1qA4EeuqkpDnuik1sg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_c-A7oKA4EeuqkpDnuik1sg" name="ReferenceDeclaration" tooltipText="" outgoingEdges="_0V3L1qA4EeuqkpDnuik1sg _p1JWcqBJEeuqkpDnuik1sg _NrtSzmTzEe2qdtyPWAtoxA _bNXJs2g8Ee25oofngfVl_A _8sdu2DrXEe62Q_vL_UTCsA" incomingEdges="_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>
@@ -1441,14 +1428,14 @@
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_jX0uAjNoEe2fD4dIhR_vzA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_dFvc0DrQEe62Q_vL_UTCsA" 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="_ida7QDNoEe2fD4dIhR_vzA" name="kind : PredicateKind = DEFAULT" 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="_jX18JDNoEe2fD4dIhR_vzA" labelAlignment="LEFT">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_blvCoDrQEe62Q_vL_UTCsA" 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="_dFx5EzrQEe62Q_vL_UTCsA" 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']"/>
@@ -1464,14 +1451,6 @@
         <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="_ARaYkBjHEe2_erjsEmF9GQ" name="modality : Modality = DEFAULT" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Parameter/modality"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Parameter/modality"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_CsAyxRjHEe2_erjsEmF9GQ" 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="_Uy4bWaA6EeuqkpDnuik1sg" name="[0..*] parameters" sourceNode="_A8hIkCrZEeyyC-O0_LlY9w" targetNode="_QKD2EKA6EeuqkpDnuik1sg">
       <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ParametricDefinition/parameters"/>
@@ -1940,12 +1919,12 @@
     <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="_jX7b1DNoEe2fD4dIhR_vzA" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_dF7qIjrQEe62Q_vL_UTCsA" 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="_jX7b1TNoEe2fD4dIhR_vzA" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_dF7qIzrQEe62Q_vL_UTCsA" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_jX7b1jNoEe2fD4dIhR_vzA" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_dF7qJDrQEe62Q_vL_UTCsA" 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>
@@ -2100,49 +2079,6 @@
         <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="_DD1pQDNoEe2fD4dIhR_vzA" 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="_DD1pQTNoEe2fD4dIhR_vzA" 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="_FDOuIDNoEe2fD4dIhR_vzA" name="DEFAULT" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//PredicateKind/DEFAULT"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//PredicateKind/DEFAULT"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_FDPVMDNoEe2fD4dIhR_vzA" 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="_F2glMDNoEe2fD4dIhR_vzA" name="ERROR" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//PredicateKind/ERROR"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//PredicateKind/ERROR"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_F2hMQDNoEe2fD4dIhR_vzA" 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="_GS7bcDNoEe2fD4dIhR_vzA" name="CONTAINED" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//PredicateKind/CONTAINED"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//PredicateKind/CONTAINED"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_GS7bcTNoEe2fD4dIhR_vzA" 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="_Gx7EkDNoEe2fD4dIhR_vzA" name="CONTAINMENT" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//PredicateKind/CONTAINMENT"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//PredicateKind/CONTAINMENT"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_Gx7roDNoEe2fD4dIhR_vzA" 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="_78pRMF9mEe2rXNsIDUvqhw" name="FunctionDefinition" tooltipText="" outgoingEdges="_rKoQHF9nEe2rXNsIDUvqhw _S6YCJl9wEe2rXNsIDUvqhw _sMPaBmTvEe2qdtyPWAtoxA" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//FunctionDefinition"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//FunctionDefinition"/>
@@ -2349,7 +2285,7 @@
       </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="_dzVaYGTvEe2qdtyPWAtoxA" name="Relation" tooltipText="" outgoingEdges="_-OYJtGTvEe2qdtyPWAtoxA" incomingEdges="_m2GbcmTvEe2qdtyPWAtoxA _nxr57GTvEe2qdtyPWAtoxA _pHlWJ2TvEe2qdtyPWAtoxA _p-1uSmTvEe2qdtyPWAtoxA _sMPaBmTvEe2qdtyPWAtoxA _NrtSzmTzEe2qdtyPWAtoxA _YWqZhmTzEe2qdtyPWAtoxA _iWzpAmTzEe2qdtyPWAtoxA _q604amTzEe2qdtyPWAtoxA" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_dzVaYGTvEe2qdtyPWAtoxA" name="Relation" tooltipText="" outgoingEdges="_-OYJtGTvEe2qdtyPWAtoxA" incomingEdges="_m2GbcmTvEe2qdtyPWAtoxA _nxr57GTvEe2qdtyPWAtoxA _pHlWJ2TvEe2qdtyPWAtoxA _p-1uSmTvEe2qdtyPWAtoxA _sMPaBmTvEe2qdtyPWAtoxA _NrtSzmTzEe2qdtyPWAtoxA _YWqZhmTzEe2qdtyPWAtoxA _iWzpAmTzEe2qdtyPWAtoxA _q604amTzEe2qdtyPWAtoxA _8sdu2DrXEe62Q_vL_UTCsA" 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>
@@ -2400,12 +2336,12 @@
     <ownedDiagramElements xmi:type="diagram:DEdge" uid="_p-1uSmTvEe2qdtyPWAtoxA" sourceNode="_fihqUKA5EeuqkpDnuik1sg" targetNode="_dzVaYGTvEe2qdtyPWAtoxA">
       <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="_p-1uS2TvEe2qdtyPWAtoxA" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_dF7qKDrQEe62Q_vL_UTCsA" 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="_p-1uTGTvEe2qdtyPWAtoxA" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_dF7qKTrQEe62Q_vL_UTCsA" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_p-1uTWTvEe2qdtyPWAtoxA" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_dF7qKjrQEe62Q_vL_UTCsA" 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>
@@ -2611,6 +2547,19 @@
         <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="_8sdu2DrXEe62Q_vL_UTCsA" name="[0..1] invalidMultiplicity" sourceNode="_c-A7oKA4EeuqkpDnuik1sg" targetNode="_dzVaYGTvEe2qdtyPWAtoxA">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration/invalidMultiplicity"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration/invalidMultiplicity"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_8seV0DrXEe62Q_vL_UTCsA" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_8seV0jrXEe62Q_vL_UTCsA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_8seV0TrXEe62Q_vL_UTCsA" 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"/>
diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore b/subprojects/language-model/src/main/resources/model/problem.ecore
index 2d86382d..204f922c 100644
--- a/subprojects/language-model/src/main/resources/model/problem.ecore
+++ b/subprojects/language-model/src/main/resources/model/problem.ecore
@@ -22,17 +22,18 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//ReferenceKind"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="referenceType" eType="#//Relation"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="invalidMultiplicity" eType="#//Relation"
+        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="#//ParametricDefinition #//Relation">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//PredicateKind"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="bodies" upperBound="-1"
         eType="#//Conjunction" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="error" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="#//Variable">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="modality" eType="#//Modality"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="parameterType" eType="#//Relation"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Variable" abstract="true" eSuperTypes="#//VariableOrNode"/>
@@ -169,12 +170,6 @@
     <eLiterals name="CONTAINMENT" value="2"/>
     <eLiterals name="CONTAINER" value="3"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="PredicateKind">
-    <eLiterals name="DEFAULT"/>
-    <eLiterals name="ERROR" value="1"/>
-    <eLiterals name="CONTAINED" value="2"/>
-    <eLiterals name="CONTAINMENT" value="3"/>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Expr" abstract="true"/>
   <eClassifiers xsi:type="ecore:EClass" name="VariableOrNodeExpr" eSuperTypes="#//Expr">
     <eStructuralFeatures xsi:type="ecore:EReference" name="variableOrNode" eType="#//VariableOrNode"/>
diff --git a/subprojects/language-model/src/main/resources/model/problem.genmodel b/subprojects/language-model/src/main/resources/model/problem.genmodel
index 5767d18d..b5aa81c4 100644
--- a/subprojects/language-model/src/main/resources/model/problem.genmodel
+++ b/subprojects/language-model/src/main/resources/model/problem.genmodel
@@ -40,12 +40,6 @@
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ReferenceKind/CONTAINMENT"/>
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ReferenceKind/CONTAINER"/>
     </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//PredicateKind">
-      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/DEFAULT"/>
-      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/ERROR"/>
-      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/CONTAINED"/>
-      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/CONTAINMENT"/>
-    </genEnums>
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//UnaryOp">
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//UnaryOp/PLUS"/>
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//UnaryOp/MINUS"/>
@@ -85,16 +79,16 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/multiplicity"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ReferenceDeclaration/kind"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/referenceType"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/invalidMultiplicity"/>
     </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/kind"/>
       <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//PredicateDefinition/bodies"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//PredicateDefinition/error"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//Parameter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Parameter/modality"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Parameter/parameterType"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//Variable"/>
diff --git a/subprojects/language-semantics/build.gradle.kts b/subprojects/language-semantics/build.gradle.kts
index 38cd9e0d..4374f78c 100644
--- a/subprojects/language-semantics/build.gradle.kts
+++ b/subprojects/language-semantics/build.gradle.kts
@@ -9,9 +9,11 @@ plugins {
 }
 
 dependencies {
-        implementation(libs.eclipseCollections)
-        implementation(libs.eclipseCollections.api)
+        api(libs.eclipseCollections.api)
         api(project(":refinery-language"))
         api(project(":refinery-store"))
-        testImplementation(testFixtures(project(":refinery-language")))
+        api(project(":refinery-store-query"))
+        api(project(":refinery-store-reasoning"))
+        implementation(project(":refinery-store-reasoning-scope"))
+        runtimeOnly(libs.eclipseCollections)
 }
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/BuiltInDetail.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/BuiltInDetail.java
new file mode 100644
index 00000000..6f706069
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/BuiltInDetail.java
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.metadata;
+
+public record BuiltInDetail() implements RelationDetail {
+        public static final BuiltInDetail INSTANCE = new BuiltInDetail();
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/ClassDetail.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/ClassDetail.java
new file mode 100644
index 00000000..1d3190f5
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/ClassDetail.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.metadata;
+
+public record ClassDetail(boolean abstractClass) implements RelationDetail {
+        public static final ClassDetail CONCRETE_CLASS = new ClassDetail(false);
+
+        public static final ClassDetail ABSTRACT_CLASS = new ClassDetail(true);
+
+        public static ClassDetail ofAbstractClass(boolean abstractClass) {
+                return abstractClass ? ABSTRACT_CLASS : CONCRETE_CLASS;
+        }
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/Metadata.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/Metadata.java
new file mode 100644
index 00000000..d2dcb43a
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/Metadata.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.metadata;
+
+public sealed interface Metadata permits NodeMetadata, RelationMetadata {
+        String name();
+
+        String simpleName();
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/MetadataCreator.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/MetadataCreator.java
new file mode 100644
index 00000000..0c18b1b3
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/MetadataCreator.java
@@ -0,0 +1,181 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.metadata;
+
+import com.google.inject.Inject;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.naming.IQualifiedNameConverter;
+import org.eclipse.xtext.naming.IQualifiedNameProvider;
+import org.eclipse.xtext.naming.QualifiedName;
+import org.eclipse.xtext.scoping.IScope;
+import org.eclipse.xtext.scoping.IScopeProvider;
+import tools.refinery.language.model.problem.*;
+import tools.refinery.language.semantics.model.ModelInitializer;
+import tools.refinery.language.semantics.model.TracedException;
+import tools.refinery.language.utils.ProblemUtil;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+
+import java.util.*;
+
+public class MetadataCreator {
+        @Inject
+        private IScopeProvider scopeProvider;
+
+        @Inject
+        private IQualifiedNameProvider qualifiedNameProvider;
+
+        @Inject
+        private IQualifiedNameConverter qualifiedNameConverter;
+
+        private ModelInitializer initializer;
+
+        private IScope nodeScope;
+
+        private IScope relationScope;
+
+        public void setInitializer(ModelInitializer initializer) {
+                if (initializer == null) {
+                        throw new IllegalArgumentException("Initializer was already set");
+                }
+                this.initializer = initializer;
+                var problem = initializer.getProblem();
+                nodeScope = scopeProvider.getScope(problem, ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT__NODE);
+                relationScope = scopeProvider.getScope(problem, ProblemPackage.Literals.ASSERTION__RELATION);
+        }
+
+        public List<NodeMetadata> getNodesMetadata() {
+                var nodes = new NodeMetadata[initializer.getNodeCount()];
+                for (var entry : initializer.getNodeTrace().keyValuesView()) {
+                        var node = entry.getOne();
+                        var id = entry.getTwo();
+                        nodes[id] = getNodeMetadata(node);
+                }
+                return List.of(nodes);
+        }
+
+        private NodeMetadata getNodeMetadata(Node node) {
+                var qualifiedName = getQualifiedName(node);
+                var simpleName = getSimpleName(node, qualifiedName, nodeScope);
+                return new NodeMetadata(qualifiedNameConverter.toString(qualifiedName),
+                                qualifiedNameConverter.toString(simpleName), getNodeKind(node));
+        }
+
+        private NodeKind getNodeKind(Node node) {
+                if (ProblemUtil.isImplicitNode(node)) {
+                        return NodeKind.IMPLICIT;
+                } else if (ProblemUtil.isIndividualNode(node)) {
+                        return NodeKind.INDIVIDUAL;
+                } else if (ProblemUtil.isNewNode(node)) {
+                        return NodeKind.NEW;
+                } else {
+                        throw new TracedException(node, "Unknown node type");
+                }
+        }
+
+        public List<RelationMetadata> getRelationsMetadata() {
+                var relationTrace = initializer.getRelationTrace();
+                var relations = new ArrayList<RelationMetadata>(relationTrace.size());
+                for (var entry : relationTrace.entrySet()) {
+                        var relation = entry.getKey();
+                        var partialRelation = entry.getValue();
+                        var metadata = getRelationMetadata(relation, partialRelation);
+                        relations.add(metadata);
+                }
+                return Collections.unmodifiableList(relations);
+        }
+
+        private RelationMetadata getRelationMetadata(Relation relation, PartialRelation partialRelation) {
+                var qualifiedName = getQualifiedName(relation);
+                var qualifiedNameString = qualifiedNameConverter.toString(qualifiedName);
+                var simpleName = getSimpleName(relation, qualifiedName, relationScope);
+                var simpleNameString = qualifiedNameConverter.toString(simpleName);
+                var arity = partialRelation.arity();
+                var detail = getRelationDetail(relation, partialRelation);
+                return new RelationMetadata(qualifiedNameString, simpleNameString, arity, detail);
+        }
+
+        private RelationDetail getRelationDetail(Relation relation, PartialRelation partialRelation) {
+                if (ProblemUtil.isBuiltIn(relation) && !ProblemUtil.isError(relation)) {
+                        return getBuiltInDetail();
+                }
+                if (relation instanceof ClassDeclaration classDeclaration) {
+                        return getClassDetail(classDeclaration);
+                } else if (relation instanceof ReferenceDeclaration) {
+                        return getReferenceDetail(partialRelation);
+                } else if (relation instanceof EnumDeclaration) {
+                        return getEnumDetail();
+                } else if (relation instanceof PredicateDefinition predicateDefinition) {
+                        return getPredicateDetail(predicateDefinition);
+                } else {
+                        throw new TracedException(relation, "Unknown relation");
+                }
+        }
+
+        private RelationDetail getBuiltInDetail() {
+                return BuiltInDetail.INSTANCE;
+        }
+
+        private RelationDetail getClassDetail(ClassDeclaration classDeclaration) {
+                return ClassDetail.ofAbstractClass(classDeclaration.isAbstract());
+        }
+
+        private RelationDetail getReferenceDetail(PartialRelation partialRelation) {
+                var metamodel = initializer.getMetamodel();
+                var opposite = metamodel.oppositeReferences().get(partialRelation);
+                if (opposite == null) {
+                        boolean isContainment = metamodel.containmentHierarchy().containsKey(partialRelation);
+                        return ReferenceDetail.ofContainment(isContainment);
+                } else {
+                        boolean isContainer = metamodel.containmentHierarchy().containsKey(opposite);
+                        return new OppositeReferenceDetail(isContainer, opposite.name());
+                }
+        }
+
+        private RelationDetail getEnumDetail() {
+                return ClassDetail.CONCRETE_CLASS;
+        }
+
+        private RelationDetail getPredicateDetail(PredicateDefinition predicate) {
+                return PredicateDetail.ofError(predicate.isError());
+        }
+
+        private QualifiedName getQualifiedName(EObject eObject) {
+                var qualifiedName = qualifiedNameProvider.getFullyQualifiedName(eObject);
+                if (qualifiedName == null) {
+                        throw new TracedException(eObject, "Unknown qualified name");
+                }
+                return qualifiedName;
+        }
+
+        private QualifiedName getSimpleName(EObject eObject, QualifiedName qualifiedName, IScope scope) {
+                var descriptions = scope.getElements(eObject);
+                var names = new HashSet<QualifiedName>();
+                for (var description : descriptions) {
+                        // {@code getQualifiedName()} will refer to the full name for objects that are loaded from the global
+                        // scope, but {@code getName()} returns the qualified name that we set in
+                        // {@code ProblemResourceDescriptionStrategy}.
+                        names.add(description.getName());
+                }
+                var iterator = names.stream().sorted(Comparator.comparingInt(QualifiedName::getSegmentCount)).iterator();
+                while (iterator.hasNext()) {
+                        var simpleName = iterator.next();
+                        if (names.contains(simpleName) && isUnique(scope, simpleName)) {
+                                return simpleName;
+                        }
+                }
+                throw new TracedException(eObject, "Ambiguous qualified name: " +
+                                qualifiedNameConverter.toString(qualifiedName));
+        }
+
+        private boolean isUnique(IScope scope, QualifiedName name) {
+                var iterator = scope.getElements(name).iterator();
+                if (!iterator.hasNext()) {
+                        return false;
+                }
+                iterator.next();
+                return !iterator.hasNext();
+        }
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/NodeKind.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/NodeKind.java
new file mode 100644
index 00000000..01f0cd09
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/NodeKind.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.metadata;
+
+public enum NodeKind {
+        IMPLICIT,
+        INDIVIDUAL,
+        NEW
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/NodeMetadata.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/NodeMetadata.java
new file mode 100644
index 00000000..812952c0
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/NodeMetadata.java
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.metadata;
+
+public record NodeMetadata(String name, String simpleName, NodeKind kind) implements Metadata {
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/OppositeReferenceDetail.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/OppositeReferenceDetail.java
new file mode 100644
index 00000000..26d7461c
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/OppositeReferenceDetail.java
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.metadata;
+
+public record OppositeReferenceDetail(boolean container, String opposite) implements RelationDetail {
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/PredicateDetail.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/PredicateDetail.java
new file mode 100644
index 00000000..ca397eca
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/PredicateDetail.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.metadata;
+
+public record PredicateDetail(boolean error) implements RelationDetail {
+        public static final PredicateDetail PREDICATE = new PredicateDetail(false);
+
+        public static final PredicateDetail ERROR_PREDICATE = new PredicateDetail(true);
+
+        public static PredicateDetail ofError(boolean error) {
+                return error ? ERROR_PREDICATE : PREDICATE;
+        }
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/ReferenceDetail.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/ReferenceDetail.java
new file mode 100644
index 00000000..36771566
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/ReferenceDetail.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.metadata;
+
+public record ReferenceDetail(boolean containment) implements RelationDetail {
+        public static final ReferenceDetail CROSS_REFERENCE = new ReferenceDetail(false);
+
+        public static final ReferenceDetail CONTAINMENT_REFERENCE = new ReferenceDetail(true);
+
+        public static ReferenceDetail ofContainment(boolean containment) {
+                return containment ? CONTAINMENT_REFERENCE : CROSS_REFERENCE;
+        }
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/RelationDetail.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/RelationDetail.java
new file mode 100644
index 00000000..105179fd
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/RelationDetail.java
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.metadata;
+
+public sealed interface RelationDetail permits ClassDetail, ReferenceDetail, PredicateDetail, OppositeReferenceDetail,
+                BuiltInDetail {
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/RelationMetadata.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/RelationMetadata.java
new file mode 100644
index 00000000..5abcc253
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/RelationMetadata.java
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.metadata;
+
+public record RelationMetadata(String name, String simpleName, int arity, RelationDetail detail) implements Metadata {
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/ModelInitializer.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/ModelInitializer.java
index 06b8ad77..89c41a8e 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/ModelInitializer.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/ModelInitializer.java
@@ -9,67 +9,399 @@ import com.google.inject.Inject;
 import org.eclipse.collections.api.factory.primitive.ObjectIntMaps;
 import org.eclipse.collections.api.map.primitive.MutableObjectIntMap;
 import tools.refinery.language.model.problem.*;
-import tools.refinery.language.semantics.model.internal.DecisionTree;
+import tools.refinery.language.semantics.model.internal.MutableSeed;
+import tools.refinery.language.utils.BuiltinSymbols;
 import tools.refinery.language.utils.ProblemDesugarer;
-import tools.refinery.language.utils.RelationInfo;
-import tools.refinery.store.representation.Symbol;
+import tools.refinery.language.utils.ProblemUtil;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.dnf.InvalidClauseException;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.query.literal.*;
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.scope.ScopePropagatorBuilder;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+import tools.refinery.store.reasoning.seed.Seed;
+import tools.refinery.store.reasoning.translator.containment.ContainmentHierarchyTranslator;
+import tools.refinery.store.reasoning.translator.metamodel.Metamodel;
+import tools.refinery.store.reasoning.translator.metamodel.MetamodelBuilder;
+import tools.refinery.store.reasoning.translator.metamodel.MetamodelTranslator;
+import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
+import tools.refinery.store.reasoning.translator.multiplicity.ConstrainedMultiplicity;
+import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
+import tools.refinery.store.reasoning.translator.multiplicity.UnconstrainedMultiplicity;
+import tools.refinery.store.reasoning.translator.predicate.PredicateTranslator;
 import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.representation.cardinality.UpperCardinalities;
 import tools.refinery.store.tuple.Tuple;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 public class ModelInitializer {
         @Inject
         private ProblemDesugarer desugarer;
 
+        @Inject
+        private SemanticsUtils semanticsUtils;
+
+        private Problem problem;
+
+        private ModelStoreBuilder storeBuilder;
+
+        private BuiltinSymbols builtinSymbols;
+
+        private PartialRelation nodeRelation;
+
         private final MutableObjectIntMap<Node> nodeTrace = ObjectIntMaps.mutable.empty();
 
-        private final Map<tools.refinery.language.model.problem.Relation, Symbol<TruthValue>> relationTrace =
-                        new HashMap<>();
+        private final Map<Relation, RelationInfo> relationInfoMap = new LinkedHashMap<>();
+
+        private final Map<PartialRelation, RelationInfo> partialRelationInfoMap = new HashMap<>();
+
+        private final Map<AnyPartialSymbol, Relation> inverseTrace = new HashMap<>();
+
+        private Map<Relation, PartialRelation> relationTrace;
+
+        private final MetamodelBuilder metamodelBuilder = Metamodel.builder();
 
-        private int nodeCount = 0;
+        private Metamodel metamodel;
+
+        private Map<Tuple, CardinalityInterval> countSeed = new LinkedHashMap<>();
+
+        private ModelSeed modelSeed;
+
+        public Problem getProblem() {
+                return problem;
+        }
+
+        public int getNodeCount() {
+                return nodeTrace.size();
+        }
+
+        public MutableObjectIntMap<Node> getNodeTrace() {
+                return nodeTrace;
+        }
+
+        public Map<Relation, PartialRelation> getRelationTrace() {
+                return relationTrace;
+        }
 
-        public void createModel(Problem problem) {
-                var builtinSymbols = desugarer.getBuiltinSymbols(problem).orElseThrow(() -> new IllegalArgumentException(
+        public Relation getInverseTrace(AnyPartialSymbol partialRelation) {
+                return inverseTrace.get(partialRelation);
+        }
+
+        public Metamodel getMetamodel() {
+                return metamodel;
+        }
+
+        public ModelSeed createModel(Problem problem, ModelStoreBuilder storeBuilder) {
+                this.problem = problem;
+                this.storeBuilder = storeBuilder;
+                builtinSymbols = desugarer.getBuiltinSymbols(problem).orElseThrow(() -> new IllegalArgumentException(
                                 "Problem has no builtin library"));
-                var collectedSymbols = desugarer.collectSymbols(problem);
-                for (var node : collectedSymbols.nodes().keySet()) {
-                        nodeTrace.put(node, nodeCount);
-                        nodeCount += 1;
-                }
-                for (var pair : collectedSymbols.relations().entrySet()) {
-                        var relation = pair.getKey();
-                        var relationInfo = pair.getValue();
-                        var isEqualsRelation = relation == builtinSymbols.equals();
-                        var decisionTree = mergeAssertions(relationInfo, isEqualsRelation);
-                        var defaultValue = isEqualsRelation ? TruthValue.FALSE : TruthValue.UNKNOWN;
-                        relationTrace.put(relation, Symbol.of(
-                                        relationInfo.name(), relationInfo.arity(), TruthValue.class, defaultValue));
-                }
-        }
-
-        private DecisionTree mergeAssertions(RelationInfo relationInfo, boolean isEqualsRelation) {
-                var arity = relationInfo.arity();
-                var defaultAssertions = new DecisionTree(arity, isEqualsRelation ? null : TruthValue.UNKNOWN);
-                var assertions = new DecisionTree(arity);
-                for (var assertion : relationInfo.assertions()) {
-                        var tuple = getTuple(assertion);
-                        var value = getTruthValue(assertion.getValue());
-                        if (assertion.isDefault()) {
-                                defaultAssertions.mergeValue(tuple, value);
+                var nodeInfo = collectPartialRelation(builtinSymbols.node(), 1, TruthValue.TRUE, TruthValue.TRUE);
+                nodeRelation = nodeInfo.partialRelation();
+                metamodelBuilder.type(nodeRelation);
+                putRelationInfo(builtinSymbols.exists(), new RelationInfo(ReasoningAdapter.EXISTS_SYMBOL, null,
+                                TruthValue.TRUE));
+                putRelationInfo(builtinSymbols.equals(), new RelationInfo(ReasoningAdapter.EQUALS_SYMBOL,
+                                (TruthValue) null,
+                                null));
+                putRelationInfo(builtinSymbols.contained(), new RelationInfo(ContainmentHierarchyTranslator.CONTAINED_SYMBOL,
+                                null, TruthValue.UNKNOWN));
+                putRelationInfo(builtinSymbols.contains(), new RelationInfo(ContainmentHierarchyTranslator.CONTAINS_SYMBOL,
+                                null, TruthValue.UNKNOWN));
+                putRelationInfo(builtinSymbols.invalidContainer(),
+                                new RelationInfo(ContainmentHierarchyTranslator.INVALID_CONTAINER, TruthValue.FALSE,
+                                                TruthValue.FALSE));
+                collectNodes();
+                collectPartialSymbols();
+                collectMetamodel();
+                metamodel = metamodelBuilder.build();
+                collectAssertions();
+                storeBuilder.with(new MultiObjectTranslator());
+                storeBuilder.with(new MetamodelTranslator(metamodel));
+                relationTrace = new LinkedHashMap<>(relationInfoMap.size());
+                int nodeCount = getNodeCount();
+                var modelSeedBuilder = ModelSeed.builder(nodeCount);
+                for (var entry : relationInfoMap.entrySet()) {
+                        var relation = entry.getKey();
+                        var info = entry.getValue();
+                        var partialRelation = info.partialRelation();
+                        relationTrace.put(relation, partialRelation);
+                        modelSeedBuilder.seed(partialRelation, info.toSeed(nodeCount));
+                }
+                collectScopes();
+                modelSeedBuilder.seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                .reducedValue(CardinalityIntervals.SET)
+                                .putAll(countSeed));
+                modelSeed = modelSeedBuilder.build();
+                collectPredicates();
+                return modelSeed;
+        }
+
+        private void collectNodes() {
+                for (var statement : problem.getStatements()) {
+                        if (statement instanceof IndividualDeclaration individualDeclaration) {
+                                for (var individual : individualDeclaration.getNodes()) {
+                                        collectNode(individual);
+                                }
+                        } else if (statement instanceof ClassDeclaration classDeclaration) {
+                                var newNode = classDeclaration.getNewNode();
+                                if (newNode != null) {
+                                        collectNode(newNode);
+                                }
+                        } else if (statement instanceof EnumDeclaration enumDeclaration) {
+                                for (var literal : enumDeclaration.getLiterals()) {
+                                        collectNode(literal);
+                                }
+                        }
+                }
+                for (var node : problem.getNodes()) {
+                        collectNode(node);
+                }
+        }
+
+        private void collectNode(Node node) {
+                nodeTrace.getIfAbsentPut(node, this::getNodeCount);
+        }
+
+        private void collectPartialSymbols() {
+                for (var statement : problem.getStatements()) {
+                        if (statement instanceof ClassDeclaration classDeclaration) {
+                                collectClassDeclarationSymbols(classDeclaration);
+                        } else if (statement instanceof EnumDeclaration enumDeclaration) {
+                                collectPartialRelation(enumDeclaration, 1, TruthValue.FALSE, TruthValue.FALSE);
+                        } else if (statement instanceof PredicateDefinition predicateDefinition) {
+                                collectPredicateDefinitionSymbol(predicateDefinition);
+                        }
+                }
+        }
+
+        private void collectClassDeclarationSymbols(ClassDeclaration classDeclaration) {
+                collectPartialRelation(classDeclaration, 1, null, TruthValue.UNKNOWN);
+                for (var featureDeclaration : classDeclaration.getFeatureDeclarations()) {
+                        if (featureDeclaration instanceof ReferenceDeclaration referenceDeclaration) {
+                                collectPartialRelation(referenceDeclaration, 2, null, TruthValue.UNKNOWN);
+                                var invalidMultiplicityConstraint = referenceDeclaration.getInvalidMultiplicity();
+                                if (invalidMultiplicityConstraint != null) {
+                                        collectPartialRelation(invalidMultiplicityConstraint, 1, TruthValue.FALSE, TruthValue.FALSE);
+                                }
                         } else {
-                                assertions.mergeValue(tuple, value);
+                                throw new TracedException(featureDeclaration, "Unknown feature declaration");
+                        }
+                }
+        }
+
+        private void collectPredicateDefinitionSymbol(PredicateDefinition predicateDefinition) {
+                int arity = predicateDefinition.getParameters().size();
+                if (predicateDefinition.isError()) {
+                        collectPartialRelation(predicateDefinition, arity, TruthValue.FALSE, TruthValue.FALSE);
+                } else {
+                        collectPartialRelation(predicateDefinition, arity, null, TruthValue.UNKNOWN);
+                }
+        }
+
+        private void putRelationInfo(Relation relation, RelationInfo info) {
+                relationInfoMap.put(relation, info);
+                partialRelationInfoMap.put(info.partialRelation(), info);
+                inverseTrace.put(info.partialRelation(), relation);
+        }
+
+        private RelationInfo collectPartialRelation(Relation relation, int arity, TruthValue value,
+                                                                                                TruthValue defaultValue) {
+                return relationInfoMap.computeIfAbsent(relation, key -> {
+                        var name = getName(relation);
+                        var info = new RelationInfo(name, arity, value, defaultValue);
+                        partialRelationInfoMap.put(info.partialRelation(), info);
+                        inverseTrace.put(info.partialRelation(), relation);
+                        return info;
+                });
+        }
+
+        private String getName(Relation relation) {
+                return semanticsUtils.getName(relation).orElseGet(() -> "#" + relationInfoMap.size());
+        }
+
+        private void collectMetamodel() {
+                for (var statement : problem.getStatements()) {
+                        if (statement instanceof ClassDeclaration classDeclaration) {
+                                collectClassDeclarationMetamodel(classDeclaration);
+                        } else if (statement instanceof EnumDeclaration enumDeclaration) {
+                                collectEnumMetamodel(enumDeclaration);
                         }
                 }
-                defaultAssertions.overwriteValues(assertions);
-                if (isEqualsRelation) {
-                        for (int i = 0; i < nodeCount; i++) {
-                                defaultAssertions.setIfMissing(Tuple.of(i, i), TruthValue.TRUE);
+        }
+
+        private void collectEnumMetamodel(EnumDeclaration enumDeclaration) {
+                try {
+                        metamodelBuilder.type(getPartialRelation(enumDeclaration), nodeRelation);
+                } catch (RuntimeException e) {
+                        throw TracedException.addTrace(enumDeclaration, e);
+                }
+        }
+
+        private void collectClassDeclarationMetamodel(ClassDeclaration classDeclaration) {
+                var superTypes = classDeclaration.getSuperTypes();
+                var partialSuperTypes = new ArrayList<PartialRelation>(superTypes.size() + 1);
+                partialSuperTypes.add(nodeRelation);
+                for (var superType : superTypes) {
+                        partialSuperTypes.add(getPartialRelation(superType));
+                }
+                try {
+                        metamodelBuilder.type(getPartialRelation(classDeclaration), classDeclaration.isAbstract(),
+                                        partialSuperTypes);
+                } catch (RuntimeException e) {
+                        throw TracedException.addTrace(classDeclaration, e);
+                }
+                for (var featureDeclaration : classDeclaration.getFeatureDeclarations()) {
+                        if (featureDeclaration instanceof ReferenceDeclaration referenceDeclaration) {
+                                collectReferenceDeclarationMetamodel(classDeclaration, referenceDeclaration);
                         }
-                        defaultAssertions.setAllMissing(TruthValue.FALSE);
                 }
-                return defaultAssertions;
+        }
+
+        private void collectReferenceDeclarationMetamodel(ClassDeclaration classDeclaration,
+                                                                                                          ReferenceDeclaration referenceDeclaration) {
+                var relation = getPartialRelation(referenceDeclaration);
+                var source = getPartialRelation(classDeclaration);
+                var target = getPartialRelation(referenceDeclaration.getReferenceType());
+                boolean containment = referenceDeclaration.getKind() == ReferenceKind.CONTAINMENT;
+                var opposite = referenceDeclaration.getOpposite();
+                PartialRelation oppositeRelation = null;
+                if (opposite != null) {
+                        oppositeRelation = getPartialRelation(opposite);
+                }
+                var multiplicity = getMultiplicityConstraint(referenceDeclaration);
+                try {
+                        metamodelBuilder.reference(relation, source, containment, multiplicity, target, oppositeRelation);
+                } catch (RuntimeException e) {
+                        throw TracedException.addTrace(classDeclaration, e);
+                }
+        }
+
+        private Multiplicity getMultiplicityConstraint(ReferenceDeclaration referenceDeclaration) {
+                if (!ProblemUtil.hasMultiplicityConstraint(referenceDeclaration)) {
+                        return UnconstrainedMultiplicity.INSTANCE;
+                }
+                var problemMultiplicity = referenceDeclaration.getMultiplicity();
+                CardinalityInterval interval;
+                if (problemMultiplicity == null) {
+                        interval = CardinalityIntervals.LONE;
+                } else {
+                        interval = getCardinalityInterval(problemMultiplicity);
+                }
+                var constraint = getRelationInfo(referenceDeclaration.getInvalidMultiplicity()).partialRelation();
+                return ConstrainedMultiplicity.of(interval, constraint);
+        }
+
+        private static CardinalityInterval getCardinalityInterval(
+                        tools.refinery.language.model.problem.Multiplicity problemMultiplicity) {
+                if (problemMultiplicity instanceof ExactMultiplicity exactMultiplicity) {
+                        return CardinalityIntervals.exactly(exactMultiplicity.getExactValue());
+                } else if (problemMultiplicity instanceof RangeMultiplicity rangeMultiplicity) {
+                        var upperBound = rangeMultiplicity.getUpperBound();
+                        return CardinalityIntervals.between(rangeMultiplicity.getLowerBound(),
+                                        upperBound < 0 ? UpperCardinalities.UNBOUNDED : UpperCardinalities.atMost(upperBound));
+                } else {
+                        throw new TracedException(problemMultiplicity, "Unknown multiplicity");
+                }
+        }
+
+        private void collectAssertions() {
+                for (var statement : problem.getStatements()) {
+                        if (statement instanceof ClassDeclaration classDeclaration) {
+                                collectClassDeclarationAssertions(classDeclaration);
+                        } else if (statement instanceof EnumDeclaration enumDeclaration) {
+                                collectEnumAssertions(enumDeclaration);
+                        } else if (statement instanceof IndividualDeclaration individualDeclaration) {
+                                for (var individual : individualDeclaration.getNodes()) {
+                                        collectIndividualAssertions(individual);
+                                }
+                        } else if (statement instanceof Assertion assertion) {
+                                collectAssertion(assertion);
+                        }
+                }
+        }
+
+        private void collectClassDeclarationAssertions(ClassDeclaration classDeclaration) {
+                var newNode = classDeclaration.getNewNode();
+                if (newNode == null) {
+                        return;
+                }
+                var newNodeId = getNodeId(newNode);
+                collectCardinalityAssertions(newNodeId, TruthValue.UNKNOWN);
+                var tuple = Tuple.of(newNodeId);
+                mergeValue(classDeclaration, tuple, TruthValue.TRUE);
+                var typeInfo = metamodel.typeHierarchy().getAnalysisResult(getPartialRelation(classDeclaration));
+                for (var subType : typeInfo.getDirectSubtypes()) {
+                        partialRelationInfoMap.get(subType).assertions().mergeValue(tuple, TruthValue.FALSE);
+                }
+        }
+
+        private void collectEnumAssertions(EnumDeclaration enumDeclaration) {
+                var overlay = MutableSeed.of(1, null);
+                for (var literal : enumDeclaration.getLiterals()) {
+                        collectIndividualAssertions(literal);
+                        var nodeId = getNodeId(literal);
+                        overlay.mergeValue(Tuple.of(nodeId), TruthValue.TRUE);
+                }
+                var info = getRelationInfo(enumDeclaration);
+                info.assertions().overwriteValues(overlay);
+        }
+
+        private void collectIndividualAssertions(Node node) {
+                var nodeId = getNodeId(node);
+                collectCardinalityAssertions(nodeId, TruthValue.TRUE);
+        }
+
+        private void collectCardinalityAssertions(int nodeId, TruthValue value) {
+                mergeValue(builtinSymbols.exists(), Tuple.of(nodeId), value);
+                mergeValue(builtinSymbols.equals(), Tuple.of(nodeId, nodeId), value);
+        }
+
+        private void collectAssertion(Assertion assertion) {
+                var tuple = getTuple(assertion);
+                var value = getTruthValue(assertion.getValue());
+                var relation = assertion.getRelation();
+                var info = getRelationInfo(relation);
+                var partialRelation = info.partialRelation();
+                if (partialRelation.arity() != tuple.getSize()) {
+                        throw new TracedException(assertion, "Expected %d arguments for %s, got %d instead"
+                                        .formatted(partialRelation.arity(), partialRelation, tuple.getSize()));
+                }
+                if (assertion.isDefault()) {
+                        info.defaultAssertions().mergeValue(tuple, value);
+                } else {
+                        info.assertions().mergeValue(tuple, value);
+                }
+        }
+
+        private void mergeValue(Relation relation, Tuple key, TruthValue value) {
+                getRelationInfo(relation).assertions().mergeValue(key, value);
+        }
+
+        private RelationInfo getRelationInfo(Relation relation) {
+                var info = relationInfoMap.get(relation);
+                if (info == null) {
+                        throw new IllegalArgumentException("Unknown relation: " + relation);
+                }
+                return info;
+        }
+
+        private PartialRelation getPartialRelation(Relation relation) {
+                return getRelationInfo(relation).partialRelation();
+        }
+
+        private int getNodeId(Node node) {
+                return nodeTrace.getOrThrow(node);
         }
 
         private Tuple getTuple(Assertion assertion) {
@@ -79,11 +411,11 @@ public class ModelInitializer {
                 for (int i = 0; i < arity; i++) {
                         var argument = arguments.get(i);
                         if (argument instanceof NodeAssertionArgument nodeArgument) {
-                                nodes[i] = nodeTrace.getOrThrow(nodeArgument.getNode());
+                                nodes[i] = getNodeId(nodeArgument.getNode());
                         } else if (argument instanceof WildcardAssertionArgument) {
                                 nodes[i] = -1;
                         } else {
-                                throw new IllegalArgumentException("Unknown assertion argument: " + argument);
+                                throw new TracedException(argument, "Unsupported assertion argument");
                         }
                 }
                 return Tuple.of(nodes);
@@ -100,4 +432,249 @@ public class ModelInitializer {
                         case ERROR -> TruthValue.ERROR;
                 };
         }
+
+        private void collectPredicates() {
+                for (var statement : problem.getStatements()) {
+                        if (statement instanceof PredicateDefinition predicateDefinition) {
+                                collectPredicateDefinitionTraced(predicateDefinition);
+                        }
+                }
+        }
+
+        private void collectPredicateDefinitionTraced(PredicateDefinition predicateDefinition) {
+                try {
+                        collectPredicateDefinition(predicateDefinition);
+                } catch (InvalidClauseException e) {
+                        int clauseIndex = e.getClauseIndex();
+                        var bodies = predicateDefinition.getBodies();
+                        if (clauseIndex < bodies.size()) {
+                                throw new TracedException(bodies.get(clauseIndex), e);
+                        } else {
+                                throw new TracedException(predicateDefinition, e);
+                        }
+                } catch (RuntimeException e) {
+                        throw TracedException.addTrace(predicateDefinition, e);
+                }
+        }
+
+        private void collectPredicateDefinition(PredicateDefinition predicateDefinition) {
+                var partialRelation = getPartialRelation(predicateDefinition);
+                var query = toQuery(partialRelation.name(), predicateDefinition);
+                boolean mutable;
+                TruthValue defaultValue;
+                if (predicateDefinition.isError()) {
+                        mutable = false;
+                        defaultValue = TruthValue.FALSE;
+                } else {
+                        var seed = modelSeed.getSeed(partialRelation);
+                        defaultValue = seed.reducedValue() == TruthValue.FALSE ? TruthValue.FALSE : TruthValue.UNKNOWN;
+                        var cursor = seed.getCursor(defaultValue, getNodeCount());
+                        // The symbol should be mutable if there is at least one non-default entry in the seed.
+                        mutable = cursor.move();
+                }
+                var translator = new PredicateTranslator(partialRelation, query, mutable, defaultValue);
+                storeBuilder.with(translator);
+        }
+
+        private RelationalQuery toQuery(String name, PredicateDefinition predicateDefinition) {
+                var problemParameters = predicateDefinition.getParameters();
+                int arity = problemParameters.size();
+                var parameters = new NodeVariable[arity];
+                var parameterMap = new HashMap<tools.refinery.language.model.problem.Variable, Variable>(arity);
+                var commonLiterals = new ArrayList<Literal>();
+                for (int i = 0; i < arity; i++) {
+                        var problemParameter = problemParameters.get(i);
+                        var parameter = Variable.of(problemParameter.getName());
+                        parameters[i] = parameter;
+                        parameterMap.put(problemParameter, parameter);
+                        var parameterType = problemParameter.getParameterType();
+                        if (parameterType != null) {
+                                var partialType = getPartialRelation(parameterType);
+                                commonLiterals.add(partialType.call(parameter));
+                        }
+                }
+                var builder = Query.builder(name).parameters(parameters);
+                for (var body : predicateDefinition.getBodies()) {
+                        try {
+                                var localScope = extendScope(parameterMap, body.getImplicitVariables());
+                                var problemLiterals = body.getLiterals();
+                                var literals = new ArrayList<>(commonLiterals);
+                                for (var problemLiteral : problemLiterals) {
+                                        toLiteralsTraced(problemLiteral, localScope, literals);
+                                }
+                                builder.clause(literals);
+                        } catch (RuntimeException e) {
+                                throw TracedException.addTrace(body, e);
+                        }
+                }
+                return builder.build();
+        }
+
+        private Map<tools.refinery.language.model.problem.Variable, Variable> extendScope(
+                        Map<tools.refinery.language.model.problem.Variable, Variable> existing,
+                        Collection<? extends tools.refinery.language.model.problem.Variable> newVariables) {
+                if (newVariables.isEmpty()) {
+                        return existing;
+                }
+                int localScopeSize = existing.size() + newVariables.size();
+                var localScope = new HashMap<tools.refinery.language.model.problem.Variable, Variable>(localScopeSize);
+                localScope.putAll(existing);
+                for (var newVariable : newVariables) {
+                        localScope.put(newVariable, Variable.of(newVariable.getName()));
+                }
+                return localScope;
+        }
+
+        private void toLiteralsTraced(Expr expr, Map<tools.refinery.language.model.problem.Variable, Variable> localScope,
+                                                                  List<Literal> literals) {
+                try {
+                        toLiterals(expr, localScope, literals);
+                } catch (RuntimeException e) {
+                        throw TracedException.addTrace(expr, e);
+                }
+        }
+
+        private void toLiterals(Expr expr, Map<tools.refinery.language.model.problem.Variable,
+                        Variable> localScope,
+                                                        List<Literal> literals) {
+                if (expr instanceof LogicConstant logicConstant) {
+                        switch (logicConstant.getLogicValue()) {
+                        case TRUE -> literals.add(BooleanLiteral.TRUE);
+                        case FALSE -> literals.add(BooleanLiteral.FALSE);
+                        default -> throw new TracedException(logicConstant, "Unsupported literal");
+                        }
+                } else if (expr instanceof Atom atom) {
+                        var target = getPartialRelation(atom.getRelation());
+                        var polarity = atom.isTransitiveClosure() ? CallPolarity.TRANSITIVE : CallPolarity.POSITIVE;
+                        var argumentList = toArgumentList(atom.getArguments(), localScope, literals);
+                        literals.add(target.call(polarity, argumentList));
+                } else if (expr instanceof NegationExpr negationExpr) {
+                        var body = negationExpr.getBody();
+                        if (!(body instanceof Atom atom)) {
+                                throw new TracedException(body, "Cannot negate literal");
+                        }
+                        var target = getPartialRelation(atom.getRelation());
+                        Constraint constraint;
+                        if (atom.isTransitiveClosure()) {
+                                constraint = Query.of(target.name() + "#transitive", (builder, p1, p2) -> builder.clause(
+                                                target.callTransitive(p1, p2)
+                                )).getDnf();
+                        } else {
+                                constraint = target;
+                        }
+                        var negatedScope = extendScope(localScope, negationExpr.getImplicitVariables());
+                        var argumentList = toArgumentList(atom.getArguments(), negatedScope, literals);
+                        literals.add(constraint.call(CallPolarity.NEGATIVE, argumentList));
+                } else if (expr instanceof ComparisonExpr comparisonExpr) {
+                        var argumentList = toArgumentList(List.of(comparisonExpr.getLeft(), comparisonExpr.getRight()),
+                                        localScope, literals);
+                        boolean positive = switch (comparisonExpr.getOp()) {
+                                case EQ -> true;
+                                case NOT_EQ -> false;
+                                default -> throw new TracedException(
+                                                comparisonExpr, "Unsupported operator");
+                        };
+                        literals.add(new EquivalenceLiteral(positive, argumentList.get(0), argumentList.get(1)));
+                } else {
+                        throw new TracedException(expr, "Unsupported literal");
+                }
+        }
+
+        private List<Variable> toArgumentList(
+                        List<Expr> expressions, Map<tools.refinery.language.model.problem.Variable, Variable> localScope,
+                        List<Literal> literals) {
+                var argumentList = new ArrayList<Variable>(expressions.size());
+                for (var expr : expressions) {
+                        if (!(expr instanceof VariableOrNodeExpr variableOrNodeExpr)) {
+                                throw new TracedException(expr, "Unsupported argument");
+                        }
+                        var variableOrNode = variableOrNodeExpr.getVariableOrNode();
+                        if (variableOrNode instanceof Node node) {
+                                int nodeId = getNodeId(node);
+                                var tempVariable = Variable.of(semanticsUtils.getName(node).orElse("_" + nodeId));
+                                literals.add(new ConstantLiteral(tempVariable, nodeId));
+                                argumentList.add(tempVariable);
+                        } else if (variableOrNode instanceof tools.refinery.language.model.problem.Variable problemVariable) {
+                                if (variableOrNodeExpr.getSingletonVariable() == problemVariable) {
+                                        argumentList.add(Variable.of(problemVariable.getName()));
+                                } else {
+                                        var variable = localScope.get(problemVariable);
+                                        if (variable == null) {
+                                                throw new TracedException(variableOrNode, "Unknown variable: " + problemVariable.getName());
+                                        }
+                                        argumentList.add(variable);
+                                }
+                        } else {
+                                throw new TracedException(variableOrNode, "Unknown argument");
+                        }
+                }
+                return argumentList;
+        }
+
+        private void collectScopes() {
+                for (var statement : problem.getStatements()) {
+                        if (statement instanceof ScopeDeclaration scopeDeclaration) {
+                                for (var typeScope : scopeDeclaration.getTypeScopes()) {
+                                        if (typeScope.isIncrement()) {
+                                                collectTypeScopeIncrement(typeScope);
+                                        } else {
+                                                collectTypeScope(typeScope);
+                                        }
+                                }
+                        }
+                }
+        }
+
+        private void collectTypeScopeIncrement(TypeScope typeScope) {
+                if (!(typeScope.getTargetType() instanceof ClassDeclaration classDeclaration)) {
+                        throw new TracedException(typeScope, "Target of incremental type scope must be a class declaration");
+                }
+                var newNode = classDeclaration.getNewNode();
+                if (newNode == null) {
+                        throw new TracedException(typeScope, "Target of incremental type scope must be concrete class");
+                }
+                int newNodeId = nodeTrace.get(newNode);
+                var type = relationTrace.get(classDeclaration);
+                var typeInfo = metamodel.typeHierarchy().getAnalysisResult(type);
+                if (!typeInfo.getDirectSubtypes().isEmpty()) {
+                        throw new TracedException(typeScope, "Target of incremental type scope cannot have any subclasses");
+                }
+                var interval = getCardinalityInterval(typeScope.getMultiplicity());
+                countSeed.compute(Tuple.of(newNodeId), (key, oldValue) ->
+                                oldValue == null ? interval : oldValue.meet(interval));
+        }
+
+        private void collectTypeScope(TypeScope typeScope) {
+                var scopePropagatorBuilder = storeBuilder.tryGetAdapter(ScopePropagatorBuilder.class).orElseThrow(
+                                () -> new TracedException(typeScope, "Type scopes require a ScopePropagatorBuilder"));
+                var type = relationTrace.get(typeScope.getTargetType());
+                if (type == null) {
+                        throw new TracedException(typeScope, "Unknown target type");
+                }
+                var interval = getCardinalityInterval(typeScope.getMultiplicity());
+                scopePropagatorBuilder.scope(type, interval);
+        }
+
+        private record RelationInfo(PartialRelation partialRelation, MutableSeed<TruthValue> assertions,
+                                                                MutableSeed<TruthValue> defaultAssertions) {
+                public RelationInfo(String name, int arity, TruthValue value, TruthValue defaultValue) {
+                        this(new PartialRelation(name, arity), value, defaultValue);
+                }
+
+                public RelationInfo(PartialRelation partialRelation, TruthValue value, TruthValue defaultValue) {
+                        this(partialRelation, MutableSeed.of(partialRelation.arity(), value),
+                                        MutableSeed.of(partialRelation.arity(), defaultValue));
+                }
+
+                public Seed<TruthValue> toSeed(int nodeCount) {
+                        defaultAssertions.overwriteValues(assertions);
+                        if (partialRelation.equals(ReasoningAdapter.EQUALS_SYMBOL)) {
+                                for (int i = 0; i < nodeCount; i++) {
+                                        defaultAssertions.setIfMissing(Tuple.of(i, i), TruthValue.TRUE);
+                                }
+                                defaultAssertions.setAllMissing(TruthValue.FALSE);
+                        }
+                        return defaultAssertions;
+                }
+        }
 }
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/SemanticsUtils.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/SemanticsUtils.java
new file mode 100644
index 00000000..47c89e9b
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/SemanticsUtils.java
@@ -0,0 +1,31 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.model;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.naming.IQualifiedNameConverter;
+import org.eclipse.xtext.naming.IQualifiedNameProvider;
+
+import java.util.Optional;
+
+@Singleton
+public class SemanticsUtils {
+        @Inject
+        private IQualifiedNameProvider qualifiedNameProvider;
+
+        @Inject
+        private IQualifiedNameConverter qualifiedNameConverter;
+
+        public Optional<String> getName(EObject eObject) {
+                var qualifiedName = qualifiedNameProvider.getFullyQualifiedName(eObject);
+                if (qualifiedName == null) {
+                        return Optional.empty();
+                }
+                return Optional.of(qualifiedNameConverter.toString(qualifiedName));
+        }
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/TracedException.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/TracedException.java
new file mode 100644
index 00000000..38fd8a67
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/TracedException.java
@@ -0,0 +1,51 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.model;
+
+import org.eclipse.emf.ecore.EObject;
+
+public class TracedException extends RuntimeException {
+        private final transient EObject sourceElement;
+
+        public TracedException(EObject sourceElement) {
+                this.sourceElement = sourceElement;
+        }
+
+        public TracedException(EObject sourceElement, String message) {
+                super(message);
+                this.sourceElement = sourceElement;
+        }
+
+        public TracedException(EObject sourceElement, String message, Throwable cause) {
+                super(message, cause);
+                this.sourceElement = sourceElement;
+        }
+
+        public TracedException(EObject sourceElement, Throwable cause) {
+                super(cause);
+                this.sourceElement = sourceElement;
+        }
+
+        public EObject getSourceElement() {
+                return sourceElement;
+        }
+
+        @Override
+        public String getMessage() {
+                var message = super.getMessage();
+                if (message == null) {
+                        return "Internal error";
+                }
+                return message;
+        }
+
+        public static TracedException addTrace(EObject sourceElement, Throwable cause) {
+                if (cause instanceof TracedException tracedException && tracedException.sourceElement != null) {
+                        return tracedException;
+                }
+                return new TracedException(sourceElement, cause);
+        }
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTree.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTree.java
index c1afecf9..32112e61 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTree.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTree.java
@@ -7,10 +7,10 @@ package tools.refinery.language.semantics.model.internal;
 
 import org.eclipse.collections.api.factory.primitive.IntObjectMaps;
 import tools.refinery.store.map.Cursor;
-import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.tuple.Tuple;
 
-public class DecisionTree {
+class DecisionTree implements MutableSeed<TruthValue> {
         private final int levels;
 
         private final DecisionTreeNode root;
@@ -29,30 +29,53 @@ public class DecisionTree {
                 this(levels, null);
         }
 
+        @Override
+        public int arity() {
+                return levels;
+        }
+
+        @Override
+        public Class<TruthValue> valueType() {
+                return TruthValue.class;
+        }
+
+        @Override
+        public TruthValue reducedValue() {
+                return root.getOtherwiseReducedValue().getTruthValue();
+        }
+
+        @Override
         public TruthValue get(Tuple tuple) {
                 return root.getValue(levels - 1, tuple).getTruthValue();
         }
 
+        @Override
         public void mergeValue(Tuple tuple, TruthValue truthValue) {
                 if (truthValue != null) {
                         root.mergeValue(levels - 1, tuple, truthValue);
                 }
         }
 
+        @Override
         public void setIfMissing(Tuple tuple, TruthValue truthValue) {
                 if (truthValue != null) {
                         root.setIfMissing(levels - 1, tuple, truthValue);
                 }
         }
 
+        @Override
         public void setAllMissing(TruthValue truthValue) {
                 if (truthValue != null) {
                         root.setAllMissing(truthValue);
                 }
         }
 
-        public void overwriteValues(DecisionTree values) {
-                root.overwriteValues(values.root);
+        @Override
+        public void overwriteValues(MutableSeed<TruthValue> values) {
+                if (!(values instanceof DecisionTree decisionTree)) {
+                        throw new IllegalArgumentException("Incompatible overwrite: " + values);
+                }
+                root.overwriteValues(decisionTree.root);
         }
 
         public TruthValue getReducedValue() {
@@ -60,6 +83,7 @@ public class DecisionTree {
                 return reducedValue == null ? null : reducedValue.getTruthValue();
         }
 
+        @Override
         public Cursor<Tuple, TruthValue> getCursor(TruthValue defaultValue, int nodeCount) {
                 return new DecisionTreeCursor(levels, defaultValue, nodeCount, root);
         }
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTreeCursor.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTreeCursor.java
index 9a1e15a3..a9fc644a 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTreeCursor.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTreeCursor.java
@@ -67,6 +67,15 @@ class DecisionTreeCursor implements Cursor<Tuple, TruthValue> {
 
         @Override
         public boolean move() {
+                while (moveOne()) {
+                        if (!value.equals(defaultValue)) {
+                                return true;
+                        }
+                }
+                return false;
+        }
+
+        private boolean moveOne() {
                 boolean found = false;
                 if (path.isEmpty() && !terminated) {
                         found = root.moveNext(levels - 1, this);
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/MutableSeed.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/MutableSeed.java
new file mode 100644
index 00000000..99019e2a
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/MutableSeed.java
@@ -0,0 +1,28 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.model.internal;
+
+import tools.refinery.store.reasoning.seed.Seed;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.tuple.Tuple;
+
+public interface MutableSeed<T> extends Seed<T> {
+        void mergeValue(Tuple tuple, T value);
+
+        void setIfMissing(Tuple tuple, T value);
+
+        void setAllMissing(T value);
+
+        void overwriteValues(MutableSeed<T> other);
+
+        static MutableSeed<TruthValue> of(int levels, TruthValue initialValue) {
+                if (levels == 0) {
+                        return new NullaryMutableSeed(initialValue);
+                } else {
+                        return new DecisionTree(levels, initialValue);
+                }
+        }
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/NullaryMutableSeed.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/NullaryMutableSeed.java
new file mode 100644
index 00000000..80644b1f
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/NullaryMutableSeed.java
@@ -0,0 +1,83 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics.model.internal;
+
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.Cursors;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.tuple.Tuple;
+
+class NullaryMutableSeed implements MutableSeed<TruthValue> {
+        private DecisionTreeValue value;
+
+        public NullaryMutableSeed(TruthValue reducedValue) {
+
+                value = DecisionTreeValue.fromTruthValue(reducedValue);
+        }
+
+        @Override
+        public int arity() {
+                return 0;
+        }
+
+        @Override
+        public Class<TruthValue> valueType() {
+                return TruthValue.class;
+        }
+
+        @Override
+        public TruthValue reducedValue() {
+                return value.getTruthValue();
+        }
+
+        @Override
+        public TruthValue get(Tuple key) {
+                validateKey(key);
+                return reducedValue();
+        }
+
+        private static void validateKey(Tuple key) {
+                if (key.getSize() > 0) {
+                        throw new IllegalArgumentException("Invalid key: " + key);
+                }
+        }
+
+        @Override
+        public Cursor<Tuple, TruthValue> getCursor(TruthValue defaultValue, int nodeCount) {
+                if (value == DecisionTreeValue.UNSET || value.getTruthValue() == defaultValue) {
+                        return Cursors.empty();
+                }
+                return Cursors.singleton(Tuple.of(), value.getTruthValue());
+        }
+
+        @Override
+        public void mergeValue(Tuple tuple, TruthValue value) {
+                this.value = DecisionTreeValue.fromTruthValue(this.value.merge(value));
+        }
+
+        @Override
+        public void setIfMissing(Tuple tuple, TruthValue value) {
+                validateKey(tuple);
+                setAllMissing(value);
+        }
+
+        @Override
+        public void setAllMissing(TruthValue value) {
+                if (this.value == DecisionTreeValue.UNSET) {
+                        this.value = DecisionTreeValue.fromTruthValue(value);
+                }
+        }
+
+        @Override
+        public void overwriteValues(MutableSeed<TruthValue> other) {
+                if (!(other instanceof NullaryMutableSeed nullaryMutableSeed)) {
+                        throw new IllegalArgumentException("Incompatible overwrite: " + other);
+                }
+                if (nullaryMutableSeed.value != DecisionTreeValue.UNSET) {
+                        value = nullaryMutableSeed.value;
+                }
+        }
+}
diff --git a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/tests/DecisionTreeTests.java b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/internal/DecisionTreeTests.java
index b3fcbabb..5d039308 100644
--- a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/tests/DecisionTreeTests.java
+++ b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/internal/DecisionTreeTests.java
@@ -3,10 +3,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model.tests;
+package tools.refinery.language.semantics.model.internal;
 
 import org.junit.jupiter.api.Test;
-import tools.refinery.language.semantics.model.internal.DecisionTree;
 import tools.refinery.store.representation.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 
@@ -134,6 +133,17 @@ class DecisionTreeTests {
         }
 
         @Test
+        void overwriteIterationTest() {
+                var sut = new DecisionTree(1, TruthValue.TRUE);
+                var overwrite = new DecisionTree(1, null);
+                overwrite.mergeValue(Tuple.of(0), TruthValue.UNKNOWN);
+                sut.overwriteValues(overwrite);
+                var map = iterateAll(sut, TruthValue.UNKNOWN, 2);
+                assertThat(map.keySet(), hasSize(1));
+                assertThat(map, hasEntry(Tuple.of(1), TruthValue.TRUE));
+        }
+
+        @Test
         void overwriteNothingTest() {
                 var sut = new DecisionTree(2, TruthValue.UNKNOWN);
                 var values = new DecisionTree(2, null);
diff --git a/subprojects/language-web/build.gradle.kts b/subprojects/language-web/build.gradle.kts
index 562a1bd9..88dccdf3 100644
--- a/subprojects/language-web/build.gradle.kts
+++ b/subprojects/language-web/build.gradle.kts
@@ -17,6 +17,10 @@ val webapp: Configuration by configurations.creating {
 dependencies {
         implementation(project(":refinery-language"))
         implementation(project(":refinery-language-ide"))
+        implementation(project(":refinery-language-semantics"))
+        implementation(project(":refinery-store-query-viatra"))
+        implementation(project(":refinery-store-reasoning-scope"))
+        implementation(libs.gson)
         implementation(libs.jetty.server)
         implementation(libs.jetty.servlet)
         implementation(libs.jetty.websocket.api)
@@ -60,9 +64,18 @@ tasks {
                 classpath(mainRuntimeClasspath)
                 mainClass.set(application.mainClass)
                 standardInput = System.`in`
-                val baseResource = webapp.incoming.artifacts.artifactFiles.first()
-                environment("BASE_RESOURCE", baseResource)
+                environment("REFINERY_BASE_RESOURCE", webapp.singleFile)
                 group = "run"
-                description = "Start a Jetty web server serving the Xtex API and assets."
+                description = "Start a Jetty web server serving the Xtext API and assets."
+        }
+
+        register<JavaExec>("serveBackendOnly") {
+                val mainRuntimeClasspath = sourceSets.main.map { it.runtimeClasspath }
+                dependsOn(mainRuntimeClasspath)
+                classpath(mainRuntimeClasspath)
+                mainClass.set(application.mainClass)
+                standardInput = System.`in`
+                group = "run"
+                description = "Start a Jetty web server serving the Xtext API without assets."
         }
 }
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
index b0197c01..6a6e0107 100644
--- 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
@@ -9,11 +9,13 @@
  */
 package tools.refinery.language.web;
 
+import org.eclipse.xtext.ide.ExecutorServiceProvider;
 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.ThreadPoolExecutorServiceProvider;
 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;
@@ -37,4 +39,8 @@ public class ProblemWebModule extends AbstractProblemWebModule {
         public Class<? extends OccurrencesService> bindOccurrencesService() {
                 return ProblemOccurrencesService.class;
         }
+
+        public Class<? extends ExecutorServiceProvider> bindExecutorServiceProvider() {
+                return ThreadPoolExecutorServiceProvider.class;
+        }
 }
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
index 7b48cde8..e98d115e 100644
--- 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
@@ -10,8 +10,10 @@ import org.eclipse.xtext.util.DisposableRegistry;
 import jakarta.servlet.ServletException;
 import tools.refinery.language.web.xtext.servlet.XtextWebSocketServlet;
 
-public class ProblemWebSocketServlet extends XtextWebSocketServlet {
+import java.io.Serial;
 
+public class ProblemWebSocketServlet extends XtextWebSocketServlet {
+        @Serial
         private static final long serialVersionUID = -7040955470384797008L;
 
         private transient DisposableRegistry disposableRegistry;
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/SecurityHeadersFilter.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/SecurityHeadersFilter.java
index 7b094fde..fab94689 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/SecurityHeadersFilter.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/SecurityHeadersFilter.java
@@ -16,7 +16,7 @@ public class SecurityHeadersFilter implements Filter {
                         ServletException {
                 if (response instanceof HttpServletResponse httpResponse) {
                         httpResponse.setHeader("Content-Security-Policy", "default-src 'none'; " +
-                                        "script-src 'self'; " +
+                                        "script-src 'self' 'wasm-unsafe-eval'; " +
                                         // CodeMirror needs inline styles, see e.g.,
                                         // https://discuss.codemirror.net/t/inline-styles-and-content-security-policy/1311/2
                                         "style-src 'self' 'unsafe-inline'; " +
@@ -25,7 +25,7 @@ public class SecurityHeadersFilter implements Filter {
                                         "font-src 'self'; " +
                                         "connect-src 'self'; " +
                                         "manifest-src 'self'; " +
-                                        "worker-src 'self';");
+                                        "worker-src 'self' blob:;");
                         httpResponse.setHeader("X-Content-Type-Options", "nosniff");
                         httpResponse.setHeader("X-Frame-Options", "DENY");
                         httpResponse.setHeader("Referrer-Policy", "strict-origin");
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
index ad19e77d..155efc6f 100644
--- 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
@@ -33,7 +33,7 @@ import java.util.EnumSet;
 import java.util.Set;
 
 public class ServerLauncher {
-        public static final String DEFAULT_LISTEN_ADDRESS = "localhost";
+        public static final String DEFAULT_LISTEN_HOST = "localhost";
 
         public static final int DEFAULT_LISTEN_PORT = 1312;
 
@@ -105,7 +105,7 @@ public class ServerLauncher {
 
         private Resource getBaseResource() {
                 var factory = ResourceFactory.of(server);
-                var baseResourceOverride = System.getenv("BASE_RESOURCE");
+                var baseResourceOverride = System.getenv("REFINERY_BASE_RESOURCE");
                 if (baseResourceOverride != null) {
                         // If a user override is provided, use it.
                         return factory.newResource(baseResourceOverride);
@@ -115,7 +115,10 @@ public class ServerLauncher {
                         // If the app is packaged in the jar, serve it.
                         URI webRootUri;
                         try {
-                                webRootUri = URI.create(indexUrlInJar.toURI().toASCIIString().replaceFirst("/index.html$", "/"));
+                                webRootUri = URI.create(indexUrlInJar.toURI().toASCIIString()
+                                                .replaceFirst("/index.html$", "/")
+                                                // Enable running without warnings from a jar.
+                                                .replaceFirst("^jar:file:", "jar:file://"));
                         } catch (URISyntaxException e) {
                                 throw new IllegalStateException("Jar has invalid base resource URI", e);
                         }
@@ -152,17 +155,17 @@ public class ServerLauncher {
         }
 
         private static String getListenAddress() {
-                var listenAddress = System.getenv("LISTEN_ADDRESS");
+                var listenAddress = System.getenv("REFINERY_LISTEN_HOST");
                 if (listenAddress == null) {
-                        return DEFAULT_LISTEN_ADDRESS;
+                        return DEFAULT_LISTEN_HOST;
                 }
                 return listenAddress;
         }
 
         private static int getListenPort() {
-                var portStr = System.getenv("LISTEN_PORT");
+                var portStr = System.getenv("REFINERY_LISTEN_PORT");
                 if (portStr != null) {
-                        return Integer.parseInt(portStr);
+                        return Integer.parseUnsignedInt(portStr);
                 }
                 return DEFAULT_LISTEN_PORT;
         }
@@ -174,7 +177,7 @@ public class ServerLauncher {
         }
 
         private static String getPublicHost() {
-                var publicHost = System.getenv("PUBLIC_HOST");
+                var publicHost = System.getenv("REFINERY_PUBLIC_HOST");
                 if (publicHost != null) {
                         return publicHost.toLowerCase();
                 }
@@ -182,15 +185,15 @@ public class ServerLauncher {
         }
 
         private static int getPublicPort() {
-                var portStr = System.getenv("PUBLIC_PORT");
+                var portStr = System.getenv("REFINERY_PUBLIC_PORT");
                 if (portStr != null) {
-                        return Integer.parseInt(portStr);
+                        return Integer.parseUnsignedInt(portStr);
                 }
                 return DEFAULT_PUBLIC_PORT;
         }
 
         private static String[] getAllowedOrigins() {
-                var allowedOrigins = System.getenv("ALLOWED_ORIGINS");
+                var allowedOrigins = System.getenv("REFINERY_ALLOWED_ORIGINS");
                 if (allowedOrigins != null) {
                         return allowedOrigins.split(ALLOWED_ORIGINS_SEPARATOR);
                 }
@@ -219,12 +222,10 @@ public class ServerLauncher {
                 int port;
                 var publicHost = getPublicHost();
                 if (publicHost == null) {
-                        host = getListenAddress();
-                        port = getListenPort();
-                } else {
-                        host = publicHost;
-                        port = getPublicPort();
+                        return null;
                 }
+                host = publicHost;
+                port = getPublicPort();
                 var scheme = port == HTTPS_DEFAULT_PORT ? "wss" : "ws";
                 return String.format("%s://%s:%d/xtext-service", scheme, host, port);
         }
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/config/BackendConfigServlet.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/config/BackendConfigServlet.java
index a2f04e34..7d0a5122 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/config/BackendConfigServlet.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/config/BackendConfigServlet.java
@@ -25,9 +25,6 @@ public class BackendConfigServlet extends HttpServlet {
         public void init(ServletConfig config) throws ServletException {
                 super.init(config);
                 var webSocketUrl = config.getInitParameter(WEBSOCKET_URL_INIT_PARAM);
-                if (webSocketUrl == null) {
-                        throw new IllegalArgumentException("Init parameter " + WEBSOCKET_URL_INIT_PARAM + " is mandatory");
-                }
                 var backendConfig = new BackendConfig(webSocketUrl);
                 var gson = new Gson();
                 serializedConfig = gson.toJson(backendConfig);
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/CancellableSeed.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/CancellableSeed.java
new file mode 100644
index 00000000..aa14f39d
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/CancellableSeed.java
@@ -0,0 +1,99 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.web.semantics;
+
+import tools.refinery.store.map.AnyVersionedMap;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+import tools.refinery.store.reasoning.seed.Seed;
+import tools.refinery.store.tuple.Tuple;
+import tools.refinery.viatra.runtime.CancellationToken;
+
+import java.util.Set;
+
+class CancellableSeed<T> implements Seed<T> {
+        private final CancellationToken cancellationToken;
+        private final Seed<T> seed;
+
+        private CancellableSeed(CancellationToken cancellationToken, Seed<T> seed) {
+                this.cancellationToken = cancellationToken;
+                this.seed = seed;
+        }
+
+        @Override
+        public int arity() {
+                return seed.arity();
+        }
+
+        @Override
+        public Class<T> valueType() {
+                return seed.valueType();
+        }
+
+        @Override
+        public T reducedValue() {
+                return seed.reducedValue();
+        }
+
+        @Override
+        public T get(Tuple key) {
+                return seed.get(key);
+        }
+
+        @Override
+        public Cursor<Tuple, T> getCursor(T defaultValue, int nodeCount) {
+                return new CancellableCursor<>(cancellationToken, seed.getCursor(defaultValue, nodeCount));
+        }
+
+        public static ModelSeed wrap(CancellationToken cancellationToken, ModelSeed modelSeed) {
+                var builder = ModelSeed.builder(modelSeed.getNodeCount());
+                for (var partialSymbol : modelSeed.getSeededSymbols()) {
+                        wrap(cancellationToken, (PartialSymbol<?, ?>) partialSymbol, modelSeed, builder);
+                }
+                return builder.build();
+        }
+
+        private static <A, C> void wrap(CancellationToken cancellationToken, PartialSymbol<A, C> partialSymbol,
+                                                                        ModelSeed originalModelSeed, ModelSeed.Builder builder) {
+                var originalSeed = originalModelSeed.getSeed(partialSymbol);
+                builder.seed(partialSymbol, new CancellableSeed<>(cancellationToken, originalSeed));
+        }
+
+        private record CancellableCursor<T>(CancellationToken cancellationToken, Cursor<Tuple, T> cursor)
+                        implements Cursor<Tuple, T> {
+                @Override
+                public Tuple getKey() {
+                        return cursor.getKey();
+                }
+
+                @Override
+                public T getValue() {
+                        return cursor.getValue();
+                }
+
+                @Override
+                public boolean isTerminated() {
+                        return cursor.isTerminated();
+                }
+
+                @Override
+                public boolean move() {
+                        cancellationToken.checkCancelled();
+                        return cursor.move();
+                }
+
+                @Override
+                public boolean isDirty() {
+                        return cursor.isDirty();
+                }
+
+                @Override
+                public Set<AnyVersionedMap> getDependingMaps() {
+                        return cursor.getDependingMaps();
+                }
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsInternalErrorResult.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsInternalErrorResult.java
new file mode 100644
index 00000000..ff592e93
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsInternalErrorResult.java
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.web.semantics;
+
+public record SemanticsInternalErrorResult(String error) implements SemanticsResult {
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsIssuesResult.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsIssuesResult.java
new file mode 100644
index 00000000..644bd179
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsIssuesResult.java
@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.web.semantics;
+
+import org.eclipse.xtext.web.server.validation.ValidationResult;
+
+import java.util.List;
+
+public record SemanticsIssuesResult(List<ValidationResult.Issue> issues) implements SemanticsResult {
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsResult.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsResult.java
new file mode 100644
index 00000000..a2e19a2f
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsResult.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.web.semantics;
+
+import org.eclipse.xtext.web.server.IServiceResult;
+
+public sealed interface SemanticsResult extends IServiceResult permits SemanticsSuccessResult,
+                SemanticsInternalErrorResult, SemanticsIssuesResult {
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsService.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsService.java
new file mode 100644
index 00000000..26924f0a
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsService.java
@@ -0,0 +1,142 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.web.semantics;
+
+import com.google.gson.JsonObject;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+import org.eclipse.xtext.ide.ExecutorServiceProvider;
+import org.eclipse.xtext.service.OperationCanceledManager;
+import org.eclipse.xtext.util.CancelIndicator;
+import org.eclipse.xtext.web.server.model.AbstractCachedService;
+import org.eclipse.xtext.web.server.model.IXtextWebDocument;
+import org.eclipse.xtext.web.server.validation.ValidationService;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.web.xtext.server.push.PushWebDocument;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+@Singleton
+public class SemanticsService extends AbstractCachedService<SemanticsResult> {
+        public static final String SEMANTICS_EXECUTOR = "semantics";
+
+        private static final Logger LOG = LoggerFactory.getLogger(SemanticsService.class);
+
+        @Inject
+        private Provider<SemanticsWorker> workerProvider;
+
+        @Inject
+        private OperationCanceledManager operationCanceledManager;
+
+        @Inject
+        private ValidationService validationService;
+
+        private ExecutorService executorService;
+
+        private final long timeoutMs;
+
+        private final long warmupTimeoutMs;
+
+        private final AtomicBoolean warmedUp = new AtomicBoolean(false);
+
+        public SemanticsService() {
+                timeoutMs = getTimeout("REFINERY_SEMANTICS_TIMEOUT_MS").orElse(1000L);
+                warmupTimeoutMs = getTimeout("REFINERY_SEMANTICS_WARMUP_TIMEOUT_MS").orElse(timeoutMs * 2);
+        }
+
+        private static Optional<Long> getTimeout(String name) {
+                return Optional.ofNullable(System.getenv(name)).map(Long::parseUnsignedLong);
+        }
+
+        @Inject
+        public void setExecutorServiceProvider(ExecutorServiceProvider provider) {
+                executorService = provider.get(SEMANTICS_EXECUTOR);
+        }
+
+        @Override
+        public SemanticsResult compute(IXtextWebDocument doc, CancelIndicator cancelIndicator) {
+                long start = 0;
+                if (LOG.isTraceEnabled()) {
+                        start = System.currentTimeMillis();
+                }
+                if (hasError(doc, cancelIndicator)) {
+                        return null;
+                }
+                var problem = getProblem(doc);
+                if (problem == null) {
+                        return new SemanticsSuccessResult(List.of(), List.of(), new JsonObject());
+                }
+                var worker = workerProvider.get();
+                worker.setProblem(problem, cancelIndicator);
+                var future = executorService.submit(worker);
+                boolean warmedUpCurrently = warmedUp.get();
+                long timeout = warmedUpCurrently ? timeoutMs : warmupTimeoutMs;
+                SemanticsResult result = null;
+                try {
+                        result = future.get(timeout, TimeUnit.MILLISECONDS);
+                        if (!warmedUpCurrently) {
+                                warmedUp.set(true);
+                        }
+                } catch (InterruptedException e) {
+                        future.cancel(true);
+                        LOG.error("Semantics service interrupted", e);
+                        Thread.currentThread().interrupt();
+                } catch (ExecutionException e) {
+                        operationCanceledManager.propagateAsErrorIfCancelException(e.getCause());
+                        LOG.debug("Error while computing semantics", e);
+                        if (e.getCause() instanceof Error error) {
+                                throw error;
+                        }
+                        String message = e.getMessage();
+                        if (message == null) {
+                                message = "Partial interpretation error";
+                        }
+                        return new SemanticsInternalErrorResult(message);
+                } catch (TimeoutException e) {
+                        future.cancel(true);
+                        if (!warmedUpCurrently) {
+                                warmedUp.set(true);
+                        }
+                        LOG.trace("Semantics service timeout", e);
+                        return new SemanticsInternalErrorResult("Partial interpretation timed out");
+                }
+                if (LOG.isTraceEnabled()) {
+                        long end = System.currentTimeMillis();
+                        LOG.trace("Computed semantics for {} ({}) in {}ms", doc.getResourceId(), doc.getStateId(),
+                                        end - start);
+                }
+                return result;
+        }
+
+        private boolean hasError(IXtextWebDocument doc, CancelIndicator cancelIndicator) {
+                if (!(doc instanceof PushWebDocument pushDoc)) {
+                        throw new IllegalArgumentException("Unexpected IXtextWebDocument: " + doc);
+                }
+                var validationResult = pushDoc.getCachedServiceResult(validationService, cancelIndicator, true);
+                return validationResult.getIssues().stream()
+                                .anyMatch(issue -> "error".equals(issue.getSeverity()));
+        }
+
+        @Nullable
+        private Problem getProblem(IXtextWebDocument doc) {
+                var contents = doc.getResource().getContents();
+                if (contents.isEmpty()) {
+                        return null;
+                }
+                var model = contents.get(0);
+                if (!(model instanceof Problem problem)) {
+                        return null;
+                }
+                return problem;
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsSuccessResult.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsSuccessResult.java
new file mode 100644
index 00000000..350b0b2b
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsSuccessResult.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.web.semantics;
+
+import com.google.gson.JsonObject;
+import tools.refinery.language.semantics.metadata.NodeMetadata;
+import tools.refinery.language.semantics.metadata.RelationMetadata;
+
+import java.util.List;
+
+public record SemanticsSuccessResult(List<NodeMetadata> nodes, List<RelationMetadata> relations,
+                                                                         JsonObject partialInterpretation) implements SemanticsResult {
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java
new file mode 100644
index 00000000..8470bb99
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsWorker.java
@@ -0,0 +1,175 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.web.semantics;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.inject.Inject;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.service.OperationCanceledManager;
+import org.eclipse.xtext.util.CancelIndicator;
+import org.eclipse.xtext.validation.CheckType;
+import org.eclipse.xtext.validation.FeatureBasedDiagnostic;
+import org.eclipse.xtext.validation.IDiagnosticConverter;
+import org.eclipse.xtext.validation.Issue;
+import org.eclipse.xtext.web.server.validation.ValidationResult;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.semantics.metadata.MetadataCreator;
+import tools.refinery.language.semantics.model.ModelInitializer;
+import tools.refinery.language.semantics.model.SemanticsUtils;
+import tools.refinery.language.semantics.model.TracedException;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.ReasoningStoreAdapter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.refinement.RefinementResult;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.scope.ScopePropagatorAdapter;
+import tools.refinery.store.reasoning.translator.TranslationException;
+import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
+import tools.refinery.store.tuple.Tuple;
+import tools.refinery.viatra.runtime.CancellationToken;
+
+import java.util.ArrayList;
+import java.util.TreeMap;
+import java.util.concurrent.Callable;
+
+class SemanticsWorker implements Callable<SemanticsResult> {
+        private static final String DIAGNOSTIC_ID = "tools.refinery.language.semantics.SemanticError";
+
+        @Inject
+        private SemanticsUtils semanticsUtils;
+
+        @Inject
+        private OperationCanceledManager operationCanceledManager;
+
+        @Inject
+        private IDiagnosticConverter diagnosticConverter;
+
+        @Inject
+        private ModelInitializer initializer;
+
+        @Inject
+        private MetadataCreator metadataCreator;
+
+        private Problem problem;
+
+        private CancellationToken cancellationToken;
+
+        public void setProblem(Problem problem, CancelIndicator parentIndicator) {
+                this.problem = problem;
+                cancellationToken = () -> {
+                        if (Thread.interrupted() || parentIndicator.isCanceled()) {
+                                operationCanceledManager.throwOperationCanceledException();
+                        }
+                };
+        }
+
+        @Override
+        public SemanticsResult call() {
+                var builder = ModelStore.builder()
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .cancellationToken(cancellationToken))
+                                .with(ReasoningAdapter.builder()
+                                                .requiredInterpretations(Concreteness.PARTIAL))
+                                .with(ScopePropagatorAdapter.builder());
+                cancellationToken.checkCancelled();
+                try {
+                        var modelSeed = initializer.createModel(problem, builder);
+                        cancellationToken.checkCancelled();
+                        metadataCreator.setInitializer(initializer);
+                        cancellationToken.checkCancelled();
+                        var nodesMetadata = metadataCreator.getNodesMetadata();
+                        cancellationToken.checkCancelled();
+                        var relationsMetadata = metadataCreator.getRelationsMetadata();
+                        cancellationToken.checkCancelled();
+                        var store = builder.build();
+                        cancellationToken.checkCancelled();
+                        var cancellableModelSeed = CancellableSeed.wrap(cancellationToken, modelSeed);
+                        var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(cancellableModelSeed);
+                        if (model.getAdapter(ScopePropagatorAdapter.class).propagate() == RefinementResult.REJECTED) {
+                                return new SemanticsInternalErrorResult("Scopes are unsatisfiable");
+                        }
+                        cancellationToken.checkCancelled();
+                        var partialInterpretation = getPartialInterpretation(initializer, model);
+
+                        return new SemanticsSuccessResult(nodesMetadata, relationsMetadata, partialInterpretation);
+                } catch (TracedException e) {
+                        return getTracedErrorResult(e.getSourceElement(), e.getMessage());
+                } catch (TranslationException e) {
+                        var sourceElement = initializer.getInverseTrace(e.getPartialSymbol());
+                        return getTracedErrorResult(sourceElement, e.getMessage());
+                }
+        }
+
+        private JsonObject getPartialInterpretation(ModelInitializer initializer, Model model) {
+                var adapter = model.getAdapter(ReasoningAdapter.class);
+                var json = new JsonObject();
+                for (var entry : initializer.getRelationTrace().entrySet()) {
+                        var relation = entry.getKey();
+                        var partialSymbol = entry.getValue();
+                        var tuples = getTuplesJson(adapter, partialSymbol);
+                        var name = semanticsUtils.getName(relation).orElse(partialSymbol.name());
+                        json.add(name, tuples);
+                        cancellationToken.checkCancelled();
+                }
+                json.add("builtin::count", getCountJson(model));
+                return json;
+        }
+
+        private static JsonArray getTuplesJson(ReasoningAdapter adapter, PartialRelation partialSymbol) {
+                var interpretation = adapter.getPartialInterpretation(Concreteness.PARTIAL, partialSymbol);
+                var cursor = interpretation.getAll();
+                return getTuplesJson(cursor);
+        }
+
+        private static JsonArray getTuplesJson(Cursor<Tuple, ?> cursor) {
+                var map = new TreeMap<Tuple, Object>();
+                while (cursor.move()) {
+                        map.put(cursor.getKey(), cursor.getValue());
+                }
+                var tuples = new JsonArray();
+                for (var entry : map.entrySet()) {
+                        tuples.add(toArray(entry.getKey(), entry.getValue()));
+                }
+                return tuples;
+        }
+
+        private static JsonArray toArray(Tuple tuple, Object value) {
+                int arity = tuple.getSize();
+                var json = new JsonArray(arity + 1);
+                for (int i = 0; i < arity; i++) {
+                        json.add(tuple.get(i));
+                }
+                json.add(value.toString());
+                return json;
+        }
+
+        private static JsonArray getCountJson(Model model) {
+                var interpretation = model.getInterpretation(MultiObjectTranslator.COUNT_STORAGE);
+                var cursor = interpretation.getAll();
+                return getTuplesJson(cursor);
+        }
+
+        private SemanticsResult getTracedErrorResult(EObject sourceElement, String message) {
+                if (sourceElement == null || !problem.eResource().equals(sourceElement.eResource())) {
+                        return new SemanticsInternalErrorResult(message);
+                }
+                var diagnostic = new FeatureBasedDiagnostic(Diagnostic.ERROR, message, sourceElement, null, 0,
+                                CheckType.EXPENSIVE, DIAGNOSTIC_ID);
+                var xtextIssues = new ArrayList<Issue>();
+                diagnosticConverter.convertValidatorDiagnostic(diagnostic, xtextIssues::add);
+                var issues = xtextIssues.stream()
+                                .map(issue -> new ValidationResult.Issue(issue.getMessage(), "error", issue.getLineNumber(),
+                                                issue.getColumn(), issue.getOffset(), issue.getLength()))
+                                .toList();
+                return new SemanticsIssuesResult(issues);
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/ThreadPoolExecutorServiceProvider.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/ThreadPoolExecutorServiceProvider.java
new file mode 100644
index 00000000..ba26ff58
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/ThreadPoolExecutorServiceProvider.java
@@ -0,0 +1,110 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.web.xtext.server;
+
+import com.google.inject.Singleton;
+import org.eclipse.xtext.ide.ExecutorServiceProvider;
+import org.eclipse.xtext.web.server.model.XtextWebDocumentAccess;
+import org.jetbrains.annotations.NotNull;
+import tools.refinery.language.web.semantics.SemanticsService;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Singleton
+public class ThreadPoolExecutorServiceProvider extends ExecutorServiceProvider {
+        private static final String DOCUMENT_LOCK_EXECUTOR;
+        private static final AtomicInteger POOL_ID = new AtomicInteger(1);
+
+        private final int executorThreadCount;
+        private final int lockExecutorThreadCount;
+        private final int semanticsExecutorThreadCount;
+
+        static {
+                var lookup = MethodHandles.lookup();
+                MethodHandle getter;
+                try {
+                        var privateLookup = MethodHandles.privateLookupIn(XtextWebDocumentAccess.class, lookup);
+                        getter = privateLookup.findStaticGetter(XtextWebDocumentAccess.class, "DOCUMENT_LOCK_EXECUTOR",
+                                        String.class);
+                } catch (IllegalAccessException | NoSuchFieldException e) {
+                        throw new IllegalStateException("Failed to find getter", e);
+                }
+                try {
+                        DOCUMENT_LOCK_EXECUTOR = (String) getter.invokeExact();
+                } catch (Error e) {
+                        // Rethrow JVM errors.
+                        throw e;
+                } catch (Throwable e) {
+                        throw new IllegalStateException("Failed to get DOCUMENT_LOCK_EXECUTOR", e);
+                }
+        }
+
+        public ThreadPoolExecutorServiceProvider() {
+                executorThreadCount = getCount("REFINERY_XTEXT_THREAD_COUNT").orElse(0);
+                lockExecutorThreadCount = getCount("REFINERY_XTEXT_LOCKING_THREAD_COUNT").orElse(executorThreadCount);
+                semanticsExecutorThreadCount = getCount("REFINERY_XTEXT_SEMANTICS_THREAD_COUNT").orElse(executorThreadCount);
+        }
+
+        private static Optional<Integer> getCount(String name) {
+                return Optional.ofNullable(System.getenv(name)).map(Integer::parseUnsignedInt);
+        }
+
+        @Override
+        protected ExecutorService createInstance(String key) {
+                String name = "xtext-" + POOL_ID.getAndIncrement();
+                if (key != null) {
+                        name = name + key + "-";
+                }
+                var threadFactory = new Factory(name, 5);
+                int size = getSize(key);
+                if (size == 0) {
+                        return Executors.newCachedThreadPool(threadFactory);
+                }
+                return Executors.newFixedThreadPool(size, threadFactory);
+        }
+
+        private int getSize(String key) {
+                if (SemanticsService.SEMANTICS_EXECUTOR.equals(key)) {
+                        return semanticsExecutorThreadCount;
+                } else if (DOCUMENT_LOCK_EXECUTOR.equals(key)) {
+                        return lockExecutorThreadCount;
+                } else {
+                        return executorThreadCount;
+                }
+        }
+
+        private static class Factory implements ThreadFactory {
+                // We have to explicitly store the {@link ThreadGroup} to create a {@link ThreadFactory}.
+                @SuppressWarnings("squid:S3014")
+                private final ThreadGroup threadGroup = Thread.currentThread().getThreadGroup();
+                private final AtomicInteger threadId = new AtomicInteger(1);
+                private final String namePrefix;
+                private final int priority;
+
+                public Factory(String name, int priority) {
+                        namePrefix = name + "-thread-";
+                        this.priority = priority;
+                }
+
+                @Override
+                public Thread newThread(@NotNull Runnable runnable) {
+                        var thread = new Thread(threadGroup, runnable, namePrefix + threadId.getAndIncrement());
+                        if (thread.isDaemon()) {
+                                thread.setDaemon(false);
+                        }
+                        if (thread.getPriority() != priority) {
+                                thread.setPriority(priority);
+                        }
+                        return thread;
+                }
+        }
+}
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
index 0135d8f5..74456604 100644
--- 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
@@ -42,6 +42,8 @@ public class TransactionExecutor implements IDisposable, PrecomputationListener
 
         private final List<XtextWebPushMessage> pendingPushMessages = new ArrayList<>();
 
+        private volatile boolean disposed;
+
         public TransactionExecutor(ISession session, IResourceServiceProvider.Registry resourceServiceProviderRegistry) {
                 this.session = session;
                 this.resourceServiceProviderRegistry = resourceServiceProviderRegistry;
@@ -52,10 +54,13 @@ public class TransactionExecutor implements IDisposable, PrecomputationListener
         }
 
         public void handleRequest(XtextWebRequest request) throws ResponseHandlerException {
+                if (disposed) {
+                        return;
+                }
                 var serviceContext = new SimpleServiceContext(session, request.getRequestData());
                 var ping = serviceContext.getParameter("ping");
                 if (ping != null) {
-                        responseHandler.onResponse(new XtextWebOkResponse(request, new PongResult(ping)));
+                        onResponse(new XtextWebOkResponse(request, new PongResult(ping)));
                         return;
                 }
                 synchronized (callPendingLock) {
@@ -72,23 +77,36 @@ public class TransactionExecutor implements IDisposable, PrecomputationListener
                         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));
+                        onResponse(new XtextWebOkResponse(request, serviceResult));
                 } catch (InvalidRequestException e) {
-                        responseHandler.onResponse(new XtextWebErrorResponse(request, XtextWebErrorKind.REQUEST_ERROR, e));
+                        onResponse(new XtextWebErrorResponse(request, XtextWebErrorKind.REQUEST_ERROR, e));
                 } catch (RuntimeException e) {
-                        responseHandler.onResponse(new XtextWebErrorResponse(request, XtextWebErrorKind.SERVER_ERROR, e));
+                        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);
-                                        }
+                        flushPendingPushMessages();
+                }
+        }
+
+        private void onResponse(XtextWebResponse response) throws ResponseHandlerException {
+                if (!disposed) {
+                        responseHandler.onResponse(response);
+                }
+        }
+
+        private void flushPendingPushMessages() {
+                synchronized (callPendingLock) {
+                        for (var message : pendingPushMessages) {
+                                if (disposed) {
+                                        return;
+                                }
+                                try {
+                                        responseHandler.onResponse(message);
+                                } catch (ResponseHandlerException | RuntimeException e) {
+                                        LOG.error("Error while flushing push message", e);
                                 }
-                                pendingPushMessages.clear();
-                                callPending = false;
                         }
+                        pendingPushMessages.clear();
+                        callPending = false;
                 }
         }
 
@@ -134,7 +152,7 @@ public class TransactionExecutor implements IDisposable, PrecomputationListener
          * @throws UnknownLanguageException if the Xtext language cannot be determined
          */
         protected Injector getInjector(IServiceContext context) {
-                IResourceServiceProvider resourceServiceProvider = null;
+                IResourceServiceProvider resourceServiceProvider;
                 var resourceName = context.getParameter("resource");
                 if (resourceName == null) {
                         resourceName = "";
@@ -164,10 +182,12 @@ public class TransactionExecutor implements IDisposable, PrecomputationListener
 
         @Override
         public void dispose() {
+                disposed = true;
                 for (var subscription : subscriptions.values()) {
                         var document = subscription.get();
                         if (document != null) {
                                 document.removePrecomputationListener(this);
+                                document.cancelBackgroundWork();
                         }
                 }
         }
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
index 73527ee5..c3379329 100644
--- 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
@@ -5,12 +5,11 @@
  */
 package tools.refinery.language.web.xtext.server.message;
 
-import java.util.Objects;
-
+import com.google.gson.annotations.SerializedName;
 import org.eclipse.xtext.web.server.IServiceResult;
 import org.eclipse.xtext.web.server.IUnwrappableServiceResult;
 
-import com.google.gson.annotations.SerializedName;
+import java.util.Objects;
 
 public final class XtextWebOkResponse implements XtextWebResponse {
         private String id;
@@ -19,7 +18,6 @@ public final class XtextWebOkResponse implements XtextWebResponse {
         private Object responseData;
 
         public XtextWebOkResponse(String id, Object responseData) {
-                super();
                 this.id = id;
                 this.responseData = responseData;
         }
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
index ff788e94..7c4562bf 100644
--- 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
@@ -5,19 +5,22 @@
  */
 package tools.refinery.language.web.xtext.server.message;
 
+import com.google.gson.annotations.SerializedName;
+
 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() {
+                this(null, null);
+        }
+
         public XtextWebRequest(String id, Map<String, String> requestData) {
-                super();
                 this.id = id;
                 this.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
index 61444c99..c370fb56 100644
--- 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
@@ -5,5 +5,5 @@
  */
 package tools.refinery.language.web.xtext.server.message;
 
-public sealed interface XtextWebResponse permits XtextWebOkResponse,XtextWebErrorResponse,XtextWebPushMessage {
+public sealed interface XtextWebResponse permits XtextWebOkResponse, XtextWebErrorResponse, XtextWebPushMessage {
 }
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
index 4c9135c8..d4a8c433 100644
--- 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
@@ -5,16 +5,28 @@
  */
 package tools.refinery.language.web.xtext.server.push;
 
+import com.google.inject.Inject;
 import org.eclipse.xtext.web.server.IServiceContext;
 import org.eclipse.xtext.web.server.XtextServiceDispatcher;
+import org.eclipse.xtext.web.server.model.PrecomputedServiceRegistry;
 import org.eclipse.xtext.web.server.model.XtextWebDocument;
 
 import com.google.inject.Singleton;
 
+import tools.refinery.language.web.semantics.SemanticsService;
 import tools.refinery.language.web.xtext.server.SubscribingServiceContext;
 
 @Singleton
 public class PushServiceDispatcher extends XtextServiceDispatcher {
+        @Inject
+        private SemanticsService semanticsService;
+
+        @Override
+        @Inject
+        protected void registerPreComputedServices(PrecomputedServiceRegistry registry) {
+                super.registerPreComputedServices(registry);
+                registry.addPrecomputedService(semanticsService);
+        }
 
         @Override
         protected XtextWebDocument getFullTextDocument(String fullText, String resourceId, IServiceContext context) {
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
index 56fd12c9..2d43fb26 100644
--- 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
@@ -5,11 +5,7 @@
  */
 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 com.google.common.collect.ImmutableList;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.web.server.IServiceResult;
 import org.eclipse.xtext.web.server.model.AbstractCachedService;
@@ -17,11 +13,13 @@ 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;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class PushWebDocument extends XtextWebDocument {
         private static final Logger LOG = LoggerFactory.getLogger(PushWebDocument.class);
 
@@ -29,48 +27,44 @@ public class PushWebDocument extends XtextWebDocument {
 
         private final Map<Class<?>, IServiceResult> precomputedServices = new HashMap<>();
 
+        private final DocumentSynchronizer synchronizer;
+
         public PushWebDocument(String resourceId, DocumentSynchronizer synchronizer) {
                 super(resourceId, synchronizer);
-                if (resourceId == null) {
-                        throw new IllegalArgumentException("resourceId must not be null");
-                }
+                this.synchronizer = synchronizer;
         }
 
-        public boolean addPrecomputationListener(PrecomputationListener listener) {
+        public void addPrecomputationListener(PrecomputationListener listener) {
                 synchronized (precomputationListeners) {
                         if (precomputationListeners.contains(listener)) {
-                                return false;
+                                return;
                         }
                         precomputationListeners.add(listener);
                         listener.onSubscribeToPrecomputationEvents(getResourceId(), this);
-                        return true;
                 }
         }
 
-        public boolean removePrecomputationListener(PrecomputationListener listener) {
+        public void removePrecomputationListener(PrecomputationListener listener) {
                 synchronized (precomputationListeners) {
-                        return precomputationListeners.remove(listener);
+                        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;
-                }
+                var result = getCachedServiceResult(service, cancelIndicator, logCacheMiss);
                 precomputedServices.put(serviceClass, result);
-                notifyPrecomputationListeners(serviceName, result);
+                if (result != null) {
+                        notifyPrecomputationListeners(serviceName, result);
+                }
         }
 
         private <T extends IServiceResult> void notifyPrecomputationListeners(String serviceName, T result) {
                 var resourceId = getResourceId();
+                if (resourceId == null) {
+                        return;
+                }
                 var stateId = getStateId();
                 List<PrecomputationListener> copyOfListeners;
                 synchronized (precomputationListeners) {
@@ -91,4 +85,8 @@ public class PushWebDocument extends XtextWebDocument {
                         }
                 }
         }
+
+        public void cancelBackgroundWork() {
+                synchronizer.setCanceled(true);
+        }
 }
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
index d9e548cd..c72e8e67 100644
--- 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
@@ -18,6 +18,7 @@ import org.eclipse.xtext.web.server.syntaxcoloring.HighlightingService;
 import org.eclipse.xtext.web.server.validation.ValidationService;
 
 import com.google.inject.Inject;
+import tools.refinery.language.web.semantics.SemanticsService;
 
 public class PushWebDocumentAccess extends XtextWebDocumentAccess {
 
@@ -49,7 +50,7 @@ public class PushWebDocumentAccess extends XtextWebDocumentAccess {
                         precomputeServiceResult(service, false);
                 }
         }
-        
+
         protected <T extends IServiceResult> void precomputeServiceResult(AbstractCachedService<T> service, boolean logCacheMiss) {
                 var serviceName = getPrecomputedServiceName(service);
                 readOnly(new CancelableUnitOfWork<Void, IXtextWebDocument>() {
@@ -60,7 +61,7 @@ public class PushWebDocumentAccess extends XtextWebDocumentAccess {
                         }
                 });
         }
-        
+
         protected String getPrecomputedServiceName(AbstractCachedService<? extends IServiceResult> service) {
                 if (service instanceof ValidationService) {
                         return "validate";
@@ -68,6 +69,9 @@ public class PushWebDocumentAccess extends XtextWebDocumentAccess {
                 if (service instanceof HighlightingService) {
                         return "highlight";
                 }
+                if (service instanceof SemanticsService) {
+                        return "semantics";
+                }
                 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
index b6f4fb43..ec6204ef 100644
--- 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
@@ -27,12 +27,7 @@ public class PushWebDocumentProvider implements IWebDocumentProvider {
 
         @Override
         public XtextWebDocument get(String resourceId, IServiceContext serviceContext) {
-                if (resourceId == null) {
-                        return new XtextWebDocument(null, 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()));
-                }
+                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/RuntimeTypeAdapterFactory.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/RuntimeTypeAdapterFactory.java
new file mode 100644
index 00000000..b16cf7df
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/RuntimeTypeAdapterFactory.java
@@ -0,0 +1,304 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ * Copyright (C) 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This file was copied into Refinery according to upstream instructions at
+ * https://github.com/google/gson/issues/1104#issuecomment-309582470.
+ * However, we changed the package name below to avoid potential clashes
+ * with other jars on the classpath.
+ */
+package tools.refinery.language.web.xtext.servlet;
+
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Adapts values whose runtime type may differ from their declaration type. This
+ * is necessary when a field's type is not the same type that GSON should create
+ * when deserializing that field. For example, consider these types:
+ * <pre>   {@code
+ *   abstract class Shape {
+ *     int x;
+ *     int y;
+ *   }
+ *   class Circle extends Shape {
+ *     int radius;
+ *   }
+ *   class Rectangle extends Shape {
+ *     int width;
+ *     int height;
+ *   }
+ *   class Diamond extends Shape {
+ *     int width;
+ *     int height;
+ *   }
+ *   class Drawing {
+ *     Shape bottomShape;
+ *     Shape topShape;
+ *   }
+ * }</pre>
+ * <p>Without additional type information, the serialized JSON is ambiguous. Is
+ * the bottom shape in this drawing a rectangle or a diamond? <pre>   {@code
+ *   {
+ *     "bottomShape": {
+ *       "width": 10,
+ *       "height": 5,
+ *       "x": 0,
+ *       "y": 0
+ *     },
+ *     "topShape": {
+ *       "radius": 2,
+ *       "x": 4,
+ *       "y": 1
+ *     }
+ *   }}</pre>
+ * This class addresses this problem by adding type information to the
+ * serialized JSON and honoring that type information when the JSON is
+ * deserialized: <pre>   {@code
+ *   {
+ *     "bottomShape": {
+ *       "type": "Diamond",
+ *       "width": 10,
+ *       "height": 5,
+ *       "x": 0,
+ *       "y": 0
+ *     },
+ *     "topShape": {
+ *       "type": "Circle",
+ *       "radius": 2,
+ *       "x": 4,
+ *       "y": 1
+ *     }
+ *   }}</pre>
+ * Both the type field name ({@code "type"}) and the type labels ({@code
+ * "Rectangle"}) are configurable.
+ *
+ * <h2>Registering Types</h2>
+ * Create a {@code RuntimeTypeAdapterFactory} by passing the base type and type field
+ * name to the {@link #of} factory method. If you don't supply an explicit type
+ * field name, {@code "type"} will be used. <pre>   {@code
+ *   RuntimeTypeAdapterFactory<Shape> shapeAdapterFactory
+ *       = RuntimeTypeAdapterFactory.of(Shape.class, "type");
+ * }</pre>
+ * Next register all of your subtypes. Every subtype must be explicitly
+ * registered. This protects your application from injection attacks. If you
+ * don't supply an explicit type label, the type's simple name will be used.
+ * <pre>   {@code
+ *   shapeAdapterFactory.registerSubtype(Rectangle.class, "Rectangle");
+ *   shapeAdapterFactory.registerSubtype(Circle.class, "Circle");
+ *   shapeAdapterFactory.registerSubtype(Diamond.class, "Diamond");
+ * }</pre>
+ * Finally, register the type adapter factory in your application's GSON builder:
+ * <pre>   {@code
+ *   Gson gson = new GsonBuilder()
+ *       .registerTypeAdapterFactory(shapeAdapterFactory)
+ *       .create();
+ * }</pre>
+ * Like {@code GsonBuilder}, this API supports chaining: <pre>   {@code
+ *   RuntimeTypeAdapterFactory<Shape> shapeAdapterFactory = RuntimeTypeAdapterFactory.of(Shape.class)
+ *       .registerSubtype(Rectangle.class)
+ *       .registerSubtype(Circle.class)
+ *       .registerSubtype(Diamond.class);
+ * }</pre>
+ *
+ * <h2>Serialization and deserialization</h2>
+ * In order to serialize and deserialize a polymorphic object,
+ * you must specify the base type explicitly.
+ * <pre>   {@code
+ *   Diamond diamond = new Diamond();
+ *   String json = gson.toJson(diamond, Shape.class);
+ * }</pre>
+ * And then:
+ * <pre>   {@code
+ *   Shape shape = gson.fromJson(json, Shape.class);
+ * }</pre>
+ */
+public final class RuntimeTypeAdapterFactory<T> implements TypeAdapterFactory {
+        private final Class<?> baseType;
+        private final String typeFieldName;
+        private final Map<String, Class<?>> labelToSubtype = new LinkedHashMap<>();
+        private final Map<Class<?>, String> subtypeToLabel = new LinkedHashMap<>();
+        private final boolean maintainType;
+        private boolean recognizeSubtypes;
+
+        private RuntimeTypeAdapterFactory(
+                        Class<?> baseType, String typeFieldName, boolean maintainType) {
+                if (typeFieldName == null || baseType == null) {
+                        throw new NullPointerException();
+                }
+                this.baseType = baseType;
+                this.typeFieldName = typeFieldName;
+                this.maintainType = maintainType;
+        }
+
+        /**
+         * Creates a new runtime type adapter using for {@code baseType} using {@code
+         * typeFieldName} as the type field name. Type field names are case sensitive.
+         *
+         * @param maintainType true if the type field should be included in deserialized objects
+         */
+        public static <T> RuntimeTypeAdapterFactory<T> of(Class<T> baseType, String typeFieldName, boolean maintainType) {
+                return new RuntimeTypeAdapterFactory<>(baseType, typeFieldName, maintainType);
+        }
+
+        /**
+         * Creates a new runtime type adapter using for {@code baseType} using {@code
+         * typeFieldName} as the type field name. Type field names are case sensitive.
+         */
+        public static <T> RuntimeTypeAdapterFactory<T> of(Class<T> baseType, String typeFieldName) {
+                return new RuntimeTypeAdapterFactory<>(baseType, typeFieldName, false);
+        }
+
+        /**
+         * Creates a new runtime type adapter for {@code baseType} using {@code "type"} as
+         * the type field name.
+         */
+        public static <T> RuntimeTypeAdapterFactory<T> of(Class<T> baseType) {
+                return new RuntimeTypeAdapterFactory<>(baseType, "type", false);
+        }
+
+        /**
+         * Ensures that this factory will handle not just the given {@code baseType}, but any subtype
+         * of that type.
+         */
+        @CanIgnoreReturnValue
+        public RuntimeTypeAdapterFactory<T> recognizeSubtypes() {
+                this.recognizeSubtypes = true;
+                return this;
+        }
+
+        /**
+         * Registers {@code type} identified by {@code label}. Labels are case
+         * sensitive.
+         *
+         * @throws IllegalArgumentException if either {@code type} or {@code label}
+         *     have already been registered on this type adapter.
+         */
+        @CanIgnoreReturnValue
+        public RuntimeTypeAdapterFactory<T> registerSubtype(Class<? extends T> type, String label) {
+                if (type == null || label == null) {
+                        throw new NullPointerException();
+                }
+                if (subtypeToLabel.containsKey(type) || labelToSubtype.containsKey(label)) {
+                        throw new IllegalArgumentException("types and labels must be unique");
+                }
+                labelToSubtype.put(label, type);
+                subtypeToLabel.put(type, label);
+                return this;
+        }
+
+        /**
+         * Registers {@code type} identified by its {@link Class#getSimpleName simple
+         * name}. Labels are case sensitive.
+         *
+         * @throws IllegalArgumentException if either {@code type} or its simple name
+         *     have already been registered on this type adapter.
+         */
+        @CanIgnoreReturnValue
+        public RuntimeTypeAdapterFactory<T> registerSubtype(Class<? extends T> type) {
+                return registerSubtype(type, type.getSimpleName());
+        }
+
+        @Override
+        public <R> TypeAdapter<R> create(Gson gson, TypeToken<R> type) {
+                if (type == null) {
+                        return null;
+                }
+                Class<?> rawType = type.getRawType();
+                boolean handle =
+                                recognizeSubtypes ? baseType.isAssignableFrom(rawType) : baseType.equals(rawType);
+                if (!handle) {
+                        return null;
+                }
+
+                final TypeAdapter<JsonElement> jsonElementAdapter = gson.getAdapter(JsonElement.class);
+                final Map<String, TypeAdapter<?>> labelToDelegate = new LinkedHashMap<>();
+                final Map<Class<?>, TypeAdapter<?>> subtypeToDelegate = new LinkedHashMap<>();
+                for (Map.Entry<String, Class<?>> entry : labelToSubtype.entrySet()) {
+                        TypeAdapter<?> delegate = gson.getDelegateAdapter(this, TypeToken.get(entry.getValue()));
+                        labelToDelegate.put(entry.getKey(), delegate);
+                        subtypeToDelegate.put(entry.getValue(), delegate);
+                }
+
+                return new TypeAdapter<R>() {
+                        @Override public R read(JsonReader in) throws IOException {
+                                JsonElement jsonElement = jsonElementAdapter.read(in);
+                                JsonElement labelJsonElement;
+                                if (maintainType) {
+                                        labelJsonElement = jsonElement.getAsJsonObject().get(typeFieldName);
+                                } else {
+                                        labelJsonElement = jsonElement.getAsJsonObject().remove(typeFieldName);
+                                }
+
+                                if (labelJsonElement == null) {
+                                        throw new JsonParseException("cannot deserialize " + baseType
+                                                        + " because it does not define a field named " + typeFieldName);
+                                }
+                                String label = labelJsonElement.getAsString();
+                                @SuppressWarnings("unchecked") // registration requires that subtype extends T
+                                TypeAdapter<R> delegate = (TypeAdapter<R>) labelToDelegate.get(label);
+                                if (delegate == null) {
+                                        throw new JsonParseException("cannot deserialize " + baseType + " subtype named "
+                                                        + label + "; did you forget to register a subtype?");
+                                }
+                                return delegate.fromJsonTree(jsonElement);
+                        }
+
+                        @Override public void write(JsonWriter out, R value) throws IOException {
+                                Class<?> srcType = value.getClass();
+                                String label = subtypeToLabel.get(srcType);
+                                @SuppressWarnings("unchecked") // registration requires that subtype extends T
+                                TypeAdapter<R> delegate = (TypeAdapter<R>) subtypeToDelegate.get(srcType);
+                                if (delegate == null) {
+                                        throw new JsonParseException("cannot serialize " + srcType.getName()
+                                                        + "; did you forget to register a subtype?");
+                                }
+                                JsonObject jsonObject = delegate.toJsonTree(value).getAsJsonObject();
+
+                                if (maintainType) {
+                                        jsonElementAdapter.write(out, jsonObject);
+                                        return;
+                                }
+
+                                JsonObject clone = new JsonObject();
+
+                                if (jsonObject.has(typeFieldName)) {
+                                        throw new JsonParseException("cannot serialize " + srcType.getName()
+                                                        + " because it already defines a field named " + typeFieldName);
+                                }
+                                clone.add(typeFieldName, new JsonPrimitive(label));
+
+                                for (Map.Entry<String, JsonElement> e : jsonObject.entrySet()) {
+                                        clone.add(e.getKey(), e.getValue());
+                                }
+                                jsonElementAdapter.write(out, clone);
+                        }
+                }.nullSafe();
+        }
+}
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
index 043d318c..1fde1be5 100644
--- 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
@@ -6,6 +6,7 @@
 package tools.refinery.language.web.xtext.servlet;
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonParseException;
 import org.eclipse.jetty.websocket.api.Callback;
@@ -16,6 +17,7 @@ import org.eclipse.xtext.resource.IResourceServiceProvider;
 import org.eclipse.xtext.web.server.ISession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import tools.refinery.language.semantics.metadata.*;
 import tools.refinery.language.web.xtext.server.ResponseHandler;
 import tools.refinery.language.web.xtext.server.ResponseHandlerException;
 import tools.refinery.language.web.xtext.server.TransactionExecutor;
@@ -28,7 +30,15 @@ import java.io.Reader;
 public class XtextWebSocket implements ResponseHandler {
         private static final Logger LOG = LoggerFactory.getLogger(XtextWebSocket.class);
 
-        private final Gson gson = new Gson();
+        private final Gson gson = new GsonBuilder()
+                        .disableJdkUnsafe()
+                        .registerTypeAdapterFactory(RuntimeTypeAdapterFactory.of(RelationDetail.class, "type")
+                                        .registerSubtype(ClassDetail.class, "class")
+                                        .registerSubtype(ReferenceDetail.class, "reference")
+                                        .registerSubtype(OppositeReferenceDetail.class, "opposite")
+                                        .registerSubtype(PredicateDetail.class, "predicate")
+                                        .registerSubtype(BuiltInDetail.class, "builtin"))
+                        .create();
 
         private final TransactionExecutor executor;
 
@@ -70,10 +80,11 @@ public class XtextWebSocket implements ResponseHandler {
 
         @OnWebSocketError
         public void onError(Throwable error) {
+                executor.dispose();
                 if (webSocketSession == null) {
                         return;
                 }
-                LOG.error("Internal websocket error in connection from" + webSocketSession.getRemoteSocketAddress(), error);
+                LOG.error("Internal websocket error in connection from " + webSocketSession.getRemoteSocketAddress(), error);
         }
 
         @OnWebSocketMessage
@@ -86,14 +97,18 @@ public class XtextWebSocket implements ResponseHandler {
                 try {
                         request = gson.fromJson(reader, XtextWebRequest.class);
                 } catch (JsonIOException e) {
-                        LOG.error("Cannot read from websocket from" + webSocketSession.getRemoteSocketAddress(), e);
+                        LOG.error("Cannot read from websocket from " + webSocketSession.getRemoteSocketAddress(), e);
                         if (webSocketSession.isOpen()) {
+                                executor.dispose();
                                 webSocketSession.close(StatusCode.SERVER_ERROR, "Cannot read payload", Callback.NOOP);
                         }
                         return;
                 } catch (JsonParseException e) {
-                        LOG.warn("Malformed websocket request from" + webSocketSession.getRemoteSocketAddress(), e);
-                        webSocketSession.close(XtextStatusCode.INVALID_JSON, "Invalid JSON payload", Callback.NOOP);
+                        LOG.warn("Malformed websocket request from " + webSocketSession.getRemoteSocketAddress(), e);
+                        if (webSocketSession.isOpen()) {
+                                executor.dispose();
+                                webSocketSession.close(XtextStatusCode.INVALID_JSON, "Invalid JSON payload", Callback.NOOP);
+                        }
                         return;
                 }
                 try {
@@ -101,6 +116,7 @@ public class XtextWebSocket implements ResponseHandler {
                 } catch (ResponseHandlerException e) {
                         LOG.warn("Cannot write websocket response", e);
                         if (webSocketSession.isOpen()) {
+                                executor.dispose();
                                 webSocketSession.close(StatusCode.SERVER_ERROR, "Cannot write response", Callback.NOOP);
                         }
                 }
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
index 927eeab1..889a55cb 100644
--- 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
@@ -93,7 +93,7 @@ class ProblemWebSocketServletIntegrationTest {
                 clientSocket.waitForTestResult();
                 assertThat(clientSocket.getCloseStatusCode(), equalTo(StatusCode.NORMAL));
                 var responses = clientSocket.getResponses();
-                assertThat(responses, hasSize(5));
+                assertThat(responses, hasSize(8));
                 assertThat(responses.get(0), equalTo("{\"id\":\"foo\",\"response\":{\"stateId\":\"-80000000\"}}"));
                 assertThat(responses.get(1), startsWith(
                                 "{\"resource\":\"test.problem\",\"stateId\":\"-80000000\",\"service\":\"highlight\"," +
@@ -101,10 +101,19 @@ class ProblemWebSocketServletIntegrationTest {
                 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(
+                assertThat(responses.get(3), startsWith(
+                                "{\"resource\":\"test.problem\",\"stateId\":\"-80000000\",\"service\":\"semantics\"," +
+                                                "\"push\":{"));
+                assertThat(responses.get(4), equalTo("{\"id\":\"bar\",\"response\":{\"stateId\":\"-7fffffff\"}}"));
+                assertThat(responses.get(5), startsWith(
                                 "{\"resource\":\"test.problem\",\"stateId\":\"-7fffffff\",\"service\":\"highlight\"," +
                                                 "\"push\":{\"regions\":["));
+                assertThat(responses.get(6), equalTo(
+                                "{\"resource\":\"test.problem\",\"stateId\":\"-7fffffff\",\"service\":\"validate\"," +
+                                                "\"push\":{\"issues\":[]}}"));
+                assertThat(responses.get(7), startsWith(
+                                "{\"resource\":\"test.problem\",\"stateId\":\"-7fffffff\",\"service\":\"semantics\"," +
+                                                "\"push\":{"));
         }
 
         @WebSocket
@@ -117,14 +126,14 @@ class ProblemWebSocketServletIntegrationTest {
                                                         "\"fullText\":\"class Person.\n\"}}",
                                         Callback.NOOP
                         );
-                        case 3 -> //noinspection TextBlockMigration
+                        case 4 -> //noinspection TextBlockMigration
                                         session.sendText(
                                         "{\"id\":\"bar\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\"," +
                                                         "\"requiredStateId\":\"-80000000\",\"deltaText\":\"indiv q.\nnode(q).\n\"," +
                                                         "\"deltaOffset\":\"0\",\"deltaReplaceLength\":\"0\"}}",
                                         Callback.NOOP
                         );
-                        case 5 -> session.close();
+                        case 8 -> session.close();
                         }
                 }
         }
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
index 4a5eed95..e9d889c4 100644
--- 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
@@ -34,6 +34,7 @@ public class ProblemWebInjectorProvider extends ProblemInjectorProvider {
                 // the tasks in the service and the {@link
                 // org.eclipse.xtext.testing.extensions.InjectionExtension}.
                 return new ProblemWebModule() {
+                        @Override
                         @SuppressWarnings("unused")
                         public Class<? extends ExecutorServiceProvider> bindExecutorServiceProvider() {
                                 return AwaitTerminationExecutorServiceProvider.class;
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
index 09079aa8..991ff114 100644
--- 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
@@ -35,7 +35,7 @@ public class RestartableCachedThreadPool implements ExecutorService {
         public void waitForTermination() {
                 boolean result = false;
                 try {
-                        result = delegate.awaitTermination(1, TimeUnit.SECONDS);
+                        result = delegate.awaitTermination(10, TimeUnit.SECONDS);
                 } catch (InterruptedException e) {
                         LOG.warn("Interrupted while waiting for delegate executor to stop", e);
                 }
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
index 841bacd3..22ce1b47 100644
--- 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
@@ -18,6 +18,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.junit.jupiter.MockitoExtension;
+import tools.refinery.language.web.semantics.SemanticsService;
 import tools.refinery.language.web.tests.AwaitTerminationExecutorServiceProvider;
 import tools.refinery.language.web.tests.ProblemWebInjectorProvider;
 import tools.refinery.language.web.xtext.server.ResponseHandler;
@@ -59,11 +60,16 @@ class TransactionExecutorTest {
         @Inject
         private AwaitTerminationExecutorServiceProvider executorServices;
 
+        @Inject
+        private SemanticsService semanticsService;
+
         private TransactionExecutor transactionExecutor;
 
         @BeforeEach
         void beforeEach() {
                 transactionExecutor = new TransactionExecutor(new SimpleSession(), resourceServiceProviderRegistry);
+                // Manually re-create the semantics analysis thread pool if it was disposed by the previous test.
+                semanticsService.setExecutorServiceProvider(executorServices);
         }
 
         @Test
@@ -95,7 +101,7 @@ class TransactionExecutorTest {
                                                 "0")));
 
                 var captor = newCaptor();
-                verify(responseHandler, times(2)).onResponse(captor.capture());
+                verify(responseHandler, times(4)).onResponse(captor.capture());
                 var newStateId = getStateId("bar", captor.getAllValues().get(0));
                 assertHighlightingResponse(newStateId, captor.getAllValues().get(1));
         }
@@ -126,7 +132,7 @@ class TransactionExecutorTest {
         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());
+                verify(responseHandler, times(4)).onResponse(captor.capture());
                 return getStateId("foo", captor.getAllValues().get(0));
         }
 
diff --git a/subprojects/language/build.gradle.kts b/subprojects/language/build.gradle.kts
index bac1e586..a6324e03 100644
--- a/subprojects/language/build.gradle.kts
+++ b/subprojects/language/build.gradle.kts
@@ -51,8 +51,8 @@ val generateXtextLanguage by tasks.registering(JavaExec::class) {
         inputs.file("../language-model/src/main/resources/model/problem.genmodel")
         outputs.dir("src/main/xtext-gen")
         outputs.dir("src/testFixtures/xtext-gen")
-        outputs.dir("$buildDir/generated/sources/xtext/ide")
-        outputs.dir("$buildDir/generated/sources/xtext/web")
+        outputs.dir(layout.buildDirectory.dir("generated/sources/xtext/ide"))
+        outputs.dir(layout.buildDirectory.dir("generated/sources/xtext/web"))
         args("src/main/java/tools/refinery/language/GenerateProblem.mwe2", "-p", "rootPath=/$projectDir/..")
 }
 
@@ -85,11 +85,11 @@ tasks {
 }
 
 artifacts {
-        add(generatedIdeSources.name, file("$buildDir/generated/sources/xtext/ide")) {
+        add(generatedIdeSources.name, layout.buildDirectory.dir("generated/sources/xtext/ide")) {
                 builtBy(generateXtextLanguage)
         }
 
-        add(generatedWebSources.name, file("$buildDir/generated/sources/xtext/web")) {
+        add(generatedWebSources.name, layout.buildDirectory.dir("generated/sources/xtext/web")) {
                 builtBy(generateXtextLanguage)
         }
 }
diff --git a/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext b/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext
index 9e330347..0a91178b 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext
+++ b/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext
@@ -14,7 +14,7 @@ Problem:
 
 Statement:
         Assertion | ClassDeclaration | EnumDeclaration |
-        PredicateDefinition | FunctionDefinition | /* RuleDefinition | */
+        PredicateDefinition | /* FunctionDefinition | RuleDefinition | */
         ScopeDeclaration | IndividualDeclaration;
 
 ClassDeclaration:
@@ -32,7 +32,7 @@ EnumLiteral returns Node:
         name=Identifier;
 
 FeatureDeclaration:
-        ReferenceDeclaration | AttributeDeclaration | FlagDeclaration;
+        ReferenceDeclaration /* | AttributeDeclaration | FlagDeclaration */;
 
 enum ReferenceKind:
         REFERENCE="refers" | CONTAINMENT="contains" | CONTAINER="container";
@@ -44,23 +44,17 @@ ReferenceDeclaration:
         name=Identifier
         ("opposite" opposite=[ReferenceDeclaration|QualifiedName])?;
 
-enum PrimitiveType:
-        INT="int" | REAL="real" | STRING="string";
-
-AttributeDeclaration:
-        attributeType=PrimitiveType name=Identifier;
-
-FlagDeclaration:
-        "bool" name=Identifier;
-
-enum ErrorKind returns PredicateKind:
-        ERROR="error";
-
-enum PredicateKind:
-        ERROR="error" | CONTAINED="contained" | CONTAINMENT="containment";
+//enum PrimitiveType:
+//      INT="int" | REAL="real" | STRING="string";
+//
+//AttributeDeclaration:
+//      attributeType=PrimitiveType name=Identifier;
+//
+//FlagDeclaration:
+//      "bool" name=Identifier;
 
 PredicateDefinition:
-        (kind=ErrorKind | kind=PredicateKind? "pred")
+        ("pred" | error?="error" "pred"?)
         name=Identifier
         "(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")"
         ("<->" bodies+=Conjunction (";" bodies+=Conjunction)*)?
@@ -69,14 +63,14 @@ PredicateDefinition:
 Conjunction:
         literals+=Expr ("," literals+=Expr)*;
 
-FunctionDefinition:
-        "fn" functionType=PrimitiveType name=Identifier
-        "(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")"
-        ("=" cases+=Case (";" cases+=Case)*)?
-        ".";
-
-Case:
-        Conjunction ({Match.condition=current} "->" value=Expr)?;
+//FunctionDefinition:
+//      "fn" functionType=PrimitiveType name=Identifier
+//      "(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")"
+//      ("=" cases+=Case (";" cases+=Case)*)?
+//      ".";
+//
+//Case:
+//      Conjunction ({Match.condition=current} "->" value=Expr)?;
 
 //RuleDefinition:
 //      "rule"
@@ -87,7 +81,7 @@ Case:
 //      ".";
 
 Parameter:
-        (modality=Modality? parameterType=[Relation|QualifiedName])? name=Identifier;
+        parameterType=[Relation|QualifiedName]? name=Identifier;
 
 //Consequent:
 //      actions+=Action ("," actions+=Action)*;
@@ -268,7 +262,7 @@ NonContainmentQualifiedName hidden():
         NonContainmentIdentifier ("::" Identifier)*;
 
 Identifier:
-        NonContainmentIdentifier | "contains";
+        NonContainmentIdentifier | "contains" | "container";
 
 NonContainmentIdentifier:
         ID | "contained" | "sum" | "prod" | "min" | "max";
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
index b145ef27..31eb55a6 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemDerivedStateComputer.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemDerivedStateComputer.java
@@ -18,6 +18,7 @@ import org.eclipse.xtext.resource.DerivedStateAwareResource;
 import org.eclipse.xtext.resource.IDerivedStateComputer;
 import org.eclipse.xtext.resource.XtextResource;
 import tools.refinery.language.model.problem.*;
+import tools.refinery.language.utils.ProblemUtil;
 
 import java.util.*;
 import java.util.function.Function;
@@ -58,7 +59,7 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
         }
 
         protected void installDerivedProblemState(Problem problem, Adapter adapter, boolean preLinkingPhase) {
-                installNewNodes(problem, adapter);
+                installDerivedClassDeclarationState(problem, adapter);
                 if (preLinkingPhase) {
                         return;
                 }
@@ -66,24 +67,67 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
                 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) {
+        protected void installDerivedClassDeclarationState(Problem problem, Adapter adapter) {
+                for (var statement : problem.getStatements()) {
+                        if (statement instanceof ClassDeclaration classDeclaration) {
+                                installOrRemoveNewNode(adapter, classDeclaration);
+                                for (var featureDeclaration : classDeclaration.getFeatureDeclarations()) {
+                                        if (featureDeclaration instanceof ReferenceDeclaration referenceDeclaration) {
+                                                installOrRemoveInvalidMultiplicityPredicate(adapter, classDeclaration, referenceDeclaration);
+                                        }
+                                }
+                        }
+                }
+        }
+
+        protected void installOrRemoveNewNode(Adapter adapter, ClassDeclaration declaration) {
+                if (declaration.isAbstract()) {
+                        var newNode = declaration.getNewNode();
+                        if (newNode != null) {
+                                declaration.setNewNode(null);
+                                adapter.removeNewNode(declaration);
+                        }
+                } else {
+                        if (declaration.getNewNode() == null) {
                                 var newNode = adapter.createNewNodeIfAbsent(declaration, key -> createNode(NEW_NODE));
                                 declaration.setNewNode(newNode);
                         }
                 }
         }
 
+        protected void installOrRemoveInvalidMultiplicityPredicate(
+                        Adapter adapter, ClassDeclaration containingClassDeclaration, ReferenceDeclaration declaration) {
+                if (ProblemUtil.hasMultiplicityConstraint(declaration)) {
+                        if (declaration.getInvalidMultiplicity() == null) {
+                                var invalidMultiplicity = adapter.createInvalidMultiplicityPredicateIfAbsent(declaration, key -> {
+                                        var predicate = ProblemFactory.eINSTANCE.createPredicateDefinition();
+                                        predicate.setError(true);
+                                        predicate.setName("invalidMultiplicity");
+                                        var parameter = ProblemFactory.eINSTANCE.createParameter();
+                                        parameter.setParameterType(containingClassDeclaration);
+                                        parameter.setName("node");
+                                        predicate.getParameters().add(parameter);
+                                        return predicate;
+                                });
+                                declaration.setInvalidMultiplicity(invalidMultiplicity);
+                        }
+                } else {
+                        var invalidMultiplicity = declaration.getInvalidMultiplicity();
+                        if (invalidMultiplicity != null) {
+                                declaration.setInvalidMultiplicity(null);
+                                adapter.removeInvalidMultiplicityPredicate(declaration);
+                        }
+                }
+        }
+
         protected Set<String> installDerivedNodes(Problem problem) {
                 var collector = nodeNameCollectorProvider.get();
                 collector.collectNodeNames(problem);
                 Set<String> nodeNames = collector.getNodeNames();
-                List<Node> grapNodes = problem.getNodes();
+                List<Node> graphNodes = problem.getNodes();
                 for (String nodeName : nodeNames) {
                         var graphNode = createNode(nodeName);
-                        grapNodes.add(graphNode);
+                        graphNodes.add(graphNode);
                 }
                 return nodeNames;
         }
@@ -104,15 +148,24 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
         }
 
         protected void discardDerivedProblemState(Problem problem, Adapter adapter) {
-                Set<ClassDeclaration> classDeclarations = new HashSet<>();
+                var abstractClassDeclarations = new HashSet<ClassDeclaration>();
+                var referenceDeclarationsWithMultiplicity = new HashSet<ReferenceDeclaration>();
                 problem.getNodes().clear();
                 for (var statement : problem.getStatements()) {
                         if (statement instanceof ClassDeclaration classDeclaration) {
                                 classDeclaration.setNewNode(null);
-                                classDeclarations.add(classDeclaration);
+                                if (classDeclaration.isAbstract()) {
+                                        abstractClassDeclarations.add(classDeclaration);
+                                }
+                                for (var featureDeclaration : classDeclaration.getFeatureDeclarations()) {
+                                        if (featureDeclaration instanceof ReferenceDeclaration referenceDeclaration &&
+                                                        ProblemUtil.hasMultiplicityConstraint(referenceDeclaration)) {
+                                                referenceDeclarationsWithMultiplicity.add(referenceDeclaration);
+                                        }
+                                }
                         }
                 }
-                adapter.retainAll(classDeclarations);
+                adapter.retainAll(abstractClassDeclarations, referenceDeclarationsWithMultiplicity);
                 derivedVariableComputer.discardDerivedVariables(problem);
         }
 
@@ -134,14 +187,31 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
 
         protected static class Adapter extends AdapterImpl {
                 private final Map<ClassDeclaration, Node> newNodes = new HashMap<>();
+                private final Map<ReferenceDeclaration, PredicateDefinition> invalidMultiplicityPredicates = new HashMap<>();
 
                 public Node createNewNodeIfAbsent(ClassDeclaration classDeclaration,
-                                Function<ClassDeclaration, Node> createNode) {
+                                                                                  Function<ClassDeclaration, Node> createNode) {
                         return newNodes.computeIfAbsent(classDeclaration, createNode);
                 }
 
-                public void retainAll(Collection<ClassDeclaration> classDeclarations) {
-                        newNodes.keySet().retainAll(classDeclarations);
+                public void removeNewNode(ClassDeclaration classDeclaration) {
+                        newNodes.remove(classDeclaration);
+                }
+
+                public PredicateDefinition createInvalidMultiplicityPredicateIfAbsent(
+                                ReferenceDeclaration referenceDeclaration,
+                                Function<ReferenceDeclaration, PredicateDefinition> createPredicate) {
+                        return invalidMultiplicityPredicates.computeIfAbsent(referenceDeclaration, createPredicate);
+                }
+
+                public void removeInvalidMultiplicityPredicate(ReferenceDeclaration referenceDeclaration) {
+                        invalidMultiplicityPredicates.remove(referenceDeclaration);
+                }
+
+                public void retainAll(Collection<ClassDeclaration> abstractClassDeclarations,
+                                                          Collection<ReferenceDeclaration> referenceDeclarationsWithMultiplicity) {
+                        newNodes.keySet().retainAll(abstractClassDeclarations);
+                        invalidMultiplicityPredicates.keySet().retainAll(referenceDeclarationsWithMultiplicity);
                 }
 
                 @Override
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
index 1fe2df89..29eaad84 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemLocationInFileProvider.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemLocationInFileProvider.java
@@ -8,7 +8,6 @@ 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.problem.ImplicitVariable;
 import tools.refinery.language.model.problem.Node;
 import tools.refinery.language.utils.ProblemUtil;
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
index 630be379..a16f77eb 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
@@ -5,6 +5,9 @@
  */
 package tools.refinery.language.resource;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
@@ -13,19 +16,18 @@ 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.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.model.problem.*;
 import tools.refinery.language.naming.NamingUtil;
 import tools.refinery.language.utils.ProblemUtil;
 
+import java.util.Map;
+
 @Singleton
 public class ProblemResourceDescriptionStrategy extends DefaultResourceDescriptionStrategy {
+        public static final String ERROR_PREDICATE = "tools.refinery.language.resource" +
+                        ".ProblemResourceDescriptionStrategy.ERROR_PREDICATE";
+        public static final String ERROR_PREDICATE_TRUE = "true";
+
         @Inject
         private IQualifiedNameConverter qualifiedNameConverter;
 
@@ -40,9 +42,10 @@ public class ProblemResourceDescriptionStrategy extends DefaultResourceDescripti
                 }
                 var problem = EcoreUtil2.getContainerOfType(eObject, Problem.class);
                 var problemQualifiedName = getNameAsQualifiedName(problem);
+                var userData = getUserData(eObject);
                 boolean nameExported;
                 if (shouldExportSimpleName(eObject)) {
-                        acceptEObjectDescription(eObject, problemQualifiedName, qualifiedName, acceptor);
+                        acceptEObjectDescription(eObject, problemQualifiedName, qualifiedName, userData, acceptor);
                         nameExported = true;
                 } else {
                         nameExported = false;
@@ -56,7 +59,7 @@ public class ProblemResourceDescriptionStrategy extends DefaultResourceDescripti
                         }
                         qualifiedName = parentQualifiedName.append(qualifiedName);
                         if (shouldExportSimpleName(parent)) {
-                                acceptEObjectDescription(eObject, problemQualifiedName, qualifiedName, acceptor);
+                                acceptEObjectDescription(eObject, problemQualifiedName, qualifiedName, userData, acceptor);
                                 nameExported = true;
                         } else {
                                 nameExported = false;
@@ -64,16 +67,15 @@ public class ProblemResourceDescriptionStrategy extends DefaultResourceDescripti
                         parent = parent.eContainer();
                 }
                 if (!nameExported) {
-                        acceptEObjectDescription(eObject, problemQualifiedName, qualifiedName, acceptor);
+                        acceptEObjectDescription(eObject, problemQualifiedName, qualifiedName, userData, acceptor);
                 }
                 return true;
         }
 
         protected QualifiedName getNameAsQualifiedName(EObject eObject) {
-                if (!(eObject instanceof NamedElement)) {
+                if (!(eObject instanceof NamedElement namedElement)) {
                         return null;
                 }
-                var namedElement = (NamedElement) eObject;
                 var name = namedElement.getName();
                 if (NamingUtil.isNullOrEmpty(name)) {
                         return null;
@@ -93,16 +95,28 @@ public class ProblemResourceDescriptionStrategy extends DefaultResourceDescripti
                 return true;
         }
 
+        protected Map<String, String> getUserData(EObject eObject) {
+                var builder = ImmutableMap.<String, String>builder();
+                if (eObject instanceof PredicateDefinition predicateDefinition && predicateDefinition.isError()) {
+                        builder.put(ERROR_PREDICATE, ERROR_PREDICATE_TRUE);
+                }
+                return builder.build();
+        }
+
         protected boolean shouldExportSimpleName(EObject eObject) {
                 if (eObject instanceof Node node) {
                         return !ProblemUtil.isNewNode(node);
                 }
+                if (eObject instanceof PredicateDefinition predicateDefinition) {
+                        return !ProblemUtil.isInvalidMultiplicityConstraint(predicateDefinition);
+                }
                 return true;
         }
 
         private void acceptEObjectDescription(EObject eObject, QualifiedName prefix, QualifiedName qualifiedName,
-                        IAcceptor<IEObjectDescription> acceptor) {
+                                                                                  Map<String, String> userData, IAcceptor<IEObjectDescription> acceptor) {
                 var qualifiedNameWithPrefix = prefix == null ? qualifiedName : prefix.append(qualifiedName);
-                acceptor.accept(EObjectDescription.create(qualifiedNameWithPrefix, eObject));
+                var description = EObjectDescription.create(qualifiedNameWithPrefix, eObject, userData);
+                acceptor.accept(description);
         }
 }
diff --git a/subprojects/language/src/main/java/tools/refinery/language/utils/BuiltinSymbols.java b/subprojects/language/src/main/java/tools/refinery/language/utils/BuiltinSymbols.java
index c8c7fd4a..c87fa044 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/utils/BuiltinSymbols.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/utils/BuiltinSymbols.java
@@ -7,7 +7,7 @@ package tools.refinery.language.utils;
 
 import tools.refinery.language.model.problem.*;
 
-public record BuiltinSymbols(Problem problem, ClassDeclaration node, ReferenceDeclaration equals,
-                                                         PredicateDefinition exists, PredicateDefinition contained, PredicateDefinition contains,
-                                                         PredicateDefinition root) {
+public record BuiltinSymbols(Problem problem, ClassDeclaration node, PredicateDefinition equals,
+                                                         PredicateDefinition exists, ClassDeclaration contained, PredicateDefinition contains,
+                                                         PredicateDefinition invalidContainer) {
 }
diff --git a/subprojects/language/src/main/java/tools/refinery/language/utils/CollectedSymbols.java b/subprojects/language/src/main/java/tools/refinery/language/utils/CollectedSymbols.java
deleted file mode 100644
index e4e4d07a..00000000
--- a/subprojects/language/src/main/java/tools/refinery/language/utils/CollectedSymbols.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.utils;
-
-import java.util.Map;
-
-import tools.refinery.language.model.problem.Node;
-import tools.refinery.language.model.problem.Relation;
-
-public record CollectedSymbols(Map<Node, NodeInfo> nodes, Map<Relation, RelationInfo> relations) {
-
-}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/utils/ContainmentRole.java b/subprojects/language/src/main/java/tools/refinery/language/utils/ContainmentRole.java
deleted file mode 100644
index a43c7dfe..00000000
--- a/subprojects/language/src/main/java/tools/refinery/language/utils/ContainmentRole.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.utils;
-
-import tools.refinery.language.model.problem.PredicateKind;
-
-public enum ContainmentRole {
-        NONE,
-        CONTAINED,
-        CONTAINMENT;
-
-        public static ContainmentRole fromPredicateKind(PredicateKind predicateKind) {
-                return switch (predicateKind) {
-                        case CONTAINED -> CONTAINED;
-                        case CONTAINMENT -> CONTAINMENT;
-                        default -> NONE;
-                };
-        }
-}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/utils/NodeInfo.java b/subprojects/language/src/main/java/tools/refinery/language/utils/NodeInfo.java
deleted file mode 100644
index 0fa7a454..00000000
--- a/subprojects/language/src/main/java/tools/refinery/language/utils/NodeInfo.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.utils;
-
-public record NodeInfo(String name, boolean individual) {
-}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemDesugarer.java b/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemDesugarer.java
index 738a0896..59e26561 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemDesugarer.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemDesugarer.java
@@ -6,7 +6,6 @@
 package tools.refinery.language.utils;
 
 import com.google.inject.Inject;
-import com.google.inject.Provider;
 import com.google.inject.Singleton;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -21,9 +20,6 @@ public class ProblemDesugarer {
         @Inject
         private IResourceScopeCache cache = IResourceScopeCache.NullImpl.INSTANCE;
 
-        @Inject
-        private Provider<SymbolCollector> symbolCollectorProvider;
-
         public Optional<Problem> getBuiltinProblem(EObject context) {
                 return Optional.ofNullable(context).map(EObject::eResource).flatMap(resource ->
                                 cache.get("builtinProblem", resource, () -> doGetBuiltinProblem(resource)));
@@ -43,12 +39,12 @@ public class ProblemDesugarer {
 
         private BuiltinSymbols doGetBuiltinSymbols(Problem builtin) {
                 var node = doGetDeclaration(builtin, ClassDeclaration.class, "node");
-                var equals = doGetEqualsReference(node);
+                var equals = doGetDeclaration(builtin, PredicateDefinition.class, "equals");
                 var exists = doGetDeclaration(builtin, PredicateDefinition.class, "exists");
-                var contained = doGetDeclaration(builtin, PredicateDefinition.class, "contained");
+                var contained = doGetDeclaration(builtin, ClassDeclaration.class, "contained");
                 var contains = doGetDeclaration(builtin, PredicateDefinition.class, "contains");
-                var root = doGetDeclaration(builtin, PredicateDefinition.class, "root");
-                return new BuiltinSymbols(builtin, node, equals, exists, contained,     contains, root);
+                var invalidContainer = doGetDeclaration(builtin, PredicateDefinition.class, "invalidContainer");
+                return new BuiltinSymbols(builtin, node, equals, exists, contained, contains, invalidContainer);
         }
 
         private <T extends Statement & NamedElement> T doGetDeclaration(Problem builtin, Class<T> type, String name) {
@@ -57,13 +53,6 @@ public class ProblemDesugarer {
                                 .orElseThrow(() -> new IllegalArgumentException("Built-in declaration " + name + " was not found"));
         }
 
-        private ReferenceDeclaration doGetEqualsReference(ClassDeclaration nodeClassDeclaration) {
-                return (ReferenceDeclaration) nodeClassDeclaration.getFeatureDeclarations().stream()
-                                .filter(reference -> reference instanceof ReferenceDeclaration &&
-                                                                "equals".equals(reference.getName())).findFirst()
-                                .orElseThrow(() -> new IllegalArgumentException("Reference " + "equals" + " not found"));
-        }
-
         public Collection<ClassDeclaration> getSuperclassesAndSelf(ClassDeclaration classDeclaration) {
                 return cache.get(Tuples.create(classDeclaration, "superclassesAndSelf"), classDeclaration.eResource(),
                                 () -> doGetSuperclassesAndSelf(classDeclaration));
@@ -109,9 +98,4 @@ public class ProblemDesugarer {
         public boolean isContainmentReference(ReferenceDeclaration referenceDeclaration) {
                 return referenceDeclaration.getKind() == ReferenceKind.CONTAINMENT;
         }
-
-        public CollectedSymbols collectSymbols(Problem problem) {
-                return cache.get(Tuples.create(problem, "collectedSymbols"), problem.eResource(),
-                                () -> symbolCollectorProvider.get().collectSymbols(problem));
-        }
 }
diff --git a/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java b/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java
index 9486dc2a..a9efc4bb 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/utils/ProblemUtil.java
@@ -7,33 +7,12 @@ package tools.refinery.language.utils;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
-
-import tools.refinery.language.model.problem.ImplicitVariable;
-import tools.refinery.language.model.problem.Node;
-import tools.refinery.language.model.problem.ProblemPackage;
-import tools.refinery.language.model.problem.Variable;
+import tools.refinery.language.model.problem.*;
 
 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";
-
-        public static final String DOMAIN_CLASS_NAME = "domain";
-
-        public static final String DATA_CLASS_NAME = "data";
-
-        public static final String INT_CLASS_NAME = "int";
-
-        public static final String REAL_CLASS_NAME = "real";
-
-        public static final String STRING_CLASS_NAME = "string";
-
-        public static final String EQUALS_RELATION_NAME = "equals";
-
-        public static final String EXISTS_PREDICATE_NAME = "exists";
-
         private ProblemUtil() {
                 throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
         }
@@ -70,6 +49,10 @@ public final class ProblemUtil {
                 }
         }
 
+        public static boolean isError(EObject eObject) {
+                return eObject instanceof PredicateDefinition predicateDefinition && predicateDefinition.isError();
+        }
+
         public static boolean isIndividualNode(Node node) {
                 var containingFeature = node.eContainingFeature();
                 return containingFeature == ProblemPackage.Literals.INDIVIDUAL_DECLARATION__NODES
@@ -80,6 +63,26 @@ public final class ProblemUtil {
                 return node.eContainingFeature() == ProblemPackage.Literals.CLASS_DECLARATION__NEW_NODE;
         }
 
+        public static boolean isInvalidMultiplicityConstraint(PredicateDefinition predicateDefinition) {
+                return predicateDefinition.eContainingFeature() ==
+                                ProblemPackage.Literals.REFERENCE_DECLARATION__INVALID_MULTIPLICITY;
+        }
+
+        public static boolean hasMultiplicityConstraint(ReferenceDeclaration referenceDeclaration) {
+                var opposite = referenceDeclaration.getOpposite();
+                if (opposite != null && opposite.getKind() == ReferenceKind.CONTAINMENT) {
+                        return false;
+                }
+                var multiplicity = referenceDeclaration.getMultiplicity();
+                if (multiplicity instanceof UnboundedMultiplicity) {
+                        return false;
+                }
+                if (multiplicity instanceof RangeMultiplicity rangeMultiplicity) {
+                        return rangeMultiplicity.getLowerBound() > 0 || rangeMultiplicity.getUpperBound() >= 0;
+                }
+                return true;
+        }
+
         private static URI getLibraryUri(String libraryName) {
                 return URI.createURI(ProblemUtil.class.getClassLoader()
                                 .getResource("tools/refinery/language/%s.problem".formatted(libraryName)).toString());
diff --git a/subprojects/language/src/main/java/tools/refinery/language/utils/RelationInfo.java b/subprojects/language/src/main/java/tools/refinery/language/utils/RelationInfo.java
deleted file mode 100644
index 1c46fe72..00000000
--- a/subprojects/language/src/main/java/tools/refinery/language/utils/RelationInfo.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.utils;
-
-import tools.refinery.language.model.problem.*;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public record RelationInfo(String name, ContainmentRole containmentRole, List<Parameter> parameters,
-                                                   Multiplicity multiplicity, Relation opposite, Collection<Conjunction> bodies,
-                                                   Collection<Assertion> assertions, Collection<TypeScope> typeScopes) {
-        public RelationInfo(String name, ContainmentRole containmentRole, List<Parameter> parameters,
-                                                Multiplicity multiplicity, Relation opposite, Collection<Conjunction> bodies) {
-                this(name, containmentRole, parameters, multiplicity, opposite, bodies, new ArrayList<>(), new ArrayList<>());
-        }
-
-        public boolean hasDefinition() {
-                return bodies != null && !bodies.isEmpty();
-        }
-
-        public int arity() {
-                return parameters.size();
-        }
-}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/utils/SymbolCollector.java b/subprojects/language/src/main/java/tools/refinery/language/utils/SymbolCollector.java
deleted file mode 100644
index a4ea1113..00000000
--- a/subprojects/language/src/main/java/tools/refinery/language/utils/SymbolCollector.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.utils;
-
-import com.google.inject.Inject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.naming.IQualifiedNameConverter;
-import org.eclipse.xtext.naming.IQualifiedNameProvider;
-import tools.refinery.language.model.problem.*;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-class SymbolCollector {
-        @Inject
-        private IQualifiedNameProvider qualifiedNameProvider;
-
-        @Inject
-        private IQualifiedNameConverter qualifiedNameConverter;
-
-        @Inject
-        private ProblemDesugarer desugarer;
-
-        private BuiltinSymbols builtinSymbols;
-
-        private final Map<Node, NodeInfo> nodes = new LinkedHashMap<>();
-
-        private final Map<Relation, RelationInfo> relations = new LinkedHashMap<>();
-
-        public CollectedSymbols collectSymbols(Problem problem) {
-                builtinSymbols = desugarer.getBuiltinSymbols(problem).orElseThrow(() -> new IllegalArgumentException(
-                                "Problem has no associated built-in library"));
-                collectOwnSymbols(builtinSymbols.problem());
-                collectOwnSymbols(problem);
-                return new CollectedSymbols(nodes, relations);
-        }
-
-        public void collectOwnSymbols(Problem problem) {
-                collectOwnRelations(problem);
-                collectOwnNodes(problem);
-                collectOwnAssertions(problem);
-        }
-
-        private void collectOwnRelations(Problem problem) {
-                for (var statement : problem.getStatements()) {
-                        if (statement instanceof PredicateDefinition predicateDefinition) {
-                                collectPredicate(predicateDefinition);
-                        } else if (statement instanceof ClassDeclaration classDeclaration) {
-                                collectClass(classDeclaration);
-                        } else if (statement instanceof EnumDeclaration enumDeclaration) {
-                                collectEnum(enumDeclaration);
-                        } else if (statement instanceof RuleDefinition) {
-                                throw new UnsupportedOperationException("Rules are not currently supported");
-                        }
-                }
-        }
-
-        private void collectPredicate(PredicateDefinition predicateDefinition) {
-                var predicateKind = predicateDefinition.getKind();
-                var info = new RelationInfo(getQualifiedNameString(predicateDefinition),
-                                ContainmentRole.fromPredicateKind(predicateKind), predicateDefinition.getParameters(), null, null,
-                                predicateDefinition.getBodies());
-                relations.put(predicateDefinition, info);
-        }
-
-        private void collectClass(ClassDeclaration classDeclaration) {
-                var contained = classDeclaration != builtinSymbols.node();
-                var containmentRole = contained ? ContainmentRole.CONTAINED : ContainmentRole.NONE;
-                var instanceParameter = ProblemFactory.eINSTANCE.createParameter();
-                instanceParameter.setName("instance");
-                var classInfo = new RelationInfo(getQualifiedNameString(classDeclaration), containmentRole,
-                                List.of(instanceParameter), null, null, List.of());
-                relations.put(classDeclaration, classInfo);
-                collectFeatures(classDeclaration);
-        }
-
-        private void collectFeatures(ClassDeclaration classDeclaration) {
-                for (var featureDeclaration : classDeclaration.getFeatureDeclarations()) {
-                        if (featureDeclaration instanceof ReferenceDeclaration referenceDeclaration) {
-                                collectReference(classDeclaration, referenceDeclaration);
-                        } else if (featureDeclaration instanceof AttributeDeclaration attributeDeclaration) {
-                                collectAttribute(classDeclaration, attributeDeclaration);
-                        } else if (featureDeclaration instanceof FlagDeclaration flagDeclaration) {
-                                collectFlag(classDeclaration, flagDeclaration);
-                        } else {
-                                throw new IllegalArgumentException("Unknown FeatureDeclaration: " + featureDeclaration);
-                        }
-                }
-        }
-
-        private void collectReference(ClassDeclaration classDeclaration, ReferenceDeclaration referenceDeclaration) {
-                var referenceRole = desugarer.isContainmentReference(referenceDeclaration) ?
-                                ContainmentRole.CONTAINMENT :
-                                ContainmentRole.NONE;
-                var sourceParameter = ProblemFactory.eINSTANCE.createParameter();
-                sourceParameter.setName("source");
-                sourceParameter.setParameterType(classDeclaration);
-                var targetParameter = ProblemFactory.eINSTANCE.createParameter();
-                targetParameter.setName("target");
-                var multiplicity = referenceDeclaration.getMultiplicity();
-                if (multiplicity == null) {
-                        var exactMultiplicity = ProblemFactory.eINSTANCE.createExactMultiplicity();
-                        exactMultiplicity.setExactValue(1);
-                        multiplicity = exactMultiplicity;
-                }
-                targetParameter.setParameterType(referenceDeclaration.getReferenceType());
-                var referenceInfo = new RelationInfo(getQualifiedNameString(referenceDeclaration), referenceRole,
-                                List.of(sourceParameter, targetParameter), multiplicity, referenceDeclaration.getOpposite(),
-                                List.of());
-                this.relations.put(referenceDeclaration, referenceInfo);
-        }
-
-        private void collectAttribute(ClassDeclaration classDeclaration, AttributeDeclaration attributeDeclaration) {
-                // TODO Implement attribute handling.
-        }
-
-        private void collectFlag(ClassDeclaration classDeclaration, FlagDeclaration flagDeclaration) {
-                var parameter = ProblemFactory.eINSTANCE.createParameter();
-                parameter.setName("object");
-                parameter.setParameterType(classDeclaration);
-                var referenceInfo = new RelationInfo(getQualifiedNameString(flagDeclaration), ContainmentRole.NONE,
-                                List.of(parameter), null, null, List.of());
-                this.relations.put(flagDeclaration, referenceInfo);
-        }
-
-        private void collectEnum(EnumDeclaration enumDeclaration) {
-                var instanceParameter = ProblemFactory.eINSTANCE.createParameter();
-                instanceParameter.setName("instance");
-                var info = new RelationInfo(getQualifiedNameString(enumDeclaration), ContainmentRole.NONE,
-                                List.of(instanceParameter), null, null, List.of());
-                this.relations.put(enumDeclaration, info);
-        }
-
-        private void collectOwnNodes(Problem problem) {
-                for (var statement : problem.getStatements()) {
-                        if (statement instanceof IndividualDeclaration individualDeclaration) {
-                                collectIndividuals(individualDeclaration);
-                        } else if (statement instanceof ClassDeclaration classDeclaration) {
-                                collectNewNode(classDeclaration);
-                        } else if (statement instanceof EnumDeclaration enumDeclaration) {
-                                collectEnumLiterals(enumDeclaration);
-                        }
-                }
-                for (var node : problem.getNodes()) {
-                        addNode(node, false);
-                }
-        }
-
-        private void collectIndividuals(IndividualDeclaration individualDeclaration) {
-                for (var individual : individualDeclaration.getNodes()) {
-                        addNode(individual, true);
-                }
-        }
-
-        private void collectNewNode(ClassDeclaration classDeclaration) {
-                var newNode = classDeclaration.getNewNode();
-                if (newNode != null) {
-                        addNode(newNode, false);
-                }
-        }
-
-        private void collectEnumLiterals(EnumDeclaration enumDeclaration) {
-                for (var literal : enumDeclaration.getLiterals()) {
-                        addNode(literal, true);
-                }
-        }
-
-        private void addNode(Node node, boolean individual) {
-                var info = new NodeInfo(getQualifiedNameString(node), individual);
-                this.nodes.put(node, info);
-        }
-
-        private String getQualifiedNameString(EObject eObject) {
-                var qualifiedName = qualifiedNameProvider.getFullyQualifiedName(eObject);
-                if (qualifiedName == null) {
-                        return null;
-                }
-                return qualifiedNameConverter.toString(qualifiedName);
-        }
-
-        private void collectOwnAssertions(Problem problem) {
-                for (var statement : problem.getStatements()) {
-                        if (statement instanceof Assertion assertion) {
-                                collectAssertion(assertion);
-                        } else if (statement instanceof PredicateDefinition predicateDefinition) {
-                                collectPredicateAssertion(predicateDefinition);
-                        } else if (statement instanceof ClassDeclaration classDeclaration) {
-                                collectClassAssertion(classDeclaration);
-                        } else if (statement instanceof EnumDeclaration enumDeclaration) {
-                                collectEnumAssertions(enumDeclaration);
-                        }
-                }
-        }
-
-        private void collectAssertion(Assertion assertion) {
-                var relationInfo = this.relations.get(assertion.getRelation());
-                if (relationInfo == null) {
-                        throw new IllegalStateException("Assertion refers to unknown relation");
-                }
-                if (assertion.getArguments().size() != relationInfo.parameters().size()) {
-                        // Silently ignoring assertions of invalid arity helps when SymbolCollector is called on an invalid
-                        // Problem during editing. The errors can still be detected by the Problem validator.
-                        return;
-                }
-                relationInfo.assertions().add(assertion);
-        }
-
-        private void collectPredicateAssertion(PredicateDefinition predicateDefinition) {
-                if (predicateDefinition.getKind() != PredicateKind.ERROR) {
-                        return;
-                }
-                int arity = predicateDefinition.getParameters().size();
-                addAssertion(predicateDefinition, LogicValue.FALSE, new Node[arity]);
-        }
-
-        private void collectClassAssertion(ClassDeclaration classDeclaration) {
-                var node = classDeclaration.getNewNode();
-                if (node == null) {
-                        return;
-                }
-                addAssertion(classDeclaration, LogicValue.TRUE, node);
-                addAssertion(builtinSymbols.exists(), LogicValue.UNKNOWN, node);
-                addAssertion(builtinSymbols.equals(), LogicValue.UNKNOWN, node, node);
-        }
-
-        private void collectEnumAssertions(EnumDeclaration enumDeclaration) {
-                for (var literal : enumDeclaration.getLiterals()) {
-                        addAssertion(enumDeclaration, LogicValue.TRUE, literal);
-                }
-        }
-
-        private void addAssertion(Relation relation, LogicValue logicValue, Node... nodes) {
-                var assertion = ProblemFactory.eINSTANCE.createAssertion();
-                assertion.setRelation(relation);
-                for (var node : nodes) {
-                        AssertionArgument argument;
-                        if (node == null) {
-                                argument = ProblemFactory.eINSTANCE.createWildcardAssertionArgument();
-                        } else {
-                                var nodeArgument = ProblemFactory.eINSTANCE.createNodeAssertionArgument();
-                                nodeArgument.setNode(node);
-                                argument = nodeArgument;
-                        }
-                        assertion.getArguments().add(argument);
-                }
-                var value = ProblemFactory.eINSTANCE.createLogicConstant();
-                value.setLogicValue(logicValue);
-                assertion.setValue(value);
-                collectAssertion(assertion);
-        }
-}
diff --git a/subprojects/language/src/main/resources/tools/refinery/language/builtin.problem b/subprojects/language/src/main/resources/tools/refinery/language/builtin.problem
index 9c1d7669..022c3167 100644
--- a/subprojects/language/src/main/resources/tools/refinery/language/builtin.problem
+++ b/subprojects/language/src/main/resources/tools/refinery/language/builtin.problem
@@ -3,43 +3,14 @@
 % SPDX-License-Identifier: EPL-2.0
 problem builtin.
 
-abstract class node {
-        refers node[] equals opposite equals
-}
+abstract class node.
 
-pred exists(node node).
+pred exists(node).
 
-% class Integer {
-%     int intValue
-% }
-%
-% class Real {
-%     real realValue
-% }
-%
-% class String {
-%     string stringValue
-% }
-%
-% enum Boolean {
-%     TRUE, FALSE
-% }
+pred equals(left, right).
 
-pred contained(node node).
+abstract class contained extends node.
 
-pred contains(node container, node contained).
+pred contains(container, contained contained).
 
-pred root(node node).
-
-% error missingContainer(contained node) <->
-%     !contains(node, _), !root(node).
-%
-% error tooManyContainers(contained node) <->
-%     #contains(_, node) > 1
-% ;
-%     contains(_, node), root(node)
-% ;
-%         contains(_, node), !contained(node).
-%
-% error containmentCycle(node node) <->
-%     contains+(node, node).
+error invalidContainer(contained contained).
diff --git a/subprojects/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.java b/subprojects/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.java
index c7952369..96e7cf9c 100644
--- a/subprojects/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.java
+++ b/subprojects/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.java
@@ -31,7 +31,6 @@ class ProblemParsingTest {
                                 class Person {
                                         Person[0..*] children opposite parent
                                         Person[0..1] parent opposite children
-                                        int age
                                         TaxStatus taxStatus
                                 }
 
@@ -51,8 +50,6 @@ class ProblemParsingTest {
                                 children(anne, ciri).
                                 ?children(bob, ciri).
                                 taxStatus(anne, ADULT).
-                                age(bob): 21..35.
-                                age(ciri): 10.
                                 """);
                 assertThat(problem.errors(), empty());
         }
diff --git a/subprojects/language/src/test/java/tools/refinery/language/tests/parser/antlr/TransitiveClosureParserTest.java b/subprojects/language/src/test/java/tools/refinery/language/tests/parser/antlr/TransitiveClosureParserTest.java
index 1180d131..ed193e90 100644
--- a/subprojects/language/src/test/java/tools/refinery/language/tests/parser/antlr/TransitiveClosureParserTest.java
+++ b/subprojects/language/src/test/java/tools/refinery/language/tests/parser/antlr/TransitiveClosureParserTest.java
@@ -29,9 +29,7 @@ class TransitiveClosureParserTest {
         @Test
         void binaryAddOperatorTest() {
                 var problem = parseHelper.parse("""
-                                        fn int a().
-                                        fn int b().
-                                        pred foo() <-> a() + (b()) > 10.
+                                        pred foo(a, b) <-> a + (b) > 10.
                                 """);
                 assertThat(problem.errors(), empty());
                 var literal = problem.pred("foo").conj(0).lit(0).get();
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
index 3f3a081f..9f4f2bbf 100644
--- 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
@@ -178,7 +178,7 @@ class ProblemSerializerTest {
                 var variable = ProblemFactory.eINSTANCE.createImplicitVariable();
                 variable.setName("q");
                 conjunction.getImplicitVariables().add(variable);
-                var equals = nodeType.feature("equals");
+                var equals = builtin.pred("equals").get();
                 conjunction.getLiterals().add(createAtom(equals, parameter1, variable));
                 conjunction.getLiterals().add(createAtom(equals, variable, parameter2));
                 pred.getBodies().add(conjunction);
@@ -212,7 +212,7 @@ class ProblemSerializerTest {
                 pred.getParameters().add(parameter);
                 var conjunction = ProblemFactory.eINSTANCE.createConjunction();
                 var atom = ProblemFactory.eINSTANCE.createAtom();
-                var equals = nodeType.feature("equals");
+                var equals = builtin.pred("equals").get();
                 atom.setRelation(equals);
                 var arg1 = ProblemFactory.eINSTANCE.createVariableOrNodeExpr();
                 arg1.setVariableOrNode(parameter);
diff --git a/subprojects/language/src/test/java/tools/refinery/language/tests/utils/SymbolCollectorTest.java b/subprojects/language/src/test/java/tools/refinery/language/tests/utils/SymbolCollectorTest.java
deleted file mode 100644
index d200eeff..00000000
--- a/subprojects/language/src/test/java/tools/refinery/language/tests/utils/SymbolCollectorTest.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.tests.utils;
-
-import com.google.inject.Inject;
-import org.eclipse.xtext.testing.InjectWith;
-import org.eclipse.xtext.testing.extensions.InjectionExtension;
-import org.hamcrest.Matcher;
-import org.junit.jupiter.api.Disabled;
-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 tools.refinery.language.model.problem.*;
-import tools.refinery.language.model.tests.utils.ProblemParseHelper;
-import tools.refinery.language.tests.ProblemInjectorProvider;
-import tools.refinery.language.utils.ContainmentRole;
-import tools.refinery.language.utils.ProblemDesugarer;
-
-import java.util.stream.Stream;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-
-@ExtendWith(InjectionExtension.class)
-@InjectWith(ProblemInjectorProvider.class)
-class SymbolCollectorTest {
-        @Inject
-        private ProblemParseHelper parseHelper;
-
-        @Inject
-        private ProblemDesugarer desugarer;
-
-        @Test
-        void implicitNodeTest() {
-                var problem = parseHelper.parse("""
-                                exists(a).
-                                """);
-                var collectedSymbols = desugarer.collectSymbols(problem.get());
-                var node = problem.node("a");
-                assertThat(collectedSymbols.nodes(), hasKey(node));
-                assertThat(collectedSymbols.nodes().get(node).individual(), is(false));
-        }
-
-        @Test
-        void individualNodeTest() {
-                var problem = parseHelper.parse("""
-                                indiv a.
-                                """);
-                var collectedSymbols = desugarer.collectSymbols(problem.get());
-                var node = problem.individualNode("a");
-                assertThat(collectedSymbols.nodes(), hasKey(node));
-                assertThat(collectedSymbols.nodes().get(node).individual(), is(true));
-        }
-
-        @Test
-        void classTest() {
-                var problem = parseHelper.parse("""
-                                class Foo.
-                                """);
-                var collectedSymbols = desugarer.collectSymbols(problem.get());
-                var classDeclaration = problem.findClass("Foo").get();
-                assertThat(collectedSymbols.relations(), hasKey(classDeclaration));
-                var classInfo = collectedSymbols.relations().get(classDeclaration);
-                assertThat(classInfo.parameters(), hasSize(1));
-                assertThat(classInfo.containmentRole(), is(ContainmentRole.CONTAINED));
-                assertThat(classInfo.hasDefinition(), is(false));
-                var newNode = classDeclaration.getNewNode();
-                assertThat(collectedSymbols.nodes(), hasKey(newNode));
-                assertThat(collectedSymbols.nodes().get(newNode).individual(), is(false));
-                assertThat(classInfo.assertions(), assertsNode(newNode, LogicValue.TRUE));
-                assertThat(collectedSymbols.relations().get(problem.builtinSymbols().exists()).assertions(),
-                                assertsNode(newNode, LogicValue.UNKNOWN));
-                assertThat(collectedSymbols.relations().get(problem.builtinSymbols().equals()).assertions(),
-                                assertsNode(newNode, LogicValue.UNKNOWN));
-        }
-
-        @Test
-        void abstractClassTest() {
-                var problem = parseHelper.parse("""
-                                abstract class Foo.
-                                """);
-                var collectedSymbols = desugarer.collectSymbols(problem.get());
-                assertThat(collectedSymbols.relations().get(problem.findClass("Foo").get()).assertions(), hasSize(0));
-        }
-
-        @Test
-        void referenceTest() {
-                var problem = parseHelper.parse("""
-                                class Foo {
-                                        refers Foo[] bar opposite quux
-                                        refers Foo quux opposite bar
-                                }
-                                """);
-                var collectedSymbols = desugarer.collectSymbols(problem.get());
-                var fooClass = problem.findClass("Foo");
-                var barReference = fooClass.feature("bar");
-                var barInfo = collectedSymbols.relations().get(barReference);
-                var quuxReference = fooClass.feature("quux");
-                var quuxInfo = collectedSymbols.relations().get(quuxReference);
-                assertThat(barInfo.containmentRole(), is(ContainmentRole.NONE));
-                assertThat(barInfo.opposite(), is(quuxReference));
-                assertThat(barInfo.multiplicity(), is(instanceOf(UnboundedMultiplicity.class)));
-                assertThat(barInfo.hasDefinition(), is(false));
-                assertThat(quuxInfo.containmentRole(), is(ContainmentRole.NONE));
-                assertThat(quuxInfo.opposite(), is(barReference));
-                assertThat(quuxInfo.multiplicity(), is(instanceOf(ExactMultiplicity.class)));
-                assertThat(quuxInfo.multiplicity(), hasProperty("exactValue", is(1)));
-                assertThat(quuxInfo.hasDefinition(), is(false));
-        }
-
-        @Test
-        void containmentReferenceTest() {
-                var problem = parseHelper.parse("""
-                                class Foo {
-                                        contains Foo[] bar
-                                }
-                                """);
-                var collectedSymbols = desugarer.collectSymbols(problem.get());
-                assertThat(collectedSymbols.relations().get(problem.findClass("Foo").feature("bar")).containmentRole(),
-                                is(ContainmentRole.CONTAINMENT));
-        }
-
-        @Disabled("TODO: Rework numerical references")
-        @Test
-        void dataReferenceTest() {
-                var problem = parseHelper.parse("""
-                                class Foo {
-                                        int bar
-                                }
-                                """);
-                var collectedSymbols = desugarer.collectSymbols(problem.get());
-                assertThat(collectedSymbols.relations().get(problem.findClass("Foo").feature("bar")).containmentRole(),
-                                is(ContainmentRole.CONTAINMENT));
-        }
-
-        @Test
-        void enumTest() {
-                var problem = parseHelper.parse("""
-                                enum Foo {
-                                        bar, quux
-                                }
-                                """);
-                var collectedSymbols = desugarer.collectSymbols(problem.get());
-                var enumDeclaration = problem.findEnum("Foo");
-                var enumInfo = collectedSymbols.relations().get(enumDeclaration.get());
-                assertThat(enumInfo.containmentRole(), is(ContainmentRole.NONE));
-                assertThat(enumInfo.assertions(), assertsNode(enumDeclaration.literal("bar"), LogicValue.TRUE));
-                assertThat(enumInfo.assertions(), assertsNode(enumDeclaration.literal("quux"), LogicValue.TRUE));
-        }
-
-        @ParameterizedTest
-        @MethodSource
-        void predicateTest(String keyword, ContainmentRole containmentRole) {
-                var problem = parseHelper.parse(keyword + " foo(node x) <-> domain(x); data(x).");
-                var collectedSymbols = desugarer.collectSymbols(problem.get());
-                var predicateInfo = collectedSymbols.relations().get(problem.pred("foo").get());
-                assertThat(predicateInfo.containmentRole(), is(containmentRole));
-                assertThat(predicateInfo.parameters(), hasSize(1));
-                assertThat(predicateInfo.bodies(), hasSize(2));
-                assertThat(predicateInfo.hasDefinition(), is(true));
-        }
-
-        static Stream<Arguments> predicateTest() {
-                return Stream.of(Arguments.of("pred", ContainmentRole.NONE), Arguments.of("error", ContainmentRole.NONE),
-                                Arguments.of("contained pred", ContainmentRole.CONTAINED), Arguments.of("containment pred",
-                                                ContainmentRole.CONTAINMENT));
-        }
-
-        @ParameterizedTest
-        @MethodSource("logicValues")
-        void assertionTest(String keyword, LogicValue value) {
-                var problem = parseHelper.parse("""
-                                pred foo(node x).
-                                foo(a): %s.
-                                """.formatted(keyword));
-                var collectedSymbols = desugarer.collectSymbols(problem.get());
-                assertThat(collectedSymbols.relations().get(problem.pred("foo").get()).assertions(),
-                                assertsNode(problem.node("a"), value));
-        }
-
-        @ParameterizedTest
-        @MethodSource("logicValues")
-        void defaultAssertionTest(String keyword, LogicValue value) {
-                var problem = parseHelper.parse("""
-                                pred foo(node x).
-                                default foo(a): %s.
-                                """.formatted(keyword));
-                var collectedSymbols = desugarer.collectSymbols(problem.get());
-                assertThat(collectedSymbols.relations().get(problem.pred("foo").get()).assertions(),
-                                assertsNode(problem.node("a"), value));
-        }
-
-        static Stream<Arguments> logicValues() {
-                return Stream.of(Arguments.of("true", LogicValue.TRUE), Arguments.of("false", LogicValue.FALSE),
-                                Arguments.of("unknown", LogicValue.UNKNOWN), Arguments.of("error", LogicValue.ERROR));
-        }
-
-        @Test
-        void invalidAssertionArityTest() {
-                var problem = parseHelper.parse("""
-                                pred foo(node x).
-                                foo(a, b).
-                                """);
-                var collectedSymbols = desugarer.collectSymbols(problem.get());
-                assertThat(collectedSymbols.relations().get(problem.pred("foo").get()).assertions(), hasSize(0));
-        }
-
-        @Test
-        void invalidProblemTest() {
-                var problem = parseHelper.parse("""
-                                class Foo {
-                                        bar[] opposite quux
-                                        Foo quux opposite bar
-                                }
-                                """).get();
-                assertDoesNotThrow(() -> desugarer.collectSymbols(problem));
-        }
-
-        @Test
-        void errorAssertionTest() {
-                var problem = parseHelper.parse("""
-                                error foo(node a, node b) <-> equals(a, b).
-                                """);
-                var collectedSymbols = desugarer.collectSymbols(problem.get());
-                var fooInfo = collectedSymbols.relations().get(problem.pred("foo").get());
-                assertThat(fooInfo.assertions(), hasSize(1));
-                var assertion = fooInfo.assertions().stream().findFirst().orElseThrow();
-                assertThat(assertion.getValue(), hasProperty("logicValue", is(LogicValue.FALSE)));
-                assertThat(assertion.getArguments(), hasSize(2));
-                assertThat(assertion.getArguments(), everyItem(instanceOf(WildcardAssertionArgument.class)));
-        }
-
-        private static Matcher<Iterable<? super Assertion>> assertsNode(Node node, LogicValue value) {
-                return hasItem(allOf(hasProperty("arguments", hasItem(hasProperty("node", is(node)))), hasProperty("value",
-                                hasProperty("logicValue", is(value)))));
-        }
-}
diff --git a/subprojects/visualization/build.gradle.kts b/subprojects/store-dse-visualization/build.gradle.kts
index abad0491..abad0491 100644
--- a/subprojects/visualization/build.gradle.kts
+++ b/subprojects/store-dse-visualization/build.gradle.kts
diff --git a/subprojects/visualization/src/main/java/tools/refinery/visualization/ModelVisualizerAdapter.java b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/ModelVisualizerAdapter.java
index ad80bbc6..ad80bbc6 100644
--- a/subprojects/visualization/src/main/java/tools/refinery/visualization/ModelVisualizerAdapter.java
+++ b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/ModelVisualizerAdapter.java
diff --git a/subprojects/visualization/src/main/java/tools/refinery/visualization/ModelVisualizerBuilder.java b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/ModelVisualizerBuilder.java
index 592f5fcf..592f5fcf 100644
--- a/subprojects/visualization/src/main/java/tools/refinery/visualization/ModelVisualizerBuilder.java
+++ b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/ModelVisualizerBuilder.java
diff --git a/subprojects/visualization/src/main/java/tools/refinery/visualization/ModelVisualizerStoreAdapter.java b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/ModelVisualizerStoreAdapter.java
index 46663b2a..46663b2a 100644
--- a/subprojects/visualization/src/main/java/tools/refinery/visualization/ModelVisualizerStoreAdapter.java
+++ b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/ModelVisualizerStoreAdapter.java
diff --git a/subprojects/visualization/src/main/java/tools/refinery/visualization/internal/FileFormat.java b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/FileFormat.java
index c5dffeb2..c5dffeb2 100644
--- a/subprojects/visualization/src/main/java/tools/refinery/visualization/internal/FileFormat.java
+++ b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/FileFormat.java
diff --git a/subprojects/visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizeStoreAdapterImpl.java b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizeStoreAdapterImpl.java
index 04be22d6..04be22d6 100644
--- a/subprojects/visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizeStoreAdapterImpl.java
+++ b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizeStoreAdapterImpl.java
diff --git a/subprojects/visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java
index 031b2e6b..031b2e6b 100644
--- a/subprojects/visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java
+++ b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java
diff --git a/subprojects/visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerBuilderImpl.java b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerBuilderImpl.java
index e4d801d8..e4d801d8 100644
--- a/subprojects/visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerBuilderImpl.java
+++ b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerBuilderImpl.java
diff --git a/subprojects/visualization/src/main/java/tools/refinery/visualization/statespace/VisualizationStore.java b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/statespace/VisualizationStore.java
index 414ef737..414ef737 100644
--- a/subprojects/visualization/src/main/java/tools/refinery/visualization/statespace/VisualizationStore.java
+++ b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/statespace/VisualizationStore.java
diff --git a/subprojects/visualization/src/main/java/tools/refinery/visualization/statespace/internal/VisualizationStoreImpl.java b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/statespace/internal/VisualizationStoreImpl.java
index 08a69cb4..08a69cb4 100644
--- a/subprojects/visualization/src/main/java/tools/refinery/visualization/statespace/internal/VisualizationStoreImpl.java
+++ b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/statespace/internal/VisualizationStoreImpl.java
diff --git a/subprojects/store-dse/build.gradle.kts b/subprojects/store-dse/build.gradle.kts
index bb1dee7d..5517e189 100644
--- a/subprojects/store-dse/build.gradle.kts
+++ b/subprojects/store-dse/build.gradle.kts
@@ -10,7 +10,8 @@ plugins {
 
 dependencies {
         api(project(":refinery-store-query"))
-        api(project(":refinery-store-query-viatra"))
-        api(project(":refinery-store-reasoning"))
-        api(project(":refinery-visualization"))
+        implementation(project(":refinery-store-dse-visualization"))
+        implementation(libs.eclipseCollections.api)
+        runtimeOnly(libs.eclipseCollections)
+        testImplementation(project(":refinery-store-query-viatra"))
 }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/ActionFactory.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/ActionFactory.java
deleted file mode 100644
index 524c2f55..00000000
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/ActionFactory.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.dse;
-
-import org.eclipse.collections.api.block.procedure.Procedure;
-import tools.refinery.store.model.Model;
-import tools.refinery.store.tuple.Tuple;
-
-public interface ActionFactory {
-        Procedure<Tuple> prepare(Model model);
-}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/DanglingEdges.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/DanglingEdges.java
new file mode 100644
index 00000000..ac9d125b
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/DanglingEdges.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.modification;
+
+public enum DanglingEdges {
+        IGNORE,
+        DELETE,
+        FAIL
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/ModificationAdapter.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/ModificationAdapter.java
index f15c16e0..58b60499 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/ModificationAdapter.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/ModificationAdapter.java
@@ -16,7 +16,7 @@ public interface ModificationAdapter extends ModelAdapter {
 
         Tuple1 createObject();
 
-        Tuple deleteObject(Tuple tuple);
+        boolean deleteObject(Tuple tuple, DanglingEdges danglingEdges);
 
         static ModificationBuilder builder() {
                 return new ModificationBuilderImpl();
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/CreateActionLiteral.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/CreateActionLiteral.java
new file mode 100644
index 00000000..5b86a5e1
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/CreateActionLiteral.java
@@ -0,0 +1,43 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.modification.actions;
+
+import tools.refinery.store.dse.modification.ModificationAdapter;
+import tools.refinery.store.dse.transition.actions.AbstractActionLiteral;
+import tools.refinery.store.dse.transition.actions.BoundActionLiteral;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.List;
+
+public class CreateActionLiteral extends AbstractActionLiteral {
+        private final NodeVariable variable;
+
+        public CreateActionLiteral(NodeVariable variable) {
+
+                this.variable = variable;
+        }
+
+        public NodeVariable getVariable() {
+                return variable;
+        }
+
+        @Override
+        public List<NodeVariable> getInputVariables() {
+                return List.of();
+        }
+
+        @Override
+        public List<NodeVariable> getOutputVariables() {
+                return List.of(variable);
+        }
+
+        @Override
+        public BoundActionLiteral bindToModel(Model model) {
+                var adapter = model.getAdapter(ModificationAdapter.class);
+                return ignoredTuple -> adapter.createObject();
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/DeleteActionLiteral.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/DeleteActionLiteral.java
new file mode 100644
index 00000000..18ad2b9d
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/DeleteActionLiteral.java
@@ -0,0 +1,51 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.modification.actions;
+
+import tools.refinery.store.dse.modification.DanglingEdges;
+import tools.refinery.store.dse.modification.ModificationAdapter;
+import tools.refinery.store.dse.transition.actions.AbstractActionLiteral;
+import tools.refinery.store.dse.transition.actions.BoundActionLiteral;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.List;
+
+public class DeleteActionLiteral extends AbstractActionLiteral {
+        private final NodeVariable variable;
+        private final DanglingEdges danglingEdges;
+
+        public DeleteActionLiteral(NodeVariable variable, DanglingEdges danglingEdges) {
+
+                this.variable = variable;
+                this.danglingEdges = danglingEdges;
+        }
+
+        public NodeVariable getVariable() {
+                return variable;
+        }
+
+        public DanglingEdges getDanglingEdges() {
+                return danglingEdges;
+        }
+
+        @Override
+        public List<NodeVariable> getInputVariables() {
+                return List.of(variable);
+        }
+
+        @Override
+        public List<NodeVariable> getOutputVariables() {
+                return List.of();
+        }
+
+        @Override
+        public BoundActionLiteral bindToModel(Model model) {
+                var adapter = model.getAdapter(ModificationAdapter.class);
+                return tuple -> adapter.deleteObject(tuple, danglingEdges) ? Tuple.of() : null;
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/ModificationActionLiterals.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/ModificationActionLiterals.java
new file mode 100644
index 00000000..31f50ac7
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/ModificationActionLiterals.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.modification.actions;
+
+import tools.refinery.store.dse.modification.DanglingEdges;
+import tools.refinery.store.query.term.NodeVariable;
+
+public class ModificationActionLiterals {
+        private ModificationActionLiterals() {
+                throw new IllegalArgumentException("This is a static utility class and should not be instantiated directly");
+        }
+
+        public static CreateActionLiteral create(NodeVariable variable) {
+                return new CreateActionLiteral(variable);
+        }
+
+        public static DeleteActionLiteral delete(NodeVariable variable, DanglingEdges danglingEdges) {
+                return new DeleteActionLiteral(variable, danglingEdges);
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/internal/ModificationAdapterImpl.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/internal/ModificationAdapterImpl.java
index b2a80d71..4e77c462 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/internal/ModificationAdapterImpl.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/internal/ModificationAdapterImpl.java
@@ -6,6 +6,7 @@
 package tools.refinery.store.dse.modification.internal;
 
 import tools.refinery.store.adapter.ModelStoreAdapter;
+import tools.refinery.store.dse.modification.DanglingEdges;
 import tools.refinery.store.dse.modification.ModificationAdapter;
 import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.model.Model;
@@ -13,6 +14,8 @@ import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.tuple.Tuple1;
 
+import java.util.HashSet;
+
 public class ModificationAdapterImpl implements ModificationAdapter {
         static final Symbol<Integer> NEXT_ID = Symbol.of("NEXT_ID", 0, Integer.class, 0);
 
@@ -49,14 +52,56 @@ public class ModificationAdapterImpl implements ModificationAdapter {
         }
 
         @Override
-        public Tuple deleteObject(Tuple tuple) {
+        public boolean deleteObject(Tuple tuple, DanglingEdges danglingEdges) {
                 if (tuple.getSize() != 1) {
                         throw new IllegalArgumentException("Tuple size must be 1");
                 }
-//              TODO: implement more efficient deletion
-                if (tuple.get(0) == getModelSize() - 1) {
-                        nodeCountInterpretation.put(Tuple.of(), getModelSize() - 1);
+                int objectId = tuple.get(0);
+                if (danglingEdges == DanglingEdges.DELETE) {
+                        deleteDanglingEdges(objectId);
+                } else if (danglingEdges == DanglingEdges.FAIL && hasDanglingEdges(objectId)) {
+                        return false;
+
+                }
+                int modelSize = getModelSize();
+                if (objectId == modelSize - 1) {
+                        nodeCountInterpretation.put(Tuple.of(), modelSize - 1);
+                }
+                return true;
+        }
+
+        private void deleteDanglingEdges(int objectId) {
+                for (var symbol : model.getStore().getSymbols()) {
+                        deleteDanglingEdges(objectId, (Symbol<?>) symbol);
+                }
+        }
+
+        private <T> void deleteDanglingEdges(int objectId, Symbol<T> symbol) {
+                var interpretation = model.getInterpretation(symbol);
+                var toDelete = new HashSet<Tuple>();
+                int arity = symbol.arity();
+                for (int i = 0; i < arity; i++) {
+                        var cursor = interpretation.getAdjacent(i, objectId);
+                        while (cursor.move()) {
+                                toDelete.add(cursor.getKey());
+                        }
+                }
+                var defaultValue = symbol.defaultValue();
+                for (var tuple : toDelete) {
+                        interpretation.put(tuple, defaultValue);
+                }
+        }
+
+        private boolean hasDanglingEdges(int objectId) {
+                for (var symbol : model.getStore().getSymbols()) {
+                        var interpretation = model.getInterpretation(symbol);
+                        int arity = symbol.arity();
+                        for (int i = 0; i < arity; i++) {
+                                if (interpretation.getAdjacentSize(i, objectId) > 0) {
+                                        return true;
+                                }
+                        }
                 }
-                return tuple;
+                return false;
         }
 }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstStoreManager.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstStoreManager.java
index 0b9aae9c..4ccba6f7 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstStoreManager.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstStoreManager.java
@@ -5,7 +5,6 @@
  */
 package tools.refinery.store.dse.strategy;
 
-import org.eclipse.collections.api.block.procedure.Procedure;
 import tools.refinery.store.dse.transition.DesignSpaceExplorationStoreAdapter;
 import tools.refinery.store.dse.transition.VersionWithObjectiveValue;
 import tools.refinery.store.dse.transition.statespace.ActivationStore;
@@ -24,6 +23,8 @@ import tools.refinery.visualization.ModelVisualizerStoreAdapter;
 import tools.refinery.visualization.statespace.VisualizationStore;
 import tools.refinery.visualization.statespace.internal.VisualizationStoreImpl;
 
+import java.util.function.Consumer;
+
 public class BestFirstStoreManager {
 
         ModelStore modelStore;
@@ -39,7 +40,7 @@ public class BestFirstStoreManager {
                                 modelStore.getAdapter(DesignSpaceExplorationStoreAdapter.class);
 
                 objectiveStore = new ObjectivePriorityQueueImpl(storeAdapter.getObjectives());
-                Procedure<VersionWithObjectiveValue> whenAllActivationsVisited = x -> objectiveStore.remove(x);
+                Consumer<VersionWithObjectiveValue> whenAllActivationsVisited = x -> objectiveStore.remove(x);
                 activationStore = new ActivationStoreImpl(storeAdapter.getTransformations().size(), whenAllActivationsVisited);
                 solutionStore = new SolutionStoreImpl(50);
                 equivalenceClassStore = new FastEquivalenceClassStore(modelStore.getAdapter(StateCoderStoreAdapter.class)) {
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/DesignSpaceExplorationAdapter.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/DesignSpaceExplorationAdapter.java
index 37448309..d326f1dd 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/DesignSpaceExplorationAdapter.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/DesignSpaceExplorationAdapter.java
@@ -7,25 +7,22 @@ package tools.refinery.store.dse.transition;
 
 import tools.refinery.store.adapter.ModelAdapter;
 import tools.refinery.store.dse.transition.internal.DesignSpaceExplorationBuilderImpl;
-import tools.refinery.store.map.Version;
-import tools.refinery.store.tuple.Tuple;
-import tools.refinery.store.tuple.Tuple1;
 
-import java.util.Collection;
 import java.util.List;
 
 public interface DesignSpaceExplorationAdapter extends ModelAdapter {
-
-
-
         @Override
         DesignSpaceExplorationStoreAdapter getStoreAdapter();
 
         static DesignSpaceExplorationBuilder builder() {
                 return new DesignSpaceExplorationBuilderImpl();
         }
+
         List<Transformation> getTransformations();
+
         boolean checkAccept();
+
         boolean checkExclude();
+
         ObjectiveValue getObjectiveValue();
 }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/DesignSpaceExplorationBuilder.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/DesignSpaceExplorationBuilder.java
index 3855a20a..800cf8f7 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/DesignSpaceExplorationBuilder.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/DesignSpaceExplorationBuilder.java
@@ -12,14 +12,16 @@ import tools.refinery.store.dse.transition.objectives.Objective;
 import java.util.Collection;
 import java.util.List;
 
+// Builder pattern with methods returning {@code this} for convenience.
+@SuppressWarnings("UnusedReturnValue")
 public interface DesignSpaceExplorationBuilder extends ModelAdapterBuilder {
+        DesignSpaceExplorationBuilder transformation(Rule transformationRuleDefinition);
 
-        DesignSpaceExplorationBuilder transformation(TransformationRule transformationRuleDefinition);
-        default DesignSpaceExplorationBuilder transformations(TransformationRule... transformationRuleDefinitions) {
+        default DesignSpaceExplorationBuilder transformations(Rule... transformationRuleDefinitions) {
                 return transformations(List.of(transformationRuleDefinitions));
         }
 
-        default DesignSpaceExplorationBuilder transformations(Collection<? extends TransformationRule> transformationRules) {
+        default DesignSpaceExplorationBuilder transformations(Collection<? extends Rule> transformationRules) {
                 transformationRules.forEach(this::transformation);
                 return this;
         }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/DesignSpaceExplorationStoreAdapter.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/DesignSpaceExplorationStoreAdapter.java
index 5c8c7a4d..fb082fae 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/DesignSpaceExplorationStoreAdapter.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/DesignSpaceExplorationStoreAdapter.java
@@ -17,7 +17,7 @@ public interface DesignSpaceExplorationStoreAdapter extends ModelStoreAdapter
         @Override
         DesignSpaceExplorationAdapter createModelAdapter(Model model);
 
-        List<TransformationRule> getTransformations();
+        List<Rule> getTransformations();
 
         List<Criterion> getAccepts();
 
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Rule.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Rule.java
new file mode 100644
index 00000000..ff45ed3e
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Rule.java
@@ -0,0 +1,99 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition;
+
+import tools.refinery.store.dse.transition.actions.Action;
+import tools.refinery.store.dse.transition.actions.BoundAction;
+import tools.refinery.store.dse.transition.callback.*;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.query.dnf.RelationalQuery;
+
+public class Rule {
+        private final String name;
+        private final RelationalQuery precondition;
+        private final Action action;
+
+        public Rule(String name, RelationalQuery precondition, Action action) {
+                if (precondition.arity() != action.getArity()) {
+                        throw new IllegalArgumentException("Expected an action clause with %d parameters, got %d instead"
+                                        .formatted(precondition.arity(), action.getArity()));
+                }
+                this.name = name;
+                this.precondition = precondition;
+                this.action = action;
+        }
+
+        public String getName() {
+                return name;
+        }
+
+        public RelationalQuery getPrecondition() {
+                return precondition;
+        }
+
+        public BoundAction createAction(Model model) {
+                return action.bindToModel(model);
+        }
+
+        public static RuleBuilder builder(String name) {
+                return new RuleBuilder(name);
+        }
+
+        public static RuleBuilder builder() {
+                return builder(null);
+        }
+
+        public static Rule of(String name, RuleCallback0 callback) {
+                var builder = builder(name);
+                callback.accept(builder);
+                return builder.build();
+        }
+
+        public static Rule of(RuleCallback0 callback) {
+                return of(null, callback);
+        }
+
+        public static Rule of(String name, RuleCallback1 callback) {
+                var builder = builder(name);
+                callback.accept(builder, builder.parameter("p1"));
+                return builder.build();
+        }
+
+        public static Rule of(RuleCallback1 callback) {
+                return of(null, callback);
+        }
+
+        public static Rule of(String name, RuleCallback2 callback) {
+                var builder = builder(name);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"));
+                return builder.build();
+        }
+
+        public static Rule of(RuleCallback2 callback) {
+                return of(null, callback);
+        }
+
+        public static Rule of(String name, RuleCallback3 callback) {
+                var builder = builder(name);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"), builder.parameter("p3"));
+                return builder.build();
+        }
+
+        public static Rule of(RuleCallback3 callback) {
+                return of(null, callback);
+        }
+
+        public static Rule of(String name, RuleCallback4 callback) {
+                var builder = builder(name);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"), builder.parameter("p3"),
+                                builder.parameter("p4"));
+                return builder.build();
+        }
+
+        public static Rule of(RuleCallback4 callback) {
+                return of(null, callback);
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/RuleBuilder.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/RuleBuilder.java
new file mode 100644
index 00000000..865ac369
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/RuleBuilder.java
@@ -0,0 +1,71 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition;
+
+import tools.refinery.store.dse.transition.actions.Action;
+import tools.refinery.store.dse.transition.actions.ActionLiteral;
+import tools.refinery.store.dse.transition.callback.*;
+import tools.refinery.store.query.dnf.AbstractQueryBuilder;
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.term.Variable;
+
+import java.util.List;
+
+public class RuleBuilder extends AbstractQueryBuilder<RuleBuilder> {
+        private final String name;
+        private List<ActionLiteral> action;
+
+        RuleBuilder(String name) {
+                super(Dnf.builder(name == null ? null : name + "#precondition"));
+                this.name = name;
+        }
+
+        @Override
+        protected RuleBuilder self() {
+                return this;
+        }
+
+        public RuleBuilder action(ActionLiteral... literals) {
+                return action(List.of(literals));
+        }
+
+        public RuleBuilder action(List<? extends ActionLiteral> literals) {
+                if (this.action != null) {
+                        throw new IllegalStateException("Actions have already been set");
+                }
+                this.action = List.copyOf(literals);
+                return this;
+        }
+
+        public RuleBuilder action(Action action) {
+                return action(action.getActionLiterals());
+        }
+
+        public RuleBuilder action(ActionCallback0 callback) {
+                return action(callback.toLiterals());
+        }
+
+        public RuleBuilder action(ActionCallback1 callback) {
+                return action(callback.toLiterals(Variable.of("v1")));
+        }
+
+        public RuleBuilder action(ActionCallback2 callback) {
+                return action(callback.toLiterals(Variable.of("v1"), Variable.of("v2")));
+        }
+
+        public RuleBuilder action(ActionCallback3 callback) {
+                return action(callback.toLiterals(Variable.of("v1"), Variable.of("v2"), Variable.of("v3")));
+        }
+
+        public RuleBuilder action(ActionCallback4 callback) {
+                return action(callback.toLiterals(Variable.of("v1"), Variable.of("v2"), Variable.of("v3"), Variable.of("v4")));
+        }
+
+        public Rule build() {
+                var precondition = dnfBuilder.build().asRelation();
+                return new Rule(name, precondition, Action.ofPrecondition(precondition, action));
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Transformation.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Transformation.java
index 2cce738f..0eeccbdf 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Transformation.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Transformation.java
@@ -5,25 +5,27 @@
  */
 package tools.refinery.store.dse.transition;
 
-import org.eclipse.collections.api.block.procedure.Procedure;
+import tools.refinery.store.dse.transition.actions.BoundAction;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.resultset.OrderedResultSet;
 import tools.refinery.store.query.resultset.ResultSet;
 import tools.refinery.store.tuple.Tuple;
 
 public class Transformation {
-        private final TransformationRule definition;
-
+        private final Rule definition;
         private final OrderedResultSet<Boolean> activations;
+        private final BoundAction action;
 
-        private final Procedure<Tuple> action;
-
-        public Transformation(TransformationRule definition, OrderedResultSet<Boolean> activations, Procedure<Tuple> action) {
+        public Transformation(Model model, Rule definition) {
                 this.definition = definition;
-                this.activations = activations;
-                this.action = action;
+                var precondition = definition.getPrecondition();
+                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                activations = new OrderedResultSet<>(queryEngine.getResultSet(precondition));
+                action = definition.createAction(model);
         }
 
-        public TransformationRule getDefinition() {
+        public Rule getDefinition() {
                 return definition;
         }
 
@@ -36,8 +38,6 @@ public class Transformation {
         }
 
         public boolean fireActivation(Tuple activation) {
-                action.accept(activation);
-                //queryEngine.flushChanges();
-                return true;
+                return action.fire(activation);
         }
 }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/TransformationRule.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/TransformationRule.java
deleted file mode 100644
index d64a3db1..00000000
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/TransformationRule.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.dse.transition;
-
-import tools.refinery.store.model.Model;
-import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.ModelQueryBuilder;
-import tools.refinery.store.query.dnf.RelationalQuery;
-import tools.refinery.store.dse.ActionFactory;
-import tools.refinery.store.query.resultset.OrderedResultSet;
-import tools.refinery.store.query.resultset.ResultSet;
-import tools.refinery.store.tuple.Tuple;
-
-import java.util.*;
-
-public class TransformationRule {
-
-        private final String name;
-        private final RelationalQuery precondition;
-        private final ActionFactory actionFactory;
-
-        private Random random;
-        private ModelQueryAdapter queryEngine;
-
-        public TransformationRule(String name, RelationalQuery precondition, ActionFactory actionFactory) {
-                this(name, precondition, actionFactory, new Random());
-        }
-
-        public TransformationRule(String name, RelationalQuery precondition, ActionFactory actionFactory, long seed) {
-                this(name, precondition, actionFactory, new Random(seed));
-        }
-
-        public TransformationRule(String name, RelationalQuery precondition, ActionFactory actionFactory, Random random) {
-                this.name = name;
-                this.precondition = precondition;
-                this.actionFactory = actionFactory;
-                this.random = random;
-        }
-        public void doConfigure(ModelStoreBuilder storeBuilder) {
-                var queryBuilder = storeBuilder.getAdapter(ModelQueryBuilder.class);
-                queryBuilder.query(this.precondition);
-        }
-
-        public Transformation prepare(Model model) {
-                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
-                var activations = new OrderedResultSet<>(queryEngine.getResultSet(precondition));
-                var action = actionFactory.prepare(model);
-                return new Transformation(this,activations,action);
-        }
-
-        public String getName() {
-                return name;
-        }
-
-        public RelationalQuery getPrecondition() {
-                return precondition;
-        }
-
-}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/AbstractActionLiteral.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/AbstractActionLiteral.java
new file mode 100644
index 00000000..e30f06bb
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/AbstractActionLiteral.java
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.actions;
+
+public abstract class AbstractActionLiteral implements ActionLiteral {
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/Action.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/Action.java
new file mode 100644
index 00000000..d63ddfdd
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/Action.java
@@ -0,0 +1,132 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.actions;
+
+import org.eclipse.collections.api.factory.primitive.ObjectIntMaps;
+import org.eclipse.collections.api.map.primitive.MutableObjectIntMap;
+import org.jetbrains.annotations.Nullable;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.query.dnf.SymbolicParameter;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.*;
+
+public class Action {
+        private final List<NodeVariable> parameters;
+        private final Set<NodeVariable> localVariables;
+        private final List<ActionLiteral> actionLiterals;
+        private final int[] @Nullable [] inputAllocations;
+        private final int[] @Nullable [] outputAllocations;
+
+        public Action(List<NodeVariable> parameters, List<? extends ActionLiteral> actionLiterals) {
+                this.parameters = List.copyOf(parameters);
+                this.actionLiterals = List.copyOf(actionLiterals);
+                var allocation = ObjectIntMaps.mutable.<NodeVariable>empty();
+                int arity = parameters.size();
+                for (int i = 0; i < arity; i++) {
+                        allocation.put(parameters.get(i), i);
+                }
+                var mutableLocalVariables = new LinkedHashSet<NodeVariable>();
+                int size = actionLiterals.size();
+                inputAllocations = new int[size][];
+                outputAllocations = new int[size][];
+                for (int i = 0; i < size; i++) {
+                        computeInputAllocation(i, parameters, allocation);
+                        computeOutputAllocation(i, mutableLocalVariables, allocation);
+                }
+                this.localVariables = Collections.unmodifiableSet(mutableLocalVariables);
+        }
+
+        private void computeInputAllocation(int actionIndex, List<NodeVariable> parameters,
+                                                                                MutableObjectIntMap<NodeVariable> allocation) {
+                var actionLiteral = actionLiterals.get(actionIndex);
+                var inputVariables = actionLiteral.getInputVariables();
+                if (inputVariables.equals(parameters)) {
+                        // Identity mappings use a {@code null} allocation to pass the activation tuple unchanged.
+                        return;
+                }
+                var inputs = new int[inputVariables.size()];
+                for (int i = 0; i < inputs.length; i++) {
+                        var variable = inputVariables.get(i);
+                        if (!allocation.containsKey(variable)) {
+                                throw new IllegalArgumentException("Unbound input variable %s of action literal %s"
+                                                .formatted(variable, actionLiteral));
+                        }
+                        inputs[i] = allocation.get(variable);
+                }
+                inputAllocations[actionIndex] = inputs;
+        }
+
+        private void computeOutputAllocation(int actionIndex, Set<NodeVariable> mutableLocalVariable,
+                                                                                 MutableObjectIntMap<NodeVariable> allocation) {
+                var actionLiteral = actionLiterals.get(actionIndex);
+                var outputVariables = actionLiteral.getOutputVariables();
+                int size = outputVariables.size();
+                if (size == 0) {
+                        // Identity mappings use a {@code null} allocation to avoid iterating over the output tuple.
+                        return;
+                }
+                if (size >= 2 && new HashSet<>(outputVariables).size() != size) {
+                        throw new IllegalArgumentException("Action literal %s has duplicate output variables %s"
+                                        .formatted(actionLiteral, outputVariables));
+                }
+                int arity = parameters.size();
+                var outputs = new int[size];
+                for (int i = 0; i < size; i++) {
+                        var variable = outputVariables.get(i);
+                        if (allocation.containsKey(variable)) {
+                                throw new IllegalArgumentException("Output variable %s of action literal %s was already assigned"
+                                                .formatted(variable, actionLiteral));
+                        }
+                        int variableId = mutableLocalVariable.size();
+                        allocation.put(variable, arity + variableId);
+                        outputs[i] = variableId;
+                        mutableLocalVariable.add(variable);
+                }
+                outputAllocations[actionIndex] = outputs;
+        }
+
+        public List<NodeVariable> getParameters() {
+                return parameters;
+        }
+
+        public int getArity() {
+                return parameters.size();
+        }
+
+        public Set<NodeVariable> getLocalVariables() {
+                return localVariables;
+        }
+
+        public List<ActionLiteral> getActionLiterals() {
+                return actionLiterals;
+        }
+
+        int @Nullable [] getInputAllocation(int actionIndex) {
+                return inputAllocations[actionIndex];
+        }
+
+        int @Nullable [] getOutputAllocation(int actionIndex) {
+                return outputAllocations[actionIndex];
+        }
+
+        public BoundAction bindToModel(Model model) {
+                return new BoundAction(this, model);
+        }
+
+        public static Action ofSymbolicParameters(List<SymbolicParameter> symbolicParameters,
+                                                                                          List<? extends ActionLiteral> actionLiterals) {
+                var nodeVariables = symbolicParameters.stream()
+                                .map(symbolicParameter -> symbolicParameter.getVariable().asNodeVariable())
+                                .toList();
+                return new Action(nodeVariables, actionLiterals);
+        }
+
+        public static Action ofPrecondition(RelationalQuery precondition, List<? extends ActionLiteral> actionLiterals) {
+                return ofSymbolicParameters(precondition.getDnf().getSymbolicParameters(), actionLiterals);
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiteral.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiteral.java
new file mode 100644
index 00000000..a721ef73
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiteral.java
@@ -0,0 +1,19 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.actions;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.List;
+
+public interface ActionLiteral {
+        List<NodeVariable> getInputVariables();
+
+        List<NodeVariable> getOutputVariables();
+
+        BoundActionLiteral bindToModel(Model model);
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiterals.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiterals.java
new file mode 100644
index 00000000..275e1e25
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiterals.java
@@ -0,0 +1,33 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.actions;
+
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.representation.Symbol;
+
+import java.util.List;
+import java.util.Objects;
+
+public final class ActionLiterals {
+        private ActionLiterals() {
+                throw new IllegalArgumentException("This is a static utility class and should not be instantiated directly");
+        }
+
+        public static <T> PutActionLiteral<T> put(Symbol<T> symbol, T value, NodeVariable... parameters) {
+                return new PutActionLiteral<>(symbol, value, List.of(parameters));
+        }
+
+        public static PutActionLiteral<Boolean> add(Symbol<Boolean> symbol, NodeVariable... parameters) {
+                if (!Objects.equals(symbol.defaultValue(), false)) {
+                        throw new IllegalArgumentException("Use put to add a value to symbols other than two-valued logic");
+                }
+                return put(symbol, true, parameters);
+        }
+
+        public static <T> PutActionLiteral<T> remove(Symbol<T> symbol, NodeVariable... parameters) {
+                return put(symbol, symbol.defaultValue(), parameters);
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/BoundAction.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/BoundAction.java
new file mode 100644
index 00000000..55f43735
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/BoundAction.java
@@ -0,0 +1,109 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.actions;
+
+import org.jetbrains.annotations.Nullable;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.tuple.Tuple;
+
+public class BoundAction {
+        private final Action action;
+        private final BoundActionLiteral[] boundLiterals;
+        private Tuple activation;
+        private final int[] localVariables;
+
+        BoundAction(Action action, Model model) {
+                this.action = action;
+                var actionLiterals = action.getActionLiterals();
+                int size = actionLiterals.size();
+                boundLiterals = new BoundActionLiteral[size];
+                for (int i = 0; i < size; i++) {
+                        boundLiterals[i] = actionLiterals.get(i).bindToModel(model);
+                }
+                localVariables = new int[action.getLocalVariables().size()];
+        }
+
+        public boolean fire(Tuple activation) {
+                if (this.activation != null) {
+                        throw new IllegalStateException("Reentrant firing is not allowed");
+                }
+                this.activation = activation;
+                try {
+                        int size = boundLiterals.length;
+                        for (int i = 0; i < size; i++) {
+                                var inputAllocation = action.getInputAllocation(i);
+                                var boundLiteral = boundLiterals[i];
+                                var input = getInputTuple(inputAllocation);
+                                var output = boundLiteral.fire(input);
+                                if (output == null) {
+                                        return false;
+                                }
+                                var outputAllocation = this.action.getOutputAllocation(i);
+                                setOutputTuple(outputAllocation, output);
+                        }
+                } finally {
+                        this.activation = null;
+                }
+                return true;
+        }
+
+        private Tuple getInputTuple(int @Nullable [] inputAllocation) {
+                if (inputAllocation == null) {
+                        // Identity allocation.
+                        return activation;
+                }
+                return switch (inputAllocation.length) {
+                        case 0 -> Tuple.of();
+                        case 1 -> Tuple.of(getInput(inputAllocation[0]));
+                        case 2 -> Tuple.of(getInput(inputAllocation[0]), getInput(inputAllocation[1]));
+                        case 3 -> Tuple.of(getInput(inputAllocation[0]), getInput(inputAllocation[1]),
+                                        getInput(inputAllocation[2]));
+                        case 4 -> Tuple.of(getInput(inputAllocation[0]), getInput(inputAllocation[1]),
+                                        getInput(inputAllocation[2]), getInput(inputAllocation[3]));
+                        default -> {
+                                var elements = new int[inputAllocation.length];
+                                for (var i = 0; i < inputAllocation.length; i++) {
+                                        elements[i] = getInput(inputAllocation[i]);
+                                }
+                                yield Tuple.of(elements);
+                        }
+                };
+        }
+
+        private int getInput(int index) {
+                int arity = action.getArity();
+                return index < arity ? activation.get(index) : localVariables[index - arity];
+        }
+
+        private void setOutputTuple(int @Nullable [] outputAllocation, Tuple output) {
+                if (outputAllocation == null || outputAllocation.length == 0) {
+                        return;
+                }
+                switch (outputAllocation.length) {
+                case 1 -> localVariables[outputAllocation[0]] = output.get(0);
+                case 2 -> {
+                        localVariables[outputAllocation[0]] = output.get(0);
+                        localVariables[outputAllocation[1]] = output.get(1);
+                }
+                case 3 -> {
+                        localVariables[outputAllocation[0]] = output.get(0);
+                        localVariables[outputAllocation[1]] = output.get(1);
+                        localVariables[outputAllocation[2]] = output.get(2);
+                }
+                case 4 -> {
+                        localVariables[outputAllocation[0]] = output.get(0);
+                        localVariables[outputAllocation[1]] = output.get(1);
+                        localVariables[outputAllocation[2]] = output.get(2);
+                        localVariables[outputAllocation[3]] = output.get(3);
+                }
+                default -> {
+                        for (int i = 0; i < outputAllocation.length; i++) {
+                                localVariables[outputAllocation[i]] = output.get(i);
+                        }
+                }
+                }
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/BoundActionLiteral.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/BoundActionLiteral.java
new file mode 100644
index 00000000..09c3c58c
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/BoundActionLiteral.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.actions;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import tools.refinery.store.tuple.Tuple;
+
+@FunctionalInterface
+public interface BoundActionLiteral {
+        @Nullable
+        Tuple fire(@NotNull Tuple tuple);
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/PutActionLiteral.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/PutActionLiteral.java
new file mode 100644
index 00000000..86288921
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/PutActionLiteral.java
@@ -0,0 +1,64 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.actions;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.List;
+
+public class PutActionLiteral<T> extends AbstractActionLiteral {
+        private final Symbol<T> symbol;
+        private final List<NodeVariable> parameters;
+        private final T value;
+
+        public PutActionLiteral(Symbol<T> symbol, T value, List<NodeVariable> parameters) {
+                if (symbol.arity() != parameters.size()) {
+                        throw new IllegalArgumentException("Expected %d parameters for symbol %s, got %d instead"
+                                        .formatted(symbol.arity(), symbol, parameters.size()));
+                }
+                if (value != null && !symbol.valueType().isInstance(value)) {
+                        throw new IllegalArgumentException("Expected value of type %s for symbol %s, got %s of type %s instead"
+                                        .formatted(symbol.valueType().getName(), symbol, value, value.getClass().getName()));
+                }
+                this.symbol = symbol;
+                this.parameters = List.copyOf(parameters);
+                this.value = value;
+        }
+
+        public Symbol<T> getSymbol() {
+                return symbol;
+        }
+
+        public List<NodeVariable> getParameters() {
+                return parameters;
+        }
+
+        public T getValue() {
+                return value;
+        }
+
+        @Override
+        public List<NodeVariable> getInputVariables() {
+                return getParameters();
+        }
+
+        @Override
+        public List<NodeVariable> getOutputVariables() {
+                return List.of();
+        }
+
+        @Override
+        public BoundActionLiteral bindToModel(Model model) {
+                var interpretation = model.getInterpretation(symbol);
+                return tuple -> {
+                        interpretation.put(tuple, value);
+                        return Tuple.of();
+                };
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback0.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback0.java
new file mode 100644
index 00000000..1190fdeb
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback0.java
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.callback;
+
+import tools.refinery.store.dse.transition.actions.ActionLiteral;
+
+import java.util.List;
+
+@FunctionalInterface
+public interface ActionCallback0 {
+        List<ActionLiteral> toLiterals();
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback1.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback1.java
new file mode 100644
index 00000000..869f1a96
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback1.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.callback;
+
+import tools.refinery.store.dse.transition.actions.ActionLiteral;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.List;
+
+@FunctionalInterface
+public interface ActionCallback1 {
+        List<ActionLiteral> toLiterals(NodeVariable v1);
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback2.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback2.java
new file mode 100644
index 00000000..a648fc93
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback2.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.callback;
+
+import tools.refinery.store.dse.transition.actions.ActionLiteral;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.List;
+
+@FunctionalInterface
+public interface ActionCallback2 {
+        List<ActionLiteral> toLiterals(NodeVariable v1, NodeVariable v2);
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback3.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback3.java
new file mode 100644
index 00000000..a9b1d334
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback3.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.callback;
+
+import tools.refinery.store.dse.transition.actions.ActionLiteral;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.List;
+
+@FunctionalInterface
+public interface ActionCallback3 {
+        List<ActionLiteral> toLiterals(NodeVariable v1, NodeVariable v2, NodeVariable v3);
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback4.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback4.java
new file mode 100644
index 00000000..aef1351c
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback4.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.callback;
+
+import tools.refinery.store.dse.transition.actions.ActionLiteral;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.List;
+
+@FunctionalInterface
+public interface ActionCallback4 {
+        List<ActionLiteral> toLiterals(NodeVariable v1, NodeVariable v2, NodeVariable v3, NodeVariable v4);
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback0.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback0.java
new file mode 100644
index 00000000..538c23ba
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback0.java
@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.callback;
+
+import tools.refinery.store.dse.transition.RuleBuilder;
+
+@FunctionalInterface
+public interface RuleCallback0 {
+        void accept(RuleBuilder builder);
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback1.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback1.java
new file mode 100644
index 00000000..bd7bf4f5
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback1.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.callback;
+
+import tools.refinery.store.dse.transition.RuleBuilder;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface RuleCallback1 {
+        void accept(RuleBuilder builder, NodeVariable p1);
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback2.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback2.java
new file mode 100644
index 00000000..7b02b68a
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback2.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.callback;
+
+import tools.refinery.store.dse.transition.RuleBuilder;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface RuleCallback2 {
+        void accept(RuleBuilder builder, NodeVariable p1, NodeVariable p2);
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback3.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback3.java
new file mode 100644
index 00000000..6f112d48
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback3.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.callback;
+
+import tools.refinery.store.dse.transition.RuleBuilder;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface RuleCallback3 {
+        void accept(RuleBuilder builder, NodeVariable p1, NodeVariable p2, NodeVariable p3);
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback4.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback4.java
new file mode 100644
index 00000000..dbcf8567
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback4.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.callback;
+
+import tools.refinery.store.dse.transition.RuleBuilder;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface RuleCallback4 {
+        void accept(RuleBuilder builder, NodeVariable p1, NodeVariable p2, NodeVariable p3, NodeVariable p4);
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/internal/DesignSpaceExplorationBuilderImpl.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/internal/DesignSpaceExplorationBuilderImpl.java
index 4371cc03..a91f6870 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/internal/DesignSpaceExplorationBuilderImpl.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/internal/DesignSpaceExplorationBuilderImpl.java
@@ -7,13 +7,13 @@ package tools.refinery.store.dse.transition.internal;
 
 import tools.refinery.store.adapter.AbstractModelAdapterBuilder;
 import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder;
-import tools.refinery.store.dse.transition.TransformationRule;
+import tools.refinery.store.dse.transition.Rule;
 import tools.refinery.store.dse.transition.objectives.Criterion;
 import tools.refinery.store.dse.transition.objectives.Objective;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.query.ModelQueryBuilder;
 
-import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
 
@@ -21,13 +21,13 @@ public class DesignSpaceExplorationBuilderImpl
                 extends AbstractModelAdapterBuilder<DesignSpaceExplorationStoreAdapterImpl>
                 implements DesignSpaceExplorationBuilder {
 
-        LinkedHashSet<TransformationRule> transformationRuleDefinitions = new LinkedHashSet<>();
+        LinkedHashSet<Rule> transformationRuleDefinitions = new LinkedHashSet<>();
         LinkedHashSet<Criterion> accepts = new LinkedHashSet<>();
         LinkedHashSet<Criterion> excludes = new LinkedHashSet<>();
         LinkedHashSet<Objective> objectives = new LinkedHashSet<>();
 
         @Override
-        public DesignSpaceExplorationBuilder transformation(TransformationRule transformationRuleDefinition) {
+        public DesignSpaceExplorationBuilder transformation(Rule transformationRuleDefinition) {
                 transformationRuleDefinitions.add(transformationRuleDefinition);
                 return this;
         }
@@ -53,23 +53,23 @@ public class DesignSpaceExplorationBuilderImpl
 
         @Override
         protected void doConfigure(ModelStoreBuilder storeBuilder) {
-                transformationRuleDefinitions.forEach(x -> x.doConfigure(storeBuilder));
-                accepts.forEach(x -> x.doConfigure(storeBuilder));
-                excludes.forEach(x -> x.doConfigure(storeBuilder));
-                objectives.forEach(x -> x.doConfigure(storeBuilder));
+                var queryEngine = storeBuilder.getAdapter(ModelQueryBuilder.class);
+                transformationRuleDefinitions.forEach(x -> queryEngine.query(x.getPrecondition()));
+                accepts.forEach(x -> x.configure(storeBuilder));
+                excludes.forEach(x -> x.configure(storeBuilder));
+                objectives.forEach(x -> x.configure(storeBuilder));
 
                 super.doConfigure(storeBuilder);
         }
 
         @Override
         protected DesignSpaceExplorationStoreAdapterImpl doBuild(ModelStore store) {
-                List<TransformationRule> transformationRuleDefinitiions1 = new ArrayList<>(transformationRuleDefinitions);
-                List<Criterion> accepts1 = new ArrayList<>(accepts);
-                List<Criterion> excludes1 = new ArrayList<>(excludes);
-                List<Objective> objectives1 = new ArrayList<>(objectives);
+                List<Rule> transformationRuleDefinitionsList = List.copyOf(transformationRuleDefinitions);
+                List<Criterion> acceptsList = List.copyOf(accepts);
+                List<Criterion> excludesList = List.copyOf(excludes);
+                List<Objective> objectivesList = List.copyOf(objectives);
 
-                return new DesignSpaceExplorationStoreAdapterImpl(store,
-                                transformationRuleDefinitiions1, accepts1,
-                                excludes1, objectives1);
+                return new DesignSpaceExplorationStoreAdapterImpl(store, transformationRuleDefinitionsList, acceptsList,
+                                excludesList, objectivesList);
         }
 }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/internal/DesignSpaceExplorationStoreAdapterImpl.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/internal/DesignSpaceExplorationStoreAdapterImpl.java
index 3319e148..bd85e7a6 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/internal/DesignSpaceExplorationStoreAdapterImpl.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/internal/DesignSpaceExplorationStoreAdapterImpl.java
@@ -7,7 +7,7 @@ package tools.refinery.store.dse.transition.internal;
 
 import tools.refinery.store.dse.transition.DesignSpaceExplorationStoreAdapter;
 import tools.refinery.store.dse.transition.Transformation;
-import tools.refinery.store.dse.transition.TransformationRule;
+import tools.refinery.store.dse.transition.Rule;
 import tools.refinery.store.dse.transition.objectives.Criterion;
 import tools.refinery.store.dse.transition.objectives.CriterionCalculator;
 import tools.refinery.store.dse.transition.objectives.Objective;
@@ -20,18 +20,16 @@ import java.util.List;
 public class DesignSpaceExplorationStoreAdapterImpl implements DesignSpaceExplorationStoreAdapter {
         protected final ModelStore store;
 
-        protected final List<TransformationRule> transformationRuleDefinitions;
+        protected final List<Rule> ruleDefinitions;
         protected final List<Criterion> accepts;
         protected final List<Criterion> excludes;
         protected final List<Objective> objectives;
 
-        public DesignSpaceExplorationStoreAdapterImpl(ModelStore store,
-                                                                                                  List<TransformationRule> transformationRuleDefinitions,
-                                                                                                  List<Criterion> accepts, List<Criterion> excludes,
-                                                                                                  List<Objective> objectives) {
+        public DesignSpaceExplorationStoreAdapterImpl(
+                        ModelStore store, List<Rule> ruleDefinitions, List<Criterion> accepts, List<Criterion> excludes,
+                        List<Objective> objectives) {
                 this.store = store;
-
-                this.transformationRuleDefinitions = transformationRuleDefinitions;
+                this.ruleDefinitions = ruleDefinitions;
                 this.accepts = accepts;
                 this.excludes = excludes;
                 this.objectives = objectives;
@@ -44,25 +42,31 @@ public class DesignSpaceExplorationStoreAdapterImpl implements DesignSpaceExplor
 
         @Override
         public DesignSpaceExplorationAdapterImpl createModelAdapter(Model model) {
-                final List<Transformation> t = this.transformationRuleDefinitions.stream().map(x->x.prepare(model)).toList();
-                final List<CriterionCalculator> a = this.accepts.stream().map(x->x.createCalculator(model)).toList();
-                final List<CriterionCalculator> e = this.excludes.stream().map(x->x.createCalculator(model)).toList();
-                final List<ObjectiveCalculator> o = this.objectives.stream().map(x->x.createCalculator(model)).toList();
+                final List<Transformation> t = this.ruleDefinitions.stream()
+                                .map(x -> new Transformation(model, x))
+                                .toList();
+                final List<CriterionCalculator> a = this.accepts.stream().map(x -> x.createCalculator(model)).toList();
+                final List<CriterionCalculator> e = this.excludes.stream().map(x -> x.createCalculator(model)).toList();
+                final List<ObjectiveCalculator> o = this.objectives.stream().map(x -> x.createCalculator(model)).toList();
 
                 return new DesignSpaceExplorationAdapterImpl(model, this, t, a, e, o);
         }
+
         @Override
-        public List<TransformationRule> getTransformations() {
-                return transformationRuleDefinitions;
+        public List<Rule> getTransformations() {
+                return ruleDefinitions;
         }
+
         @Override
         public List<Criterion> getAccepts() {
                 return accepts;
         }
+
         @Override
         public List<Criterion> getExcludes() {
                 return excludes;
         }
+
         @Override
         public List<Objective> getObjectives() {
                 return objectives;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/AndCriterion.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/AndCriterion.java
new file mode 100644
index 00000000..0ad2b7a4
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/AndCriterion.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.objectives;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.literal.Reduction;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+public final class AndCriterion extends CompositeCriterion {
+        AndCriterion(Collection<? extends Criterion> criteria) {
+                super(criteria);
+        }
+
+        @Override
+        public Reduction getReduction(ModelStore store) {
+                for (var criterion : getCriteria()) {
+                        var reduction = criterion.getReduction(store);
+                        if (reduction == Reduction.ALWAYS_FALSE) {
+                                return Reduction.ALWAYS_FALSE;
+                        } else if (reduction == Reduction.NOT_REDUCIBLE) {
+                                return Reduction.NOT_REDUCIBLE;
+                        }
+                }
+                return Reduction.ALWAYS_TRUE;
+        }
+
+        @Override
+        public CriterionCalculator createCalculator(Model model) {
+                var calculators = new ArrayList<CriterionCalculator>();
+                for (var criterion : getCriteria()) {
+                        var reduction = criterion.getReduction(model.getStore());
+                        if (reduction == Reduction.ALWAYS_FALSE) {
+                                return () -> false;
+                        } else if (reduction == Reduction.NOT_REDUCIBLE) {
+                                calculators.add(criterion.createCalculator(model));
+                        }
+                }
+                return () -> {
+                        for (var calculator : calculators) {
+                                if (!calculator.isSatisfied()) {
+                                        return false;
+                                }
+                        }
+                        return true;
+                };
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CompositeCriterion.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CompositeCriterion.java
new file mode 100644
index 00000000..5746cc7e
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CompositeCriterion.java
@@ -0,0 +1,43 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.objectives;
+
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.query.literal.Reduction;
+
+import java.util.*;
+
+public abstract sealed class CompositeCriterion implements Criterion permits AndCriterion, OrCriterion {
+        private final List<Criterion> criteria;
+
+        protected CompositeCriterion(Collection<? extends Criterion> criteria) {
+                var deDuplicatedCriteria = new LinkedHashSet<Criterion>();
+                for (var criterion : criteria) {
+                        if (criterion.getClass() == this.getClass()) {
+                                var childCriteria = ((CompositeCriterion) criterion).getCriteria();
+                                deDuplicatedCriteria.addAll(childCriteria);
+                        } else {
+                                deDuplicatedCriteria.add(criterion);
+                        }
+                }
+                this.criteria = List.copyOf(deDuplicatedCriteria);
+        }
+
+        public List<Criterion> getCriteria() {
+                return criteria;
+        }
+
+        @Override
+        public abstract Reduction getReduction(ModelStore store);
+
+        @Override
+        public void configure(ModelStoreBuilder storeBuilder) {
+                for (var criterion : criteria) {
+                        criterion.configure(storeBuilder);
+                }
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CompositeObjective.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CompositeObjective.java
new file mode 100644
index 00000000..192a824b
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CompositeObjective.java
@@ -0,0 +1,69 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.objectives;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.model.ModelStoreBuilder;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+public class CompositeObjective implements Objective {
+        private final List<Objective> objectives;
+
+        CompositeObjective(Collection<? extends Objective> objectives) {
+                var unwrappedObjectives = new ArrayList<Objective>();
+                for (var objective : objectives) {
+                        if (objective instanceof CompositeObjective compositeObjective) {
+                                unwrappedObjectives.addAll(compositeObjective.getObjectives());
+                        } else {
+                                unwrappedObjectives.add(objective);
+                        }
+                }
+                this.objectives = Collections.unmodifiableList(unwrappedObjectives);
+        }
+
+        public List<Objective> getObjectives() {
+                return objectives;
+        }
+
+        @Override
+        public boolean isAlwaysZero(ModelStore store) {
+                for (var objective : objectives) {
+                        if (!objective.isAlwaysZero(store)) {
+                                return false;
+                        }
+                }
+                return true;
+        }
+
+        @Override
+        public ObjectiveCalculator createCalculator(Model model) {
+                var calculators = new ArrayList<ObjectiveCalculator>();
+                for (var objective : objectives) {
+                        if (!objective.isAlwaysZero(model.getStore())) {
+                                calculators.add(objective.createCalculator(model));
+                        }
+                }
+                return () -> {
+                        double value = 0;
+                        for (var calculator : calculators) {
+                                value += calculator.getValue();
+                        }
+                        return value;
+                };
+        }
+
+        @Override
+        public void configure(ModelStoreBuilder storeBuilder) {
+                for (var objective : objectives) {
+                        objective.configure(storeBuilder);
+                }
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CountObjective.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CountObjective.java
new file mode 100644
index 00000000..fbd05ded
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CountObjective.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.objectives;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.query.ModelQueryAdapter;
+import tools.refinery.store.query.ModelQueryBuilder;
+import tools.refinery.store.query.ModelQueryStoreAdapter;
+import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.query.literal.Reduction;
+
+public class CountObjective implements Objective {
+        private final RelationalQuery query;
+        private final double weight;
+
+        public CountObjective(RelationalQuery query) {
+                this(query, 1);
+        }
+
+        public CountObjective(RelationalQuery query, double weight) {
+                this.query = query;
+                this.weight = weight;
+        }
+
+        @Override
+        public boolean isAlwaysZero(ModelStore store) {
+                var queryStore = store.getAdapter(ModelQueryStoreAdapter.class);
+                var canonicalQuery = queryStore.getCanonicalQuery(query);
+                return canonicalQuery.getDnf().getReduction() == Reduction.ALWAYS_FALSE;
+        }
+
+        @Override
+        public ObjectiveCalculator createCalculator(Model model) {
+                var resultSet = model.getAdapter(ModelQueryAdapter.class).getResultSet(query);
+                return () -> resultSet.size() * weight;
+        }
+
+        @Override
+        public void configure(ModelStoreBuilder storeBuilder) {
+                storeBuilder.getAdapter(ModelQueryBuilder.class).query(query);
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criteria.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criteria.java
new file mode 100644
index 00000000..0e4ec5c9
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criteria.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.objectives;
+
+import tools.refinery.store.query.dnf.AnyQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+public final class Criteria {
+        private Criteria() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+
+        public static QueryCriterion whenHasMatch(AnyQuery query) {
+                return new QueryCriterion(query, true);
+        }
+
+        public static QueryCriterion whenNoMatch(AnyQuery query) {
+                return new QueryCriterion(query, false);
+        }
+
+        public static Criterion and(Criterion... criteria) {
+                return and(List.of(criteria));
+        }
+
+        public static Criterion and(Collection<? extends Criterion> criteria) {
+                if (criteria.size() == 1) {
+                        return criteria.iterator().next();
+                }
+                return new AndCriterion(criteria);
+        }
+
+        public static Criterion or(Criterion... criteria) {
+                return or(List.of(criteria));
+        }
+
+        public static Criterion or(Collection<? extends Criterion> criteria) {
+                if (criteria.size() == 1) {
+                        return criteria.iterator().next();
+                }
+                return new OrCriterion(criteria);
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criterion.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criterion.java
index 66ca6f5e..c827f20e 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criterion.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criterion.java
@@ -6,10 +6,17 @@
 package tools.refinery.store.dse.transition.objectives;
 
 import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.query.literal.Reduction;
 
 public interface Criterion {
-        default void doConfigure(ModelStoreBuilder storeBuilder) {
+        default void configure(ModelStoreBuilder storeBuilder) {
         }
+
+        default Reduction getReduction(ModelStore store) {
+                return Reduction.NOT_REDUCIBLE;
+        }
+
         CriterionCalculator createCalculator(Model model);
 }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objective.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objective.java
index b5924455..49c34d87 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objective.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objective.java
@@ -6,10 +6,18 @@
 package tools.refinery.store.dse.transition.objectives;
 
 import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.model.ModelStoreBuilder;
 
 public interface Objective {
-        default void doConfigure(ModelStoreBuilder storeBuilder) {
+        default void configure(ModelStoreBuilder storeBuilder) {
         }
+
+        // The name {@code isAlwaysZero} is more straightforward than something like {@code canBeNonZero}.
+        @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+        default boolean isAlwaysZero(ModelStore store) {
+                return false;
+        }
+
         ObjectiveCalculator createCalculator(Model model);
 }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objectives.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objectives.java
new file mode 100644
index 00000000..e552d14c
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objectives.java
@@ -0,0 +1,41 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.objectives;
+
+import tools.refinery.store.query.dnf.FunctionalQuery;
+import tools.refinery.store.query.dnf.RelationalQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+public final class Objectives {
+        private Objectives() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+
+        public static CountObjective count(RelationalQuery query, double weight) {
+                return new CountObjective(query, weight);
+        }
+
+        public static CountObjective count(RelationalQuery query) {
+                return new CountObjective(query);
+        }
+
+        public static QueryObjective value(FunctionalQuery<? extends Number> query) {
+                return new QueryObjective(query);
+        }
+
+        public static Objective sum(Objective... objectives) {
+                return sum(List.of(objectives));
+        }
+
+        public static Objective sum(Collection<? extends Objective> objectives) {
+                if (objectives.size() == 1) {
+                        return objectives.iterator().next();
+                }
+                return new CompositeObjective(objectives);
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/OrCriterion.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/OrCriterion.java
new file mode 100644
index 00000000..7a8d7778
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/OrCriterion.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.dse.transition.objectives;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.literal.Reduction;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+public final class OrCriterion extends CompositeCriterion {
+        OrCriterion(Collection<? extends Criterion> criteria) {
+                super(criteria);
+        }
+
+        @Override
+        public Reduction getReduction(ModelStore store) {
+                for (var criterion : getCriteria()) {
+                        var reduction = criterion.getReduction(store);
+                        if (reduction == Reduction.ALWAYS_TRUE) {
+                                return Reduction.ALWAYS_TRUE;
+                        } else if (reduction == Reduction.NOT_REDUCIBLE) {
+                                return Reduction.NOT_REDUCIBLE;
+                        }
+                }
+                return Reduction.ALWAYS_FALSE;
+        }
+
+        @Override
+        public CriterionCalculator createCalculator(Model model) {
+                var calculators = new ArrayList<CriterionCalculator>();
+                for (var criterion : getCriteria()) {
+                        var reduction = criterion.getReduction(model.getStore());
+                        if (reduction == Reduction.ALWAYS_TRUE) {
+                                return () -> true;
+                        } else if (reduction == Reduction.NOT_REDUCIBLE) {
+                                calculators.add(criterion.createCalculator(model));
+                        }
+                }
+                return () -> {
+                        for (var calculator : calculators) {
+                                if (calculator.isSatisfied()) {
+                                        return true;
+                                }
+                        }
+                        return false;
+                };
+        }
+}
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriteria.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriterion.java
index e6dddd53..e15e4e41 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriteria.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriterion.java
@@ -6,39 +6,54 @@
 package tools.refinery.store.dse.transition.objectives;
 
 import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.ModelQueryBuilder;
+import tools.refinery.store.query.ModelQueryStoreAdapter;
 import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.store.query.literal.Reduction;
 
-public class QueryCriteria implements Criterion {
+public class QueryCriterion implements Criterion {
         protected final boolean satisfiedIfHasMatch;
         protected final AnyQuery query;
 
         /**
          * Criteria based on the existence of matches evaluated on the model.
-         * @param query The query evaluated on the model.
+         *
+         * @param query               The query evaluated on the model.
          * @param satisfiedIfHasMatch If true, the criteria satisfied if the query has any match on the model. Otherwise,
          *                            the criteria satisfied if the query has no match on the model.
          */
-        public QueryCriteria(AnyQuery query, boolean satisfiedIfHasMatch) {
+        public QueryCriterion(AnyQuery query, boolean satisfiedIfHasMatch) {
                 this.query = query;
                 this.satisfiedIfHasMatch = satisfiedIfHasMatch;
         }
 
         @Override
+        public Reduction getReduction(ModelStore store) {
+                var queryStore = store.getAdapter(ModelQueryStoreAdapter.class);
+                var canonicalQuery = queryStore.getCanonicalQuery(query);
+                var reduction = canonicalQuery.getDnf().getReduction();
+                if (satisfiedIfHasMatch) {
+                        return reduction;
+                }
+                return reduction.negate();
+        }
+
+        @Override
         public CriterionCalculator createCalculator(Model model) {
                 var resultSet = model.getAdapter(ModelQueryAdapter.class).getResultSet(query);
-                if(satisfiedIfHasMatch) {
+                if (satisfiedIfHasMatch) {
                         return () -> resultSet.size() > 0;
                 } else {
-                        return () ->  resultSet.size() == 0;
+                        return () -> resultSet.size() == 0;
                 }
         }
 
         @Override
-        public void doConfigure(ModelStoreBuilder storeBuilder) {
-                Criterion.super.doConfigure(storeBuilder);
+        public void configure(ModelStoreBuilder storeBuilder) {
+                Criterion.super.configure(storeBuilder);
                 storeBuilder.getAdapter(ModelQueryBuilder.class).query(query);
         }
 }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryObjective.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryObjective.java
index dfddccfc..9f4bb536 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryObjective.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryObjective.java
@@ -15,6 +15,10 @@ public class QueryObjective implements Objective {
         protected final FunctionalQuery<? extends Number> objectiveFunction;
 
         public QueryObjective(FunctionalQuery<? extends Number> objectiveFunction) {
+                if (objectiveFunction.arity() != 0) {
+                        throw new IllegalArgumentException("Objective functions must have 0 parameters, got %d instead"
+                                        .formatted(objectiveFunction.arity()));
+                }
                 this.objectiveFunction = objectiveFunction;
         }
 
@@ -23,22 +27,15 @@ public class QueryObjective implements Objective {
                 var resultSet = model.getAdapter(ModelQueryAdapter.class).getResultSet(objectiveFunction);
                 return () -> {
                         var cursor = resultSet.getAll();
-                        boolean hasElement = cursor.move();
-                        if(hasElement) {
-                                double result = cursor.getValue().doubleValue();
-                                if(cursor.move()) {
-                                        throw new IllegalStateException("Query providing the objective function has multiple values!");
-                                }
-                                return result;
-                        } else {
+                        if (!cursor.move()) {
                                 throw new IllegalStateException("Query providing the objective function has no values!");
                         }
+                        return cursor.getValue().doubleValue();
                 };
         }
 
         @Override
-        public void doConfigure(ModelStoreBuilder storeBuilder) {
-                Objective.super.doConfigure(storeBuilder);
+        public void configure(ModelStoreBuilder storeBuilder) {
                 storeBuilder.getAdapter(ModelQueryBuilder.class).query(objectiveFunction);
         }
 }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreImpl.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreImpl.java
index 9186741f..4d775b5a 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreImpl.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreImpl.java
@@ -5,19 +5,19 @@
  */
 package tools.refinery.store.dse.transition.statespace.internal;
 
-import org.eclipse.collections.api.block.procedure.Procedure;
 import tools.refinery.store.dse.transition.VersionWithObjectiveValue;
 import tools.refinery.store.dse.transition.statespace.ActivationStore;
 
 import java.util.*;
+import java.util.function.Consumer;
 
 public class ActivationStoreImpl implements ActivationStore {
         final int numberOfTransformations;
-        final Procedure<VersionWithObjectiveValue> actionWhenAllActivationVisited;
+        final Consumer<VersionWithObjectiveValue> actionWhenAllActivationVisited;
         final Map<VersionWithObjectiveValue, List<ActivationStoreEntry>> versionToActivations;
 
         public ActivationStoreImpl(final int numberOfTransformations,
-                                                           Procedure<VersionWithObjectiveValue> actionWhenAllActivationVisited) {
+                                                           Consumer<VersionWithObjectiveValue> actionWhenAllActivationVisited) {
                 this.numberOfTransformations = numberOfTransformations;
                 this.actionWhenAllActivationVisited = actionWhenAllActivationVisited;
                 versionToActivations = new HashMap<>();
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreListEntry.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreListEntry.java
index 3d4cbfdc..14298bee 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreListEntry.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/ActivationStoreListEntry.java
@@ -5,14 +5,14 @@
  */
 package tools.refinery.store.dse.transition.statespace.internal;
 
-import org.eclipse.collections.impl.list.mutable.primitive.IntArrayList;
+import org.eclipse.collections.api.factory.primitive.IntLists;
+import org.eclipse.collections.api.list.primitive.MutableIntList;
 
 public class ActivationStoreListEntry extends ActivationStoreEntry {
-        IntArrayList visitedActivations;
+        private final MutableIntList visitedActivations = IntLists.mutable.empty();
 
         ActivationStoreListEntry(int numberOfActivations) {
                 super(numberOfActivations);
-                visitedActivations = new IntArrayList();
         }
 
         @Override
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/CompleteEquivalenceClassStore.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/CompleteEquivalenceClassStore.java
index 925e09a3..20a026b6 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/CompleteEquivalenceClassStore.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/CompleteEquivalenceClassStore.java
@@ -5,7 +5,8 @@
  */
 package tools.refinery.store.dse.transition.statespace.internal;
 
-import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;
+import org.eclipse.collections.api.factory.primitive.IntObjectMaps;
+import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
 import tools.refinery.store.dse.transition.VersionWithObjectiveValue;
 import tools.refinery.store.dse.transition.statespace.EquivalenceClassStore;
 import tools.refinery.store.statecoding.StateCoderResult;
@@ -27,11 +28,10 @@ public abstract class CompleteEquivalenceClassStore extends AbstractEquivalenceC
                 }
         }
 
-        final IntObjectHashMap<Object> modelCode2Versions;
+        private final MutableIntObjectMap<Object> modelCode2Versions = IntObjectMaps.mutable.empty();
 
         protected CompleteEquivalenceClassStore(StateCoderStoreAdapter stateCoderStoreAdapter) {
                 super(stateCoderStoreAdapter);
-                this.modelCode2Versions = new IntObjectHashMap<>();
         }
 
         @Override
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/FastEquivalenceClassStore.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/FastEquivalenceClassStore.java
index 6eba87d4..6d028124 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/FastEquivalenceClassStore.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/statespace/internal/FastEquivalenceClassStore.java
@@ -5,7 +5,8 @@
  */
 package tools.refinery.store.dse.transition.statespace.internal;
 
-import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet;
+import org.eclipse.collections.api.factory.primitive.IntSets;
+import org.eclipse.collections.api.set.primitive.MutableIntSet;
 import tools.refinery.store.dse.transition.VersionWithObjectiveValue;
 import tools.refinery.store.dse.transition.statespace.EquivalenceClassStore;
 import tools.refinery.store.statecoding.StateCoderResult;
@@ -13,11 +14,10 @@ import tools.refinery.store.statecoding.StateCoderStoreAdapter;
 
 public abstract class FastEquivalenceClassStore extends AbstractEquivalenceClassStore implements EquivalenceClassStore {
 
-        final IntHashSet codes;
+        private final MutableIntSet codes = IntSets.mutable.empty();
 
         protected FastEquivalenceClassStore(StateCoderStoreAdapter stateCoderStoreAdapter) {
                 super(stateCoderStoreAdapter);
-                this.codes = new IntHashSet();
         }
 
         @Override
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
index 831b9ff0..685b88bd 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
@@ -7,19 +7,18 @@ package tools.refinery.store.dse;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import tools.refinery.store.dse.modification.DanglingEdges;
 import tools.refinery.store.dse.modification.ModificationAdapter;
 import tools.refinery.store.dse.strategy.BestFirstStoreManager;
+import tools.refinery.store.dse.tests.DummyCriterion;
 import tools.refinery.store.dse.tests.DummyRandomCriterion;
 import tools.refinery.store.dse.tests.DummyRandomObjective;
 import tools.refinery.store.dse.transition.DesignSpaceExplorationAdapter;
-import tools.refinery.store.dse.tests.DummyCriterion;
-import tools.refinery.store.dse.tests.DummyObjective;
+import tools.refinery.store.dse.transition.Rule;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.FunctionalQuery;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.dnf.RelationalQuery;
-import tools.refinery.store.dse.transition.TransformationRule;
 import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
 import tools.refinery.store.query.view.AnySymbolView;
@@ -32,195 +31,102 @@ import tools.refinery.visualization.internal.FileFormat;
 
 import java.util.List;
 
+import static tools.refinery.store.dse.modification.actions.ModificationActionLiterals.create;
+import static tools.refinery.store.dse.modification.actions.ModificationActionLiterals.delete;
+import static tools.refinery.store.dse.transition.actions.ActionLiterals.add;
+import static tools.refinery.store.dse.transition.actions.ActionLiterals.remove;
 import static tools.refinery.store.query.literal.Literals.not;
 
 class CRAExamplesTest {
-
         private static final Symbol<String> name = Symbol.of("Name", 1, String.class);
-
-//      private static final Symbol<Boolean> classModel = Symbol.of("ClassModel", 1);
         private static final Symbol<Boolean> classElement = Symbol.of("ClassElement", 1);
-//      private static final Symbol<Boolean> feature = Symbol.of("Feature", 1);
         private static final Symbol<Boolean> attribute = Symbol.of("Attribute", 1);
         private static final Symbol<Boolean> method = Symbol.of("Method", 1);
-
-//      private static final Symbol<Boolean> isEncapsulatedBy = Symbol.of("IsEncapsulatedBy", 2);
         private static final Symbol<Boolean> encapsulates = Symbol.of("Encapsulates", 2);
         private static final Symbol<Boolean> dataDependency = Symbol.of("DataDependency", 2);
         private static final Symbol<Boolean> functionalDependency = Symbol.of("FunctionalDependency", 2);
 
-        private static final Symbol<Boolean> features = Symbol.of("Features", 2);
-        private static final Symbol<Boolean> classes = Symbol.of("Classes", 2);
-
-//      private static final AnySymbolView classModelView = new KeyOnlyView<>(classModel);
         private static final AnySymbolView classElementView = new KeyOnlyView<>(classElement);
-//      private static final AnySymbolView featureView = new KeyOnlyView<>(feature);
         private static final AnySymbolView attributeView = new KeyOnlyView<>(attribute);
         private static final AnySymbolView methodView = new KeyOnlyView<>(method);
-//      private static final AnySymbolView isEncapsulatedByView = new KeyOnlyView<>(isEncapsulatedBy);
         private static final AnySymbolView encapsulatesView = new KeyOnlyView<>(encapsulates);
-        private static final AnySymbolView dataDependencyView = new KeyOnlyView<>(dataDependency);
-        private static final AnySymbolView functionalDependencyView = new KeyOnlyView<>(functionalDependency);
-        private static final AnySymbolView featuresView = new KeyOnlyView<>(features);
-        private static final AnySymbolView classesView = new KeyOnlyView<>(classes);
 
-        /*Example Transformation rules*/
-        private static final RelationalQuery feature = Query.of("Feature",
-                        (builder, f) -> builder.clause(
-                                attributeView.call(f))
+        private static final RelationalQuery feature = Query.of("Feature", (builder, f) -> builder
                         .clause(
-                                methodView.call(f))
-                        );
-
-        private static final RelationalQuery assignFeaturePreconditionHelper = Query.of("AssignFeaturePreconditionHelper",
-                        (builder, c, f) -> builder.clause(
-                                        classElementView.call(c),
-//                                      classesView.call(model, c),
-                                        encapsulatesView.call(c, f)
+                                        attributeView.call(f)
+                        )
+                        .clause(
+                                        methodView.call(f)
                         ));
 
-        private static final RelationalQuery assignFeaturePrecondition = Query.of("AssignFeaturePrecondition",
-                        (builder, f, c1) -> builder.clause((c2) -> List.of(
-//                                      classModelView.call(model),
+        private static final Rule assignFeatureRule = Rule.of("AssignFeature", (builder, f, c1) -> builder
+                        .clause(
                                         feature.call(f),
                                         classElementView.call(c1),
-//                                      featuresView.call(model, f),
-                                        not(assignFeaturePreconditionHelper.call(c2, f)),
-                                        not(encapsulatesView.call(c1, f))
-                        )));
+                                        not(encapsulatesView.call(Variable.of(), f))
+                        )
+                        .action(
+                                        add(encapsulates, f, c1)
+                        ));
 
-        private static final RelationalQuery deleteEmptyClassPrecondition = Query.of("DeleteEmptyClassPrecondition",
-                        (builder, c) -> builder.clause((f) -> List.of(
-//                                      classModelView.call(model),
+        private static final Rule deleteEmptyClassRule = Rule.of("DeleteEmptyClass", (builder, c) -> builder
+                        .clause((f) -> List.of(
                                         classElementView.call(c),
-//                                      featuresView.call(model, f),
                                         not(encapsulatesView.call(c, f))
-                        )));
-
-        private static final RelationalQuery createClassPreconditionHelper = Query.of("CreateClassPreconditionHelper",
-                        (builder, f, c) -> builder.clause(
-                                        classElementView.call(c),
-//                                      classesView.call(model, c),
-                                        encapsulatesView.call(c, f)
+                        ))
+                        .action(
+                                        remove(classElement, c),
+                                        delete(c, DanglingEdges.IGNORE)
                         ));
 
-        private static final RelationalQuery createClassPrecondition = Query.of("CreateClassPrecondition",
-                        (builder, f) -> builder.clause((c) -> List.of(
-//                                      classModelView.call(model),
+        private static final Rule createClassRule = Rule.of("CreateClass", (builder, f) -> builder
+                        .clause((c) -> List.of(
                                         feature.call(f),
-                                        not(createClassPreconditionHelper.call(f, c))
+                                        not(encapsulatesView.call(f, c))
+                        ))
+                        .action((newClass) -> List.of(
+                                        create(newClass),
+                                        add(classElement, newClass),
+                                        add(encapsulates, newClass, f)
                         )));
 
-        private static final RelationalQuery moveFeaturePrecondition = Query.of("MoveFeature",
-                        (builder, c1, c2, f) -> builder.clause(
-//                                      classModelView.call(model),
+        private static final Rule moveFeatureRule = Rule.of("MoveFeature", (builder, c1, c2, f) -> builder
+                        .clause(
                                         classElementView.call(c1),
                                         classElementView.call(c2),
                                         c1.notEquivalent(c2),
                                         feature.call(f),
-//                                      classesView.call(model, c1),
-//                                      classesView.call(model, c2),
-//                                      featuresView.call(model, f),
                                         encapsulatesView.call(c1, f)
+                        )
+                        .action(
+                                        remove(encapsulates, c1, f),
+                                        add(encapsulates, c2, f)
                         ));
 
-        private static final TransformationRule assignFeatureRule = new TransformationRule("AssignFeature",
-                        assignFeaturePrecondition,
-                        (model) -> {
-//                              var isEncapsulatedByInterpretation = model.getInterpretation(isEncapsulatedBy);
-                                var encapsulatesInterpretation = model.getInterpretation(encapsulates);
-                                return ((Tuple activation) -> {
-                                        var feature = activation.get(0);
-                                        var classElement = activation.get(1);
-
-//                                      isEncapsulatedByInterpretation.put(Tuple.of(feature, classElement), true);
-                                        encapsulatesInterpretation.put(Tuple.of(classElement, feature), true);
-                                });
-                        });
-
-        private static final TransformationRule deleteEmptyClassRule = new TransformationRule("DeleteEmptyClass",
-                        deleteEmptyClassPrecondition,
-                        (model) -> {
-//                              var classesInterpretation = model.getInterpretation(classes);
-                                var classElementInterpretation = model.getInterpretation(classElement);
-                                return ((Tuple activation) -> {
-                                        // TODO: can we move modificationAdapter outside?
-                                        var modificationAdapter = model.getAdapter(ModificationAdapter.class);
-//                                      var modelElement = activation.get(0);
-                                        var classElement = activation.get(0);
-
-//                                      classesInterpretation.put(Tuple.of(modelElement, classElement), false);
-                                        classElementInterpretation.put(Tuple.of(classElement), false);
-                                        modificationAdapter.deleteObject(Tuple.of(classElement));
-                                });
-                        });
-
-        private static final TransformationRule createClassRule = new TransformationRule("CreateClass",
-                        createClassPrecondition,
-                        (model) -> {
-                                var classElementInterpretation = model.getInterpretation(classElement);
-//                              var classesInterpretation = model.getInterpretation(classes);
-                                var encapsulatesInterpretation = model.getInterpretation(encapsulates);
-                                return ((Tuple activation) -> {
-                                        // TODO: can we move modificationAdapter outside?
-                                        var modificationAdapter = model.getAdapter(ModificationAdapter.class);
-//                                      var modelElement = activation.get(0);
-                                        var feature = activation.get(0);
-
-                                        var newClassElement = modificationAdapter.createObject();
-                                        var newClassElementId = newClassElement.get(0);
-                                        classElementInterpretation.put(newClassElement, true);
-//                                      classesInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-                                        encapsulatesInterpretation.put(Tuple.of(newClassElementId, feature), true);
-                                });
-                        });
-
-        private static final TransformationRule moveFeatureRule = new TransformationRule("MoveFeature",
-                        moveFeaturePrecondition,
-                        (model) -> {
-                                var encapsulatesInterpretation = model.getInterpretation(encapsulates);
-                                return ((Tuple activation) -> {
-                                        var classElement1 = activation.get(0);
-                                        var classElement2 = activation.get(1);
-                                        var feature = activation.get(2);
-
-                                        encapsulatesInterpretation.put(Tuple.of(classElement1, feature), false);
-                                        encapsulatesInterpretation.put(Tuple.of(classElement2, feature), true);
-                                });
-                        });
-
         @Test
         @Disabled("This test is only for debugging purposes")
         void craTest() {
                 var store = ModelStore.builder()
-                                .symbols(classElement, encapsulates, classes, features, attribute, method, dataDependency,
-                                                functionalDependency, name)
-                                .with(ViatraModelQueryAdapter.builder()
-                                                .queries(feature, assignFeaturePreconditionHelper, assignFeaturePrecondition,
-                                                                deleteEmptyClassPrecondition, createClassPreconditionHelper, createClassPrecondition,
-                                                                moveFeaturePrecondition))
+                                .symbols(classElement, encapsulates, attribute, method, dataDependency, functionalDependency, name)
+                                .with(ViatraModelQueryAdapter.builder())
                                 .with(ModelVisualizerAdapter.builder()
                                                 .withOutputpath("test_output")
                                                 .withFormat(FileFormat.DOT)
                                                 .withFormat(FileFormat.SVG)
                                                 .saveStates()
-                                                .saveDesignSpace()
-                                )
+                                                .saveDesignSpace())
                                 .with(StateCoderAdapter.builder())
                                 .with(ModificationAdapter.builder())
                                 .with(DesignSpaceExplorationAdapter.builder()
                                                 .transformations(assignFeatureRule, deleteEmptyClassRule, createClassRule, moveFeatureRule)
                                                 .objectives(new DummyRandomObjective())
                                                 .accept(new DummyRandomCriterion())
-                                                .exclude(new DummyCriterion(false))
-                                )
+                                                .exclude(new DummyCriterion(false)))
                                 .build();
 
                 var model = store.createEmptyModel();
-//              modificationAdapter.setRandom(1);
                 var queryEngine = model.getAdapter(ModelQueryAdapter.class);
 
-//              var modelInterpretation = model.getInterpretation(classModel);
                 var nameInterpretation = model.getInterpretation(name);
                 var methodInterpretation = model.getInterpretation(method);
                 var attributeInterpretation = model.getInterpretation(attribute);
@@ -229,7 +135,6 @@ class CRAExamplesTest {
 
                 var modificationAdapter = model.getAdapter(ModificationAdapter.class);
 
-//              var modelElement = modificationAdapter.createObject();
                 var method1 = modificationAdapter.createObject();
                 var method1Id = method1.get(0);
                 var method2 = modificationAdapter.createObject();
@@ -259,9 +164,6 @@ class CRAExamplesTest {
                 nameInterpretation.put(attribute4, "A4");
                 nameInterpretation.put(attribute5, "A5");
 
-
-
-//              modelInterpretation.put(modelElement, true);
                 methodInterpretation.put(method1, true);
                 methodInterpretation.put(method2, true);
                 methodInterpretation.put(method3, true);
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java
index 87c3892a..baa7c8a4 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java
@@ -9,110 +9,73 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.dse.modification.ModificationAdapter;
 import tools.refinery.store.dse.strategy.BestFirstStoreManager;
-import tools.refinery.store.dse.tests.DummyCriterion;
-import tools.refinery.store.dse.tests.DummyObjective;
 import tools.refinery.store.dse.tests.DummyRandomCriterion;
 import tools.refinery.store.dse.tests.DummyRandomObjective;
 import tools.refinery.store.dse.transition.DesignSpaceExplorationAdapter;
-import tools.refinery.store.dse.transition.TransformationRule;
+import tools.refinery.store.dse.transition.Rule;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.statecoding.StateCoderAdapter;
-import tools.refinery.store.tuple.Tuple;
 import tools.refinery.visualization.ModelVisualizerAdapter;
 import tools.refinery.visualization.internal.FileFormat;
 
+import java.util.List;
+
+import static tools.refinery.store.dse.modification.actions.ModificationActionLiterals.create;
+import static tools.refinery.store.dse.transition.actions.ActionLiterals.add;
+
 class DebugTest {
         private static final Symbol<Boolean> classModel = Symbol.of("ClassModel", 1);
         private static final Symbol<Boolean> classElement = Symbol.of("ClassElement", 1);
         private static final Symbol<Boolean> feature = Symbol.of("Feature", 1);
-
-        private static final Symbol<Boolean> isEncapsulatedBy = Symbol.of("IsEncapsulatedBy", 2);
-        private static final Symbol<Boolean> encapsulates = Symbol.of("Encapsulates", 2);
-
         private static final Symbol<Boolean> features = Symbol.of("Features", 2);
         private static final Symbol<Boolean> classes = Symbol.of("Classes", 2);
 
         private static final AnySymbolView classModelView = new KeyOnlyView<>(classModel);
-        private static final AnySymbolView classElementView = new KeyOnlyView<>(classElement);
-        private static final AnySymbolView featureView = new KeyOnlyView<>(feature);
-        private static final AnySymbolView isEncapsulatedByView = new KeyOnlyView<>(isEncapsulatedBy);
-        private static final AnySymbolView encapsulatesView = new KeyOnlyView<>(encapsulates);
-        private static final AnySymbolView featuresView = new KeyOnlyView<>(features);
-        private static final AnySymbolView classesView = new KeyOnlyView<>(classes);
-
 
         @Test
         @Disabled("This test is only for debugging purposes")
         void BFSTest() {
-                var createClassPrecondition = Query.of("CreateClassPrecondition",
-                                (builder, model) -> builder.clause(
+                var createClassRule = Rule.of("CreateClass", (builder, model) -> builder
+                                .clause(
                                                 classModelView.call(model)
-                                ));
-
-                var createClassRule = new TransformationRule("CreateClass",
-                                createClassPrecondition,
-                                (model) -> {
-                                        var classesInterpretation = model.getInterpretation(classes);
-                                        var classElementInterpretation = model.getInterpretation(classElement);
-                                        return ((Tuple activation) -> {
-                                                var dseAdapter = model.getAdapter(ModificationAdapter.class);
-                                                var modelElement = activation.get(0);
-
-                                                var newClassElement = dseAdapter.createObject();
-                                                var newClassElementId = newClassElement.get(0);
-
-                                                classesInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-                                                classElementInterpretation.put(Tuple.of(newClassElementId), true);
-                                        });
-                                });
-
-                var createFeaturePrecondition = Query.of("CreateFeaturePrecondition",
-                                (builder, model) -> builder.clause(
+                                )
+                                .action((newClassElement) -> List.of(
+                                                create(newClassElement),
+                                                add(classElement, newClassElement),
+                                                add(classes, model, newClassElement)
+                                )));
+
+                var createFeatureRule = Rule.of("CreateFeature", (builder, model) -> builder
+                                .clause(
                                                 classModelView.call(model)
-                                ));
-
-                var createFeatureRule = new TransformationRule("CreateFeature",
-                                createFeaturePrecondition,
-                                (model) -> {
-                                        var featuresInterpretation = model.getInterpretation(features);
-                                        var featureInterpretation = model.getInterpretation(feature);
-                                        return ((Tuple activation) -> {
-                                                var dseAdapter = model.getAdapter(ModificationAdapter.class);
-                                                var modelElement = activation.get(0);
-
-                                                var newClassElement = dseAdapter.createObject();
-                                                var newClassElementId = newClassElement.get(0);
-
-                                                featuresInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-                                                featureInterpretation.put(Tuple.of(newClassElementId), true);
-                                        });
-                                });
+                                )
+                                .action((newFeature) -> List.of(
+                                                create(newFeature),
+                                                add(feature, newFeature),
+                                                add(features, model, newFeature)
+                                )));
 
                 var store = ModelStore.builder()
-                                .symbols(classModel, classElement, feature, isEncapsulatedBy, encapsulates, classes, features)
-                                .with(ViatraModelQueryAdapter.builder()
-                                                .queries(createClassPrecondition, createFeaturePrecondition))
+                                .symbols(classModel, classElement, feature, classes, features)
+                                .with(ViatraModelQueryAdapter.builder())
                                 .with(ModelVisualizerAdapter.builder()
                                                 .withOutputpath("test_output")
                                                 .withFormat(FileFormat.DOT)
                                                 .withFormat(FileFormat.SVG)
                                                 .saveStates()
-                                                .saveDesignSpace()
-                                )
+                                                .saveDesignSpace())
                                 .with(StateCoderAdapter.builder())
                                 .with(ModificationAdapter.builder())
                                 .with(DesignSpaceExplorationAdapter.builder()
                                                 .transformations(createClassRule, createFeatureRule)
                                                 .objectives(new DummyRandomObjective())
                                                 .accept(new DummyRandomCriterion())
-                                                .exclude(new DummyRandomCriterion())
-                                )
+                                                .exclude(new DummyRandomCriterion()))
                                 .build();
 
                 var model = store.createEmptyModel();
@@ -128,11 +91,9 @@ class DebugTest {
                 var initialVersion = model.commit();
                 queryEngine.flushChanges();
 
-
                 var bestFirst = new BestFirstStoreManager(store);
                 bestFirst.startExploration(initialVersion);
                 var resultStore = bestFirst.getSolutionStore();
                 System.out.println("states size: " + resultStore.getSolutions().size());
-
         }
 }
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DesignSpaceExplorationTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DesignSpaceExplorationTest.java
deleted file mode 100644
index f5f13433..00000000
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DesignSpaceExplorationTest.java
+++ /dev/null
@@ -1,596 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.dse;
-
-import tools.refinery.store.query.view.AnySymbolView;
-import tools.refinery.store.query.view.KeyOnlyView;
-import tools.refinery.store.representation.Symbol;
-
-class DesignSpaceExplorationTest {
-//      private static final Symbol<Boolean> namedElement = Symbol.of("NamedElement", 1);
-//      private static final Symbol<Boolean> attribute = Symbol.of("Attribute", 1);
-//      private static final Symbol<Boolean> method = Symbol.of("Method", 1);
-//      private static final Symbol<Boolean> dataDependency = Symbol.of("DataDependency", 2);
-//      private static final Symbol<Boolean> functionalDependency = Symbol.of("FunctionalDependency", 2);
-
-        private static final Symbol<Boolean> classModel = Symbol.of("ClassModel", 1);
-        private static final Symbol<Boolean> classElement = Symbol.of("ClassElement", 1);
-        private static final Symbol<Boolean> feature = Symbol.of("Feature", 1);
-
-        private static final Symbol<Boolean> isEncapsulatedBy = Symbol.of("IsEncapsulatedBy", 2);
-        private static final Symbol<Boolean> encapsulates = Symbol.of("Encapsulates", 2);
-
-        private static final Symbol<Boolean> features = Symbol.of("Features", 2);
-        private static final Symbol<Boolean> classes = Symbol.of("Classes", 2);
-
-        private static final AnySymbolView classModelView = new KeyOnlyView<>(classModel);
-        private static final AnySymbolView classElementView = new KeyOnlyView<>(classElement);
-        private static final AnySymbolView featureView = new KeyOnlyView<>(feature);
-        private static final AnySymbolView isEncapsulatedByView = new KeyOnlyView<>(isEncapsulatedBy);
-        private static final AnySymbolView encapsulatesView = new KeyOnlyView<>(encapsulates);
-        private static final AnySymbolView featuresView = new KeyOnlyView<>(features);
-        private static final AnySymbolView classesView = new KeyOnlyView<>(classes);
-
-//      @Test
-//      void createObjectTest() {
-//              var store = ModelStore.builder()
-//                              .with(ViatraModelQueryAdapter.builder())
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .strategy(new DepthFirstStrategy().withDepthLimit(0)))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//
-//              assertEquals(0, dseAdapter.getModelSize());
-//
-//              var newModel = dseAdapter.createObject();
-//              var newModelId = newModel.get(0);
-//              var newClass1 = dseAdapter.createObject();
-//              var newClass1Id = newClass1.get(0);
-//              var newClass2 = dseAdapter.createObject();
-//              var newClass2Id = newClass2.get(0);
-//              var newField = dseAdapter.createObject();
-//              var newFieldId = newField.get(0);
-//
-//              assertEquals(0, newModelId);
-//              assertEquals(1, newClass1Id);
-//              assertEquals(2, newClass2Id);
-//              assertEquals(3, newFieldId);
-//              assertEquals(4, dseAdapter.getModelSize());
-//      }
-
-//      @Test
-//      void deleteMiddleObjectTest() {
-//              var store = ModelStore.builder()
-//                              .with(ViatraModelQueryAdapter.builder())
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .strategy(new DepthFirstStrategy()))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//
-//              assertEquals(0, dseAdapter.getModelSize());
-//
-//              var newObject0 = dseAdapter.createObject();
-//              var newObject0Id = newObject0.get(0);
-//              var newObject1 = dseAdapter.createObject();
-//              var newObject1Id = newObject1.get(0);
-//              var newObject2 = dseAdapter.createObject();
-//              var newObject2Id = newObject2.get(0);
-//              var newObject3 = dseAdapter.createObject();
-//              var newObject3Id = newObject3.get(0);
-//
-//              assertEquals(0, newObject0Id);
-//              assertEquals(1, newObject1Id);
-//              assertEquals(2, newObject2Id);
-//              assertEquals(3, newObject3Id);
-//              assertEquals(4, dseAdapter.getModelSize());
-//
-//              dseAdapter.deleteObject(newObject1);
-//              assertEquals(4, dseAdapter.getModelSize());
-//
-//              var newObject4 = dseAdapter.createObject();
-//              var newObject4Id = newObject4.get(0);
-//              assertEquals(4, newObject4Id);
-//              assertEquals(5, dseAdapter.getModelSize());
-//
-//              dseAdapter.deleteObject(newObject4);
-//              assertEquals(5, dseAdapter.getModelSize());
-//      }
-//
-//      @Test
-//      void DFSTrivialTest() {
-//              var store = ModelStore.builder()
-//                              .symbols(classModel)
-//                              .with(ViatraModelQueryAdapter.builder())
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .strategy(new DepthFirstStrategy().withDepthLimit(0)))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//
-//              var states = dseAdapter.explore();
-//              assertEquals(1, states.size());
-//      }
-//
-//      @Test
-//      void DFSOneRuleTest() {
-//              var createClassPrecondition = Query.of("CreateClassPrecondition",
-//                              (builder, model) -> builder.clause(
-//                                              classModelView.call(model)
-//                              ));
-//
-//              var createClassRule = new TransformationRule("CreateClass",
-//                              createClassPrecondition,
-//                              (model) -> {
-//                                      var classesInterpretation = model.getInterpretation(classes);
-//                                      var classElementInterpretation = model.getInterpretation(classElement);
-//                                      return ((Tuple activation) -> {
-//                                              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//                                              var modelElement = activation.get(0);
-//
-//                                              var newClassElement = dseAdapter.createObject();
-//                                              var newClassElementId = newClassElement.get(0);
-//
-//                                              classesInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-//                                              classElementInterpretation.put(Tuple.of(newClassElementId), true);
-//                                      });
-//                              });
-//
-//              var store = ModelStore.builder()
-//                              .symbols(classModel, classElement, classes)
-//                              .with(ViatraModelQueryAdapter.builder()
-//                                              .queries(createClassPrecondition))
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .transformations(createClassRule)
-//                                              .strategy(new DepthFirstStrategy().withDepthLimit(0)
-//                                              ))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//              var queryEngine = model.getAdapter(ModelQueryAdapter.class);
-//
-//              var modelElementInterpretation = model.getInterpretation(classModel);
-//              modelElementInterpretation.put(dseAdapter.createObject(), true);
-//              queryEngine.flushChanges();
-//
-//              var states = dseAdapter.explore();
-//              assertEquals(1, states.size());
-//      }
-//
-//      @Test
-//      void DFSContinueTest() {
-//              var createClassPrecondition = Query.of("CreateClassPrecondition",
-//                              (builder, model) -> builder.clause(
-//                                              classModelView.call(model)
-//                              ));
-//
-//              var createClassRule = new TransformationRule("CreateClass",
-//                              createClassPrecondition,
-//                              (model) -> {
-//                                      var classesInterpretation = model.getInterpretation(classes);
-//                                      var classElementInterpretation = model.getInterpretation(classElement);
-//                                      return ((Tuple activation) -> {
-//                                              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//                                              var modelElement = activation.get(0);
-//
-//                                              var newClassElement = dseAdapter.createObject();
-//                                              var newClassElementId = newClassElement.get(0);
-//
-//                                              classesInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-//                                              classElementInterpretation.put(Tuple.of(newClassElementId), true);
-//                                      });
-//                              });
-//
-//              var store = ModelStore.builder()
-//                              .symbols(classModel, classElement, classes)
-//                              .with(ViatraModelQueryAdapter.builder()
-//                                              .queries(createClassPrecondition))
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .transformations(createClassRule)
-//                                              .strategy(new DepthFirstStrategy().withDepthLimit(4).continueIfHardObjectivesFulfilled()
-//                                              ))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//              var queryEngine = model.getAdapter(ModelQueryAdapter.class);
-//
-//              var modelElementInterpretation = model.getInterpretation(classModel);
-//              modelElementInterpretation.put(dseAdapter.createObject(), true);
-//              queryEngine.flushChanges();
-//
-//              var states = dseAdapter.explore();
-//              assertEquals(5, states.size());
-//      }
-//
-//      @Test
-//      void DFSCompletenessTest() {
-//              var createClassPrecondition = Query.of("CreateClassPrecondition",
-//                              (builder, model) -> builder.clause(
-//                                              classModelView.call(model)
-//                              ));
-//
-//              var createClassRule = new TransformationRule("CreateClass",
-//                              createClassPrecondition,
-//                              (model) -> {
-//                                      var classesInterpretation = model.getInterpretation(classes);
-//                                      var classElementInterpretation = model.getInterpretation(classElement);
-//                                      return ((Tuple activation) -> {
-//                                              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//                                              var modelElement = activation.get(0);
-//
-//                                              var newClassElement = dseAdapter.createObject();
-//                                              var newClassElementId = newClassElement.get(0);
-//
-//                                              classesInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-//                                              classElementInterpretation.put(Tuple.of(newClassElementId), true);
-//                                      });
-//                              });
-//
-//              var createFeaturePrecondition = Query.of("CreateFeaturePrecondition",
-//                              (builder, model) -> builder.clause(
-//                                              classModelView.call(model)
-//                              ));
-//
-//              var createFeatureRule = new TransformationRule("CreateFeature",
-//                              createFeaturePrecondition,
-//                              (model) -> {
-//                                      var featuresInterpretation = model.getInterpretation(features);
-//                                      var featureInterpretation = model.getInterpretation(feature);
-//                                      return ((Tuple activation) -> {
-//                                              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//                                              var modelElement = activation.get(0);
-//
-//                                              var newClassElement = dseAdapter.createObject();
-//                                              var newClassElementId = newClassElement.get(0);
-//
-//                                              featuresInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-//                                              featureInterpretation.put(Tuple.of(newClassElementId), true);
-//                                      });
-//                              });
-//
-//              var store = ModelStore.builder()
-//                              .symbols(classModel, classElement, classes, feature, features, isEncapsulatedBy, encapsulates)
-//                              .with(ViatraModelQueryAdapter.builder()
-//                                              .queries(createClassPrecondition, createFeaturePrecondition))
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .transformations(createClassRule, createFeatureRule)
-//                                              .strategy(new DepthFirstStrategy().withDepthLimit(10).continueIfHardObjectivesFulfilled()
-//                                              ))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//              var queryEngine = model.getAdapter(ModelQueryAdapter.class);
-//
-//              var modelElementInterpretation = model.getInterpretation(classModel);
-//              modelElementInterpretation.put(dseAdapter.createObject(), true);
-//              queryEngine.flushChanges();
-//
-//              var states = dseAdapter.explore();
-//              assertEquals(2047, states.size());
-//      }
-//
-//      @Test
-//      void DFSSolutionLimitTest() {
-//              var createClassPrecondition = Query.of("CreateClassPrecondition",
-//                              (builder, model) -> builder.clause(
-//                                              classModelView.call(model)
-//                              ));
-//
-//              var createClassRule = new TransformationRule("CreateClass",
-//                              createClassPrecondition,
-//                              (model) -> {
-//                                      var classesInterpretation = model.getInterpretation(classes);
-//                                      var classElementInterpretation = model.getInterpretation(classElement);
-//                                      return ((Tuple activation) -> {
-//                                              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//                                              var modelElement = activation.get(0);
-//
-//                                              var newClassElement = dseAdapter.createObject();
-//                                              var newClassElementId = newClassElement.get(0);
-//
-//                                              classesInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-//                                              classElementInterpretation.put(Tuple.of(newClassElementId), true);
-//                                      });
-//                              });
-//
-//              var createFeaturePrecondition = Query.of("CreateFeaturePrecondition",
-//                              (builder, model) -> builder.clause(
-//                                              classModelView.call(model)
-//                              ));
-//
-//              var createFeatureRule = new TransformationRule("CreateFeature",
-//                              createFeaturePrecondition,
-//                              (model) -> {
-//                                      var featuresInterpretation = model.getInterpretation(features);
-//                                      var featureInterpretation = model.getInterpretation(feature);
-//                                      return ((Tuple activation) -> {
-//                                              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//                                              var modelElement = activation.get(0);
-//
-//                                              var newClassElement = dseAdapter.createObject();
-//                                              var newClassElementId = newClassElement.get(0);
-//
-//                                              featuresInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-//                                              featureInterpretation.put(Tuple.of(newClassElementId), true);
-//                                      });
-//                              });
-//
-//              var store = ModelStore.builder()
-//                              .symbols(classModel, classElement, classes, feature, features, isEncapsulatedBy, encapsulates)
-//                              .with(ViatraModelQueryAdapter.builder()
-//                                              .queries(createClassPrecondition, createFeaturePrecondition))
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .transformations(createClassRule, createFeatureRule)
-//                                              .strategy(new DepthFirstStrategy().withSolutionLimit(222)
-//                                                              .continueIfHardObjectivesFulfilled()
-//                                              ))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//              var queryEngine = model.getAdapter(ModelQueryAdapter.class);
-//
-//              var modelElementInterpretation = model.getInterpretation(classModel);
-//              modelElementInterpretation.put(dseAdapter.createObject(), true);
-//              queryEngine.flushChanges();
-//
-//              var states = dseAdapter.explore();
-//              assertEquals(222, states.size());
-//      }
-//
-//      @Test
-//      void BeFSTrivialTest() {
-//              var store = ModelStore.builder()
-//                              .symbols(classModel)
-//                              .with(ViatraModelQueryAdapter.builder())
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .strategy(new BestFirstStrategy().withDepthLimit(0)))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//
-//              var states = dseAdapter.explore();
-//              assertEquals(1, states.size());
-//      }
-//
-//      @Test
-//      void BeFSOneRuleTest() {
-//              var createClassPrecondition = Query.of("CreateClassPrecondition",
-//                              (builder, model) -> builder.clause(
-//                                              classModelView.call(model)
-//                              ));
-//
-//              var createClassRule = new TransformationRule("CreateClass",
-//                              createClassPrecondition,
-//                              (model) -> {
-//                                      var classesInterpretation = model.getInterpretation(classes);
-//                                      var classElementInterpretation = model.getInterpretation(classElement);
-//                                      return ((Tuple activation) -> {
-//                                              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//                                              var modelElement = activation.get(0);
-//
-//                                              var newClassElement = dseAdapter.createObject();
-//                                              var newClassElementId = newClassElement.get(0);
-//
-//                                              classesInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-//                                              classElementInterpretation.put(Tuple.of(newClassElementId), true);
-//                                      });
-//                              });
-//
-//              var store = ModelStore.builder()
-//                              .symbols(classModel, classElement, classes)
-//                              .with(ViatraModelQueryAdapter.builder()
-//                                              .queries(createClassPrecondition))
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .transformations(createClassRule)
-//                                              .strategy(new BestFirstStrategy().withDepthLimit(4)
-//                                              ))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//              var queryEngine = model.getAdapter(ModelQueryAdapter.class);
-//
-//              var modelElementInterpretation = model.getInterpretation(classModel);
-//              modelElementInterpretation.put(dseAdapter.createObject(), true);
-//              queryEngine.flushChanges();
-//
-//              var states = dseAdapter.explore();
-//              assertEquals(1, states.size());
-//      }
-//
-//      @Test
-//      void BeFSContinueTest() {
-//              var createClassPrecondition = Query.of("CreateClassPrecondition",
-//                              (builder, model) -> builder.clause(
-//                                              classModelView.call(model)
-//                              ));
-//
-//              var createClassRule = new TransformationRule("CreateClass",
-//                              createClassPrecondition,
-//                              (model) -> {
-//                                      var classesInterpretation = model.getInterpretation(classes);
-//                                      var classElementInterpretation = model.getInterpretation(classElement);
-//                                      return ((Tuple activation) -> {
-//                                              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//                                              var modelElement = activation.get(0);
-//
-//                                              var newClassElement = dseAdapter.createObject();
-//                                              var newClassElementId = newClassElement.get(0);
-//
-//                                              classesInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-//                                              classElementInterpretation.put(Tuple.of(newClassElementId), true);
-//                                      });
-//                              });
-//
-//              var store = ModelStore.builder()
-//                              .symbols(classModel, classElement, classes)
-//                              .with(ViatraModelQueryAdapter.builder()
-//                                              .queries(createClassPrecondition))
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .transformations(createClassRule)
-//                                              .strategy(new BestFirstStrategy().withDepthLimit(4).continueIfHardObjectivesFulfilled()
-//                                              ))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//              var queryEngine = model.getAdapter(ModelQueryAdapter.class);
-//
-//              var modelElementInterpretation = model.getInterpretation(classModel);
-//              modelElementInterpretation.put(dseAdapter.createObject(), true);
-//              queryEngine.flushChanges();
-//
-//              var states = dseAdapter.explore();
-//              assertEquals(5, states.size());
-//      }
-//
-//      @Test
-//      void BeFSCompletenessTest() {
-//              var createClassPrecondition = Query.of("CreateClassPrecondition",
-//                              (builder, model) -> builder.clause(
-//                                              classModelView.call(model)
-//                              ));
-//
-//              var createClassRule = new TransformationRule("CreateClass",
-//                              createClassPrecondition,
-//                              (model) -> {
-//                                      var classesInterpretation = model.getInterpretation(classes);
-//                                      var classElementInterpretation = model.getInterpretation(classElement);
-//                                      return ((Tuple activation) -> {
-//                                              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//                                              var modelElement = activation.get(0);
-//
-//                                              var newClassElement = dseAdapter.createObject();
-//                                              var newClassElementId = newClassElement.get(0);
-//
-//                                              classesInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-//                                              classElementInterpretation.put(Tuple.of(newClassElementId), true);
-//                                      });
-//                              });
-//
-//              var createFeaturePrecondition = Query.of("CreateFeaturePrecondition",
-//                              (builder, model) -> builder.clause(
-//                                              classModelView.call(model)
-//                              ));
-//
-//              var createFeatureRule = new TransformationRule("CreateFeature",
-//                              createFeaturePrecondition,
-//                              (model) -> {
-//                                      var featuresInterpretation = model.getInterpretation(features);
-//                                      var featureInterpretation = model.getInterpretation(feature);
-//                                      return ((Tuple activation) -> {
-//                                              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//                                              var modelElement = activation.get(0);
-//
-//                                              var newClassElement = dseAdapter.createObject();
-//                                              var newClassElementId = newClassElement.get(0);
-//
-//                                              featuresInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-//                                              featureInterpretation.put(Tuple.of(newClassElementId), true);
-//                                      });
-//                              });
-//
-//              var store = ModelStore.builder()
-//                              .symbols(classModel, classElement, classes, feature, features, isEncapsulatedBy, encapsulates)
-//                              .with(ViatraModelQueryAdapter.builder()
-//                                              .queries(createClassPrecondition, createFeaturePrecondition))
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .transformations(createClassRule, createFeatureRule)
-//                                              .strategy(new BestFirstStrategy().withDepthLimit(10).continueIfHardObjectivesFulfilled()
-//                                              ))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//              var queryEngine = model.getAdapter(ModelQueryAdapter.class);
-//
-//              var modelElementInterpretation = model.getInterpretation(classModel);
-//              modelElementInterpretation.put(dseAdapter.createObject(), true);
-//              queryEngine.flushChanges();
-//
-//              var states = dseAdapter.explore();
-//              assertEquals(2047, states.size());
-//      }
-//
-//      @Test
-//      void BeFSSolutionLimitTest() {
-//              var createClassPrecondition = Query.of("CreateClassPrecondition",
-//                              (builder, model) -> builder.clause(
-//                                              classModelView.call(model)
-//                              ));
-//
-//              var createClassRule = new TransformationRule("CreateClass",
-//                              createClassPrecondition,
-//                              (model) -> {
-//                                      var classesInterpretation = model.getInterpretation(classes);
-//                                      var classElementInterpretation = model.getInterpretation(classElement);
-//                                      return ((Tuple activation) -> {
-//                                              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//                                              var modelElement = activation.get(0);
-//
-//                                              var newClassElement = dseAdapter.createObject();
-//                                              var newClassElementId = newClassElement.get(0);
-//
-//                                              classesInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-//                                              classElementInterpretation.put(Tuple.of(newClassElementId), true);
-//                                      });
-//                              });
-//
-//              var createFeaturePrecondition = Query.of("CreateFeaturePrecondition",
-//                              (builder, model) -> builder.clause(
-//                                              classModelView.call(model)
-//                              ));
-//
-//              var createFeatureRule = new TransformationRule("CreateFeature",
-//                              createFeaturePrecondition,
-//                              (model) -> {
-//                                      var featuresInterpretation = model.getInterpretation(features);
-//                                      var featureInterpretation = model.getInterpretation(feature);
-//                                      return ((Tuple activation) -> {
-//                                              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//                                              var modelElement = activation.get(0);
-//
-//                                              var newClassElement = dseAdapter.createObject();
-//                                              var newClassElementId = newClassElement.get(0);
-//
-//                                              featuresInterpretation.put(Tuple.of(modelElement, newClassElementId), true);
-//                                              featureInterpretation.put(Tuple.of(newClassElementId), true);
-//                                      });
-//                              });
-//
-//              var store = ModelStore.builder()
-//                              .symbols(classModel, classElement, classes, feature, features, isEncapsulatedBy, encapsulates)
-//                              .with(ViatraModelQueryAdapter.builder()
-//                                              .queries(createClassPrecondition, createFeaturePrecondition))
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .transformations(createClassRule, createFeatureRule)
-//                                              .strategy(new BestFirstStrategy().withSolutionLimit(222)
-//                                                              .continueIfHardObjectivesFulfilled()
-//                                              ))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//              var queryEngine = model.getAdapter(ModelQueryAdapter.class);
-//
-//              var modelElementInterpretation = model.getInterpretation(classModel);
-//              modelElementInterpretation.put(dseAdapter.createObject(), true);
-//              queryEngine.flushChanges();
-//
-//              var states = dseAdapter.explore();
-//              assertEquals(222, states.size());
-//      }
-
-}
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/TransformationRuleTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/TransformationRuleTest.java
deleted file mode 100644
index 43b04e0d..00000000
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/TransformationRuleTest.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.dse;
-
-import org.junit.jupiter.api.Test;
-//
-//import tools.refinery.store.dse.transition.DesignSpaceExplorationAdapter;
-//import tools.refinery.store.model.ModelStore;
-//import tools.refinery.store.query.ModelQueryAdapter;
-//import tools.refinery.store.query.dnf.Query;
-//import tools.refinery.store.dse.transition.TransformationRule;
-//import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
-//import tools.refinery.store.query.view.AnySymbolView;
-//import tools.refinery.store.query.view.KeyOnlyView;
-//import tools.refinery.store.representation.Symbol;
-//import tools.refinery.store.tuple.Tuple;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-//import static org.junit.jupiter.api.Assertions.assertEquals;
-//import static tools.refinery.store.query.literal.Literals.not;
-//import static tools.refinery.store.dse.tests.QueryAssertions.assertResults;
-//
-class TransformationRuleTest {
-//
-//      private static final Symbol<Boolean> classModel = Symbol.of("ClassModel", 1);
-//      private static final Symbol<Boolean> classElement = Symbol.of("ClassElement", 1);
-//      private static final Symbol<Boolean> feature = Symbol.of("Feature", 1);
-//
-//      private static final Symbol<Boolean> isEncapsulatedBy = Symbol.of("IsEncapsulatedBy", 2);
-//      private static final Symbol<Boolean> encapsulates = Symbol.of("Encapsulates", 2);
-//
-//      private static final Symbol<Boolean> features = Symbol.of("Features", 2);
-//      private static final Symbol<Boolean> classes = Symbol.of("Classes", 2);
-//
-//      private static final AnySymbolView classModelView = new KeyOnlyView<>(classModel);
-//      private static final AnySymbolView classElementView = new KeyOnlyView<>(classElement);
-//      private static final AnySymbolView featureView = new KeyOnlyView<>(feature);
-//      private static final AnySymbolView isEncapsulatedByView = new KeyOnlyView<>(isEncapsulatedBy);
-//      private static final AnySymbolView encapsulatesView = new KeyOnlyView<>(encapsulates);
-//      private static final AnySymbolView featuresView = new KeyOnlyView<>(features);
-//      private static final AnySymbolView classesView = new KeyOnlyView<>(classes);
-//
-//      @Test
-//      void activationsTest() {
-//              var assignFeaturePreconditionHelper = Query.of("AssignFeaturePreconditionHelper",
-//                              (builder, model, c, f) -> builder.clause(
-//                                              classElementView.call(c),
-//                                              classesView.call(model, c),
-//                                              encapsulatesView.call(c, f)
-//                              ));
-//
-//              var assignFeaturePrecondition = Query.of("AssignFeaturePrecondition", (builder, c2, f)
-//                              -> builder.clause((model, c1) -> List.of(
-//                              classModelView.call(model),
-//                              featureView.call(f),
-//                              classElementView.call(c2),
-//                              featuresView.call(model, f),
-//                              classesView.call(model, c1),
-//                              not(assignFeaturePreconditionHelper.call(model, c2, f)),
-//                              not(encapsulatesView.call(c2, f))
-//              )));
-//
-//              var deleteEmptyClassPrecondition = Query.of("DeleteEmptyClassPrecondition",
-//                              (builder, model, c) -> builder.clause((f) -> List.of(
-//                                              classModelView.call(model),
-//                                              classElementView.call(c),
-//                                              featuresView.call(model, f),
-//                                              not(encapsulatesView.call(c, f))
-//                              )));
-//
-//              TransformationRule assignFeatureRule = new TransformationRule("AssignFeature",
-//                              assignFeaturePrecondition,
-//                              (model) -> {
-//                                      var isEncapsulatedByInterpretation = model.getInterpretation(isEncapsulatedBy);
-//                                      return ((Tuple activation) -> {
-//                                              var feature = activation.get(0);
-//                                              var classElement = activation.get(1);
-//
-//                                              isEncapsulatedByInterpretation.put(Tuple.of(feature, classElement), true);
-//                                      });
-//                              });
-//
-//              TransformationRule deleteEmptyClassRule = new TransformationRule("DeleteEmptyClass",
-//                              deleteEmptyClassPrecondition,
-//                              (model) -> {
-//                                      var classesInterpretation = model.getInterpretation(classes);
-//                                      var classElementInterpretation = model.getInterpretation(classElement);
-//                                      return ((Tuple activation) -> {
-//                                              var modelElement = activation.get(0);
-//                                              var classElement = activation.get(1);
-//
-//                                              classesInterpretation.put(Tuple.of(modelElement, classElement), false);
-//                                              classElementInterpretation.put(Tuple.of(classElement), false);
-//                                      });
-//                              });
-//
-//
-//              var store = ModelStore.builder()
-//                              .symbols(classModel, classElement, feature, isEncapsulatedBy, encapsulates, classes, features)
-//                              .with(ViatraModelQueryAdapter.builder()
-//                                              .queries(assignFeaturePrecondition, assignFeaturePreconditionHelper,
-//                                                              deleteEmptyClassPrecondition))
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .strategy(new DepthFirstStrategy().withDepthLimit(0)))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var queryEngine = model.getAdapter(ModelQueryAdapter.class);
-//              assignFeatureRule.prepare(model, queryEngine);
-//              deleteEmptyClassRule.prepare(model, queryEngine);
-//
-//              var classModelInterpretation = model.getInterpretation(classModel);
-//              var classElementInterpretation = model.getInterpretation(classElement);
-//              var featureInterpretation = model.getInterpretation(feature);
-//              var featuresInterpretation = model.getInterpretation(features);
-//              var classesInterpretation = model.getInterpretation(classes);
-//
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//              var newModel = dseAdapter.createObject();
-//              var newModelId = newModel.get(0);
-//              var newClass1 = dseAdapter.createObject();
-//              var newClass1Id = newClass1.get(0);
-//              var newClass2 = dseAdapter.createObject();
-//              var newClass2Id = newClass2.get(0);
-//              var newField = dseAdapter.createObject();
-//              var newFieldId = newField.get(0);
-//
-//              classModelInterpretation.put(newModel, true);
-//              classElementInterpretation.put(newClass1, true);
-//              classElementInterpretation.put(newClass2, true);
-//              featureInterpretation.put(newField, true);
-//              classesInterpretation.put(Tuple.of(newModelId, newClass1Id), true);
-//              classesInterpretation.put(Tuple.of(newModelId, newClass2Id), true);
-//              featuresInterpretation.put(Tuple.of(newModelId, newFieldId), true);
-//
-//              queryEngine.flushChanges();
-//
-//              var assignFeatureRuleActivations = assignFeatureRule.getAllActivationsAsResultSet();
-//              var deleteEmptyClassRuleActivations = deleteEmptyClassRule.getAllActivationsAsResultSet();
-//
-//              assertResults(Map.of(
-//                              Tuple.of(newClass1Id, newFieldId), true,
-//                              Tuple.of(newClass2Id, newFieldId), true
-//              ), assignFeatureRuleActivations);
-//
-//              assertResults(Map.of(
-//                              Tuple.of(newModelId, newClass1Id), true,
-//                              Tuple.of(newModelId, newClass2Id), true
-//              ), deleteEmptyClassRuleActivations);
-//      }
-//
-//      @Test
-//      void randomActivationTest() {
-//              var deleteEmptyClassPrecondition = Query.of("DeleteEmptyClassPrecondition",
-//                              (builder, model, c) -> builder.clause((f) -> List.of(
-//                                              classModelView.call(model),
-//                                              classElementView.call(c),
-//                                              featuresView.call(model, f),
-//                                              not(encapsulatesView.call(c, f))
-//                              )));
-//
-//              TransformationRule deleteEmptyClassRule0 = new TransformationRule("DeleteEmptyClass0",
-//                              deleteEmptyClassPrecondition,
-//                              (model) -> {
-//                                      var classesInterpretation = model.getInterpretation(classes);
-//                                      var classElementInterpretation = model.getInterpretation(classElement);
-//                                      return ((Tuple activation) -> {
-//                                              var modelElement = activation.get(0);
-//                                              var classElement = activation.get(1);
-//
-//                                              classesInterpretation.put(Tuple.of(modelElement, classElement), false);
-//                                              classElementInterpretation.put(Tuple.of(classElement), false);
-//                                      });
-//                              },
-//                              0L);
-//
-//              TransformationRule deleteEmptyClassRule1 = new TransformationRule("DeleteEmptyClass1",
-//                              deleteEmptyClassPrecondition,
-//                              (model) -> {
-//                                      var classesInterpretation = model.getInterpretation(classes);
-//                                      var classElementInterpretation = model.getInterpretation(classElement);
-//                                      return ((Tuple activation) -> {
-//                                              var modelElement = activation.get(0);
-//                                              var classElement = activation.get(1);
-//
-//                                              classesInterpretation.put(Tuple.of(modelElement, classElement), false);
-//                                              classElementInterpretation.put(Tuple.of(classElement), false);
-//                                      });
-//                              },
-//                              78634L);
-//
-//              var store = ModelStore.builder()
-//                              .symbols(classModel, classElement, feature, isEncapsulatedBy, encapsulates, classes, features)
-//                              .with(ViatraModelQueryAdapter.builder()
-//                                              .queries(deleteEmptyClassPrecondition))
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .strategy(new DepthFirstStrategy().withDepthLimit(0)))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var queryEngine = model.getAdapter(ModelQueryAdapter.class);
-//              deleteEmptyClassRule0.prepare(model, queryEngine);
-//              deleteEmptyClassRule1.prepare(model, queryEngine);
-//
-//              var classModelInterpretation = model.getInterpretation(classModel);
-//              var classElementInterpretation = model.getInterpretation(classElement);
-//              var featureInterpretation = model.getInterpretation(feature);
-//              var featuresInterpretation = model.getInterpretation(features);
-//              var classesInterpretation = model.getInterpretation(classes);
-//
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//              var newModel = dseAdapter.createObject();
-//              var newModelId = newModel.get(0);
-//              var newClass1 = dseAdapter.createObject();
-//              var newClass1Id = newClass1.get(0);
-//              var newClass2 = dseAdapter.createObject();
-//              var newClass2Id = newClass2.get(0);
-//              var newField = dseAdapter.createObject();
-//              var newFieldId = newField.get(0);
-//
-//              classModelInterpretation.put(newModel, true);
-//              classElementInterpretation.put(newClass1, true);
-//              classElementInterpretation.put(newClass2, true);
-//              featureInterpretation.put(newField, true);
-//              classesInterpretation.put(Tuple.of(newModelId, newClass1Id), true);
-//              classesInterpretation.put(Tuple.of(newModelId, newClass2Id), true);
-//              featuresInterpretation.put(Tuple.of(newModelId, newFieldId), true);
-//
-//              queryEngine.flushChanges();
-//
-//
-//              var activation0 = deleteEmptyClassRule0.getRandomActivation().activation();
-//              var activation1 = deleteEmptyClassRule1.getRandomActivation().activation();
-//
-//              assertResults(Map.of(
-//                              Tuple.of(newModelId, newClass1Id), true,
-//                              Tuple.of(newModelId, newClass2Id), true
-//              ), deleteEmptyClassRule0.getAllActivationsAsResultSet());
-//
-//              assertResults(Map.of(
-//                              Tuple.of(newModelId, newClass1Id), true,
-//                              Tuple.of(newModelId, newClass2Id), true
-//              ), deleteEmptyClassRule1.getAllActivationsAsResultSet());
-//
-//              assertEquals(Tuple.of(newModelId, newClass2Id), activation0);
-//              assertEquals(Tuple.of(newModelId, newClass1Id), activation1);
-//
-//      }
-//
-//      @Test
-//      void fireTest() {
-//              var deleteEmptyClassPrecondition = Query.of("DeleteEmptyClassPrecondition",
-//                              (builder, model, c) -> builder.clause((f) -> List.of(
-//                                              classModelView.call(model),
-//                                              classElementView.call(c),
-//                                              featuresView.call(model, f),
-//                                              not(encapsulatesView.call(c, f))
-//                              )));
-//
-//              TransformationRule deleteEmptyClassRule = new TransformationRule("DeleteEmptyClass",
-//                              deleteEmptyClassPrecondition,
-//                              (model) -> {
-//                                      var classesInterpretation = model.getInterpretation(classes);
-//                                      var classElementInterpretation = model.getInterpretation(classElement);
-//                                      return ((Tuple activation) -> {
-//                                              var modelElement = activation.get(0);
-//                                              var classElement = activation.get(1);
-//
-//                                              classesInterpretation.put(Tuple.of(modelElement, classElement), false);
-//                                              classElementInterpretation.put(Tuple.of(classElement), false);
-//                                      });
-//                              });
-//
-//              var store = ModelStore.builder()
-//                              .symbols(classModel, classElement, feature, isEncapsulatedBy, encapsulates, classes, features)
-//                              .with(ViatraModelQueryAdapter.builder()
-//                                              .queries(deleteEmptyClassPrecondition))
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .strategy(new DepthFirstStrategy().withDepthLimit(0)))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var queryEngine = model.getAdapter(ModelQueryAdapter.class);
-//              deleteEmptyClassRule.prepare(model, queryEngine);
-//
-//              var classModelInterpretation = model.getInterpretation(classModel);
-//              var classElementInterpretation = model.getInterpretation(classElement);
-//              var featureInterpretation = model.getInterpretation(feature);
-//              var featuresInterpretation = model.getInterpretation(features);
-//              var classesInterpretation = model.getInterpretation(classes);
-//
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//              var newModel = dseAdapter.createObject();
-//              var newModelId = newModel.get(0);
-//              var newClass1 = dseAdapter.createObject();
-//              var newClass1Id = newClass1.get(0);
-//              var newClass2 = dseAdapter.createObject();
-//              var newClass2Id = newClass2.get(0);
-//              var newField = dseAdapter.createObject();
-//              var newFieldId = newField.get(0);
-//
-//              classModelInterpretation.put(newModel, true);
-//              classElementInterpretation.put(newClass1, true);
-//              classElementInterpretation.put(newClass2, true);
-//              featureInterpretation.put(newField, true);
-//              classesInterpretation.put(Tuple.of(newModelId, newClass1Id), true);
-//              classesInterpretation.put(Tuple.of(newModelId, newClass2Id), true);
-//              featuresInterpretation.put(Tuple.of(newModelId, newFieldId), true);
-//
-//              queryEngine.flushChanges();
-//
-//              assertResults(Map.of(
-//                              Tuple.of(newModelId, newClass1Id), true,
-//                              Tuple.of(newModelId, newClass2Id), true
-//              ), deleteEmptyClassRule.getAllActivationsAsResultSet());
-//
-//
-//              deleteEmptyClassRule.fireActivation(Tuple.of(0, 1));
-//
-//              assertResults(Map.of(
-//                              Tuple.of(newModelId, newClass1Id), false,
-//                              Tuple.of(newModelId, newClass2Id), true
-//              ), deleteEmptyClassRule.getAllActivationsAsResultSet());
-//      }
-//
-//      @Test
-//      void randomFireTest() {
-//              var deleteEmptyClassPrecondition = Query.of("DeleteEmptyClassPrecondition",
-//                              (builder, model, c) -> builder.clause((f) -> List.of(
-//                                              classModelView.call(model),
-//                                              classElementView.call(c),
-//                                              featuresView.call(model, f),
-//                                              not(encapsulatesView.call(c, f))
-//                              )));
-//
-//              TransformationRule deleteEmptyClassRule = new TransformationRule("DeleteEmptyClass0",
-//                              deleteEmptyClassPrecondition,
-//                              (model) -> {
-//                                      var classesInterpretation = model.getInterpretation(classes);
-//                                      var classElementInterpretation = model.getInterpretation(classElement);
-//                                      return ((Tuple activation) -> {
-//                                              var modelElement = activation.get(0);
-//                                              var classElement = activation.get(1);
-//
-//                                              classesInterpretation.put(Tuple.of(modelElement, classElement), false);
-//                                              classElementInterpretation.put(Tuple.of(classElement), false);
-//                                      });
-//                              },
-//                              0L);
-//
-//              var store = ModelStore.builder()
-//                              .symbols(classModel, classElement, feature, isEncapsulatedBy, encapsulates, classes, features)
-//                              .with(ViatraModelQueryAdapter.builder()
-//                                              .queries(deleteEmptyClassPrecondition))
-//                              .with(DesignSpaceExplorationAdapter.builder()
-//                                              .strategy(new DepthFirstStrategy().withDepthLimit(0)))
-//                              .build();
-//
-//              var model = store.createEmptyModel();
-//              var queryEngine = model.getAdapter(ModelQueryAdapter.class);
-//              deleteEmptyClassRule.prepare(model, queryEngine);
-//
-//              var classModelInterpretation = model.getInterpretation(classModel);
-//              var classElementInterpretation = model.getInterpretation(classElement);
-//              var featureInterpretation = model.getInterpretation(feature);
-//              var featuresInterpretation = model.getInterpretation(features);
-//              var classesInterpretation = model.getInterpretation(classes);
-//
-//              var dseAdapter = model.getAdapter(DesignSpaceExplorationAdapter.class);
-//              var newModel = dseAdapter.createObject();
-//              var newModelId = newModel.get(0);
-//              var newClass1 = dseAdapter.createObject();
-//              var newClass1Id = newClass1.get(0);
-//              var newClass2 = dseAdapter.createObject();
-//              var newClass2Id = newClass2.get(0);
-//              var newField = dseAdapter.createObject();
-//              var newFieldId = newField.get(0);
-//
-//              classModelInterpretation.put(newModel, true);
-//              classElementInterpretation.put(newClass1, true);
-//              classElementInterpretation.put(newClass2, true);
-//              featureInterpretation.put(newField, true);
-//              classesInterpretation.put(Tuple.of(newModelId, newClass1Id), true);
-//              classesInterpretation.put(Tuple.of(newModelId, newClass2Id), true);
-//              featuresInterpretation.put(Tuple.of(newModelId, newFieldId), true);
-//
-//              queryEngine.flushChanges();
-//
-//              assertResults(Map.of(
-//                              Tuple.of(newModelId, newClass1Id), true,
-//                              Tuple.of(newModelId, newClass2Id), true
-//              ), deleteEmptyClassRule.getAllActivationsAsResultSet());
-//
-//              deleteEmptyClassRule.fireRandomActivation();
-//
-//              assertResults(Map.of(
-//                              Tuple.of(newModelId, newClass1Id), true,
-//                              Tuple.of(newModelId, newClass2Id), false
-//              ), deleteEmptyClassRule.getAllActivationsAsResultSet());
-//
-//              deleteEmptyClassRule.fireRandomActivation();
-//
-//              assertResults(Map.of(
-//                              Tuple.of(newModelId, newClass1Id), false,
-//                              Tuple.of(newModelId, newClass2Id), false
-//              ), deleteEmptyClassRule.getAllActivationsAsResultSet());
-//
-//      }
-}
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/tests/QueryAssertions.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/tests/QueryAssertions.java
index be514eaf..f0a20720 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/tests/QueryAssertions.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/tests/QueryAssertions.java
@@ -30,7 +30,7 @@ public final class QueryAssertions {
         }
 
         public static <T> void assertResults(Map<Tuple, T> expected, ResultSet<T> resultSet) {
-                var defaultValue = resultSet.getQuery().defaultValue();
+                var defaultValue = resultSet.getCanonicalQuery().defaultValue();
                 var filteredExpected = new LinkedHashMap<Tuple, T>();
                 var executables = new ArrayList<Executable>();
                 for (var entry : expected.entrySet()) {
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/TransitionTests.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/TransitionTests.java
index b89360cb..42a0f89b 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/TransitionTests.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/TransitionTests.java
@@ -7,16 +7,14 @@ package tools.refinery.store.dse.transition;
 
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.dse.modification.ModificationAdapter;
-import tools.refinery.store.dse.transition.objectives.QueryCriteria;
-import tools.refinery.store.dse.transition.objectives.QueryObjective;
+import tools.refinery.store.dse.transition.objectives.Criteria;
+import tools.refinery.store.dse.transition.objectives.Objectives;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.dnf.FunctionalQuery;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.dnf.RelationalQuery;
-import tools.refinery.store.query.literal.CallPolarity;
-import tools.refinery.store.query.literal.Literals;
 import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.term.int_.IntTerms;
 import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
@@ -29,33 +27,33 @@ import tools.refinery.store.tuple.Tuple;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.store.query.literal.Literals.not;
 
 class TransitionBuildTests {
         Symbol<Boolean> person = new Symbol<>("Person", 1, Boolean.class, false);
         Symbol<Boolean> friend = new Symbol<>("friend", 2, Boolean.class, false);
+
         AnySymbolView personView = new KeyOnlyView<>(person);
         AnySymbolView friendView = new KeyOnlyView<>(friend);
 
-        /*RelationalQuery areNotFriends = Query.of("areNotFriends",
-                        (builder, p1, p2) -> builder.clause(
-                                        personView.call(p1),
-                                        personView.call(p2),
-                                        not(friendView.call(p1, p2))))*/
-
-        RelationalQuery moreThan3Friends = Query.of("moreThan3Friends",
-                        (builder, tooMuchFriends) -> builder.clause(Integer.class, (numberOfFriends) -> List.of(
+        RelationalQuery moreThan3Friends = Query.of("moreThan3Friends", (builder, tooMuchFriends) -> builder
+                        .clause(Integer.class, (numberOfFriends) -> List.of(
                                         numberOfFriends.assign(friendView.count(tooMuchFriends, Variable.of())),
-                                        Literals.assume(IntTerms.less(IntTerms.constant(3), numberOfFriends)),
+                                        check(IntTerms.less(IntTerms.constant(3), numberOfFriends)),
                                         personView.call(tooMuchFriends)
                         )));
 
-        RelationalQuery somebodyHasNoFriend = Query.of("somebodyHasNoFriend",
-                        (builder, lonely) -> builder.clause(
+        RelationalQuery somebodyHasNoFriend = Query.of("somebodyHasNoFriend", (builder, lonely) -> builder
+                        .clause(
                                         personView.call(lonely),
-                                        friendView.call(CallPolarity.NEGATIVE, lonely, Variable.of())
+                                        not(friendView.call(lonely, Variable.of()))
+                        ));
+
+        FunctionalQuery<Integer> numberOfFriends = Query.of(Integer.class, (builder, output) -> builder
+                        .clause(
+                                        output.assign(friendView.count(Variable.of(), Variable.of()))
                         ));
-        FunctionalQuery<Integer> numberOfFriends = FunctionalQuery.of(Integer.class,
-                        (builder, output) -> builder.clause(output.assign(friendView.count(Variable.of(), Variable.of()))));
 
         @Test
         void acceptTest() {
@@ -141,9 +139,9 @@ class TransitionBuildTests {
                                 .with(StateCoderAdapter.builder())
                                 .with(ModificationAdapter.builder())
                                 .with(DesignSpaceExplorationAdapter.builder()
-                                                .objective(new QueryObjective(numberOfFriends))
-                                                .exclude(new QueryCriteria(moreThan3Friends, true))
-                                                .accept(new QueryCriteria(somebodyHasNoFriend, false)))
+                                                .objective(Objectives.value(numberOfFriends))
+                                                .exclude(Criteria.whenHasMatch(moreThan3Friends))
+                                                .accept(Criteria.whenNoMatch(somebodyHasNoFriend)))
                                 .build();
 
                 return store.createEmptyModel();
diff --git a/subprojects/store-query-viatra/build.gradle.kts b/subprojects/store-query-viatra/build.gradle.kts
index ef73e10a..fa1c1da3 100644
--- a/subprojects/store-query-viatra/build.gradle.kts
+++ b/subprojects/store-query-viatra/build.gradle.kts
@@ -9,9 +9,11 @@ plugins {
 }
 
 dependencies {
-        implementation(libs.ecore)
-        api(libs.viatra)
+        api(project(":refinery-viatra-runtime"))
+        api(project(":refinery-viatra-runtime-localsearch"))
+        api(project(":refinery-viatra-runtime-rete"))
+        api(project(":refinery-viatra-runtime-rete-recipes"))
         api(project(":refinery-store-query"))
-        api(project(":refinery-store-reasoning"))
-        api(project(":refinery-visualization"))
+        implementation(libs.ecore)
+        implementation(libs.slf4j.log4j)
 }
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryBuilder.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryBuilder.java
index 931a07aa..6b3be115 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryBuilder.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryBuilder.java
@@ -5,13 +5,15 @@
  */
 package tools.refinery.store.query.viatra;
 
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions;
-import org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackendFactory;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
 import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.ModelQueryBuilder;
 import tools.refinery.store.query.dnf.AnyQuery;
 import tools.refinery.store.query.dnf.Dnf;
-import tools.refinery.store.query.ModelQueryBuilder;
+import tools.refinery.store.query.rewriter.DnfRewriter;
+import tools.refinery.viatra.runtime.CancellationToken;
+import tools.refinery.viatra.runtime.api.ViatraQueryEngineOptions;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
 
 import java.util.Collection;
 import java.util.function.Function;
@@ -28,6 +30,8 @@ public interface ViatraModelQueryBuilder extends ModelQueryBuilder {
 
         ViatraModelQueryBuilder searchBackend(IQueryBackendFactory queryBackendFactory);
 
+        ViatraModelQueryBuilder cancellationToken(CancellationToken cancellationToken);
+
         @Override
         default ViatraModelQueryBuilder queries(AnyQuery... queries) {
                 ModelQueryBuilder.super.queries(queries);
@@ -43,12 +47,11 @@ public interface ViatraModelQueryBuilder extends ModelQueryBuilder {
         @Override
         ViatraModelQueryBuilder query(AnyQuery query);
 
-        ViatraModelQueryBuilder query(AnyQuery query, QueryEvaluationHint queryEvaluationHint);
+        @Override
+        ViatraModelQueryBuilder rewriter(DnfRewriter rewriter);
 
         ViatraModelQueryBuilder computeHint(Function<Dnf, QueryEvaluationHint> computeHint);
 
-        ViatraModelQueryBuilder hint(Dnf dnf, QueryEvaluationHint queryEvaluationHint);
-
         @Override
         ViatraModelQueryStoreAdapter build(ModelStore store);
 }
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryStoreAdapter.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryStoreAdapter.java
index da6d7bd5..588c00d4 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryStoreAdapter.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/ViatraModelQueryStoreAdapter.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra;
 
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions;
+import tools.refinery.viatra.runtime.api.ViatraQueryEngineOptions;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.ModelQueryStoreAdapter;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/RelationalScope.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/RelationalScope.java
index d1a65a89..9303cae6 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/RelationalScope.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/RelationalScope.java
@@ -6,10 +6,10 @@
 package tools.refinery.store.query.viatra.internal;
 
 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.viatra.runtime.api.ViatraQueryEngine;
+import tools.refinery.viatra.runtime.api.scope.IEngineContext;
+import tools.refinery.viatra.runtime.api.scope.IIndexingErrorListener;
+import tools.refinery.viatra.runtime.api.scope.QueryScope;
 import tools.refinery.store.query.viatra.internal.context.RelationalEngineContext;
 
 public class RelationalScope extends QueryScope {
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryAdapterImpl.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryAdapterImpl.java
index 5f3e86b4..ad754988 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryAdapterImpl.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryAdapterImpl.java
@@ -5,69 +5,47 @@
  */
 package tools.refinery.store.query.viatra.internal;
 
-import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.GenericQueryGroup;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.internal.apiimpl.ViatraQueryEngineImpl;
-import org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackend;
-import org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackendFactory;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelListener;
-import tools.refinery.store.query.resultset.AnyResultSet;
-import tools.refinery.store.query.resultset.EmptyResultSet;
-import tools.refinery.store.query.resultset.ResultSet;
 import tools.refinery.store.query.dnf.AnyQuery;
 import tools.refinery.store.query.dnf.FunctionalQuery;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.query.resultset.AnyResultSet;
+import tools.refinery.store.query.resultset.EmptyResultSet;
+import tools.refinery.store.query.resultset.ResultSet;
 import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
 import tools.refinery.store.query.viatra.internal.matcher.FunctionalViatraMatcher;
 import tools.refinery.store.query.viatra.internal.matcher.RawPatternMatcher;
 import tools.refinery.store.query.viatra.internal.matcher.RelationalViatraMatcher;
+import tools.refinery.viatra.runtime.CancellationToken;
+import tools.refinery.viatra.runtime.api.AdvancedViatraQueryEngine;
+import tools.refinery.viatra.runtime.api.GenericQueryGroup;
+import tools.refinery.viatra.runtime.api.IQuerySpecification;
 
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class ViatraModelQueryAdapterImpl implements ViatraModelQueryAdapter, ModelListener {
-        private static final String DELAY_MESSAGE_DELIVERY_FIELD_NAME = "delayMessageDelivery";
-        private static final MethodHandle SET_UPDATE_PROPAGATION_DELAYED_HANDLE;
-        private static final String QUERY_BACKENDS_FIELD_NAME = "queryBackends";
-        private static final MethodHandle GET_QUERY_BACKENDS_HANDLE;
-
         private final Model model;
         private final ViatraModelQueryStoreAdapterImpl storeAdapter;
-        private final ViatraQueryEngineImpl queryEngine;
+        private final AdvancedViatraQueryEngine queryEngine;
         private final Map<AnyQuery, AnyResultSet> resultSets;
         private boolean pendingChanges;
 
-        static {
-                try {
-                        var lookup = MethodHandles.privateLookupIn(ViatraQueryEngineImpl.class, MethodHandles.lookup());
-                        SET_UPDATE_PROPAGATION_DELAYED_HANDLE = lookup.findSetter(ViatraQueryEngineImpl.class,
-                                        DELAY_MESSAGE_DELIVERY_FIELD_NAME, Boolean.TYPE);
-                        GET_QUERY_BACKENDS_HANDLE = lookup.findGetter(ViatraQueryEngineImpl.class, QUERY_BACKENDS_FIELD_NAME,
-                                        Map.class);
-                } catch (IllegalAccessException | NoSuchFieldException e) {
-                        throw new IllegalStateException("Cannot access private members of %s"
-                                        .formatted(ViatraQueryEngineImpl.class.getName()), e);
-                }
-        }
-
         ViatraModelQueryAdapterImpl(Model model, ViatraModelQueryStoreAdapterImpl storeAdapter) {
                 this.model = model;
                 this.storeAdapter = storeAdapter;
                 var scope = new RelationalScope(this);
-                queryEngine = (ViatraQueryEngineImpl) AdvancedViatraQueryEngine.createUnmanagedEngine(scope,
+                queryEngine = AdvancedViatraQueryEngine.createUnmanagedEngine(scope,
                                 storeAdapter.getEngineOptions());
 
                 var querySpecifications = storeAdapter.getQuerySpecifications();
                 GenericQueryGroup.of(
                                 Collections.<IQuerySpecification<?>>unmodifiableCollection(querySpecifications.values()).stream()
                 ).prepare(queryEngine);
+                queryEngine.flushChanges();
                 var vacuousQueries = storeAdapter.getVacuousQueries();
                 resultSets = new LinkedHashMap<>(querySpecifications.size() + vacuousQueries.size());
                 for (var entry : querySpecifications.entrySet()) {
@@ -79,7 +57,6 @@ public class ViatraModelQueryAdapterImpl implements ViatraModelQueryAdapter, Mod
                         resultSets.put(vacuousQuery, new EmptyResultSet<>(this, (Query<?>) vacuousQuery));
                 }
 
-                setUpdatePropagationDelayed(true);
                 model.addListener(this);
         }
 
@@ -95,30 +72,6 @@ public class ViatraModelQueryAdapterImpl implements ViatraModelQueryAdapter, Mod
                 }
         }
 
-        private void setUpdatePropagationDelayed(boolean value) {
-                try {
-                        SET_UPDATE_PROPAGATION_DELAYED_HANDLE.invokeExact(queryEngine, value);
-                } catch (Error e) {
-                        // Fatal JVM errors should not be wrapped.
-                        throw e;
-                } catch (Throwable e) {
-                        throw new IllegalStateException("Cannot set %s".formatted(DELAY_MESSAGE_DELIVERY_FIELD_NAME), e);
-                }
-        }
-
-        private Collection<IQueryBackend> getQueryBackends() {
-                try {
-                        @SuppressWarnings("unchecked")
-                        var backendMap = (Map<IQueryBackendFactory, IQueryBackend>) GET_QUERY_BACKENDS_HANDLE.invokeExact(queryEngine);
-                        return backendMap.values();
-                } catch (Error e) {
-                        // Fatal JVM errors should not be wrapped.
-                        throw e;
-                } catch (Throwable e) {
-                        throw new IllegalStateException("Cannot get %s".formatted(QUERY_BACKENDS_FIELD_NAME), e);
-                }
-        }
-
         @Override
         public Model getModel() {
                 return model;
@@ -129,9 +82,14 @@ public class ViatraModelQueryAdapterImpl implements ViatraModelQueryAdapter, Mod
                 return storeAdapter;
         }
 
+        public CancellationToken getCancellationToken() {
+                return storeAdapter.getCancellationToken();
+        }
+
         @Override
         public <T> ResultSet<T> getResultSet(Query<T> query) {
-                var resultSet = resultSets.get(query);
+                var canonicalQuery = storeAdapter.getCanonicalQuery(query);
+                var resultSet = resultSets.get(canonicalQuery);
                 if (resultSet == null) {
                         throw new IllegalArgumentException("No matcher for query %s in model".formatted(query.name()));
                 }
@@ -153,20 +111,7 @@ public class ViatraModelQueryAdapterImpl implements ViatraModelQueryAdapter, Mod
 
         @Override
         public void flushChanges() {
-                if (!queryEngine.isUpdatePropagationDelayed()) {
-                        throw new IllegalStateException("Trying to flush changes while changes are already being flushed");
-                }
-                if (!pendingChanges) {
-                        return;
-                }
-                setUpdatePropagationDelayed(false);
-                try {
-                        for (var queryBackend : getQueryBackends()) {
-                                queryBackend.flushUpdates();
-                        }
-                } finally {
-                        setUpdatePropagationDelayed(true);
-                }
+                queryEngine.flushChanges();
                 pendingChanges = false;
         }
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java
index ce2467b4..bb0630f3 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java
@@ -5,22 +5,26 @@
  */
 package tools.refinery.store.query.viatra.internal;
 
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions;
-import org.eclipse.viatra.query.runtime.localsearch.matcher.integration.LocalSearchHintOptions;
-import org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackendFactory;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.rete.matcher.ReteBackendFactory;
 import tools.refinery.store.adapter.AbstractModelAdapterBuilder;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.query.dnf.AnyQuery;
 import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.rewriter.CompositeRewriter;
+import tools.refinery.store.query.rewriter.DnfRewriter;
+import tools.refinery.store.query.rewriter.DuplicateDnfRemover;
+import tools.refinery.store.query.rewriter.InputParameterResolver;
 import tools.refinery.store.query.viatra.ViatraModelQueryBuilder;
 import tools.refinery.store.query.viatra.internal.localsearch.FlatCostFunction;
-import tools.refinery.store.query.viatra.internal.localsearch.RelationalLocalSearchBackendFactory;
 import tools.refinery.store.query.viatra.internal.matcher.RawPatternMatcher;
 import tools.refinery.store.query.viatra.internal.pquery.Dnf2PQuery;
+import tools.refinery.viatra.runtime.CancellationToken;
+import tools.refinery.viatra.runtime.api.IQuerySpecification;
+import tools.refinery.viatra.runtime.api.ViatraQueryEngineOptions;
+import tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchGenericBackendFactory;
+import tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHintOptions;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.rete.matcher.ReteBackendFactory;
 
 import java.util.*;
 import java.util.function.Function;
@@ -32,15 +36,19 @@ public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder<Via
                         // Use a cost function that ignores the initial (empty) model but allows higher arity input keys.
                         LocalSearchHintOptions.PLANNER_COST_FUNCTION, new FlatCostFunction()
         ), (IQueryBackendFactory) null);
+        private CancellationToken cancellationToken = CancellationToken.NONE;
+        private final CompositeRewriter rewriter;
         private final Dnf2PQuery dnf2PQuery = new Dnf2PQuery();
-        private final Set<AnyQuery> vacuousQueries = new LinkedHashSet<>();
-        private final Map<AnyQuery, IQuerySpecification<RawPatternMatcher>> querySpecifications = new LinkedHashMap<>();
+        private final Set<AnyQuery> queries = new LinkedHashSet<>();
 
         public ViatraModelQueryBuilderImpl() {
                 engineOptionsBuilder = new ViatraQueryEngineOptions.Builder()
                                 .withDefaultBackend(ReteBackendFactory.INSTANCE)
                                 .withDefaultCachingBackend(ReteBackendFactory.INSTANCE)
-                                .withDefaultSearchBackend(RelationalLocalSearchBackendFactory.INSTANCE);
+                                .withDefaultSearchBackend(LocalSearchGenericBackendFactory.INSTANCE);
+                rewriter = new CompositeRewriter();
+                rewriter.addFirst(new DuplicateDnfRemover());
+                rewriter.addFirst(new InputParameterResolver());
         }
 
         @Override
@@ -79,58 +87,64 @@ public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder<Via
         }
 
         @Override
-        public ViatraModelQueryBuilder query(AnyQuery query) {
-                checkNotConfigured();
-                if (querySpecifications.containsKey(query) || vacuousQueries.contains(query)) {
-                        // Ignore duplicate queries.
-                        return this;
-                }
-                var dnf = query.getDnf();
-                var reduction = dnf.getReduction();
-                switch (reduction) {
-                case NOT_REDUCIBLE -> {
-                        var pQuery = dnf2PQuery.translate(dnf);
-                        querySpecifications.put(query, pQuery.build());
-                }
-                case ALWAYS_FALSE -> vacuousQueries.add(query);
-                case ALWAYS_TRUE -> throw new IllegalArgumentException(
-                                "Query %s is relationally unsafe (it matches every tuple)".formatted(query.name()));
-                default -> throw new IllegalArgumentException("Unknown reduction: " + reduction);
-                }
+        public ViatraModelQueryBuilder cancellationToken(CancellationToken cancellationToken) {
+                this.cancellationToken = cancellationToken;
                 return this;
         }
 
         @Override
-        public ViatraModelQueryBuilder query(AnyQuery query, QueryEvaluationHint queryEvaluationHint) {
-                hint(query.getDnf(), queryEvaluationHint);
-                query(query);
+        public ViatraModelQueryBuilder queries(Collection<? extends AnyQuery> queries) {
+                checkNotConfigured();
+                this.queries.addAll(queries);
                 return this;
         }
 
         @Override
-        public ViatraModelQueryBuilder computeHint(Function<Dnf, QueryEvaluationHint> computeHint) {
+        public ViatraModelQueryBuilder query(AnyQuery query) {
                 checkNotConfigured();
-                dnf2PQuery.setComputeHint(computeHint);
+                queries.add(query);
                 return this;
         }
 
         @Override
-        public ViatraModelQueryBuilder hint(Dnf dnf, QueryEvaluationHint queryEvaluationHint) {
-                checkNotConfigured();
-                dnf2PQuery.hint(dnf, queryEvaluationHint);
+        public ViatraModelQueryBuilder rewriter(DnfRewriter rewriter) {
+                this.rewriter.addFirst(rewriter);
                 return this;
         }
 
         @Override
-        public void doConfigure(ModelStoreBuilder storeBuilder) {
-                dnf2PQuery.assertNoUnusedHints();
+        public ViatraModelQueryBuilder computeHint(Function<Dnf, QueryEvaluationHint> computeHint) {
+                checkNotConfigured();
+                dnf2PQuery.setComputeHint(computeHint);
+                return this;
         }
 
         @Override
         public ViatraModelQueryStoreAdapterImpl doBuild(ModelStore store) {
+                var canonicalQueryMap = new HashMap<AnyQuery, AnyQuery>();
+                var querySpecifications = new LinkedHashMap<AnyQuery, IQuerySpecification<RawPatternMatcher>>();
+                var vacuousQueries = new LinkedHashSet<AnyQuery>();
+                for (var query : queries) {
+                        var canonicalQuery = rewriter.rewrite(query);
+                        canonicalQueryMap.put(query, canonicalQuery);
+                        var dnf = canonicalQuery.getDnf();
+                        var reduction = dnf.getReduction();
+                        switch (reduction) {
+                        case NOT_REDUCIBLE -> {
+                                var pQuery = dnf2PQuery.translate(dnf);
+                                querySpecifications.put(canonicalQuery, pQuery.build());
+                        }
+                        case ALWAYS_FALSE -> vacuousQueries.add(canonicalQuery);
+                        case ALWAYS_TRUE -> throw new IllegalArgumentException(
+                                        "Query %s is relationally unsafe (it matches every tuple)".formatted(query.name()));
+                        default -> throw new IllegalArgumentException("Unknown reduction: " + reduction);
+                        }
+                }
+
                 validateSymbols(store);
                 return new ViatraModelQueryStoreAdapterImpl(store, buildEngineOptions(), dnf2PQuery.getSymbolViews(),
-                                Collections.unmodifiableMap(querySpecifications), Collections.unmodifiableSet(vacuousQueries));
+                                Collections.unmodifiableMap(canonicalQueryMap), Collections.unmodifiableMap(querySpecifications),
+                                Collections.unmodifiableSet(vacuousQueries), cancellationToken);
         }
 
         private ViatraQueryEngineOptions buildEngineOptions() {
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryStoreAdapterImpl.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryStoreAdapterImpl.java
index 11a3c7fd..f32e1cc6 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryStoreAdapterImpl.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryStoreAdapterImpl.java
@@ -5,12 +5,14 @@
  */
 package tools.refinery.store.query.viatra.internal;
 
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.CancellationToken;
+import tools.refinery.viatra.runtime.api.IQuerySpecification;
+import tools.refinery.viatra.runtime.api.ViatraQueryEngineOptions;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.viatra.ViatraModelQueryStoreAdapter;
 import tools.refinery.store.query.viatra.internal.matcher.RawPatternMatcher;
 import tools.refinery.store.query.view.AnySymbolView;
@@ -21,19 +23,24 @@ public class ViatraModelQueryStoreAdapterImpl implements ViatraModelQueryStoreAd
         private final ModelStore store;
         private final ViatraQueryEngineOptions engineOptions;
         private final Map<AnySymbolView, IInputKey> inputKeys;
+        private final Map<AnyQuery, AnyQuery> canonicalQueryMap;
         private final Map<AnyQuery, IQuerySpecification<RawPatternMatcher>> querySpecifications;
         private final Set<AnyQuery> vacuousQueries;
         private final Set<AnyQuery> allQueries;
+        private final CancellationToken cancellationToken;
 
         ViatraModelQueryStoreAdapterImpl(ModelStore store, ViatraQueryEngineOptions engineOptions,
                                                                          Map<AnySymbolView, IInputKey> inputKeys,
+                                                                         Map<AnyQuery, AnyQuery> canonicalQueryMap,
                                                                          Map<AnyQuery, IQuerySpecification<RawPatternMatcher>> querySpecifications,
-                                                                         Set<AnyQuery> vacuousQueries) {
+                                                                         Set<AnyQuery> vacuousQueries, CancellationToken cancellationToken) {
                 this.store = store;
                 this.engineOptions = engineOptions;
                 this.inputKeys = inputKeys;
+                this.canonicalQueryMap = canonicalQueryMap;
                 this.querySpecifications = querySpecifications;
                 this.vacuousQueries = vacuousQueries;
+                this.cancellationToken = cancellationToken;
                 var mutableAllQueries = new LinkedHashSet<AnyQuery>(querySpecifications.size() + vacuousQueries.size());
                 mutableAllQueries.addAll(querySpecifications.keySet());
                 mutableAllQueries.addAll(vacuousQueries);
@@ -58,6 +65,21 @@ public class ViatraModelQueryStoreAdapterImpl implements ViatraModelQueryStoreAd
                 return allQueries;
         }
 
+        public CancellationToken getCancellationToken() {
+                return cancellationToken;
+        }
+
+        @Override
+        public <T> Query<T> getCanonicalQuery(Query<T> query) {
+                // We know that canonical forms of queries do not change output types.
+                @SuppressWarnings("unchecked")
+                var canonicalQuery = (Query<T>) canonicalQueryMap.get(query);
+                if (canonicalQuery == null) {
+                        throw new IllegalArgumentException("Unknown query: " + query);
+                }
+                return canonicalQuery;
+        }
+
         Map<AnyQuery, IQuerySpecification<RawPatternMatcher>> getQuerySpecifications() {
                 return querySpecifications;
         }
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/DummyBaseIndexer.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/DummyBaseIndexer.java
index 8cb199d2..64d98258 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/DummyBaseIndexer.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/DummyBaseIndexer.java
@@ -5,16 +5,16 @@
  */
 package tools.refinery.store.query.viatra.internal.context;
 
-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;
+import tools.refinery.viatra.runtime.api.scope.IBaseIndex;
+import tools.refinery.viatra.runtime.api.scope.IIndexingErrorListener;
+import tools.refinery.viatra.runtime.api.scope.IInstanceObserver;
+import tools.refinery.viatra.runtime.api.scope.ViatraBaseIndexChangeListener;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.Callable;
 
 /**
- * Copied from <code>org.eclipse.viatra.query.runtime.tabular.TabularEngineContext</code>
+ * Copied from <code>tools.refinery.viatra.runtime.tabular.TabularEngineContext</code>
  */
 public class DummyBaseIndexer implements IBaseIndex {
         DummyBaseIndexer() {
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalEngineContext.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalEngineContext.java
index 7220f8ca..f7d323ff 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalEngineContext.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalEngineContext.java
@@ -5,9 +5,9 @@
  */
 package tools.refinery.store.query.viatra.internal.context;
 
-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.viatra.runtime.api.scope.IBaseIndex;
+import tools.refinery.viatra.runtime.api.scope.IEngineContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
 import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
 
 public class RelationalEngineContext implements IEngineContext {
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalQueryMetaContext.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalQueryMetaContext.java
index 211eacb4..77d86a1c 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalQueryMetaContext.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalQueryMetaContext.java
@@ -5,10 +5,10 @@
  */
 package tools.refinery.store.query.viatra.internal.context;
 
-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 org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
+import tools.refinery.viatra.runtime.matchers.context.AbstractQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.InputKeyImplication;
+import tools.refinery.viatra.runtime.matchers.context.common.JavaTransitiveInstancesKey;
 import tools.refinery.store.query.viatra.internal.pquery.SymbolViewWrapper;
 import tools.refinery.store.query.view.AnySymbolView;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalRuntimeContext.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalRuntimeContext.java
index 0f2daca8..dadab5dd 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalRuntimeContext.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/context/RelationalRuntimeContext.java
@@ -5,12 +5,13 @@
  */
 package tools.refinery.store.query.viatra.internal.context;
 
-import org.eclipse.viatra.query.runtime.matchers.context.*;
-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.viatra.runtime.CancellationToken;
+import tools.refinery.viatra.runtime.matchers.context.*;
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.Accuracy;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
 import tools.refinery.store.query.viatra.internal.pquery.SymbolViewWrapper;
@@ -32,10 +33,13 @@ public class RelationalRuntimeContext implements IQueryRuntimeContext {
 
         private final Model model;
 
+        private final CancellationToken cancellationToken;
+
         RelationalRuntimeContext(ViatraModelQueryAdapterImpl adapter) {
                 model = adapter.getModel();
                 metaContext = new RelationalQueryMetaContext(adapter.getStoreAdapter().getInputKeys());
                 modelUpdateListener = new ModelUpdateListener(adapter);
+                cancellationToken = adapter.getCancellationToken();
         }
 
         @Override
@@ -119,10 +123,20 @@ public class RelationalRuntimeContext implements IQueryRuntimeContext {
 
         private Iterable<Object[]> enumerate(IInputKey key, TupleMask seedMask, ITuple seed) {
                 var relationViewKey = checkKey(key);
-                Iterable<Object[]> allObjects = relationViewKey.getAll(model);
+                Iterable<Object[]> allObjects = getAllObjects(relationViewKey, seedMask, seed);
                 return filter(allObjects, objectArray -> isMatching(objectArray, seedMask, seed));
         }
 
+        private Iterable<Object[]> getAllObjects(AnySymbolView key, TupleMask seedMask, ITuple seed) {
+                for (int i = 0; i < seedMask.indices.length; i++) {
+                        int slot = seedMask.indices[i];
+                        if (key.canIndexSlot(slot)) {
+                                return key.getAdjacent(model, slot, seed.get(i));
+                        }
+                }
+                return key.getAll(model);
+        }
+
         private static boolean isMatching(Object[] tuple, TupleMask seedMask, ITuple seed) {
                 for (int i = 0; i < seedMask.indices.length; i++) {
                         final Object seedElement = seed.get(i);
@@ -182,4 +196,9 @@ public class RelationalRuntimeContext implements IQueryRuntimeContext {
         public void executeAfterTraversal(Runnable runnable) {
                 runnable.run();
         }
+
+        @Override
+        public CancellationToken getCancellationToken() {
+                return cancellationToken;
+        }
 }
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/FlatCostFunction.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/FlatCostFunction.java
index cc906f22..ce2a75bd 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/FlatCostFunction.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/FlatCostFunction.java
@@ -5,12 +5,12 @@
  */
 package tools.refinery.store.query.viatra.internal.localsearch;
 
-import org.eclipse.viatra.query.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
-import org.eclipse.viatra.query.runtime.localsearch.planner.cost.impl.StatisticsBasedConstraintCostFunction;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.tuple.TupleMask;
-import org.eclipse.viatra.query.runtime.matchers.util.Accuracy;
+import tools.refinery.viatra.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
+import tools.refinery.viatra.runtime.localsearch.planner.cost.impl.StatisticsBasedConstraintCostFunction;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Accuracy;
 
 import java.util.Optional;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/RelationalLocalSearchBackendFactory.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/RelationalLocalSearchBackendFactory.java
deleted file mode 100644
index 0c77f587..00000000
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/RelationalLocalSearchBackendFactory.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.query.viatra.internal.localsearch;
-
-import org.eclipse.viatra.query.runtime.localsearch.matcher.integration.AbstractLocalSearchResultProvider;
-import org.eclipse.viatra.query.runtime.localsearch.matcher.integration.LocalSearchBackend;
-import org.eclipse.viatra.query.runtime.localsearch.matcher.integration.LocalSearchHints;
-import org.eclipse.viatra.query.runtime.localsearch.plan.IPlanProvider;
-import org.eclipse.viatra.query.runtime.localsearch.plan.SimplePlanProvider;
-import org.eclipse.viatra.query.runtime.matchers.backend.IMatcherCapability;
-import org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackend;
-import org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackendFactory;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.IQueryBackendContext;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery;
-
-public class RelationalLocalSearchBackendFactory implements IQueryBackendFactory {
-        public static final RelationalLocalSearchBackendFactory INSTANCE = new RelationalLocalSearchBackendFactory();
-
-        private RelationalLocalSearchBackendFactory() {
-        }
-
-        @Override
-        public IQueryBackend create(IQueryBackendContext context) {
-                return new LocalSearchBackend(context) {
-                        // Create a new {@link IPlanProvider}, because the original {@link LocalSearchBackend#planProvider} is not
-                        // accessible.
-                        private final IPlanProvider planProvider = new SimplePlanProvider(context.getLogger());
-
-                        @Override
-                        protected AbstractLocalSearchResultProvider initializeResultProvider(PQuery query,
-                                                                                                                                                                 QueryEvaluationHint hints) {
-                                return new RelationalLocalSearchResultProvider(this, context, query, planProvider, hints);
-                        }
-
-                        @Override
-                        public IQueryBackendFactory getFactory() {
-                                return RelationalLocalSearchBackendFactory.this;
-                        }
-                };
-        }
-
-        @Override
-        public Class<? extends IQueryBackend> getBackendClass() {
-                return LocalSearchBackend.class;
-        }
-
-        @Override
-        public IMatcherCapability calculateRequiredCapability(PQuery pQuery, QueryEvaluationHint queryEvaluationHint) {
-                return LocalSearchHints.parse(queryEvaluationHint);
-        }
-
-        @Override
-        public boolean isCaching() {
-                return false;
-        }
-}
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/RelationalLocalSearchResultProvider.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/RelationalLocalSearchResultProvider.java
deleted file mode 100644
index da37be14..00000000
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/RelationalLocalSearchResultProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.query.viatra.internal.localsearch;
-
-import org.eclipse.viatra.query.runtime.localsearch.matcher.integration.AbstractLocalSearchResultProvider;
-import org.eclipse.viatra.query.runtime.localsearch.matcher.integration.LocalSearchBackend;
-import org.eclipse.viatra.query.runtime.localsearch.matcher.integration.LocalSearchHints;
-import org.eclipse.viatra.query.runtime.localsearch.plan.IPlanProvider;
-import org.eclipse.viatra.query.runtime.localsearch.planner.compiler.IOperationCompiler;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.IQueryBackendContext;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery;
-
-class RelationalLocalSearchResultProvider extends AbstractLocalSearchResultProvider {
-        public RelationalLocalSearchResultProvider(LocalSearchBackend backend, IQueryBackendContext context, PQuery query,
-                                                                                           IPlanProvider planProvider, QueryEvaluationHint userHints) {
-                super(backend, context, query, planProvider, userHints);
-        }
-
-        @Override
-        protected IOperationCompiler getOperationCompiler(IQueryBackendContext backendContext,
-                                                                                                          LocalSearchHints configuration) {
-                return new RelationalOperationCompiler(runtimeContext);
-        }
-}
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/RelationalOperationCompiler.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/RelationalOperationCompiler.java
deleted file mode 100644
index f76ef486..00000000
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/RelationalOperationCompiler.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.query.viatra.internal.localsearch;
-
-import org.eclipse.viatra.query.runtime.localsearch.operations.generic.GenericTypeExtendSingleValue;
-import org.eclipse.viatra.query.runtime.localsearch.operations.util.CallInformation;
-import org.eclipse.viatra.query.runtime.localsearch.planner.compiler.GenericOperationCompiler;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContext;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-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.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.TupleMask;
-
-import java.util.*;
-
-public class RelationalOperationCompiler extends GenericOperationCompiler  {
-        public RelationalOperationCompiler(IQueryRuntimeContext runtimeContext) {
-                super(runtimeContext);
-        }
-
-        @Override
-        protected void createExtend(TypeConstraint typeConstraint, Map<PVariable, Integer> variableMapping) {
-                IInputKey inputKey = typeConstraint.getSupplierKey();
-                Tuple tuple = typeConstraint.getVariablesTuple();
-
-                int[] positions = new int[tuple.getSize()];
-                List<Integer> boundVariableIndices = new ArrayList<>();
-                List<Integer> boundVariables = new ArrayList<>();
-                Set<Integer> unboundVariables = new HashSet<>();
-                for (int i = 0; i < tuple.getSize(); i++) {
-                        PVariable variable = (PVariable) tuple.get(i);
-                        Integer position = variableMapping.get(variable);
-                        positions[i] = position;
-                        if (variableBindings.get(typeConstraint).contains(position)) {
-                                boundVariableIndices.add(i);
-                                boundVariables.add(position);
-                        } else {
-                                unboundVariables.add(position);
-                        }
-                }
-                TupleMask indexerMask = TupleMask.fromSelectedIndices(inputKey.getArity(), boundVariableIndices);
-                TupleMask callMask = TupleMask.fromSelectedIndices(variableMapping.size(), boundVariables);
-                // If multiple tuple elements from the indexer should be bound to the same variable, we must use a
-                // {@link GenericTypeExtend} check whether the tuple elements have the same value.
-                if (unboundVariables.size() == 1 && indexerMask.getSize() + 1 == indexerMask.getSourceWidth()) {
-                        operations.add(new GenericTypeExtendSingleValue(inputKey, positions, callMask, indexerMask,
-                                        unboundVariables.iterator().next()));
-                } else {
-                        // Use a fixed version of
-                        // {@code org.eclipse.viatra.query.runtime.localsearch.operations.generic.GenericTypeExtend} that handles
-                        // failed unification of variables correctly.
-                        operations.add(new GenericTypeExtend(inputKey, positions, callMask, indexerMask, unboundVariables));
-                }
-        }
-
-        @Override
-        protected void createExtend(PositivePatternCall pCall, Map<PVariable, Integer> variableMapping) {
-                CallInformation information = CallInformation.create(pCall, variableMapping, variableBindings.get(pCall));
-                // Use a fixed version of
-                // {@code org.eclipse.viatra.query.runtime.localsearch.operations.extend.ExtendPositivePatternCall} that handles
-                // failed unification of variables correctly.
-                operations.add(new ExtendPositivePatternCall(information));
-                dependencies.add(information.getCallWithAdornment());
-        }
-}
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/AbstractViatraMatcher.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/AbstractViatraMatcher.java
index 99b0a3d8..c4a5a236 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/AbstractViatraMatcher.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/AbstractViatraMatcher.java
@@ -5,8 +5,8 @@
  */
 package tools.refinery.store.query.viatra.internal.matcher;
 
-import org.eclipse.viatra.query.runtime.matchers.backend.IQueryResultProvider;
-import org.eclipse.viatra.query.runtime.matchers.backend.IUpdateable;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.backend.IUpdateable;
 import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.resultset.AbstractResultSet;
 import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/FunctionalCursor.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/FunctionalCursor.java
index 47efb2aa..44038669 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/FunctionalCursor.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/FunctionalCursor.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra.internal.matcher;
 
-import org.eclipse.viatra.query.runtime.rete.index.IterableIndexer;
+import tools.refinery.viatra.runtime.rete.index.IterableIndexer;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.tuple.Tuple;
 
@@ -13,7 +13,7 @@ import java.util.Iterator;
 
 class FunctionalCursor<T> implements Cursor<Tuple, T> {
         private final IterableIndexer indexer;
-        private final Iterator<org.eclipse.viatra.query.runtime.matchers.tuple.Tuple> iterator;
+        private final Iterator<tools.refinery.viatra.runtime.matchers.tuple.Tuple> iterator;
         private boolean terminated;
         private Tuple key;
         private T value;
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/FunctionalViatraMatcher.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/FunctionalViatraMatcher.java
index db4740cd..fb9e4df6 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/FunctionalViatraMatcher.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/FunctionalViatraMatcher.java
@@ -5,10 +5,10 @@
  */
 package tools.refinery.store.query.viatra.internal.matcher;
 
-import org.eclipse.viatra.query.runtime.matchers.tuple.TupleMask;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.rete.index.IterableIndexer;
-import org.eclipse.viatra.query.runtime.rete.matcher.RetePatternMatcher;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.rete.index.IterableIndexer;
+import tools.refinery.viatra.runtime.rete.matcher.RetePatternMatcher;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.query.dnf.FunctionalQuery;
 import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
@@ -17,9 +17,9 @@ import tools.refinery.store.tuple.Tuple;
 /**
  * Directly access the tuples inside a VIATRA pattern matcher.<p>
  * This class neglects calling
- * {@link org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContext#wrapTuple(org.eclipse.viatra.query.runtime.matchers.tuple.Tuple)}
+ * {@link tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext#wrapTuple(org.eclipse.viatra.query.runtime.matchers.tuple.Tuple)}
  * and
- * {@link org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContext#unwrapTuple(org.eclipse.viatra.query.runtime.matchers.tuple.Tuple)},
+ * {@link tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext#unwrapTuple(org.eclipse.viatra.query.runtime.matchers.tuple.Tuple)},
  * because {@link tools.refinery.store.query.viatra.internal.context.RelationalRuntimeContext} provides a trivial
  * implementation for these methods.
  * Using this class with any other runtime context may lead to undefined behavior.
@@ -37,7 +37,7 @@ public class FunctionalViatraMatcher<T> extends AbstractViatraMatcher<T> {
                 emptyMask = TupleMask.empty(arityWithOutput);
                 omitOutputMask = TupleMask.omit(arity, arityWithOutput);
                 if (backend instanceof RetePatternMatcher reteBackend) {
-                        var maybeIterableOmitOutputIndexer = IndexerUtils.getIndexer(reteBackend, omitOutputMask);
+                        var maybeIterableOmitOutputIndexer = reteBackend.getInternalIndexer(omitOutputMask);
                         if (maybeIterableOmitOutputIndexer instanceof IterableIndexer iterableOmitOutputIndexer) {
                                 omitOutputIndexer = iterableOmitOutputIndexer;
                         } else {
@@ -76,7 +76,7 @@ public class FunctionalViatraMatcher<T> extends AbstractViatraMatcher<T> {
         }
 
         @Override
-        public void update(org.eclipse.viatra.query.runtime.matchers.tuple.Tuple updateElement, boolean isInsertion) {
+        public void update(tools.refinery.viatra.runtime.matchers.tuple.Tuple updateElement, boolean isInsertion) {
                 var key = MatcherUtils.keyToRefineryTuple(updateElement);
                 var value = MatcherUtils.<T>getValue(updateElement);
                 if (isInsertion) {
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/IndexerUtils.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/IndexerUtils.java
deleted file mode 100644
index 15f00b2d..00000000
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/IndexerUtils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.query.viatra.internal.matcher;
-
-import org.eclipse.viatra.query.runtime.matchers.tuple.TupleMask;
-import org.eclipse.viatra.query.runtime.rete.index.Indexer;
-import org.eclipse.viatra.query.runtime.rete.matcher.ReteEngine;
-import org.eclipse.viatra.query.runtime.rete.matcher.RetePatternMatcher;
-import org.eclipse.viatra.query.runtime.rete.traceability.RecipeTraceInfo;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-
-final class IndexerUtils {
-    private static final MethodHandle GET_ENGINE_HANDLE;
-    private static final MethodHandle GET_PRODUCTION_NODE_TRACE_HANDLE;
-    private static final MethodHandle ACCESS_PROJECTION_HANDLE;
-
-    static {
-        try {
-            var lookup = MethodHandles.privateLookupIn(RetePatternMatcher.class, MethodHandles.lookup());
-            GET_ENGINE_HANDLE = lookup.findGetter(RetePatternMatcher.class, "engine", ReteEngine.class);
-            GET_PRODUCTION_NODE_TRACE_HANDLE = lookup.findGetter(RetePatternMatcher.class, "productionNodeTrace",
-                    RecipeTraceInfo.class);
-            ACCESS_PROJECTION_HANDLE = lookup.findVirtual(ReteEngine.class, "accessProjection",
-                    MethodType.methodType(Indexer.class, RecipeTraceInfo.class, TupleMask.class));
-        } catch (IllegalAccessException | NoSuchFieldException | NoSuchMethodException e) {
-            throw new IllegalStateException("Cannot access private members of %s"
-                    .formatted(RetePatternMatcher.class.getPackageName()), e);
-        }
-    }
-
-    private IndexerUtils() {
-        throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
-    }
-
-    public static Indexer getIndexer(RetePatternMatcher backend, TupleMask mask) {
-        try {
-            var engine = (ReteEngine) GET_ENGINE_HANDLE.invokeExact(backend);
-            var trace = (RecipeTraceInfo) GET_PRODUCTION_NODE_TRACE_HANDLE.invokeExact(backend);
-            return (Indexer) ACCESS_PROJECTION_HANDLE.invokeExact(engine, trace, mask);
-        } catch (Error e) {
-            // Fatal JVM errors should not be wrapped.
-            throw e;
-        } catch (Throwable e) {
-            throw new IllegalStateException("Cannot access matcher for mask " + mask, e);
-        }
-    }
-}
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/MatcherUtils.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/MatcherUtils.java
index 6e24812a..6cda23cd 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/MatcherUtils.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/MatcherUtils.java
@@ -5,8 +5,8 @@
  */
 package tools.refinery.store.query.viatra.internal.matcher;
 
-import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
 import org.jetbrains.annotations.Nullable;
 import tools.refinery.store.tuple.*;
 
@@ -17,7 +17,7 @@ final class MatcherUtils {
                 throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
         }
 
-        public static org.eclipse.viatra.query.runtime.matchers.tuple.Tuple toViatraTuple(Tuple refineryTuple) {
+        public static tools.refinery.viatra.runtime.matchers.tuple.Tuple toViatraTuple(Tuple refineryTuple) {
                 if (refineryTuple instanceof Tuple0) {
                         return Tuples.staticArityFlatTupleOf();
                 } else if (refineryTuple instanceof Tuple1) {
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RawPatternMatcher.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RawPatternMatcher.java
index 5b82c4b7..c0be70ba 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RawPatternMatcher.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RawPatternMatcher.java
@@ -5,9 +5,9 @@
  */
 package tools.refinery.store.query.viatra.internal.matcher;
 
-import org.eclipse.viatra.query.runtime.api.GenericPatternMatcher;
-import org.eclipse.viatra.query.runtime.api.GenericQuerySpecification;
-import org.eclipse.viatra.query.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.api.GenericPatternMatcher;
+import tools.refinery.viatra.runtime.api.GenericQuerySpecification;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
 
 public class RawPatternMatcher extends GenericPatternMatcher {
     public RawPatternMatcher(GenericQuerySpecification<? extends GenericPatternMatcher> specification) {
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RelationalCursor.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RelationalCursor.java
index 1dc8f5db..53475218 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RelationalCursor.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RelationalCursor.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra.internal.matcher;
 
-import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.tuple.Tuple;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RelationalViatraMatcher.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RelationalViatraMatcher.java
index ac95dcc0..da75e864 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RelationalViatraMatcher.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/RelationalViatraMatcher.java
@@ -5,10 +5,10 @@
  */
 package tools.refinery.store.query.viatra.internal.matcher;
 
-import org.eclipse.viatra.query.runtime.matchers.tuple.TupleMask;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.rete.index.Indexer;
-import org.eclipse.viatra.query.runtime.rete.matcher.RetePatternMatcher;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.rete.index.Indexer;
+import tools.refinery.viatra.runtime.rete.matcher.RetePatternMatcher;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.map.Cursors;
 import tools.refinery.store.query.dnf.RelationalQuery;
@@ -18,9 +18,9 @@ import tools.refinery.store.tuple.Tuple;
 /**
  * Directly access the tuples inside a VIATRA pattern matcher.<p>
  * This class neglects calling
- * {@link org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContext#wrapTuple(org.eclipse.viatra.query.runtime.matchers.tuple.Tuple)}
+ * {@link tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext#wrapTuple(org.eclipse.viatra.query.runtime.matchers.tuple.Tuple)}
  * and
- * {@link org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContext#unwrapTuple(org.eclipse.viatra.query.runtime.matchers.tuple.Tuple)},
+ * {@link tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext#unwrapTuple(org.eclipse.viatra.query.runtime.matchers.tuple.Tuple)},
  * because {@link tools.refinery.store.query.viatra.internal.context.RelationalRuntimeContext} provides a trivial
  * implementation for these methods.
  * Using this class with any other runtime context may lead to undefined behavior.
@@ -37,7 +37,7 @@ public class RelationalViatraMatcher extends AbstractViatraMatcher<Boolean> {
                 emptyMask = TupleMask.empty(arity);
                 identityMask = TupleMask.identity(arity);
                 if (backend instanceof RetePatternMatcher reteBackend) {
-                        emptyMaskIndexer = IndexerUtils.getIndexer(reteBackend, emptyMask);
+                        emptyMaskIndexer = reteBackend.getInternalIndexer(emptyMask);
                 } else {
                         emptyMaskIndexer = null;
                 }
@@ -73,7 +73,7 @@ public class RelationalViatraMatcher extends AbstractViatraMatcher<Boolean> {
         }
 
         @Override
-        public void update(org.eclipse.viatra.query.runtime.matchers.tuple.Tuple updateElement, boolean isInsertion) {
+        public void update(tools.refinery.viatra.runtime.matchers.tuple.Tuple updateElement, boolean isInsertion) {
                 var key = MatcherUtils.toRefineryTuple(updateElement);
                 notifyChange(key, !isInsertion, isInsertion);
         }
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/UnsafeFunctionalCursor.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/UnsafeFunctionalCursor.java
index b0b507fe..093ade96 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/UnsafeFunctionalCursor.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/matcher/UnsafeFunctionalCursor.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra.internal.matcher;
 
-import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.tuple.Tuple;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/AssumptionEvaluator.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/CheckEvaluator.java
index cf127291..ada154d4 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/AssumptionEvaluator.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/CheckEvaluator.java
@@ -5,11 +5,11 @@
  */
 package tools.refinery.store.query.viatra.internal.pquery;
 
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
+import tools.refinery.viatra.runtime.matchers.psystem.IValueProvider;
 import tools.refinery.store.query.term.Term;
 
-class AssumptionEvaluator extends TermEvaluator<Boolean> {
-        public AssumptionEvaluator(Term<Boolean> term) {
+class CheckEvaluator extends TermEvaluator<Boolean> {
+        public CheckEvaluator(Term<Boolean> term) {
                 super(term);
         }
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/Dnf2PQuery.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/Dnf2PQuery.java
index 5b0ea61d..492bd054 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/Dnf2PQuery.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/Dnf2PQuery.java
@@ -5,24 +5,7 @@
  */
 package tools.refinery.store.query.viatra.internal.pquery;
 
-import org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackendFactory;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-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.aggregations.BoundAggregator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.*;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.ConstantValue;
-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.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import tools.refinery.store.query.Constraint;
 import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.dnf.DnfClause;
 import tools.refinery.store.query.dnf.SymbolicParameter;
@@ -33,17 +16,33 @@ import tools.refinery.store.query.term.StatelessAggregator;
 import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.util.CycleDetectingMapper;
-
-import java.util.*;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.BoundAggregator;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.psystem.annotations.PAnnotation;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.*;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.*;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.Connectivity;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameterDirection;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 public class Dnf2PQuery {
-        private static final Object P_CONSTRAINT_LOCK = new Object();
         private final CycleDetectingMapper<Dnf, RawPQuery> mapper = new CycleDetectingMapper<>(Dnf::name,
                         this::doTranslate);
         private final QueryWrapperFactory wrapperFactory = new QueryWrapperFactory(this);
-        private final Map<Dnf, QueryEvaluationHint> hintOverrides = new LinkedHashMap<>();
         private Function<Dnf, QueryEvaluationHint> computeHint = dnf -> new QueryEvaluationHint(null,
                         (IQueryBackendFactory) null);
 
@@ -59,36 +58,15 @@ public class Dnf2PQuery {
                 return wrapperFactory.getSymbolViews();
         }
 
-        public void hint(Dnf dnf, QueryEvaluationHint hint) {
-                hintOverrides.compute(dnf, (ignoredKey, existingHint) ->
-                                existingHint == null ? hint : existingHint.overrideBy(hint));
-        }
-
-        private QueryEvaluationHint consumeHint(Dnf dnf) {
-                var defaultHint = computeHint.apply(dnf);
-                var existingHint = hintOverrides.remove(dnf);
-                return defaultHint.overrideBy(existingHint);
-        }
-
-        public void assertNoUnusedHints() {
-                if (hintOverrides.isEmpty()) {
-                        return;
-                }
-                var unusedHints = hintOverrides.keySet().stream().map(Dnf::name).collect(Collectors.joining(", "));
-                throw new IllegalStateException(
-                                "Unused query evaluation hints for %s. Hints must be set before a query is added to the engine"
-                                                .formatted(unusedHints));
-        }
-
         private RawPQuery doTranslate(Dnf dnfQuery) {
                 var pQuery = new RawPQuery(dnfQuery.getUniqueName());
-                pQuery.setEvaluationHints(consumeHint(dnfQuery));
+                pQuery.setEvaluationHints(computeHint.apply(dnfQuery));
 
                 Map<SymbolicParameter, PParameter> parameters = new HashMap<>();
                 List<PParameter> parameterList = new ArrayList<>();
                 for (var parameter : dnfQuery.getSymbolicParameters()) {
                         var direction = switch (parameter.getDirection()) {
-                                case OUT -> parameter.isUnifiable() ? PParameterDirection.INOUT : PParameterDirection.OUT;
+                                case OUT -> PParameterDirection.INOUT;
                                 case IN -> throw new IllegalArgumentException("Query %s with input parameter %s is not supported"
                                                 .formatted(dnfQuery, parameter.getVariable()));
                         };
@@ -110,22 +88,17 @@ public class Dnf2PQuery {
                         pQuery.addAnnotation(functionalDependencyAnnotation);
                 }
 
-                // The constructor of {@link org.eclipse.viatra.query.runtime.matchers.psystem.BasePConstraint} mutates
-                // global static state (<code>nextID</code>) without locking. Therefore, we need to synchronize before creating
-                // any query literals to avoid a data race.
-                synchronized (P_CONSTRAINT_LOCK) {
-                        for (DnfClause clause : dnfQuery.getClauses()) {
-                                PBody body = new PBody(pQuery);
-                                List<ExportedParameter> parameterExports = new ArrayList<>();
-                                for (var parameter : dnfQuery.getSymbolicParameters()) {
-                                        PVariable pVar = body.getOrCreateVariableByName(parameter.getVariable().getUniqueName());
-                                        parameterExports.add(new ExportedParameter(body, pVar, parameters.get(parameter)));
-                                }
-                                body.setSymbolicParameters(parameterExports);
-                                pQuery.addBody(body);
-                                for (Literal literal : clause.literals()) {
-                                        translateLiteral(literal, body);
-                                }
+                for (DnfClause clause : dnfQuery.getClauses()) {
+                        PBody body = new PBody(pQuery);
+                        List<ExportedParameter> parameterExports = new ArrayList<>();
+                        for (var parameter : dnfQuery.getSymbolicParameters()) {
+                                PVariable pVar = body.getOrCreateVariableByName(parameter.getVariable().getUniqueName());
+                                parameterExports.add(new ExportedParameter(body, pVar, parameters.get(parameter)));
+                        }
+                        body.setSymbolicParameters(parameterExports);
+                        pQuery.addBody(body);
+                        for (Literal literal : clause.literals()) {
+                                translateLiteral(literal, body);
                         }
                 }
 
@@ -141,21 +114,23 @@ public class Dnf2PQuery {
                         translateConstantLiteral(constantLiteral, body);
                 } else if (literal instanceof AssignLiteral<?> assignLiteral) {
                         translateAssignLiteral(assignLiteral, body);
-                } else if (literal instanceof AssumeLiteral assumeLiteral) {
-                        translateAssumeLiteral(assumeLiteral, body);
+                } else if (literal instanceof CheckLiteral checkLiteral) {
+                        translateCheckLiteral(checkLiteral, body);
                 } else if (literal instanceof CountLiteral countLiteral) {
                         translateCountLiteral(countLiteral, body);
                 } else if (literal instanceof AggregationLiteral<?, ?> aggregationLiteral) {
                         translateAggregationLiteral(aggregationLiteral, body);
+                } else if (literal instanceof RepresentativeElectionLiteral representativeElectionLiteral) {
+                        translateRepresentativeElectionLiteral(representativeElectionLiteral, body);
                 } else {
                         throw new IllegalArgumentException("Unknown literal: " + literal.toString());
                 }
         }
 
         private void translateEquivalenceLiteral(EquivalenceLiteral equivalenceLiteral, PBody body) {
-                PVariable varSource = body.getOrCreateVariableByName(equivalenceLiteral.left().getUniqueName());
-                PVariable varTarget = body.getOrCreateVariableByName(equivalenceLiteral.right().getUniqueName());
-                if (equivalenceLiteral.positive()) {
+                PVariable varSource = body.getOrCreateVariableByName(equivalenceLiteral.getLeft().getUniqueName());
+                PVariable varTarget = body.getOrCreateVariableByName(equivalenceLiteral.getRight().getUniqueName());
+                if (equivalenceLiteral.isPositive()) {
                         new Equality(body, varSource, varTarget);
                 } else {
                         new Inequality(body, varSource, varTarget);
@@ -180,15 +155,7 @@ public class Dnf2PQuery {
                 }
                 case TRANSITIVE -> {
                         var substitution = translateSubstitution(callLiteral.getArguments(), body);
-                        var constraint = callLiteral.getTarget();
-                        PQuery pattern;
-                        if (constraint instanceof Dnf dnf) {
-                                pattern = translate(dnf);
-                        } else if (constraint instanceof AnySymbolView symbolView) {
-                                pattern = wrapperFactory.wrapSymbolViewIdentityArguments(symbolView);
-                        } else {
-                                throw new IllegalArgumentException("Unknown Constraint: " + constraint);
-                        }
+                        var pattern = wrapConstraintWithIdentityArguments(callLiteral.getTarget());
                         new BinaryTransitiveClosure(body, substitution, pattern);
                 }
                 case NEGATIVE -> {
@@ -201,6 +168,16 @@ public class Dnf2PQuery {
                 }
         }
 
+        private PQuery wrapConstraintWithIdentityArguments(Constraint constraint) {
+                if (constraint instanceof Dnf dnf) {
+                        return translate(dnf);
+                } else if (constraint instanceof AnySymbolView symbolView) {
+                        return wrapperFactory.wrapSymbolViewIdentityArguments(symbolView);
+                } else {
+                        throw new IllegalArgumentException("Unknown Constraint: " + constraint);
+                }
+        }
+
         private static Tuple translateSubstitution(List<Variable> substitution, PBody body) {
                 int arity = substitution.size();
                 Object[] variables = new Object[arity];
@@ -212,13 +189,13 @@ public class Dnf2PQuery {
         }
 
         private void translateConstantLiteral(ConstantLiteral constantLiteral, PBody body) {
-                var variable = body.getOrCreateVariableByName(constantLiteral.variable().getUniqueName());
-                new ConstantValue(body, variable, constantLiteral.nodeId());
+                var variable = body.getOrCreateVariableByName(constantLiteral.getVariable().getUniqueName());
+                new ConstantValue(body, variable, tools.refinery.store.tuple.Tuple.of(constantLiteral.getNodeId()));
         }
 
         private <T> void translateAssignLiteral(AssignLiteral<T> assignLiteral, PBody body) {
-                var variable = body.getOrCreateVariableByName(assignLiteral.variable().getUniqueName());
-                var term = assignLiteral.term();
+                var variable = body.getOrCreateVariableByName(assignLiteral.getVariable().getUniqueName());
+                var term = assignLiteral.getTerm();
                 if (term instanceof ConstantTerm<T> constantTerm) {
                         new ConstantValue(body, variable, constantTerm.getValue());
                 } else {
@@ -227,8 +204,8 @@ public class Dnf2PQuery {
                 }
         }
 
-        private void translateAssumeLiteral(AssumeLiteral assumeLiteral, PBody body) {
-                var evaluator = new AssumptionEvaluator(assumeLiteral.term());
+        private void translateCheckLiteral(CheckLiteral checkLiteral, PBody body) {
+                var evaluator = new CheckEvaluator(checkLiteral.getTerm());
                 new ExpressionEvaluation(body, evaluator, null);
         }
 
@@ -263,4 +240,14 @@ public class Dnf2PQuery {
                 new AggregatorConstraint(boundAggregator, body, substitution, wrappedCall.pattern(), resultVariable,
                                 aggregatedColumn);
         }
+
+        private void translateRepresentativeElectionLiteral(RepresentativeElectionLiteral literal, PBody body) {
+                var substitution = translateSubstitution(literal.getArguments(), body);
+                var pattern = wrapConstraintWithIdentityArguments(literal.getTarget());
+                var connectivity = switch (literal.getConnectivity()) {
+                        case WEAK -> Connectivity.WEAK;
+                        case STRONG -> Connectivity.STRONG;
+                };
+                new RepresentativeElectionConstraint(body, substitution, pattern, connectivity);
+        }
 }
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/QueryWrapperFactory.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/QueryWrapperFactory.java
index 2b7280f2..d21131e5 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/QueryWrapperFactory.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/QueryWrapperFactory.java
@@ -5,17 +5,17 @@
  */
 package tools.refinery.store.query.viatra.internal.pquery;
 
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-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.ExportedParameter;
-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.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PVisibility;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
 import tools.refinery.store.query.Constraint;
 import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.dnf.DnfUtils;
@@ -33,7 +33,7 @@ class QueryWrapperFactory {
         private final Dnf2PQuery dnf2PQuery;
         private final Map<AnySymbolView, SymbolViewWrapper> view2WrapperMap = new LinkedHashMap<>();
         private final CycleDetectingMapper<RemappedConstraint, RawPQuery> wrapConstraint = new CycleDetectingMapper<>(
-                        RemappedConstraint::toString, this::doWrapConstraint);
+                        this::doWrapConstraint);
 
         QueryWrapperFactory(Dnf2PQuery dnf2PQuery) {
                 this.dnf2PQuery = dnf2PQuery;
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/RawPQuery.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/RawPQuery.java
index 255738c5..06644bf2 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/RawPQuery.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/RawPQuery.java
@@ -5,14 +5,14 @@
  */
 package tools.refinery.store.query.viatra.internal.pquery;
 
-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.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-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 tools.refinery.viatra.runtime.api.GenericQuerySpecification;
+import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
+import tools.refinery.viatra.runtime.api.scope.QueryScope;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.annotations.PAnnotation;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.BasePQuery;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PVisibility;
 import tools.refinery.store.query.viatra.internal.RelationalScope;
 import tools.refinery.store.query.viatra.internal.matcher.RawPatternMatcher;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/StatefulMultisetAggregator.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/StatefulMultisetAggregator.java
index 461416f7..ba99cf9a 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/StatefulMultisetAggregator.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/StatefulMultisetAggregator.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra.internal.pquery;
 
-import org.eclipse.viatra.query.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
 import tools.refinery.store.query.term.StatefulAggregate;
 import tools.refinery.store.query.term.StatefulAggregator;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/StatelessMultisetAggregator.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/StatelessMultisetAggregator.java
index 49175d75..bf2c2f4f 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/StatelessMultisetAggregator.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/StatelessMultisetAggregator.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra.internal.pquery;
 
-import org.eclipse.viatra.query.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
 import tools.refinery.store.query.term.StatelessAggregator;
 
 import java.util.stream.Stream;
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/SymbolViewWrapper.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/SymbolViewWrapper.java
index a777613e..a774404e 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/SymbolViewWrapper.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/SymbolViewWrapper.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra.internal.pquery;
 
-import org.eclipse.viatra.query.runtime.matchers.context.common.BaseInputKeyWrapper;
+import tools.refinery.viatra.runtime.matchers.context.common.BaseInputKeyWrapper;
 import tools.refinery.store.query.view.AnySymbolView;
 
 public class SymbolViewWrapper extends BaseInputKeyWrapper<AnySymbolView> {
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/TermEvaluator.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/TermEvaluator.java
index 1187f57a..5df861a6 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/TermEvaluator.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/TermEvaluator.java
@@ -5,8 +5,8 @@
  */
 package tools.refinery.store.query.viatra.internal.pquery;
 
-import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
+import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.viatra.runtime.matchers.psystem.IValueProvider;
 import tools.refinery.store.query.term.Term;
 import tools.refinery.store.query.term.Variable;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/ValueProviderBasedValuation.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/ValueProviderBasedValuation.java
index 62cb8b3a..b9ae8ab2 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/ValueProviderBasedValuation.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/pquery/ValueProviderBasedValuation.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra.internal.pquery;
 
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
+import tools.refinery.viatra.runtime.matchers.psystem.IValueProvider;
 import tools.refinery.store.query.term.DataVariable;
 import tools.refinery.store.query.valuation.Valuation;
 
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/ModelUpdateListener.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/ModelUpdateListener.java
index 986bb0b1..e1bc9efc 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/ModelUpdateListener.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/ModelUpdateListener.java
@@ -5,9 +5,9 @@
  */
 package tools.refinery.store.query.viatra.internal.update;
 
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener;
-import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContextListener;
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
 import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.SymbolView;
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/RelationViewFilter.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/RelationViewFilter.java
index efdbfcbe..73c4a3f9 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/RelationViewFilter.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/RelationViewFilter.java
@@ -5,10 +5,10 @@
  */
 package tools.refinery.store.query.viatra.internal.update;
 
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-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.Tuple;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContextListener;
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/SymbolViewUpdateListener.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/SymbolViewUpdateListener.java
index f1a2ac7c..d0cdda72 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/SymbolViewUpdateListener.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/SymbolViewUpdateListener.java
@@ -5,10 +5,10 @@
  */
 package tools.refinery.store.query.viatra.internal.update;
 
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-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.Tuple;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContextListener;
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
 import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.model.InterpretationListener;
 import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/TupleChangingViewUpdateListener.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/TupleChangingViewUpdateListener.java
index 45d35571..9dc739f1 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/TupleChangingViewUpdateListener.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/TupleChangingViewUpdateListener.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra.internal.update;
 
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
 import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
 import tools.refinery.store.query.view.SymbolView;
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/TuplePreservingViewUpdateListener.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/TuplePreservingViewUpdateListener.java
index c18dbafb..7dbd50b3 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/TuplePreservingViewUpdateListener.java
+++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/update/TuplePreservingViewUpdateListener.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra.internal.update;
 
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
 import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.query.viatra.internal.ViatraModelQueryAdapterImpl;
 import tools.refinery.store.query.view.TuplePreservingView;
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/DiagonalQueryTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/DiagonalQueryTest.java
index 6aae2ebe..85bdc204 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/DiagonalQueryTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/DiagonalQueryTest.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra;
 
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.dnf.Dnf;
@@ -98,6 +98,7 @@ class DiagonalQueryTest {
                                 .build();
 
                 var model = store.createEmptyModel();
+
                 var personInterpretation = model.getInterpretation(person);
                 var symbolInterpretation = model.getInterpretation(symbol);
                 var queryEngine = model.getAdapter(ModelQueryAdapter.class);
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/FunctionalQueryTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/FunctionalQueryTest.java
index 258127e7..7190d8f1 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/FunctionalQueryTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/FunctionalQueryTest.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra;
 
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
@@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static tools.refinery.store.query.literal.Literals.assume;
+import static tools.refinery.store.query.literal.Literals.check;
 import static tools.refinery.store.query.term.int_.IntTerms.*;
 import static tools.refinery.store.query.viatra.tests.QueryAssertions.assertNullableResults;
 import static tools.refinery.store.query.viatra.tests.QueryAssertions.assertResults;
@@ -390,7 +390,7 @@ class FunctionalQueryTest {
                 var query = Query.of("InvalidAssume", (builder, p1) -> builder.clause(Integer.class, (x) -> List.of(
                                 personView.call(p1),
                                 ageView.call(p1, x),
-                                assume(lessEq(div(constant(120), x), constant(5)))
+                                check(lessEq(div(constant(120), x), constant(5)))
                 )));
 
                 var store = ModelStore.builder()
@@ -424,6 +424,42 @@ class FunctionalQueryTest {
         }
 
         @QueryEngineTest
+        void multipleAssignmentTest(QueryEvaluationHint hint) {
+                var query = Query.of("MultipleAssignment", Integer.class, (builder, p1, p2, output) -> builder
+                                .clause(Integer.class, Integer.class, (x1, x2) -> List.of(
+                                                ageView.call(p1, x1),
+                                                ageView.call(p2, x2),
+                                                output.assign(mul(x1, constant(2))),
+                                                output.assign(mul(x2, constant(3)))
+                                )));
+
+                var store = ModelStore.builder()
+                                .symbols(age)
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .defaultHint(hint)
+                                                .queries(query))
+                                .build();
+
+                var model = store.createEmptyModel();
+                var ageInterpretation = model.getInterpretation(age);
+                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                var queryResultSet = queryEngine.getResultSet(query);
+
+                ageInterpretation.put(Tuple.of(0), 3);
+                ageInterpretation.put(Tuple.of(1), 2);
+                ageInterpretation.put(Tuple.of(2), 15);
+                ageInterpretation.put(Tuple.of(3), 10);
+
+                queryEngine.flushChanges();
+                assertNullableResults(Map.of(
+                                Tuple.of(0, 1), Optional.of(6),
+                                Tuple.of(1, 0), Optional.empty(),
+                                Tuple.of(2, 3), Optional.of(30),
+                                Tuple.of(3, 2), Optional.empty()
+                ), queryResultSet);
+        }
+
+        @QueryEngineTest
         void notFunctionalTest(QueryEvaluationHint hint) {
                 var query = Query.of("NotFunctional", Integer.class, (builder, p1, output) -> builder.clause((p2) -> List.of(
                                 personView.call(p1),
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java
index 25bcb0dc..ce403e3a 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java
@@ -5,11 +5,13 @@
  */
 package tools.refinery.store.query.viatra;
 
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
+import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.term.ParameterDirection;
 import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.viatra.tests.QueryEngineTest;
 import tools.refinery.store.query.view.AnySymbolView;
@@ -23,7 +25,7 @@ import tools.refinery.store.tuple.Tuple;
 import java.util.List;
 import java.util.Map;
 
-import static tools.refinery.store.query.literal.Literals.assume;
+import static tools.refinery.store.query.literal.Literals.check;
 import static tools.refinery.store.query.literal.Literals.not;
 import static tools.refinery.store.query.term.int_.IntTerms.constant;
 import static tools.refinery.store.query.term.int_.IntTerms.greaterEq;
@@ -108,6 +110,44 @@ class QueryTest {
         }
 
         @QueryEngineTest
+        void isConstantTest(QueryEvaluationHint hint) {
+                var predicate = Query.of("RelationConstraint", (builder, p1, p2) -> builder.clause(
+                                personView.call(p1),
+                                p1.isConstant(1),
+                                friendMustView.call(p1, p2)
+                ));
+
+                var store = ModelStore.builder()
+                                .symbols(person, friend)
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .defaultHint(hint)
+                                                .queries(predicate))
+                                .build();
+
+                var model = store.createEmptyModel();
+                var personInterpretation = model.getInterpretation(person);
+                var friendInterpretation = model.getInterpretation(friend);
+                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                var predicateResultSet = queryEngine.getResultSet(predicate);
+
+                personInterpretation.put(Tuple.of(0), true);
+                personInterpretation.put(Tuple.of(1), true);
+                personInterpretation.put(Tuple.of(2), true);
+
+                friendInterpretation.put(Tuple.of(0, 1), TruthValue.TRUE);
+                friendInterpretation.put(Tuple.of(1, 0), TruthValue.TRUE);
+                friendInterpretation.put(Tuple.of(1, 2), TruthValue.TRUE);
+
+                queryEngine.flushChanges();
+                assertResults(Map.of(
+                                Tuple.of(0, 1), false,
+                                Tuple.of(1, 0), true,
+                                Tuple.of(1, 2), true,
+                                Tuple.of(2, 1), false
+                ), predicateResultSet);
+        }
+
+        @QueryEngineTest
         void existTest(QueryEvaluationHint hint) {
                 var predicate = Query.of("Exists", (builder, p1) -> builder.clause((p2) -> List.of(
                                 personView.call(p1),
@@ -312,6 +352,53 @@ class QueryTest {
         }
 
         @QueryEngineTest
+        void patternCallInputArgumentTest(QueryEvaluationHint hint) {
+                var friendPredicate = Dnf.of("Friend", builder -> {
+                        var p1 = builder.parameter("p1", ParameterDirection.IN);
+                        var p2 = builder.parameter("p2", ParameterDirection.IN);
+                        builder.clause(
+                                        personView.call(p1),
+                                        personView.call(p2),
+                                        friendMustView.call(p1, p2)
+                        );
+                });
+                var predicate = Query.of("PositivePatternCall", (builder, p3, p4) -> builder.clause(
+                                personView.call(p3),
+                                personView.call(p4),
+                                friendPredicate.call(p3, p4)
+                ));
+
+                var store = ModelStore.builder()
+                                .symbols(person, friend)
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .defaultHint(hint)
+                                                .queries(predicate))
+                                .build();
+
+                var model = store.createEmptyModel();
+                var personInterpretation = model.getInterpretation(person);
+                var friendInterpretation = model.getInterpretation(friend);
+                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                var predicateResultSet = queryEngine.getResultSet(predicate);
+
+                personInterpretation.put(Tuple.of(0), true);
+                personInterpretation.put(Tuple.of(1), true);
+                personInterpretation.put(Tuple.of(2), true);
+
+                friendInterpretation.put(Tuple.of(0, 1), TruthValue.TRUE);
+                friendInterpretation.put(Tuple.of(1, 0), TruthValue.TRUE);
+                friendInterpretation.put(Tuple.of(1, 2), TruthValue.TRUE);
+
+                queryEngine.flushChanges();
+                assertResults(Map.of(
+                                Tuple.of(0, 1), true,
+                                Tuple.of(1, 0), true,
+                                Tuple.of(1, 2), true,
+                                Tuple.of(2, 1), false
+                ), predicateResultSet);
+        }
+
+        @QueryEngineTest
         void negativeRelationViewTest(QueryEvaluationHint hint) {
                 var predicate = Query.of("NegativePatternCall", (builder, p1, p2) -> builder.clause(
                                 personView.call(p1),
@@ -652,7 +739,7 @@ class QueryTest {
                 var query = Query.of("Constraint", (builder, p1) -> builder.clause(Integer.class, (x) -> List.of(
                                 personView.call(p1),
                                 ageView.call(p1, x),
-                                assume(greaterEq(x, constant(18)))
+                                check(greaterEq(x, constant(18)))
                 )));
 
                 var store = ModelStore.builder()
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTransactionTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTransactionTest.java
index 32f51cf0..3f8c060a 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTransactionTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTransactionTest.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra;
 
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/StronglyConnectedComponentsTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/StronglyConnectedComponentsTest.java
new file mode 100644
index 00000000..37795ff3
--- /dev/null
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/StronglyConnectedComponentsTest.java
@@ -0,0 +1,261 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.viatra;
+
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.ModelQueryAdapter;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.literal.Connectivity;
+import tools.refinery.store.query.literal.RepresentativeElectionLiteral;
+import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.store.query.view.KeyOnlyView;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static tools.refinery.store.query.viatra.tests.QueryAssertions.assertResults;
+
+class StronglyConnectedComponentsTest {
+        private static final Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private static final AnySymbolView friendView = new KeyOnlyView<>(friend);
+
+        @Test
+        void symbolViewTest() {
+                var query = Query.of("SymbolViewRepresentative", (builder, p1, p2) -> builder
+                                .clause(v1 -> List.of(
+                                                new RepresentativeElectionLiteral(Connectivity.STRONG, friendView, p1, v1),
+                                                new RepresentativeElectionLiteral(Connectivity.STRONG, friendView, p2, v1)
+                                )));
+
+                var store = ModelStore.builder()
+                                .symbols(friend)
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .queries(query))
+                                .build();
+
+                var model = store.createEmptyModel();
+                var friendInterpretation = model.getInterpretation(friend);
+                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                var resultSet = queryEngine.getResultSet(query);
+
+                friendInterpretation.put(Tuple.of(0, 1), true);
+                friendInterpretation.put(Tuple.of(1, 0), true);
+                friendInterpretation.put(Tuple.of(1, 2), true);
+                queryEngine.flushChanges();
+
+                assertResults(Map.of(
+                                Tuple.of(0, 0), true,
+                                Tuple.of(0, 1), true,
+                                Tuple.of(1, 0), true,
+                                Tuple.of(1, 1), true,
+                                Tuple.of(2, 2), true
+                ), resultSet);
+        }
+
+        @Test
+        void symbolViewInsertTest() {
+                var query = Query.of("SymbolViewRepresentative", (builder, p1, p2) -> builder
+                                .clause(v1 -> List.of(
+                                                new RepresentativeElectionLiteral(Connectivity.STRONG, friendView, p1, v1),
+                                                new RepresentativeElectionLiteral(Connectivity.STRONG, friendView, p2, v1)
+                                )));
+
+                var store = ModelStore.builder()
+                                .symbols(friend)
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .queries(query))
+                                .build();
+
+                var model = store.createEmptyModel();
+                var friendInterpretation = model.getInterpretation(friend);
+                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                var resultSet = queryEngine.getResultSet(query);
+
+                friendInterpretation.put(Tuple.of(0, 1), true);
+                friendInterpretation.put(Tuple.of(1, 0), true);
+                friendInterpretation.put(Tuple.of(1, 2), true);
+                queryEngine.flushChanges();
+
+                friendInterpretation.put(Tuple.of(2, 0), true);
+                friendInterpretation.put(Tuple.of(0, 3), true);
+                queryEngine.flushChanges();
+
+                assertResults(Map.of(
+                                Tuple.of(0, 0), true,
+                                Tuple.of(0, 1), true,
+                                Tuple.of(0, 2), true,
+                                Tuple.of(1, 1), true,
+                                Tuple.of(1, 0), true,
+                                Tuple.of(1, 2), true,
+                                Tuple.of(2, 0), true,
+                                Tuple.of(2, 1), true,
+                                Tuple.of(2, 2), true,
+                                Tuple.of(3, 3), true
+                ), resultSet);
+        }
+
+        @Test
+        void symbolViewDeleteTest() {
+                var query = Query.of("SymbolViewRepresentative", (builder, p1, p2) -> builder
+                                .clause(v1 -> List.of(
+                                                new RepresentativeElectionLiteral(Connectivity.STRONG, friendView, p1, v1),
+                                                new RepresentativeElectionLiteral(Connectivity.STRONG, friendView, p2, v1)
+                                )));
+
+                var store = ModelStore.builder()
+                                .symbols(friend)
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .queries(query))
+                                .build();
+
+                var model = store.createEmptyModel();
+                var friendInterpretation = model.getInterpretation(friend);
+                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                var resultSet = queryEngine.getResultSet(query);
+
+                friendInterpretation.put(Tuple.of(0, 1), true);
+                friendInterpretation.put(Tuple.of(1, 0), true);
+                friendInterpretation.put(Tuple.of(1, 2), true);
+                queryEngine.flushChanges();
+
+                friendInterpretation.put(Tuple.of(1, 0), false);
+                friendInterpretation.put(Tuple.of(1, 2), false);
+                queryEngine.flushChanges();
+
+                assertResults(Map.of(
+                                Tuple.of(0, 0), true,
+                                Tuple.of(1, 1), true
+                ), resultSet);
+        }
+
+        @Test
+        void diagonalSymbolViewTest() {
+                var person = Symbol.of("Person", 1);
+                var personView = new KeyOnlyView<>(person);
+
+                var query = Query.of("SymbolViewRepresentative", (builder, p1) -> builder
+                                .clause(
+                                                personView.call(p1),
+                                                new RepresentativeElectionLiteral(Connectivity.STRONG, friendView, p1, p1)
+                                ));
+
+                var store = ModelStore.builder()
+                                .symbols(person, friend)
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .queries(query))
+                                .build();
+
+                var model = store.createEmptyModel();
+                var personInterpretation = model.getInterpretation(person);
+                var friendInterpretation = model.getInterpretation(friend);
+                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                var resultSet = queryEngine.getResultSet(query);
+
+                personInterpretation.put(Tuple.of(0), true);
+                personInterpretation.put(Tuple.of(1), true);
+                personInterpretation.put(Tuple.of(2), true);
+
+                friendInterpretation.put(Tuple.of(0, 1), true);
+                friendInterpretation.put(Tuple.of(1, 0), true);
+                friendInterpretation.put(Tuple.of(1, 2), true);
+                queryEngine.flushChanges();
+
+                assertThat(resultSet.size(), is(2));
+                assertThat(resultSet.get(Tuple.of(2)), is(true));
+        }
+
+        @Test
+        void diagonalDnfTest() {
+                var person = Symbol.of("Person", 1);
+                var personView = new KeyOnlyView<>(person);
+
+                var subQuery = Query.of("SubQuery", (builder, p1, p2) -> builder
+                                .clause(
+                                                personView.call(p1),
+                                                personView.call(p2),
+                                                friendView.call(p1, p2)
+                                ))
+                                .getDnf();
+                var query = Query.of("SymbolViewRepresentative", (builder, p1) -> builder
+                                .clause(
+                                                personView.call(p1),
+                                                new RepresentativeElectionLiteral(Connectivity.STRONG, subQuery, p1, p1)
+                                ));
+
+                var store = ModelStore.builder()
+                                .symbols(person, friend)
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .queries(query))
+                                .build();
+
+                var model = store.createEmptyModel();
+                var personInterpretation = model.getInterpretation(person);
+                var friendInterpretation = model.getInterpretation(friend);
+                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                var resultSet = queryEngine.getResultSet(query);
+
+                personInterpretation.put(Tuple.of(0), true);
+                personInterpretation.put(Tuple.of(1), true);
+                personInterpretation.put(Tuple.of(2), true);
+
+                friendInterpretation.put(Tuple.of(0, 1), true);
+                friendInterpretation.put(Tuple.of(1, 0), true);
+                friendInterpretation.put(Tuple.of(1, 2), true);
+                queryEngine.flushChanges();
+
+                assertThat(resultSet.size(), is(2));
+                assertThat(resultSet.get(Tuple.of(2)), is(true));
+        }
+
+        @Test
+        void loopTest() {
+                var query = Query.of("SymbolViewRepresentative", (builder, p1, p2) -> builder
+                                .clause(v1 -> List.of(
+                                                new RepresentativeElectionLiteral(Connectivity.STRONG, friendView, p1, v1),
+                                                new RepresentativeElectionLiteral(Connectivity.STRONG, friendView, p2, v1)
+                                )));
+
+                var store = ModelStore.builder()
+                                .symbols(friend)
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .queries(query))
+                                .build();
+
+                var model = store.createEmptyModel();
+                var friendInterpretation = model.getInterpretation(friend);
+                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                var resultSet = queryEngine.getResultSet(query);
+
+                friendInterpretation.put(Tuple.of(0, 1), true);
+                friendInterpretation.put(Tuple.of(1, 2), true);
+                friendInterpretation.put(Tuple.of(2, 3), true);
+                friendInterpretation.put(Tuple.of(3, 0), true);
+                friendInterpretation.put(Tuple.of(3, 4), true);
+                queryEngine.flushChanges();
+
+                assertThat(resultSet.get(Tuple.of(0, 1)), is(true));
+                assertThat(resultSet.get(Tuple.of(1, 2)), is(true));
+                assertThat(resultSet.get(Tuple.of(2, 3)), is(true));
+                assertThat(resultSet.get(Tuple.of(3, 0)), is(true));
+                assertThat(resultSet.get(Tuple.of(3, 4)), is(false));
+
+                friendInterpretation.put(Tuple.of(2, 3), false);
+                queryEngine.flushChanges();
+
+                assertThat(resultSet.get(Tuple.of(0, 1)), is(false));
+                assertThat(resultSet.get(Tuple.of(0, 2)), is(false));
+                assertThat(resultSet.get(Tuple.of(0, 3)), is(false));
+                assertThat(resultSet.get(Tuple.of(1, 2)), is(false));
+                assertThat(resultSet.get(Tuple.of(2, 3)), is(false));
+                assertThat(resultSet.get(Tuple.of(3, 0)), is(false));
+                assertThat(resultSet.get(Tuple.of(3, 4)), is(false));
+        }
+}
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/WeaklyConnectedComponentsTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/WeaklyConnectedComponentsTest.java
new file mode 100644
index 00000000..613d4284
--- /dev/null
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/WeaklyConnectedComponentsTest.java
@@ -0,0 +1,188 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.viatra;
+
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.ModelQueryAdapter;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.literal.Connectivity;
+import tools.refinery.store.query.literal.RepresentativeElectionLiteral;
+import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.store.query.view.KeyOnlyView;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static tools.refinery.store.query.viatra.tests.QueryAssertions.assertResults;
+
+class WeaklyConnectedComponentsTest {
+        private static final Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private static final AnySymbolView friendView = new KeyOnlyView<>(friend);
+
+        @Test
+        void symbolViewTest() {
+                var query = Query.of("SymbolViewRepresentative", (builder, p1, p2) -> builder
+                                .clause(v1 -> List.of(
+                                                new RepresentativeElectionLiteral(Connectivity.WEAK, friendView, p1, v1),
+                                                new RepresentativeElectionLiteral(Connectivity.WEAK, friendView, p2, v1)
+                                )));
+
+                var store = ModelStore.builder()
+                                .symbols(friend)
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .queries(query))
+                                .build();
+
+                var model = store.createEmptyModel();
+                var friendInterpretation = model.getInterpretation(friend);
+                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                var resultSet = queryEngine.getResultSet(query);
+
+                friendInterpretation.put(Tuple.of(0, 1), true);
+                friendInterpretation.put(Tuple.of(1, 0), true);
+                friendInterpretation.put(Tuple.of(2, 3), true);
+                queryEngine.flushChanges();
+
+                assertResults(Map.of(
+                                Tuple.of(0, 0), true,
+                                Tuple.of(0, 1), true,
+                                Tuple.of(1, 0), true,
+                                Tuple.of(1, 1), true,
+                                Tuple.of(2, 2), true,
+                                Tuple.of(2, 3), true,
+                                Tuple.of(3, 2), true,
+                                Tuple.of(3, 3), true
+                ), resultSet);
+        }
+
+        @Test
+        void symbolViewUpdateTest() {
+                var query = Query.of("SymbolViewRepresentative", (builder, p1, p2) -> builder
+                                .clause(v1 -> List.of(
+                                                new RepresentativeElectionLiteral(Connectivity.WEAK, friendView, p1, v1),
+                                                new RepresentativeElectionLiteral(Connectivity.WEAK, friendView, p2, v1)
+                                )));
+
+                var store = ModelStore.builder()
+                                .symbols(friend)
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .queries(query))
+                                .build();
+
+                var model = store.createEmptyModel();
+                var friendInterpretation = model.getInterpretation(friend);
+                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                var resultSet = queryEngine.getResultSet(query);
+
+                friendInterpretation.put(Tuple.of(0, 1), true);
+                friendInterpretation.put(Tuple.of(1, 0), true);
+                friendInterpretation.put(Tuple.of(2, 3), true);
+                queryEngine.flushChanges();
+
+                friendInterpretation.put(Tuple.of(2, 3), false);
+                friendInterpretation.put(Tuple.of(1, 0), false);
+                friendInterpretation.put(Tuple.of(1, 2), true);
+                queryEngine.flushChanges();
+
+                assertResults(Map.of(
+                                Tuple.of(0, 0), true,
+                                Tuple.of(0, 1), true,
+                                Tuple.of(0, 2), true,
+                                Tuple.of(1, 0), true,
+                                Tuple.of(1, 1), true,
+                                Tuple.of(1, 2), true,
+                                Tuple.of(2, 0), true,
+                                Tuple.of(2, 1), true,
+                                Tuple.of(2, 2), true
+                ), resultSet);
+        }
+
+        @Test
+        void diagonalSymbolViewTest() {
+                var person = Symbol.of("Person", 1);
+                var personView = new KeyOnlyView<>(person);
+
+                var query = Query.of("SymbolViewRepresentative", (builder, p1) -> builder
+                                .clause(
+                                                personView.call(p1),
+                                                new RepresentativeElectionLiteral(Connectivity.WEAK, friendView, p1, p1)
+                                ));
+
+                var store = ModelStore.builder()
+                                .symbols(person, friend)
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .queries(query))
+                                .build();
+
+                var model = store.createEmptyModel();
+                var personInterpretation = model.getInterpretation(person);
+                var friendInterpretation = model.getInterpretation(friend);
+                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                var resultSet = queryEngine.getResultSet(query);
+
+                personInterpretation.put(Tuple.of(0), true);
+                personInterpretation.put(Tuple.of(1), true);
+                personInterpretation.put(Tuple.of(2), true);
+                personInterpretation.put(Tuple.of(3), true);
+
+                friendInterpretation.put(Tuple.of(0, 1), true);
+                friendInterpretation.put(Tuple.of(1, 0), true);
+                friendInterpretation.put(Tuple.of(2, 3), true);
+                queryEngine.flushChanges();
+
+                assertThat(resultSet.size(), is(2));
+                assertThat(resultSet.get(Tuple.of(2)), is(true));
+        }
+
+        @Test
+        void diagonalDnfTest() {
+                var person = Symbol.of("Person", 1);
+                var personView = new KeyOnlyView<>(person);
+
+                var subQuery = Query.of("SubQuery", (builder, p1, p2) -> builder
+                                .clause(
+                                                personView.call(p1),
+                                                personView.call(p2),
+                                                friendView.call(p1, p2)
+                                ))
+                                .getDnf();
+                var query = Query.of("SymbolViewRepresentative", (builder, p1) -> builder
+                                .clause(
+                                                personView.call(p1),
+                                                new RepresentativeElectionLiteral(Connectivity.WEAK, subQuery, p1, p1)
+                                ));
+
+                var store = ModelStore.builder()
+                                .symbols(person, friend)
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .queries(query))
+                                .build();
+
+                var model = store.createEmptyModel();
+                var personInterpretation = model.getInterpretation(person);
+                var friendInterpretation = model.getInterpretation(friend);
+                var queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                var resultSet = queryEngine.getResultSet(query);
+
+                personInterpretation.put(Tuple.of(0), true);
+                personInterpretation.put(Tuple.of(1), true);
+                personInterpretation.put(Tuple.of(2), true);
+                personInterpretation.put(Tuple.of(3), true);
+
+                friendInterpretation.put(Tuple.of(0, 1), true);
+                friendInterpretation.put(Tuple.of(1, 0), true);
+                friendInterpretation.put(Tuple.of(2, 3), true);
+                queryEngine.flushChanges();
+
+                assertThat(resultSet.size(), is(2));
+                assertThat(resultSet.get(Tuple.of(2)), is(true));
+        }
+}
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/internal/matcher/MatcherUtilsTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/internal/matcher/MatcherUtilsTest.java
index 968c6c5e..319797a0 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/internal/matcher/MatcherUtilsTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/internal/matcher/MatcherUtilsTest.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra.internal.matcher;
 
-import org.eclipse.viatra.query.runtime.matchers.tuple.*;
+import tools.refinery.viatra.runtime.matchers.tuple.*;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.tuple.*;
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryAssertions.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryAssertions.java
index ca089a9d..5c1c4fc1 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryAssertions.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryAssertions.java
@@ -30,7 +30,7 @@ public final class QueryAssertions {
         }
 
         public static <T> void assertResults(Map<Tuple, T> expected, ResultSet<T> resultSet) {
-                var defaultValue = resultSet.getQuery().defaultValue();
+                var defaultValue = resultSet.getCanonicalQuery().defaultValue();
                 var filteredExpected = new LinkedHashMap<Tuple, T>();
                 var executables = new ArrayList<Executable>();
                 for (var entry : expected.entrySet()) {
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryBackendHint.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryBackendHint.java
index dc0e92c8..5f88e04b 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryBackendHint.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryBackendHint.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra.tests;
 
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
 
 /**
  * Overrides {@link QueryEvaluationHint#toString()} for pretty names in parametric test names.
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryEvaluationHintSource.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryEvaluationHintSource.java
index 9e75d5f3..ed356eeb 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryEvaluationHintSource.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryEvaluationHintSource.java
@@ -5,7 +5,7 @@
  */
 package tools.refinery.store.query.viatra.tests;
 
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.ArgumentsProvider;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/InvalidQueryException.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/InvalidQueryException.java
new file mode 100644
index 00000000..c39277a0
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/InvalidQueryException.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query;
+
+public class InvalidQueryException extends RuntimeException {
+        public InvalidQueryException() {
+        }
+
+        public InvalidQueryException(String message) {
+                super(message);
+        }
+
+        public InvalidQueryException(String message, Throwable cause) {
+                super(message, cause);
+        }
+
+        public InvalidQueryException(Throwable cause) {
+                super(cause);
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java
index c62a95b5..332e6381 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java
@@ -8,6 +8,7 @@ package tools.refinery.store.query;
 import tools.refinery.store.adapter.ModelAdapterBuilder;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.store.query.rewriter.DnfRewriter;
 
 import java.util.Collection;
 import java.util.List;
@@ -25,6 +26,8 @@ public interface ModelQueryBuilder extends ModelAdapterBuilder {
 
         ModelQueryBuilder query(AnyQuery query);
 
+        ModelQueryBuilder rewriter(DnfRewriter rewriter);
+
         @Override
         ModelQueryStoreAdapter build(ModelStore store);
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java
index f0a950a6..8b67c5c1 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java
@@ -8,6 +8,7 @@ package tools.refinery.store.query;
 import tools.refinery.store.adapter.ModelStoreAdapter;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.view.AnySymbolView;
 
 import java.util.Collection;
@@ -17,6 +18,12 @@ public interface ModelQueryStoreAdapter extends ModelStoreAdapter {
 
         Collection<AnyQuery> getQueries();
 
+        default AnyQuery getCanonicalQuery(AnyQuery query) {
+                return getCanonicalQuery((Query<?>) query);
+        }
+
+        <T> Query<T> getCanonicalQuery(Query<T> query);
+
         @Override
         ModelQueryAdapter createModelAdapter(Model model);
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/ClausePostProcessor.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/ClausePostProcessor.java
index b5e7092b..8800a155 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/ClausePostProcessor.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/ClausePostProcessor.java
@@ -6,13 +6,12 @@
 package tools.refinery.store.query.dnf;
 
 import org.jetbrains.annotations.NotNull;
-import tools.refinery.store.query.literal.BooleanLiteral;
-import tools.refinery.store.query.literal.EquivalenceLiteral;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.store.query.literal.*;
 import tools.refinery.store.query.substitution.MapBasedSubstitution;
 import tools.refinery.store.query.substitution.StatelessSubstitution;
 import tools.refinery.store.query.substitution.Substitution;
-import tools.refinery.store.query.term.NodeVariable;
 import tools.refinery.store.query.term.ParameterDirection;
 import tools.refinery.store.query.term.Variable;
 
@@ -22,8 +21,8 @@ import java.util.function.Function;
 class ClausePostProcessor {
         private final Map<Variable, ParameterInfo> parameters;
         private final List<Literal> literals;
-        private final Map<NodeVariable, NodeVariable> representatives = new LinkedHashMap<>();
-        private final Map<NodeVariable, Set<NodeVariable>> equivalencePartition = new HashMap<>();
+        private final Map<Variable, Variable> representatives = new LinkedHashMap<>();
+        private final Map<Variable, Set<Variable>> equivalencePartition = new HashMap<>();
         private List<Literal> substitutedLiterals;
         private final Set<Variable> existentiallyQuantifiedVariables = new LinkedHashSet<>();
         private Set<Variable> positiveVariables;
@@ -58,6 +57,9 @@ class ClausePostProcessor {
                 if (filteredLiterals.isEmpty()) {
                         return ConstantResult.ALWAYS_TRUE;
                 }
+                if (hasContradictoryCall(filteredLiterals)) {
+                        return ConstantResult.ALWAYS_FALSE;
+                }
                 var clause = new DnfClause(Collections.unmodifiableSet(positiveVariables),
                                 Collections.unmodifiableList(filteredLiterals));
                 return new ClauseResult(clause);
@@ -67,16 +69,16 @@ class ClausePostProcessor {
                 for (var literal : literals) {
                         if (isPositiveEquivalence(literal)) {
                                 var equivalenceLiteral = (EquivalenceLiteral) literal;
-                                mergeVariables(equivalenceLiteral.left(), equivalenceLiteral.right());
+                                mergeVariables(equivalenceLiteral.getLeft(), equivalenceLiteral.getRight());
                         }
                 }
         }
 
         private static boolean isPositiveEquivalence(Literal literal) {
-                return literal instanceof EquivalenceLiteral equivalenceLiteral && equivalenceLiteral.positive();
+                return literal instanceof EquivalenceLiteral equivalenceLiteral && equivalenceLiteral.isPositive();
         }
 
-        private void mergeVariables(NodeVariable left, NodeVariable right) {
+        private void mergeVariables(Variable left, Variable right) {
                 var leftRepresentative = getRepresentative(left);
                 var rightRepresentative = getRepresentative(right);
                 var leftInfo = parameters.get(leftRepresentative);
@@ -89,7 +91,7 @@ class ClausePostProcessor {
                 }
         }
 
-        private void doMergeVariables(NodeVariable parentRepresentative, NodeVariable newChildRepresentative) {
+        private void doMergeVariables(Variable parentRepresentative, Variable newChildRepresentative) {
                 var parentSet = getEquivalentVariables(parentRepresentative);
                 var childSet = getEquivalentVariables(newChildRepresentative);
                 parentSet.addAll(childSet);
@@ -99,18 +101,18 @@ class ClausePostProcessor {
                 }
         }
 
-        private NodeVariable getRepresentative(NodeVariable variable) {
+        private Variable getRepresentative(Variable variable) {
                 return representatives.computeIfAbsent(variable, Function.identity());
         }
 
-        private Set<NodeVariable> getEquivalentVariables(NodeVariable variable) {
+        private Set<Variable> getEquivalentVariables(Variable variable) {
                 var representative = getRepresentative(variable);
                 if (!representative.equals(variable)) {
                         throw new AssertionError("NodeVariable %s already has a representative %s"
                                         .formatted(variable, representative));
                 }
                 return equivalencePartition.computeIfAbsent(variable, key -> {
-                        var set = new HashSet<NodeVariable>(1);
+                        var set = new HashSet<Variable>(1);
                         set.add(key);
                         return set;
                 });
@@ -121,7 +123,7 @@ class ClausePostProcessor {
                         var left = pair.getKey();
                         var right = pair.getValue();
                         if (!left.equals(right) && parameters.containsKey(left) && parameters.containsKey(right)) {
-                                substitutedLiterals.add(left.isEquivalent(right));
+                                substitutedLiterals.add(new EquivalenceLiteral(true, left, right));
                         }
                 }
         }
@@ -147,20 +149,7 @@ class ClausePostProcessor {
 
         private void computeExistentiallyQuantifiedVariables() {
                 for (var literal : substitutedLiterals) {
-                        for (var variable : literal.getOutputVariables()) {
-                                boolean added = existentiallyQuantifiedVariables.add(variable);
-                                if (!variable.isUnifiable()) {
-                                        var parameterInfo = parameters.get(variable);
-                                        if (parameterInfo != null && parameterInfo.direction() == ParameterDirection.IN) {
-                                                throw new IllegalArgumentException("Trying to bind %s parameter %s"
-                                                                .formatted(ParameterDirection.IN, variable));
-                                        }
-                                        if (!added) {
-                                                throw new IllegalArgumentException("Variable %s has multiple assigned values"
-                                                                .formatted(variable));
-                                        }
-                                }
-                        }
+                        existentiallyQuantifiedVariables.addAll(literal.getOutputVariables());
                 }
         }
 
@@ -172,7 +161,7 @@ class ClausePostProcessor {
                                 // Inputs count as positive, because they are already bound when we evaluate literals.
                                 positiveVariables.add(variable);
                         } else if (!existentiallyQuantifiedVariables.contains(variable)) {
-                                throw new IllegalArgumentException("Unbound %s parameter %s"
+                                throw new InvalidQueryException("Unbound %s parameter %s"
                                                 .formatted(ParameterDirection.OUT, variable));
                         }
                 }
@@ -184,7 +173,7 @@ class ClausePostProcessor {
                         var representative = pair.getKey();
                         if (!positiveVariables.contains(representative)) {
                                 var variableSet = pair.getValue();
-                                throw new IllegalArgumentException("Variables %s were merged by equivalence but are not bound"
+                                throw new InvalidQueryException("Variables %s were merged by equivalence but are not bound"
                                                 .formatted(variableSet));
                         }
                 }
@@ -196,7 +185,7 @@ class ClausePostProcessor {
                         for (var variable : literal.getPrivateVariables(positiveVariables)) {
                                 var oldLiteral = negativeVariablesMap.put(variable, literal);
                                 if (oldLiteral != null) {
-                                        throw new IllegalArgumentException("Unbound variable %s appears in multiple literals %s and %s"
+                                        throw new InvalidQueryException("Unbound variable %s appears in multiple literals %s and %s"
                                                         .formatted(variable, oldLiteral, literal));
                                 }
                         }
@@ -218,11 +207,60 @@ class ClausePostProcessor {
                         variable.addToSortedLiterals();
                 }
                 if (!variableToLiteralInputMap.isEmpty()) {
-                        throw new IllegalArgumentException("Unbound input variables %s"
+                        throw new InvalidQueryException("Unbound input variables %s"
                                         .formatted(variableToLiteralInputMap.keySet()));
                 }
         }
 
+        private boolean hasContradictoryCall(Collection<Literal> filteredLiterals) {
+                var positiveCalls = new HashMap<Constraint, Set<CallLiteral>>();
+                for (var literal : filteredLiterals) {
+                        if (literal instanceof CallLiteral callLiteral && callLiteral.getPolarity() == CallPolarity.POSITIVE) {
+                                var callsOfTarget = positiveCalls.computeIfAbsent(callLiteral.getTarget(), key -> new HashSet<>());
+                                callsOfTarget.add(callLiteral);
+                        }
+                }
+                for (var literal : filteredLiterals) {
+                        if (literal instanceof CallLiteral callLiteral && callLiteral.getPolarity() == CallPolarity.NEGATIVE) {
+                                var callsOfTarget = positiveCalls.get(callLiteral.getTarget());
+                                if (contradicts(callLiteral, callsOfTarget)) {
+                                        return true;
+                                }
+                        }
+                }
+                return false;
+        }
+
+        private boolean contradicts(CallLiteral negativeCall, Collection<CallLiteral> positiveCalls) {
+                if (positiveCalls == null) {
+                        return false;
+                }
+                for (var positiveCall : positiveCalls) {
+                        if (contradicts(negativeCall, positiveCall)) {
+                                return true;
+                        }
+                }
+                return false;
+        }
+
+        private boolean contradicts(CallLiteral negativeCall, CallLiteral positiveCall) {
+                var privateVariables = negativeCall.getPrivateVariables(positiveVariables);
+                var negativeArguments = negativeCall.getArguments();
+                var positiveArguments = positiveCall.getArguments();
+                int arity = negativeArguments.size();
+                for (int i = 0; i < arity; i++) {
+                        var negativeArgument = negativeArguments.get(i);
+                        if (privateVariables.contains(negativeArgument)) {
+                                continue;
+                        }
+                        var positiveArgument = positiveArguments.get(i);
+                        if (!negativeArgument.equals(positiveArgument)) {
+                                return false;
+                        }
+                }
+                return true;
+        }
+
         private class SortableLiteral implements Comparable<SortableLiteral> {
                 private final int index;
                 private final Literal literal;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Dnf.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Dnf.java
index 50b245f7..86a1b6b2 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Dnf.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Dnf.java
@@ -6,9 +6,12 @@
 package tools.refinery.store.query.dnf;
 
 import tools.refinery.store.query.Constraint;
-import tools.refinery.store.query.literal.Reduction;
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.DnfEqualityChecker;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.SubstitutingLiteralEqualityHelper;
+import tools.refinery.store.query.equality.SubstitutingLiteralHashCodeHelper;
+import tools.refinery.store.query.literal.Reduction;
 import tools.refinery.store.query.term.Parameter;
 import tools.refinery.store.query.term.Variable;
 
@@ -53,7 +56,7 @@ public final class Dnf implements Constraint {
                                                                                    FunctionalDependency<Variable> functionalDependency) {
                 for (var variable : toValidate) {
                         if (!parameterSet.contains(variable)) {
-                                throw new IllegalArgumentException(
+                                throw new InvalidQueryException(
                                                 "Variable %s of functional dependency %s does not appear in the parameter list %s"
                                                                 .formatted(variable, functionalDependency, symbolicParameters));
                         }
@@ -66,7 +69,7 @@ public final class Dnf implements Constraint {
         }
 
         public boolean isExplicitlyNamed() {
-                return name == null;
+                return name != null;
         }
 
         public String getUniqueName() {
@@ -129,7 +132,7 @@ public final class Dnf implements Constraint {
                         return false;
                 }
                 for (int i = 0; i < numClauses; i++) {
-                        var literalEqualityHelper = new LiteralEqualityHelper(callEqualityChecker, symbolicParameters,
+                        var literalEqualityHelper = new SubstitutingLiteralEqualityHelper(callEqualityChecker, symbolicParameters,
                                         other.symbolicParameters);
                         if (!clauses.get(i).equalsWithSubstitution(literalEqualityHelper, other.clauses.get(i))) {
                                 return false;
@@ -146,6 +149,18 @@ public final class Dnf implements Constraint {
                 return false;
         }
 
+        public int hashCodeWithSubstitution() {
+                var helper = new SubstitutingLiteralHashCodeHelper();
+                int result = 0;
+                for (var symbolicParameter : symbolicParameters) {
+                        result = result * 31 + symbolicParameter.hashCodeWithSubstitution(helper);
+                }
+                for (var clause : clauses) {
+                        result = result * 31 + clause.hashCodeWithSubstitution(helper);
+                }
+                return result;
+        }
+
         @Override
         public String toString() {
                 return "%s/%d".formatted(name(), arity());
@@ -201,6 +216,13 @@ public final class Dnf implements Constraint {
                 return new DnfBuilder(name);
         }
 
+        public static DnfBuilder builderFrom(Dnf original) {
+                var builder = builder(original.name());
+                builder.symbolicParameters(original.getSymbolicParameters());
+                builder.functionalDependencies(original.getFunctionalDependencies());
+                return builder;
+        }
+
         public static Dnf of(Consumer<DnfBuilder> callback) {
                 return of(null, callback);
         }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfBuilder.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfBuilder.java
index 8e38ca6b..0f9fd366 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfBuilder.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfBuilder.java
@@ -5,12 +5,10 @@
  */
 package tools.refinery.store.query.dnf;
 
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.dnf.callback.*;
 import tools.refinery.store.query.literal.Literal;
-import tools.refinery.store.query.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
-import tools.refinery.store.query.term.ParameterDirection;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.term.*;
 
 import java.util.*;
 
@@ -62,6 +60,18 @@ public final class DnfBuilder {
                 return variable;
         }
 
+        public Variable parameter(Parameter parameter) {
+                return parameter(null, parameter);
+        }
+
+        public Variable parameter(String name, Parameter parameter) {
+                var type = parameter.tryGetType();
+                if (type.isPresent()) {
+                        return parameter(name, type.get(), parameter.getDirection());
+                }
+                return parameter(name, parameter.getDirection());
+        }
+
         public DnfBuilder parameter(Variable variable) {
                 return parameter(variable, ParameterDirection.OUT);
         }
@@ -88,7 +98,7 @@ public final class DnfBuilder {
         public DnfBuilder symbolicParameter(SymbolicParameter symbolicParameter) {
                 var variable = symbolicParameter.getVariable();
                 if (!parameterVariables.add(variable)) {
-                        throw new IllegalArgumentException("Variable %s is already on the parameter list %s"
+                        throw new InvalidQueryException("Variable %s is already on the parameter list %s"
                                         .formatted(variable, parameters));
                 }
                 parameters.add(symbolicParameter);
@@ -129,7 +139,7 @@ public final class DnfBuilder {
         }
 
         public <T> DnfBuilder clause(Class<T> type1, ClauseCallback1Data1<T> callback) {
-                return clause(callback.toLiterals(Variable.of("v1", type1)));
+                return clause(callback.toLiterals(Variable.of("d1", type1)));
         }
 
         public DnfBuilder clause(ClauseCallback2Data0 callback) {
@@ -206,57 +216,10 @@ public final class DnfBuilder {
         }
 
         public Dnf build() {
-                var postProcessedClauses = postProcessClauses();
+                var postProcessor = new DnfPostProcessor(parameters, clauses);
+                var postProcessedClauses = postProcessor.postProcessClauses();
                 return new Dnf(name, Collections.unmodifiableList(parameters),
                                 Collections.unmodifiableList(functionalDependencies),
                                 Collections.unmodifiableList(postProcessedClauses));
         }
-
-        private List<DnfClause> postProcessClauses() {
-                var parameterInfoMap = getParameterInfoMap();
-                var postProcessedClauses = new ArrayList<DnfClause>(clauses.size());
-                for (var literals : clauses) {
-                        var postProcessor = new ClausePostProcessor(parameterInfoMap, literals);
-                        var result = postProcessor.postProcessClause();
-                        if (result instanceof ClausePostProcessor.ClauseResult clauseResult) {
-                                postProcessedClauses.add(clauseResult.clause());
-                        } else if (result instanceof ClausePostProcessor.ConstantResult constantResult) {
-                                switch (constantResult) {
-                                case ALWAYS_TRUE -> {
-                                        var inputVariables = getInputVariables();
-                                        return List.of(new DnfClause(inputVariables, List.of()));
-                                }
-                                case ALWAYS_FALSE -> {
-                                        // Skip this clause because it can never match.
-                                }
-                                default -> throw new IllegalStateException("Unexpected ClausePostProcessor.ConstantResult: " +
-                                                constantResult);
-                                }
-                        } else {
-                                throw new IllegalStateException("Unexpected ClausePostProcessor.Result: " + result);
-                        }
-                }
-                return postProcessedClauses;
-        }
-
-        private Map<Variable, ClausePostProcessor.ParameterInfo> getParameterInfoMap() {
-                var mutableParameterInfoMap = new LinkedHashMap<Variable, ClausePostProcessor.ParameterInfo>();
-                int arity = parameters.size();
-                for (int i = 0; i < arity; i++) {
-                        var parameter = parameters.get(i);
-                        mutableParameterInfoMap.put(parameter.getVariable(),
-                                        new ClausePostProcessor.ParameterInfo(parameter.getDirection(), i));
-                }
-                return Collections.unmodifiableMap(mutableParameterInfoMap);
-        }
-
-        private Set<Variable> getInputVariables() {
-                var inputParameters = new LinkedHashSet<Variable>();
-                for (var parameter : parameters) {
-                        if (parameter.getDirection() == ParameterDirection.IN) {
-                                inputParameters.add(parameter.getVariable());
-                        }
-                }
-                return Collections.unmodifiableSet(inputParameters);
-        }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfClause.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfClause.java
index fdd0d47c..94327bad 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfClause.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfClause.java
@@ -6,6 +6,7 @@
 package tools.refinery.store.query.dnf;
 
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.literal.Literal;
 import tools.refinery.store.query.term.Variable;
 
@@ -25,4 +26,12 @@ public record DnfClause(Set<Variable> positiveVariables, List<Literal> literals)
                 }
                 return true;
         }
+
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                int result = 0;
+                for (var literal : literals) {
+                        result = result * 31 + literal.hashCodeWithSubstitution(helper);
+                }
+                return result;
+        }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfPostProcessor.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfPostProcessor.java
new file mode 100644
index 00000000..50236642
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfPostProcessor.java
@@ -0,0 +1,112 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf;
+
+import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.store.query.equality.DnfEqualityChecker;
+import tools.refinery.store.query.equality.SubstitutingLiteralEqualityHelper;
+import tools.refinery.store.query.equality.SubstitutingLiteralHashCodeHelper;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.store.query.term.Variable;
+
+import java.util.*;
+
+class DnfPostProcessor {
+        private final List<SymbolicParameter> parameters;
+        private final List<List<Literal>> clauses;
+
+        public DnfPostProcessor(List<SymbolicParameter> parameters, List<List<Literal>> clauses) {
+                this.parameters = parameters;
+                this.clauses = clauses;
+        }
+
+        public List<DnfClause> postProcessClauses() {
+                var parameterInfoMap = getParameterInfoMap();
+                var postProcessedClauses = new LinkedHashSet<CanonicalClause>(clauses.size());
+                int index = 0;
+                for (var literals : clauses) {
+                        var postProcessor = new ClausePostProcessor(parameterInfoMap, literals);
+                        ClausePostProcessor.Result result;
+                        try {
+                                result = postProcessor.postProcessClause();
+                        } catch (InvalidQueryException e) {
+                                throw new InvalidClauseException(index, e);
+                        }
+                        if (result instanceof ClausePostProcessor.ClauseResult clauseResult) {
+                                postProcessedClauses.add(new CanonicalClause(clauseResult.clause()));
+                        } else if (result instanceof ClausePostProcessor.ConstantResult constantResult) {
+                                switch (constantResult) {
+                                case ALWAYS_TRUE -> {
+                                        var inputVariables = getInputVariables();
+                                        return List.of(new DnfClause(inputVariables, List.of()));
+                                }
+                                case ALWAYS_FALSE -> {
+                                        // Skip this clause because it can never match.
+                                }
+                                default -> throw new IllegalStateException("Unexpected ClausePostProcessor.ConstantResult: " +
+                                                constantResult);
+                                }
+                        } else {
+                                throw new IllegalStateException("Unexpected ClausePostProcessor.Result: " + result);
+                        }
+                        index++;
+                }
+                return postProcessedClauses.stream().map(CanonicalClause::getDnfClause).toList();
+        }
+
+        private Map<Variable, ClausePostProcessor.ParameterInfo> getParameterInfoMap() {
+                var mutableParameterInfoMap = new LinkedHashMap<Variable, ClausePostProcessor.ParameterInfo>();
+                int arity = parameters.size();
+                for (int i = 0; i < arity; i++) {
+                        var parameter = parameters.get(i);
+                        mutableParameterInfoMap.put(parameter.getVariable(),
+                                        new ClausePostProcessor.ParameterInfo(parameter.getDirection(), i));
+                }
+                return Collections.unmodifiableMap(mutableParameterInfoMap);
+        }
+
+        private Set<Variable> getInputVariables() {
+                var inputParameters = new LinkedHashSet<Variable>();
+                for (var parameter : parameters) {
+                        if (parameter.getDirection() == ParameterDirection.IN) {
+                                inputParameters.add(parameter.getVariable());
+                        }
+                }
+                return Collections.unmodifiableSet(inputParameters);
+        }
+
+        private class CanonicalClause {
+                private final DnfClause dnfClause;
+
+                public CanonicalClause(DnfClause dnfClause) {
+                        this.dnfClause = dnfClause;
+                }
+
+                public DnfClause getDnfClause() {
+                        return dnfClause;
+                }
+
+                @Override
+                public boolean equals(Object obj) {
+                        if (this == obj) {
+                                return true;
+                        }
+                        if (obj == null || getClass() != obj.getClass()) {
+                                return false;
+                        }
+                        var otherCanonicalClause = (CanonicalClause) obj;
+                        var helper = new SubstitutingLiteralEqualityHelper(DnfEqualityChecker.DEFAULT, parameters, parameters);
+                        return dnfClause.equalsWithSubstitution(helper, otherCanonicalClause.dnfClause);
+                }
+
+                @Override
+                public int hashCode() {
+                        var helper = new SubstitutingLiteralHashCodeHelper(parameters);
+                        return dnfClause.hashCodeWithSubstitution(helper);
+                }
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalDependency.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalDependency.java
index b00b2cb7..aef07ee3 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalDependency.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalDependency.java
@@ -5,6 +5,8 @@
  */
 package tools.refinery.store.query.dnf;
 
+import tools.refinery.store.query.InvalidQueryException;
+
 import java.util.HashSet;
 import java.util.Set;
 
@@ -13,7 +15,7 @@ public record FunctionalDependency<T>(Set<T> forEach, Set<T> unique) {
                 var uniqueForEach = new HashSet<>(unique);
                 uniqueForEach.retainAll(forEach);
                 if (!uniqueForEach.isEmpty()) {
-                        throw new IllegalArgumentException("Variables %s appear on both sides of the functional dependency"
+                        throw new InvalidQueryException("Variables %s appear on both sides of the functional dependency"
                                         .formatted(uniqueForEach));
                 }
         }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQuery.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQuery.java
index 5a32b1ba..225f6844 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQuery.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQuery.java
@@ -5,6 +5,7 @@
  */
 package tools.refinery.store.query.dnf;
 
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.literal.CallPolarity;
 import tools.refinery.store.query.term.Aggregator;
 import tools.refinery.store.query.term.AssignedValue;
@@ -26,14 +27,14 @@ public final class FunctionalQuery<T> extends Query<T> {
                         var parameter = parameters.get(i);
                         var parameterType = parameter.tryGetType();
                         if (parameterType.isPresent()) {
-                                throw new IllegalArgumentException("Expected parameter %s of %s to be a node variable, got %s instead"
+                                throw new InvalidQueryException("Expected parameter %s of %s to be a node variable, got %s instead"
                                                 .formatted(parameter, dnf, parameterType.get().getName()));
                         }
                 }
                 var outputParameter = parameters.get(outputIndex);
                 var outputParameterType = outputParameter.tryGetType();
                 if (outputParameterType.isEmpty() || !outputParameterType.get().equals(type)) {
-                        throw new IllegalArgumentException("Expected parameter %s of %s to be %s, but got %s instead".formatted(
+                        throw new InvalidQueryException("Expected parameter %s of %s to be %s, but got %s instead".formatted(
                                         outputParameter, dnf, type, outputParameterType.map(Class::getName).orElse("node")));
                 }
                 this.type = type;
@@ -54,6 +55,16 @@ public final class FunctionalQuery<T> extends Query<T> {
                 return null;
         }
 
+        @Override
+        protected FunctionalQuery<T> withDnfInternal(Dnf newDnf) {
+                return newDnf.asFunction(type);
+        }
+
+        @Override
+        public FunctionalQuery<T> withDnf(Dnf newDnf) {
+                return (FunctionalQuery<T>) super.withDnf(newDnf);
+        }
+
         public AssignedValue<T> call(List<NodeVariable> arguments) {
                 return targetVariable -> {
                         var argumentsWithTarget = new ArrayList<Variable>(arguments.size() + 1);
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/InvalidClauseException.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/InvalidClauseException.java
new file mode 100644
index 00000000..747574b9
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/InvalidClauseException.java
@@ -0,0 +1,35 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf;
+
+import tools.refinery.store.query.InvalidQueryException;
+
+public class InvalidClauseException extends InvalidQueryException {
+        private final int clauseIndex;
+
+        public InvalidClauseException(int clauseIndex) {
+                this.clauseIndex = clauseIndex;
+        }
+
+        public InvalidClauseException(int clauseIndex, String message) {
+                super(message);
+                this.clauseIndex = clauseIndex;
+        }
+
+        public InvalidClauseException(int clauseIndex, String message, Throwable cause) {
+                super(message, cause);
+                this.clauseIndex = clauseIndex;
+        }
+
+        public InvalidClauseException(int clauseIndex, Throwable cause) {
+                super(cause);
+                this.clauseIndex = clauseIndex;
+        }
+
+        public int getClauseIndex() {
+                return clauseIndex;
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java
index aaa52ce6..83fe6ccd 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java
@@ -43,6 +43,29 @@ public abstract sealed class Query<T> implements AnyQuery permits FunctionalQuer
 
         public abstract T defaultValue();
 
+        public Query<T> withDnf(Dnf newDnf) {
+                if (dnf.equals(newDnf)) {
+                        return this;
+                }
+                int arity = dnf.arity();
+                if (newDnf.arity() != arity) {
+                        throw new IllegalArgumentException("Arity of %s and %s do not match".formatted(dnf, newDnf));
+                }
+                var parameters = dnf.getParameters();
+                var newParameters = newDnf.getParameters();
+                for (int i = 0; i < arity; i++) {
+                        var parameter = parameters.get(i);
+                        var newParameter = newParameters.get(i);
+                        if (!parameter.matches(newParameter)) {
+                                throw new IllegalArgumentException("Parameter #%d mismatch: %s does not match %s"
+                                                .formatted(i, parameter, newParameter));
+                        }
+                }
+                return withDnfInternal(newDnf);
+        }
+
+        protected abstract Query<T> withDnfInternal(Dnf newDnf);
+
         @Override
         public boolean equals(Object o) {
                 if (this == o) return true;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/RelationalQuery.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/RelationalQuery.java
index d34a7ace..98f71e11 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/RelationalQuery.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/RelationalQuery.java
@@ -5,6 +5,7 @@
  */
 package tools.refinery.store.query.dnf;
 
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.literal.CallLiteral;
 import tools.refinery.store.query.literal.CallPolarity;
 import tools.refinery.store.query.term.AssignedValue;
@@ -19,7 +20,7 @@ public final class RelationalQuery extends Query<Boolean> {
                 for (var parameter : dnf.getSymbolicParameters()) {
                         var parameterType = parameter.tryGetType();
                         if (parameterType.isPresent()) {
-                                throw new IllegalArgumentException("Expected parameter %s of %s to be a node variable, got %s instead"
+                                throw new InvalidQueryException("Expected parameter %s of %s to be a node variable, got %s instead"
                                                 .formatted(parameter, dnf, parameterType.get().getName()));
                         }
                 }
@@ -40,6 +41,16 @@ public final class RelationalQuery extends Query<Boolean> {
                 return false;
         }
 
+        @Override
+        protected RelationalQuery withDnfInternal(Dnf newDnf) {
+                return newDnf.asRelation();
+        }
+
+        @Override
+        public RelationalQuery withDnf(Dnf newDnf) {
+                return (RelationalQuery) super.withDnf(newDnf);
+        }
+
         public CallLiteral call(CallPolarity polarity, List<NodeVariable> arguments) {
                 return getDnf().call(polarity, Collections.unmodifiableList(arguments));
         }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/SymbolicParameter.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/SymbolicParameter.java
index e0d3ba1f..fe9cefcc 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/SymbolicParameter.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/SymbolicParameter.java
@@ -5,6 +5,7 @@
  */
 package tools.refinery.store.query.dnf;
 
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.term.Parameter;
 import tools.refinery.store.query.term.ParameterDirection;
 import tools.refinery.store.query.term.Variable;
@@ -23,8 +24,8 @@ public final class SymbolicParameter extends Parameter {
                 return variable;
         }
 
-        public boolean isUnifiable() {
-                return variable.isUnifiable();
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return Objects.hash(super.hashCode(), helper.getVariableHashCode(variable));
         }
 
         @Override
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/DeepDnfEqualityChecker.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/DeepDnfEqualityChecker.java
index 1eeb5723..d6171314 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/DeepDnfEqualityChecker.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/DeepDnfEqualityChecker.java
@@ -14,8 +14,7 @@ import tools.refinery.store.util.CycleDetectingMapper;
 import java.util.List;
 
 public class DeepDnfEqualityChecker implements DnfEqualityChecker {
-        private final CycleDetectingMapper<Pair, Boolean> mapper = new CycleDetectingMapper<>(Pair::toString,
-                        this::doCheckEqual);
+        private final CycleDetectingMapper<Pair, Boolean> mapper = new CycleDetectingMapper<>(this::doCheckEqual);
 
         @Override
         public boolean dnfEqual(Dnf left, Dnf right) {
@@ -38,7 +37,7 @@ public class DeepDnfEqualityChecker implements DnfEqualityChecker {
                         return false;
                 }
                 for (int i = 0; i < numClauses; i++) {
-                        var literalEqualityHelper = new LiteralEqualityHelper(this, symbolicParameters,
+                        var literalEqualityHelper = new SubstitutingLiteralEqualityHelper(this, symbolicParameters,
                                         other.getSymbolicParameters());
                         if (!equalsWithSubstitutionRaw(literalEqualityHelper, clauses.get(i), other.getClauses().get(i))) {
                                 return false;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/DnfEqualityChecker.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/DnfEqualityChecker.java
index 4a8bee3b..e2cfd79b 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/DnfEqualityChecker.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/DnfEqualityChecker.java
@@ -7,7 +7,11 @@ package tools.refinery.store.query.equality;
 
 import tools.refinery.store.query.dnf.Dnf;
 
+import java.util.Objects;
+
 @FunctionalInterface
 public interface DnfEqualityChecker {
+        DnfEqualityChecker DEFAULT = Objects::equals;
+
         boolean dnfEqual(Dnf left, Dnf right);
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/LiteralEqualityHelper.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/LiteralEqualityHelper.java
index 9315fb30..5abc76ce 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/LiteralEqualityHelper.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/LiteralEqualityHelper.java
@@ -6,49 +6,22 @@
 package tools.refinery.store.query.equality;
 
 import tools.refinery.store.query.dnf.Dnf;
-import tools.refinery.store.query.dnf.SymbolicParameter;
 import tools.refinery.store.query.term.Variable;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.Objects;
 
-public class LiteralEqualityHelper {
-        private final DnfEqualityChecker dnfEqualityChecker;
-        private final Map<Variable, Variable> leftToRight;
-        private final Map<Variable, Variable> rightToLeft;
-
-        public LiteralEqualityHelper(DnfEqualityChecker dnfEqualityChecker, List<SymbolicParameter> leftParameters,
-                                                                 List<SymbolicParameter> rightParameters) {
-                this.dnfEqualityChecker = dnfEqualityChecker;
-                var arity = leftParameters.size();
-                if (arity != rightParameters.size()) {
-                        throw new IllegalArgumentException("Parameter lists have unequal length");
-                }
-                leftToRight = new HashMap<>(arity);
-                rightToLeft = new HashMap<>(arity);
-                for (int i = 0; i < arity; i++) {
-                        if (!variableEqual(leftParameters.get(i).getVariable(), rightParameters.get(i).getVariable())) {
-                                throw new IllegalArgumentException("Parameter lists cannot be unified: duplicate parameter " + i);
-                        }
+public interface LiteralEqualityHelper extends DnfEqualityChecker {
+        LiteralEqualityHelper DEFAULT = new LiteralEqualityHelper() {
+                @Override
+                public boolean variableEqual(Variable left, Variable right) {
+                        return Objects.equals(left, right);
                 }
-        }
-
-        public boolean dnfEqual(Dnf left, Dnf right) {
-                return dnfEqualityChecker.dnfEqual(left, right);
-        }
 
-        public boolean variableEqual(Variable left, Variable right) {
-                if (checkMapping(leftToRight, left, right) && checkMapping(rightToLeft, right, left)) {
-                        leftToRight.put(left, right);
-                        rightToLeft.put(right, left);
-                        return true;
+                @Override
+                public boolean dnfEqual(Dnf left, Dnf right) {
+                        return DnfEqualityChecker.DEFAULT.dnfEqual(left, right);
                 }
-                return false;
-        }
+        };
 
-        private static boolean checkMapping(Map<Variable, Variable> map, Variable key, Variable expectedValue) {
-                var currentValue = map.get(key);
-                return currentValue == null || currentValue.equals(expectedValue);
-        }
+        boolean variableEqual(Variable left, Variable right);
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/LiteralHashCodeHelper.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/LiteralHashCodeHelper.java
new file mode 100644
index 00000000..5495160a
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/LiteralHashCodeHelper.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.equality;
+
+import tools.refinery.store.query.term.Variable;
+
+import java.util.Objects;
+
+@FunctionalInterface
+public interface LiteralHashCodeHelper {
+        LiteralHashCodeHelper DEFAULT = Objects::hashCode;
+
+        int getVariableHashCode(Variable variable);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/SubstitutingLiteralEqualityHelper.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/SubstitutingLiteralEqualityHelper.java
new file mode 100644
index 00000000..50a79e07
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/SubstitutingLiteralEqualityHelper.java
@@ -0,0 +1,59 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.equality;
+
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.dnf.SymbolicParameter;
+import tools.refinery.store.query.term.Variable;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SubstitutingLiteralEqualityHelper implements LiteralEqualityHelper {
+        private final DnfEqualityChecker dnfEqualityChecker;
+        private final Map<Variable, Variable> leftToRight;
+        private final Map<Variable, Variable> rightToLeft;
+
+        public SubstitutingLiteralEqualityHelper(DnfEqualityChecker dnfEqualityChecker,
+                                                                                         List<SymbolicParameter> leftParameters,
+                                                                                         List<SymbolicParameter> rightParameters) {
+                this.dnfEqualityChecker = dnfEqualityChecker;
+                var arity = leftParameters.size();
+                if (arity != rightParameters.size()) {
+                        throw new IllegalArgumentException("Parameter lists have unequal length");
+                }
+                leftToRight = new HashMap<>(arity);
+                rightToLeft = new HashMap<>(arity);
+                for (int i = 0; i < arity; i++) {
+                        if (!variableEqual(leftParameters.get(i).getVariable(), rightParameters.get(i).getVariable())) {
+                                throw new IllegalArgumentException("Parameter lists cannot be unified: duplicate parameter " + i);
+                        }
+                }
+        }
+
+        @Override
+        public boolean dnfEqual(Dnf left, Dnf right) {
+                return dnfEqualityChecker.dnfEqual(left, right);
+        }
+
+        @Override
+        public boolean variableEqual(Variable left, Variable right) {
+                if (left.tryGetType().equals(right.tryGetType()) &&
+                                checkMapping(leftToRight, left, right) &&
+                                checkMapping(rightToLeft, right, left)) {
+                        leftToRight.put(left, right);
+                        rightToLeft.put(right, left);
+                        return true;
+                }
+                return false;
+        }
+
+        private static boolean checkMapping(Map<Variable, Variable> map, Variable key, Variable expectedValue) {
+                var currentValue = map.get(key);
+                return currentValue == null || currentValue.equals(expectedValue);
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/SubstitutingLiteralHashCodeHelper.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/SubstitutingLiteralHashCodeHelper.java
new file mode 100644
index 00000000..754f6976
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/SubstitutingLiteralHashCodeHelper.java
@@ -0,0 +1,42 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.equality;
+
+import tools.refinery.store.query.dnf.SymbolicParameter;
+import tools.refinery.store.query.term.Variable;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SubstitutingLiteralHashCodeHelper implements LiteralHashCodeHelper {
+        private final Map<Variable, Integer> assignedHashCodes = new LinkedHashMap<>();
+
+        // 0 is for {@code null}, so we start with 1.
+        private int next = 1;
+
+        public SubstitutingLiteralHashCodeHelper() {
+                this(List.of());
+        }
+
+        public SubstitutingLiteralHashCodeHelper(List<SymbolicParameter> parameters) {
+                for (var parameter : parameters) {
+                        getVariableHashCode(parameter.getVariable());
+                }
+        }
+
+        @Override
+        public int getVariableHashCode(Variable variable) {
+                if (variable == null) {
+                        return 0;
+                }
+                return assignedHashCodes.computeIfAbsent(variable, key -> {
+                        int sequenceNumber = next;
+                        next++;
+                        return variable.hashCodeWithSubstitution(sequenceNumber);
+                });
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCallLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCallLiteral.java
index 8ef8e8b4..0e99d441 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCallLiteral.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCallLiteral.java
@@ -6,14 +6,18 @@
 package tools.refinery.store.query.literal;
 
 import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.term.ParameterDirection;
 import tools.refinery.store.query.term.Variable;
 
 import java.util.*;
 
-public abstract class AbstractCallLiteral implements Literal {
+// {@link Object#equals(Object)} is implemented by {@link AbstractLiteral}.
+@SuppressWarnings("squid:S2160")
+public abstract class AbstractCallLiteral extends AbstractLiteral {
         private final Constraint target;
         private final List<Variable> arguments;
         private final Set<Variable> inArguments;
@@ -24,7 +28,7 @@ public abstract class AbstractCallLiteral implements Literal {
         protected AbstractCallLiteral(Constraint target, List<Variable> arguments) {
                 int arity = target.arity();
                 if (arguments.size() != arity) {
-                        throw new IllegalArgumentException("%s needs %d arguments, but got %s".formatted(target.name(),
+                        throw new InvalidQueryException("%s needs %d arguments, but got %s".formatted(target.name(),
                                         target.arity(), arguments.size()));
                 }
                 this.target = target;
@@ -36,21 +40,17 @@ public abstract class AbstractCallLiteral implements Literal {
                         var argument = arguments.get(i);
                         var parameter = parameters.get(i);
                         if (!parameter.isAssignable(argument)) {
-                                throw new IllegalArgumentException("Argument %d of %s is not assignable to parameter %s"
+                                throw new InvalidQueryException("Argument %d of %s is not assignable to parameter %s"
                                                 .formatted(i, target, parameter));
                         }
                         switch (parameter.getDirection()) {
                         case IN -> {
-                                if (mutableOutArguments.remove(argument)) {
-                                        checkInOutUnifiable(argument);
-                                }
+                                mutableOutArguments.remove(argument);
                                 mutableInArguments.add(argument);
                         }
                         case OUT -> {
-                                if (mutableInArguments.contains(argument)) {
-                                        checkInOutUnifiable(argument);
-                                } else if (!mutableOutArguments.add(argument)) {
-                                        checkDuplicateOutUnifiable(argument);
+                                if (!mutableInArguments.contains(argument)) {
+                                        mutableOutArguments.add(argument);
                                 }
                         }
                         }
@@ -59,19 +59,6 @@ public abstract class AbstractCallLiteral implements Literal {
                 outArguments = Collections.unmodifiableSet(mutableOutArguments);
         }
 
-        private static void checkInOutUnifiable(Variable argument) {
-                if (!argument.isUnifiable()) {
-                        throw new IllegalArgumentException("Argument %s cannot appear with both %s and %s direction"
-                                        .formatted(argument, ParameterDirection.IN, ParameterDirection.OUT));
-                }
-        }
-
-        private static void checkDuplicateOutUnifiable(Variable argument) {
-                if (!argument.isUnifiable()) {
-                        throw new IllegalArgumentException("Argument %s cannot be bound multiple times".formatted(argument));
-                }
-        }
-
         public Constraint getTarget() {
                 return target;
         }
@@ -110,9 +97,18 @@ public abstract class AbstractCallLiteral implements Literal {
 
         protected abstract Literal doSubstitute(Substitution substitution, List<Variable> substitutedArguments);
 
+        public AbstractCallLiteral withTarget(Constraint newTarget) {
+                if (Objects.equals(target, newTarget)) {
+                        return this;
+                }
+                return withArguments(newTarget, arguments);
+        }
+
+        public abstract AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments);
+
         @Override
         public boolean equalsWithSubstitution(LiteralEqualityHelper helper, Literal other) {
-                if (other == null || getClass() != other.getClass()) {
+                if (!super.equalsWithSubstitution(helper, other)) {
                         return false;
                 }
                 var otherCallLiteral = (AbstractCallLiteral) other;
@@ -129,15 +125,11 @@ public abstract class AbstractCallLiteral implements Literal {
         }
 
         @Override
-        public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                AbstractCallLiteral that = (AbstractCallLiteral) o;
-                return target.equals(that.target) && arguments.equals(that.arguments);
-        }
-
-        @Override
-        public int hashCode() {
-                return Objects.hash(getClass(), target, arguments);
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                int result = super.hashCodeWithSubstitution(helper) * 31 + target.hashCode();
+                for (var argument : arguments) {
+                        result = result * 31 + helper.getVariableHashCode(argument);
+                }
+                return result;
         }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCountLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCountLiteral.java
new file mode 100644
index 00000000..9bb572c0
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCountLiteral.java
@@ -0,0 +1,107 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.literal;
+
+import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.store.query.term.ConstantTerm;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.Variable;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+// {@link Object#equals(Object)} is implemented by {@link AbstractLiteral}.
+@SuppressWarnings("squid:S2160")
+public abstract class AbstractCountLiteral<T> extends AbstractCallLiteral {
+        private final Class<T> resultType;
+        private final DataVariable<T> resultVariable;
+
+        protected AbstractCountLiteral(Class<T> resultType, DataVariable<T> resultVariable, Constraint target,
+                                                                   List<Variable> arguments) {
+                super(target, arguments);
+                if (!resultVariable.getType().equals(resultType)) {
+                        throw new InvalidQueryException("Count result variable %s must be of type %s, got %s instead".formatted(
+                                        resultVariable, resultType, resultVariable.getType().getName()));
+                }
+                if (arguments.contains(resultVariable)) {
+                        throw new InvalidQueryException("Count result variable %s must not appear in the argument list"
+                                        .formatted(resultVariable));
+                }
+                this.resultType = resultType;
+                this.resultVariable = resultVariable;
+        }
+
+        public Class<T> getResultType() {
+                return resultType;
+        }
+
+        public DataVariable<T> getResultVariable() {
+                return resultVariable;
+        }
+
+        @Override
+        public Set<Variable> getOutputVariables() {
+                return Set.of(resultVariable);
+        }
+
+        protected abstract T zero();
+
+        protected abstract T one();
+
+        @Override
+        public Literal reduce() {
+                var reduction = getTarget().getReduction();
+                return switch (reduction) {
+                        case ALWAYS_FALSE -> getResultVariable().assign(new ConstantTerm<>(resultType, zero()));
+                        // The only way a constant {@code true} predicate can be called in a negative position is to have all of
+                        // its arguments bound as input variables. Thus, there will only be a single match.
+                        case ALWAYS_TRUE -> getResultVariable().assign(new ConstantTerm<>(resultType, one()));
+                        case NOT_REDUCIBLE -> this;
+                };
+        }
+
+        @Override
+        public boolean equalsWithSubstitution(LiteralEqualityHelper helper, Literal other) {
+                if (!super.equalsWithSubstitution(helper, other)) {
+                        return false;
+                }
+                var otherCountLiteral = (AbstractCountLiteral<?>) other;
+                return Objects.equals(resultType, otherCountLiteral.resultType) &&
+                                helper.variableEqual(resultVariable, otherCountLiteral.resultVariable);
+        }
+
+        @Override
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return Objects.hash(super.hashCodeWithSubstitution(helper), resultType,
+                                helper.getVariableHashCode(resultVariable));
+        }
+
+        protected abstract String operatorName();
+
+        @Override
+        public String toString() {
+                var builder = new StringBuilder();
+                builder.append(resultVariable);
+                builder.append(" is ");
+                builder.append(operatorName());
+                builder.append(' ');
+                builder.append(getTarget().toReferenceString());
+                builder.append('(');
+                var argumentIterator = getArguments().iterator();
+                if (argumentIterator.hasNext()) {
+                        builder.append(argumentIterator.next());
+                        while (argumentIterator.hasNext()) {
+                                builder.append(", ").append(argumentIterator.next());
+                        }
+                }
+                builder.append(')');
+                return builder.toString();
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractLiteral.java
new file mode 100644
index 00000000..7d3cabd7
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractLiteral.java
@@ -0,0 +1,34 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.literal;
+
+import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+
+public abstract class AbstractLiteral implements Literal {
+        @Override
+        public boolean equalsWithSubstitution(LiteralEqualityHelper helper, Literal other) {
+                return other != null && getClass() == other.getClass();
+        }
+
+        @Override
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return getClass().hashCode();
+        }
+
+        @Override
+        public boolean equals(Object o) {
+                if (this == o) return true;
+                if (o == null || getClass() != o.getClass()) return false;
+                AbstractLiteral that = (AbstractLiteral) o;
+                return equalsWithSubstitution(LiteralEqualityHelper.DEFAULT, that);
+        }
+
+        @Override
+        public int hashCode() {
+                return hashCodeWithSubstitution(LiteralHashCodeHelper.DEFAULT);
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AggregationLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AggregationLiteral.java
index 3a5eb5c7..e3acfacc 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AggregationLiteral.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AggregationLiteral.java
@@ -6,7 +6,9 @@
 package tools.refinery.store.query.literal;
 
 import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.term.*;
 
@@ -14,6 +16,8 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
+// {@link Object#equals(Object)} is implemented by {@link AbstractLiteral}.
+@SuppressWarnings("squid:S2160")
 public class AggregationLiteral<R, T> extends AbstractCallLiteral {
         private final DataVariable<R> resultVariable;
         private final DataVariable<T> inputVariable;
@@ -23,19 +27,19 @@ public class AggregationLiteral<R, T> extends AbstractCallLiteral {
                                                           DataVariable<T> inputVariable, Constraint target, List<Variable> arguments) {
                 super(target, arguments);
                 if (!inputVariable.getType().equals(aggregator.getInputType())) {
-                        throw new IllegalArgumentException("Input variable %s must of type %s, got %s instead".formatted(
+                        throw new InvalidQueryException("Input variable %s must of type %s, got %s instead".formatted(
                                         inputVariable, aggregator.getInputType().getName(), inputVariable.getType().getName()));
                 }
                 if (!getArgumentsOfDirection(ParameterDirection.OUT).contains(inputVariable)) {
-                        throw new IllegalArgumentException("Input variable %s must be bound with direction %s in the argument list"
+                        throw new InvalidQueryException("Input variable %s must be bound with direction %s in the argument list"
                                         .formatted(inputVariable, ParameterDirection.OUT));
                 }
                 if (!resultVariable.getType().equals(aggregator.getResultType())) {
-                        throw new IllegalArgumentException("Result variable %s must of type %s, got %s instead".formatted(
+                        throw new InvalidQueryException("Result variable %s must of type %s, got %s instead".formatted(
                                         resultVariable, aggregator.getResultType().getName(), resultVariable.getType().getName()));
                 }
                 if (arguments.contains(resultVariable)) {
-                        throw new IllegalArgumentException("Result variable %s must not appear in the argument list".formatted(
+                        throw new InvalidQueryException("Result variable %s must not appear in the argument list".formatted(
                                         resultVariable));
                 }
                 this.resultVariable = resultVariable;
@@ -63,7 +67,7 @@ public class AggregationLiteral<R, T> extends AbstractCallLiteral {
         @Override
         public Set<Variable> getInputVariables(Set<? extends Variable> positiveVariablesInClause) {
                 if (positiveVariablesInClause.contains(inputVariable)) {
-                        throw new IllegalArgumentException("Aggregation variable %s must not be bound".formatted(inputVariable));
+                        throw new InvalidQueryException("Aggregation variable %s must not be bound".formatted(inputVariable));
                 }
                 return super.getInputVariables(positiveVariablesInClause);
         }
@@ -77,7 +81,7 @@ public class AggregationLiteral<R, T> extends AbstractCallLiteral {
                                 yield emptyValue == null ? BooleanLiteral.FALSE :
                                                 resultVariable.assign(new ConstantTerm<>(resultVariable.getType(), emptyValue));
                         }
-                        case ALWAYS_TRUE -> throw new IllegalArgumentException("Trying to aggregate over an infinite set");
+                        case ALWAYS_TRUE -> throw new InvalidQueryException("Trying to aggregate over an infinite set");
                         case NOT_REDUCIBLE -> this;
                 };
         }
@@ -89,6 +93,11 @@ public class AggregationLiteral<R, T> extends AbstractCallLiteral {
         }
 
         @Override
+        public AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments) {
+                return new AggregationLiteral<>(resultVariable, aggregator, inputVariable, newTarget, newArguments);
+        }
+
+        @Override
         public boolean equalsWithSubstitution(LiteralEqualityHelper helper, Literal other) {
                 if (!super.equalsWithSubstitution(helper, other)) {
                         return false;
@@ -100,18 +109,9 @@ public class AggregationLiteral<R, T> extends AbstractCallLiteral {
         }
 
         @Override
-        public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                if (!super.equals(o)) return false;
-                AggregationLiteral<?, ?> that = (AggregationLiteral<?, ?>) o;
-                return resultVariable.equals(that.resultVariable) && inputVariable.equals(that.inputVariable) &&
-                                aggregator.equals(that.aggregator);
-        }
-
-        @Override
-        public int hashCode() {
-                return Objects.hash(super.hashCode(), resultVariable, inputVariable, aggregator);
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return Objects.hash(super.hashCodeWithSubstitution(helper), helper.getVariableHashCode(resultVariable),
+                                helper.getVariableHashCode(inputVariable), aggregator);
         }
 
         @Override
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AssignLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AssignLiteral.java
index dbf999a2..dadf487f 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AssignLiteral.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AssignLiteral.java
@@ -5,7 +5,9 @@
  */
 package tools.refinery.store.query.literal;
 
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.term.DataVariable;
 import tools.refinery.store.query.term.Term;
@@ -15,17 +17,32 @@ import java.util.Collections;
 import java.util.Objects;
 import java.util.Set;
 
-public record AssignLiteral<T>(DataVariable<T> variable, Term<T> term) implements Literal {
-        public AssignLiteral {
+// {@link Object#equals(Object)} is implemented by {@link AbstractLiteral}.
+@SuppressWarnings("squid:S2160")
+public class AssignLiteral<T> extends AbstractLiteral {
+        private final DataVariable<T> variable;
+        private final Term<T> term;
+
+        public AssignLiteral(DataVariable<T> variable, Term<T> term) {
                 if (!term.getType().equals(variable.getType())) {
-                        throw new IllegalArgumentException("Term %s must be of type %s, got %s instead".formatted(
+                        throw new InvalidQueryException("Term %s must be of type %s, got %s instead".formatted(
                                         term, variable.getType().getName(), term.getType().getName()));
                 }
                 var inputVariables = term.getInputVariables();
                 if (inputVariables.contains(variable)) {
-                        throw new IllegalArgumentException("Result variable %s must not appear in the term %s".formatted(
+                        throw new InvalidQueryException("Result variable %s must not appear in the term %s".formatted(
                                         variable, term));
                 }
+                this.variable = variable;
+                this.term = term;
+        }
+
+        public DataVariable<T> getVariable() {
+                return variable;
+        }
+
+        public Term<T> getTerm() {
+                return term;
         }
 
         @Override
@@ -53,27 +70,19 @@ public record AssignLiteral<T>(DataVariable<T> variable, Term<T> term) implement
                 if (other == null || getClass() != other.getClass()) {
                         return false;
                 }
-                var otherLetLiteral = (AssignLiteral<?>) other;
-                return helper.variableEqual(variable, otherLetLiteral.variable) && term.equalsWithSubstitution(helper,
-                                otherLetLiteral.term);
-        }
-
-        @Override
-        public String toString() {
-                return "%s is (%s)".formatted(variable, term);
+                var otherAssignLiteral = (AssignLiteral<?>) other;
+                return helper.variableEqual(variable, otherAssignLiteral.variable) &&
+                                term.equalsWithSubstitution(helper, otherAssignLiteral.term);
         }
 
         @Override
-        public boolean equals(Object obj) {
-                if (obj == this) return true;
-                if (obj == null || obj.getClass() != this.getClass()) return false;
-                var that = (AssignLiteral<?>) obj;
-                return Objects.equals(this.variable, that.variable) &&
-                                Objects.equals(this.term, that.term);
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return Objects.hash(super.hashCodeWithSubstitution(helper), helper.getVariableHashCode(variable),
+                                term.hashCodeWithSubstitution(helper));
         }
 
         @Override
-        public int hashCode() {
-                return Objects.hash(getClass(), variable, term);
+        public String toString() {
+                return "%s is (%s)".formatted(variable, term);
         }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/BooleanLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/BooleanLiteral.java
index f312d202..6cd320da 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/BooleanLiteral.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/BooleanLiteral.java
@@ -6,6 +6,7 @@
 package tools.refinery.store.query.literal;
 
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.term.Variable;
 
@@ -53,6 +54,11 @@ public enum BooleanLiteral implements CanNegate<BooleanLiteral> {
         }
 
         @Override
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return hashCode();
+        }
+
+        @Override
         public String toString() {
                 return Boolean.toString(value);
         }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallLiteral.java
index 29772aee..2d0e4e97 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallLiteral.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallLiteral.java
@@ -6,13 +6,17 @@
 package tools.refinery.store.query.literal;
 
 import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.term.ParameterDirection;
 import tools.refinery.store.query.term.Variable;
 
 import java.util.*;
 
+// {@link Object#equals(Object)} is implemented by {@link AbstractLiteral}.
+@SuppressWarnings("squid:S2160")
 public final class CallLiteral extends AbstractCallLiteral implements CanNegate<CallLiteral> {
         private final CallPolarity polarity;
 
@@ -22,10 +26,14 @@ public final class CallLiteral extends AbstractCallLiteral implements CanNegate<
                 int arity = target.arity();
                 if (polarity.isTransitive()) {
                         if (arity != 2) {
-                                throw new IllegalArgumentException("Transitive closures can only take binary relations");
+                                throw new InvalidQueryException("Transitive closures can only take binary relations");
                         }
                         if (parameters.get(0).isDataVariable() || parameters.get(1).isDataVariable()) {
-                                throw new IllegalArgumentException("Transitive closures can only be computed over nodes");
+                                throw new InvalidQueryException("Transitive closures can only be computed over nodes");
+                        }
+                        if (parameters.get(0).getDirection() != ParameterDirection.OUT ||
+                                        parameters.get(1).getDirection() != ParameterDirection.OUT) {
+                                throw new InvalidQueryException("Transitive closures cannot take input parameters");
                         }
                 }
                 this.polarity = polarity;
@@ -85,22 +93,18 @@ public final class CallLiteral extends AbstractCallLiteral implements CanNegate<
         }
 
         @Override
-        public CallLiteral negate() {
-                return new CallLiteral(polarity.negate(), getTarget(), getArguments());
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return Objects.hash(super.hashCodeWithSubstitution(helper), polarity);
         }
 
         @Override
-        public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                if (!super.equals(o)) return false;
-                CallLiteral that = (CallLiteral) o;
-                return polarity == that.polarity;
+        public CallLiteral negate() {
+                return new CallLiteral(polarity.negate(), getTarget(), getArguments());
         }
 
         @Override
-        public int hashCode() {
-                return Objects.hash(super.hashCode(), polarity);
+        public AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments) {
+                return new CallLiteral(polarity, newTarget, newArguments);
         }
 
         @Override
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallPolarity.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallPolarity.java
index ca70b0fd..716c7109 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallPolarity.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallPolarity.java
@@ -5,6 +5,8 @@
  */
 package tools.refinery.store.query.literal;
 
+import tools.refinery.store.query.InvalidQueryException;
+
 public enum CallPolarity {
         POSITIVE(true, false),
         NEGATIVE(false, false),
@@ -31,7 +33,7 @@ public enum CallPolarity {
                 return switch (this) {
                         case POSITIVE -> NEGATIVE;
                         case NEGATIVE -> POSITIVE;
-                        case TRANSITIVE -> throw new IllegalArgumentException("Transitive polarity cannot be negated");
+                        case TRANSITIVE -> throw new InvalidQueryException("Transitive polarity cannot be negated");
                 };
         }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AssumeLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CheckLiteral.java
index 1ca04c77..dfedd2cb 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AssumeLiteral.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CheckLiteral.java
@@ -5,22 +5,35 @@
  */
 package tools.refinery.store.query.literal;
 
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.term.ConstantTerm;
 import tools.refinery.store.query.term.Term;
 import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.term.bool.BoolNotTerm;
+import tools.refinery.store.query.term.bool.BoolTerms;
 
 import java.util.Collections;
 import java.util.Objects;
 import java.util.Set;
 
-public record AssumeLiteral(Term<Boolean> term) implements Literal {
-        public AssumeLiteral {
+// {@link Object#equals(Object)} is implemented by {@link AbstractLiteral}.
+@SuppressWarnings("squid:S2160")
+public class CheckLiteral extends AbstractLiteral implements CanNegate<CheckLiteral> {
+        private final Term<Boolean> term;
+
+        public CheckLiteral(Term<Boolean> term) {
                 if (!term.getType().equals(Boolean.class)) {
-                        throw new IllegalArgumentException("Term %s must be of type %s, got %s instead".formatted(
+                        throw new InvalidQueryException("Term %s must be of type %s, got %s instead".formatted(
                                         term, Boolean.class.getName(), term.getType().getName()));
                 }
+                this.term = term;
+        }
+
+        public Term<Boolean> getTerm() {
+                return term;
         }
 
         @Override
@@ -38,10 +51,17 @@ public record AssumeLiteral(Term<Boolean> term) implements Literal {
                 return Set.of();
         }
 
-
         @Override
         public Literal substitute(Substitution substitution) {
-                return new AssumeLiteral(term.substitute(substitution));
+                return new CheckLiteral(term.substitute(substitution));
+        }
+
+        @Override
+        public CheckLiteral negate() {
+                if (term instanceof BoolNotTerm notTerm) {
+                        return new CheckLiteral(notTerm.getBody());
+                }
+                return new CheckLiteral(BoolTerms.not(term));
         }
 
         @Override
@@ -49,11 +69,16 @@ public record AssumeLiteral(Term<Boolean> term) implements Literal {
                 if (other == null || getClass() != other.getClass()) {
                         return false;
                 }
-                var otherAssumeLiteral = (AssumeLiteral) other;
+                var otherAssumeLiteral = (CheckLiteral) other;
                 return term.equalsWithSubstitution(helper, otherAssumeLiteral.term);
         }
 
         @Override
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return Objects.hash(super.hashCodeWithSubstitution(helper), term.hashCodeWithSubstitution(helper));
+        }
+
+        @Override
         public Literal reduce() {
                 if (term instanceof ConstantTerm<Boolean> constantTerm) {
                         // Return {@link BooleanLiteral#FALSE} for {@code false} or {@code null} literals.
@@ -67,17 +92,4 @@ public record AssumeLiteral(Term<Boolean> term) implements Literal {
         public String toString() {
                 return "(%s)".formatted(term);
         }
-
-        @Override
-        public boolean equals(Object obj) {
-                if (obj == this) return true;
-                if (obj == null || obj.getClass() != this.getClass()) return false;
-                var that = (AssumeLiteral) obj;
-                return Objects.equals(this.term, that.term);
-        }
-
-        @Override
-        public int hashCode() {
-                return Objects.hash(getClass(), term);
-        }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Connectivity.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Connectivity.java
new file mode 100644
index 00000000..a058094d
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Connectivity.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.literal;
+
+import java.util.Locale;
+
+public enum Connectivity {
+        WEAK,
+        STRONG;
+
+        @Override
+        public String toString() {
+                return name().toLowerCase(Locale.ROOT);
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/ConstantLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/ConstantLiteral.java
index 73545620..d83bd584 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/ConstantLiteral.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/ConstantLiteral.java
@@ -6,6 +6,7 @@
 package tools.refinery.store.query.literal;
 
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.term.NodeVariable;
 import tools.refinery.store.query.term.Variable;
@@ -13,7 +14,24 @@ import tools.refinery.store.query.term.Variable;
 import java.util.Objects;
 import java.util.Set;
 
-public record ConstantLiteral(NodeVariable variable, int nodeId) implements Literal {
+public class ConstantLiteral extends AbstractLiteral {
+        private final NodeVariable variable;
+        private final int nodeId;
+
+        public ConstantLiteral(NodeVariable variable, int nodeId) {
+                this.variable = variable;
+                this.nodeId = nodeId;
+        }
+
+        public NodeVariable getVariable() {
+                return variable;
+        }
+
+        public int getNodeId() {
+                return nodeId;
+        }
+
+
         @Override
         public Set<Variable> getOutputVariables() {
                 return Set.of(variable);
@@ -43,23 +61,13 @@ public record ConstantLiteral(NodeVariable variable, int nodeId) implements Lite
                 return helper.variableEqual(variable, otherConstantLiteral.variable) && nodeId == otherConstantLiteral.nodeId;
         }
 
-
-        @Override
-        public String toString() {
-                return "%s === @Constant %d".formatted(variable, nodeId);
-        }
-
         @Override
-        public boolean equals(Object obj) {
-                if (obj == this) return true;
-                if (obj == null || obj.getClass() != this.getClass()) return false;
-                var that = (ConstantLiteral) obj;
-                return Objects.equals(this.variable, that.variable) &&
-                                this.nodeId == that.nodeId;
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return Objects.hash(super.hashCodeWithSubstitution(helper), helper.getVariableHashCode(variable), nodeId);
         }
 
         @Override
-        public int hashCode() {
-                return Objects.hash(getClass(), variable, nodeId);
+        public String toString() {
+                return "%s === @Constant %d".formatted(variable, nodeId);
         }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CountLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CountLiteral.java
index 4d4749c8..3d078d89 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CountLiteral.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CountLiteral.java
@@ -6,96 +6,40 @@
 package tools.refinery.store.query.literal;
 
 import tools.refinery.store.query.Constraint;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.term.DataVariable;
 import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.term.int_.IntTerms;
 
 import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-public class CountLiteral extends AbstractCallLiteral {
-        private final DataVariable<Integer> resultVariable;
 
+public class CountLiteral extends AbstractCountLiteral<Integer> {
         public CountLiteral(DataVariable<Integer> resultVariable, Constraint target, List<Variable> arguments) {
-                super(target, arguments);
-                if (!resultVariable.getType().equals(Integer.class)) {
-                        throw new IllegalArgumentException("Count result variable %s must be of type %s, got %s instead".formatted(
-                                        resultVariable, Integer.class.getName(), resultVariable.getType().getName()));
-                }
-                if (arguments.contains(resultVariable)) {
-                        throw new IllegalArgumentException("Count result variable %s must not appear in the argument list"
-                                        .formatted(resultVariable));
-                }
-                this.resultVariable = resultVariable;
-        }
-
-        public DataVariable<Integer> getResultVariable() {
-                return resultVariable;
+                super(Integer.class, resultVariable, target, arguments);
         }
 
         @Override
-        public Set<Variable> getOutputVariables() {
-                return Set.of(resultVariable);
+        protected Integer zero() {
+                return 0;
         }
 
         @Override
-        public Literal reduce() {
-                var reduction = getTarget().getReduction();
-                return switch (reduction) {
-                        case ALWAYS_FALSE -> getResultVariable().assign(IntTerms.constant(0));
-                        // The only way a constant {@code true} predicate can be called in a negative position is to have all of
-                        // its arguments bound as input variables. Thus, there will only be a single match.
-                        case ALWAYS_TRUE -> getResultVariable().assign(IntTerms.constant(1));
-                        case NOT_REDUCIBLE -> this;
-                };
+        protected Integer one() {
+                return 1;
         }
 
         @Override
         protected Literal doSubstitute(Substitution substitution, List<Variable> substitutedArguments) {
-                return new CountLiteral(substitution.getTypeSafeSubstitute(resultVariable), getTarget(), substitutedArguments);
-        }
-
-        @Override
-        public boolean equalsWithSubstitution(LiteralEqualityHelper helper, Literal other) {
-                if (!super.equalsWithSubstitution(helper, other)) {
-                        return false;
-                }
-                var otherCountLiteral = (CountLiteral) other;
-                return helper.variableEqual(resultVariable, otherCountLiteral.resultVariable);
-        }
-
-        @Override
-        public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                if (!super.equals(o)) return false;
-                CountLiteral that = (CountLiteral) o;
-                return resultVariable.equals(that.resultVariable);
+                return new CountLiteral(substitution.getTypeSafeSubstitute(getResultVariable()), getTarget(),
+                                substitutedArguments);
         }
 
         @Override
-        public int hashCode() {
-                return Objects.hash(super.hashCode(), resultVariable);
+        public AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments) {
+                return new CountLiteral(getResultVariable(), newTarget, newArguments);
         }
 
         @Override
-        public String toString() {
-                var builder = new StringBuilder();
-                builder.append(resultVariable);
-                builder.append(" is count ");
-                builder.append(getTarget().toReferenceString());
-                builder.append("(");
-                var argumentIterator = getArguments().iterator();
-                if (argumentIterator.hasNext()) {
-                        builder.append(argumentIterator.next());
-                        while (argumentIterator.hasNext()) {
-                                builder.append(", ").append(argumentIterator.next());
-                        }
-                }
-                builder.append(")");
-                return builder.toString();
+        protected String operatorName() {
+                return "count";
         }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/EquivalenceLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/EquivalenceLiteral.java
index 28ba7625..7343f709 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/EquivalenceLiteral.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/EquivalenceLiteral.java
@@ -5,16 +5,44 @@
  */
 package tools.refinery.store.query.literal;
 
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.substitution.Substitution;
-import tools.refinery.store.query.term.NodeVariable;
 import tools.refinery.store.query.term.Variable;
 
 import java.util.Objects;
 import java.util.Set;
 
-public record EquivalenceLiteral(boolean positive, NodeVariable left, NodeVariable right)
-                implements CanNegate<EquivalenceLiteral> {
+// {@link Object#equals(Object)} is implemented by {@link AbstractLiteral}.
+@SuppressWarnings("squid:S2160")
+public final class EquivalenceLiteral extends AbstractLiteral implements CanNegate<EquivalenceLiteral> {
+        private final boolean positive;
+        private final Variable left;
+        private final Variable right;
+
+        public EquivalenceLiteral(boolean positive, Variable left, Variable right) {
+                if (!left.tryGetType().equals(right.tryGetType())) {
+                        throw new InvalidQueryException("Variables %s and %s of different type cannot be equivalent"
+                                        .formatted(left, right));
+                }
+                this.positive = positive;
+                this.left = left;
+                this.right = right;
+        }
+
+        public boolean isPositive() {
+                return positive;
+        }
+
+        public Variable getLeft() {
+                return left;
+        }
+
+        public Variable getRight() {
+                return right;
+        }
+
         @Override
         public Set<Variable> getOutputVariables() {
                 return Set.of(left);
@@ -37,8 +65,8 @@ public record EquivalenceLiteral(boolean positive, NodeVariable left, NodeVariab
 
         @Override
         public EquivalenceLiteral substitute(Substitution substitution) {
-                return new EquivalenceLiteral(positive, substitution.getTypeSafeSubstitute(left),
-                                substitution.getTypeSafeSubstitute(right));
+                return new EquivalenceLiteral(positive, substitution.getSubstitute(left),
+                                substitution.getSubstitute(right));
         }
 
         @Override
@@ -55,27 +83,18 @@ public record EquivalenceLiteral(boolean positive, NodeVariable left, NodeVariab
                         return false;
                 }
                 var otherEquivalenceLiteral = (EquivalenceLiteral) other;
-                return helper.variableEqual(left, otherEquivalenceLiteral.left) && helper.variableEqual(right,
-                                otherEquivalenceLiteral.right);
-        }
-
-        @Override
-        public String toString() {
-                return "%s %s %s".formatted(left, positive ? "===" : "!==", right);
+                return helper.variableEqual(left, otherEquivalenceLiteral.left) &&
+                                helper.variableEqual(right, otherEquivalenceLiteral.right);
         }
 
         @Override
-        public boolean equals(Object obj) {
-                if (obj == this) return true;
-                if (obj == null || obj.getClass() != this.getClass()) return false;
-                var that = (EquivalenceLiteral) obj;
-                return this.positive == that.positive &&
-                                Objects.equals(this.left, that.left) &&
-                                Objects.equals(this.right, that.right);
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return Objects.hash(super.hashCodeWithSubstitution(helper), helper.getVariableHashCode(left),
+                                helper.getVariableHashCode(right));
         }
 
         @Override
-        public int hashCode() {
-                return Objects.hash(getClass(), positive, left, right);
+        public String toString() {
+                return "%s %s %s".formatted(left, positive ? "===" : "!==", right);
         }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Literal.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Literal.java
index ce6c11fe..cb16ab00 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Literal.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Literal.java
@@ -6,6 +6,7 @@
 package tools.refinery.store.query.literal;
 
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.term.Variable;
 
@@ -26,4 +27,6 @@ public interface Literal {
 
         @SuppressWarnings("BooleanMethodIsAlwaysInverted")
         boolean equalsWithSubstitution(LiteralEqualityHelper helper, Literal other);
+
+        int hashCodeWithSubstitution(LiteralHashCodeHelper helper);
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Literals.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Literals.java
index b3a87811..6056da45 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Literals.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Literals.java
@@ -16,7 +16,7 @@ public final class Literals {
                 return literal.negate();
         }
 
-        public static AssumeLiteral assume(Term<Boolean> term) {
-                return new AssumeLiteral(term);
+        public static CheckLiteral check(Term<Boolean> term) {
+                return new CheckLiteral(term);
         }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/RepresentativeElectionLiteral.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/RepresentativeElectionLiteral.java
new file mode 100644
index 00000000..f7323947
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/RepresentativeElectionLiteral.java
@@ -0,0 +1,119 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.literal;
+
+import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.store.query.term.Variable;
+
+import java.util.List;
+import java.util.Set;
+
+// {@link Object#equals(Object)} is implemented by {@link AbstractLiteral}.
+@SuppressWarnings("squid:S2160")
+public class RepresentativeElectionLiteral extends AbstractCallLiteral {
+        private final Connectivity connectivity;
+
+        public RepresentativeElectionLiteral(Connectivity connectivity, Constraint target, NodeVariable specific,
+                                                                                 NodeVariable representative) {
+                this(connectivity, target, List.of(specific, representative));
+        }
+
+        private RepresentativeElectionLiteral(Connectivity connectivity, Constraint target, List<Variable> arguments) {
+                super(target, arguments);
+                this.connectivity = connectivity;
+                var parameters = target.getParameters();
+                int arity = target.arity();
+                if (arity != 2) {
+                        throw new InvalidQueryException("SCCs can only take binary relations");
+                }
+                if (parameters.get(0).isDataVariable() || parameters.get(1).isDataVariable()) {
+                        throw new InvalidQueryException("SCCs can only be computed over nodes");
+                }
+                if (parameters.get(0).getDirection() != ParameterDirection.OUT ||
+                                parameters.get(1).getDirection() != ParameterDirection.OUT) {
+                        throw new InvalidQueryException("SCCs cannot take input parameters");
+                }
+        }
+
+        public Connectivity getConnectivity() {
+                return connectivity;
+        }
+
+        @Override
+        protected Literal doSubstitute(Substitution substitution, List<Variable> substitutedArguments) {
+                return new RepresentativeElectionLiteral(connectivity, getTarget(), substitutedArguments);
+        }
+
+        @Override
+        public Set<Variable> getOutputVariables() {
+                return getArgumentsOfDirection(ParameterDirection.OUT);
+        }
+
+        @Override
+        public Set<Variable> getInputVariables(Set<? extends Variable> positiveVariablesInClause) {
+                return Set.of();
+        }
+
+        @Override
+        public Set<Variable> getPrivateVariables(Set<? extends Variable> positiveVariablesInClause) {
+                return Set.of();
+        }
+
+        @Override
+        public Literal reduce() {
+                var reduction = getTarget().getReduction();
+                return switch (reduction) {
+                        case ALWAYS_FALSE -> BooleanLiteral.FALSE;
+                        case ALWAYS_TRUE -> throw new InvalidQueryException(
+                                        "Trying to elect representatives over an infinite set");
+                        case NOT_REDUCIBLE -> this;
+                };
+        }
+
+        @Override
+        public AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments) {
+                return new RepresentativeElectionLiteral(connectivity, newTarget, newArguments);
+        }
+
+        @Override
+        public boolean equalsWithSubstitution(LiteralEqualityHelper helper, Literal other) {
+                if (!super.equalsWithSubstitution(helper, other)) {
+                        return false;
+                }
+                var otherRepresentativeElectionLiteral = (RepresentativeElectionLiteral) other;
+                return connectivity.equals(otherRepresentativeElectionLiteral.connectivity);
+        }
+
+        @Override
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return super.hashCodeWithSubstitution(helper) * 31 + connectivity.hashCode();
+        }
+
+        @Override
+        public String toString() {
+                var builder = new StringBuilder();
+                builder.append("@Representative(\"");
+                builder.append(connectivity);
+                builder.append("\") ");
+                builder.append(getTarget().toReferenceString());
+                builder.append("(");
+                var argumentIterator = getArguments().iterator();
+                if (argumentIterator.hasNext()) {
+                        builder.append(argumentIterator.next());
+                        while (argumentIterator.hasNext()) {
+                                builder.append(", ").append(argumentIterator.next());
+                        }
+                }
+                builder.append(")");
+                return builder.toString();
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AbstractResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AbstractResultSet.java
index a710c64d..dcfe6cc5 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AbstractResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AbstractResultSet.java
@@ -28,7 +28,7 @@ public abstract class AbstractResultSet<T> implements ResultSet<T> {
         }
 
         @Override
-        public Query<T> getQuery() {
+        public Query<T> getCanonicalQuery() {
                 return query;
         }
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AnyResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AnyResultSet.java
index 02809477..5b75b103 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AnyResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AnyResultSet.java
@@ -11,7 +11,7 @@ import tools.refinery.store.query.dnf.AnyQuery;
 public sealed interface AnyResultSet permits ResultSet {
         ModelQueryAdapter getAdapter();
 
-        AnyQuery getQuery();
+        AnyQuery getCanonicalQuery();
 
         int size();
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/EmptyResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/EmptyResultSet.java
index 2795a44b..991b1e32 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/EmptyResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/EmptyResultSet.java
@@ -18,7 +18,7 @@ public record EmptyResultSet<T>(ModelQueryAdapter adapter, Query<T> query) imple
         }
 
         @Override
-        public Query<T> getQuery() {
+        public Query<T> getCanonicalQuery() {
                 return query;
         }
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/OrderedResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/OrderedResultSet.java
index 39006d65..df12b967 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/OrderedResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/OrderedResultSet.java
@@ -17,7 +17,7 @@ public class OrderedResultSet<T> implements AutoCloseable, ResultSet<T> {
         private final ResultSet<T> resultSet;
         private final OrderStatisticTree<Tuple> tree = new OrderStatisticTree<>();
         private final ResultSetListener<T> listener = (key, fromValue, toValue) -> {
-                var defaultValue = getQuery().defaultValue();
+                var defaultValue = getCanonicalQuery().defaultValue();
                 if (Objects.equals(defaultValue, toValue)) {
                         tree.remove(key);
                 } else {
@@ -45,8 +45,8 @@ public class OrderedResultSet<T> implements AutoCloseable, ResultSet<T> {
         }
 
         @Override
-        public Query<T> getQuery() {
-                return resultSet.getQuery();
+        public Query<T> getCanonicalQuery() {
+                return resultSet.getCanonicalQuery();
         }
 
         @Override
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/ResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/ResultSet.java
index 33d1ea95..a6e99784 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/ResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/ResultSet.java
@@ -10,7 +10,7 @@ import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.tuple.Tuple;
 
 public non-sealed interface ResultSet<T> extends AnyResultSet {
-        Query<T> getQuery();
+        Query<T> getCanonicalQuery();
 
         T get(Tuple parameters);
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/AbstractRecursiveRewriter.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/AbstractRecursiveRewriter.java
new file mode 100644
index 00000000..fb4c14a7
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/AbstractRecursiveRewriter.java
@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.rewriter;
+
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.equality.DnfEqualityChecker;
+import tools.refinery.store.util.CycleDetectingMapper;
+
+public abstract class AbstractRecursiveRewriter implements DnfRewriter {
+        private final CycleDetectingMapper<Dnf, Dnf> mapper = new CycleDetectingMapper<>(Dnf::name, this::map);
+
+        @Override
+        public Dnf rewrite(Dnf dnf) {
+                return mapper.map(dnf);
+        }
+
+        protected Dnf map(Dnf dnf) {
+                var result = doRewrite(dnf);
+                return dnf.equalsWithSubstitution(DnfEqualityChecker.DEFAULT, result) ? dnf : result;
+        }
+
+        protected abstract Dnf doRewrite(Dnf dnf);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/ClauseInputParameterResolver.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/ClauseInputParameterResolver.java
new file mode 100644
index 00000000..aa06a05a
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/ClauseInputParameterResolver.java
@@ -0,0 +1,160 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.rewriter;
+
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.dnf.DnfClause;
+import tools.refinery.store.query.literal.*;
+import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.store.query.term.Variable;
+
+import java.util.*;
+
+class ClauseInputParameterResolver {
+        private final InputParameterResolver rewriter;
+        private final String dnfName;
+        private final int clauseIndex;
+        private final Set<Variable> positiveVariables = new LinkedHashSet<>();
+        private final List<Literal> inlinedLiterals = new ArrayList<>();
+        private final Deque<Literal> workList;
+        private int helperIndex = 0;
+
+        public ClauseInputParameterResolver(InputParameterResolver rewriter, List<Literal> context, DnfClause clause,
+                                                                                String dnfName, int clauseIndex) {
+                this.rewriter = rewriter;
+                this.dnfName = dnfName;
+                this.clauseIndex = clauseIndex;
+                workList = new ArrayDeque<>(clause.literals().size() + context.size());
+                for (var literal : context) {
+                        workList.addLast(literal);
+                }
+                for (var literal : clause.literals()) {
+                        workList.addLast(literal);
+                }
+        }
+
+        public List<Literal> rewriteClause() {
+                while (!workList.isEmpty()) {
+                        var literal = workList.removeFirst();
+                        processLiteral(literal);
+                }
+                return inlinedLiterals;
+        }
+
+        private void processLiteral(Literal literal) {
+                if (!(literal instanceof AbstractCallLiteral abstractCallLiteral) ||
+                                !(abstractCallLiteral.getTarget() instanceof Dnf targetDnf)) {
+                        markAsDone(literal);
+                        return;
+                }
+                boolean hasInputParameter = hasInputParameter(targetDnf);
+                if (!hasInputParameter) {
+                        targetDnf = rewriter.rewrite(targetDnf);
+                }
+                if (inlinePositiveClause(abstractCallLiteral, targetDnf)) {
+                        return;
+                }
+                if (eliminateDoubleNegation(abstractCallLiteral, targetDnf)) {
+                        return;
+                }
+                if (hasInputParameter) {
+                        rewriteWithCurrentContext(abstractCallLiteral, targetDnf);
+                        return;
+                }
+                markAsDone(abstractCallLiteral.withTarget(targetDnf));
+        }
+
+        private void markAsDone(Literal literal) {
+                positiveVariables.addAll(literal.getOutputVariables());
+                inlinedLiterals.add(literal);
+        }
+
+        private boolean inlinePositiveClause(AbstractCallLiteral abstractCallLiteral, Dnf targetDnf) {
+                var targetLiteral = getSingleLiteral(abstractCallLiteral, targetDnf, CallPolarity.POSITIVE);
+                if (targetLiteral == null) {
+                        return false;
+                }
+                var substitution = asSubstitution(abstractCallLiteral, targetDnf);
+                var substitutedLiteral = targetLiteral.substitute(substitution);
+                workList.addFirst(substitutedLiteral);
+                return true;
+        }
+
+        private boolean eliminateDoubleNegation(AbstractCallLiteral abstractCallLiteral, Dnf targetDnf) {
+                var targetLiteral = getSingleLiteral(abstractCallLiteral, targetDnf, CallPolarity.NEGATIVE);
+                if (!(targetLiteral instanceof CallLiteral targetCallLiteral) ||
+                                targetCallLiteral.getPolarity() != CallPolarity.NEGATIVE) {
+                        return false;
+                }
+                var substitution = asSubstitution(abstractCallLiteral, targetDnf);
+                var substitutedLiteral = (CallLiteral) targetCallLiteral.substitute(substitution);
+                workList.addFirst(substitutedLiteral.negate());
+                return true;
+        }
+
+        private void rewriteWithCurrentContext(AbstractCallLiteral abstractCallLiteral, Dnf targetDnf) {
+                var contextBuilder = Dnf.builder("%s#clause%d#helper%d".formatted(dnfName, clauseIndex, helperIndex));
+                helperIndex++;
+                contextBuilder.parameters(positiveVariables, ParameterDirection.OUT);
+                contextBuilder.clause(inlinedLiterals);
+                var contextDnf = contextBuilder.build();
+                var contextCall = new CallLiteral(CallPolarity.POSITIVE, contextDnf, List.copyOf(positiveVariables));
+                inlinedLiterals.clear();
+                var substitution = Substitution.builder().renewing().build();
+                var context = new ArrayList<Literal>();
+                context.add(contextCall.substitute(substitution));
+                int arity = targetDnf.arity();
+                for (int i = 0; i < arity; i++) {
+                        var parameter = targetDnf.getSymbolicParameters().get(i).getVariable();
+                        var argument = abstractCallLiteral.getArguments().get(i);
+                        context.add(new EquivalenceLiteral(true, parameter, substitution.getSubstitute(argument)));
+                }
+                var rewrittenDnf = rewriter.rewriteWithContext(context, targetDnf);
+                workList.addFirst(abstractCallLiteral.withTarget(rewrittenDnf));
+                workList.addFirst(contextCall);
+        }
+
+        private static boolean hasInputParameter(Dnf targetDnf) {
+                for (var parameter : targetDnf.getParameters()) {
+                        if (parameter.getDirection() != ParameterDirection.OUT) {
+                                return true;
+                        }
+                }
+                return false;
+        }
+
+        private static Literal getSingleLiteral(AbstractCallLiteral abstractCallLiteral, Dnf targetDnf,
+                                                                                        CallPolarity polarity) {
+                if (!(abstractCallLiteral instanceof CallLiteral callLiteral) ||
+                                callLiteral.getPolarity() != polarity) {
+                        return null;
+                }
+                var clauses = targetDnf.getClauses();
+                if (clauses.size() != 1) {
+                        return null;
+                }
+                var targetLiterals = clauses.get(0).literals();
+                if (targetLiterals.size() != 1) {
+                        return null;
+                }
+                return targetLiterals.get(0);
+        }
+
+        private static Substitution asSubstitution(AbstractCallLiteral callLiteral, Dnf targetDnf) {
+                var builder = Substitution.builder().renewing();
+                var arguments = callLiteral.getArguments();
+                var parameters = targetDnf.getSymbolicParameters();
+                int arity = arguments.size();
+                if (parameters.size() != arity) {
+                        throw new IllegalArgumentException("Call %s of %s arity mismatch".formatted(callLiteral, targetDnf));
+                }
+                for (int i = 0; i < arity; i++) {
+                        builder.putChecked(parameters.get(i).getVariable(), arguments.get(i));
+                }
+                return builder.build();
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/CompositeRewriter.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/CompositeRewriter.java
new file mode 100644
index 00000000..5b4f65e5
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/CompositeRewriter.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.rewriter;
+
+import tools.refinery.store.query.dnf.Dnf;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CompositeRewriter implements DnfRewriter {
+        private final List<DnfRewriter> rewriterList = new ArrayList<>();
+
+        public void addFirst(DnfRewriter rewriter) {
+                rewriterList.add(rewriter);
+        }
+
+        @Override
+        public Dnf rewrite(Dnf dnf) {
+                Dnf rewrittenDnf = dnf;
+                for (int i = rewriterList.size() - 1; i >= 0; i--) {
+                        var rewriter = rewriterList.get(i);
+                        rewrittenDnf = rewriter.rewrite(rewrittenDnf);
+                }
+                return rewrittenDnf;
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/DnfRewriter.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/DnfRewriter.java
new file mode 100644
index 00000000..5d8359d1
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/DnfRewriter.java
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.rewriter;
+
+import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.dnf.Query;
+
+@FunctionalInterface
+public interface DnfRewriter {
+        Dnf rewrite(Dnf dnf);
+
+        default AnyQuery rewrite(AnyQuery query) {
+                return rewrite((Query<?>) query);
+        }
+
+        default <T> Query<T> rewrite(Query<T> query) {
+                var rewrittenDnf = rewrite(query.getDnf());
+                return query.withDnf(rewrittenDnf);
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/DuplicateDnfRemover.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/DuplicateDnfRemover.java
new file mode 100644
index 00000000..0c786470
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/DuplicateDnfRemover.java
@@ -0,0 +1,98 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.rewriter;
+
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.dnf.DnfClause;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.equality.DnfEqualityChecker;
+import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.store.query.literal.Literal;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class DuplicateDnfRemover extends AbstractRecursiveRewriter {
+        private final Map<CanonicalDnf, Dnf> dnfCache = new HashMap<>();
+        private final Map<Dnf, Query<?>> queryCache = new HashMap<>();
+
+        @Override
+        protected Dnf map(Dnf dnf) {
+                var result = super.map(dnf);
+                return dnfCache.computeIfAbsent(new CanonicalDnf(result), CanonicalDnf::getDnf);
+        }
+
+        @Override
+        protected Dnf doRewrite(Dnf dnf) {
+                var builder = Dnf.builderFrom(dnf);
+                for (var clause : dnf.getClauses()) {
+                        builder.clause(rewriteClause(clause));
+                }
+                return builder.build();
+        }
+
+        private List<Literal> rewriteClause(DnfClause clause) {
+                var originalLiterals = clause.literals();
+                var literals = new ArrayList<Literal>(originalLiterals.size());
+                for (var literal : originalLiterals) {
+                        var rewrittenLiteral = literal;
+                        if (literal instanceof AbstractCallLiteral abstractCallLiteral &&
+                                        abstractCallLiteral.getTarget() instanceof Dnf targetDnf) {
+                                var rewrittenTarget = rewrite(targetDnf);
+                                rewrittenLiteral = abstractCallLiteral.withTarget(rewrittenTarget);
+                        }
+                        literals.add(rewrittenLiteral);
+                }
+                return literals;
+        }
+
+        @Override
+        public <T> Query<T> rewrite(Query<T> query) {
+                var rewrittenDnf = rewrite(query.getDnf());
+                // {@code withDnf} will always return the appropriate type.
+                @SuppressWarnings("unchecked")
+                var rewrittenQuery = (Query<T>) queryCache.computeIfAbsent(rewrittenDnf, query::withDnf);
+                return rewrittenQuery;
+        }
+
+        private static class CanonicalDnf {
+                private final Dnf dnf;
+                private final int hash;
+
+                public CanonicalDnf(Dnf dnf) {
+                        this.dnf = dnf;
+                        hash = dnf.hashCodeWithSubstitution();
+                }
+
+                public Dnf getDnf() {
+                        return dnf;
+                }
+
+                @Override
+                public boolean equals(Object obj) {
+                        if (this == obj) {
+                                return true;
+                        }
+                        if (obj == null || getClass() != obj.getClass()) {
+                                return false;
+                        }
+                        var otherCanonicalDnf = (CanonicalDnf) obj;
+                        return dnf.equalsWithSubstitution(DnfEqualityChecker.DEFAULT, otherCanonicalDnf.dnf);
+                }
+
+                @Override
+                public int hashCode() {
+                        return hash;
+                }
+
+                @Override
+                public String toString() {
+                        return dnf.name();
+                }
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/InputParameterResolver.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/InputParameterResolver.java
new file mode 100644
index 00000000..cd8a2e7d
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/InputParameterResolver.java
@@ -0,0 +1,51 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.rewriter;
+
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.dnf.DnfBuilder;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.store.query.term.Variable;
+
+import java.util.HashSet;
+import java.util.List;
+
+public class InputParameterResolver extends AbstractRecursiveRewriter {
+        @Override
+        protected Dnf doRewrite(Dnf dnf) {
+                return rewriteWithContext(List.of(), dnf);
+        }
+
+        Dnf rewriteWithContext(List<Literal> context, Dnf dnf) {
+                var dnfName = dnf.name();
+                var builder = Dnf.builder(dnfName);
+                createSymbolicParameters(context, dnf, builder);
+                builder.functionalDependencies(dnf.getFunctionalDependencies());
+                var clauses = dnf.getClauses();
+                int clauseCount = clauses.size();
+                for (int i = 0; i < clauseCount; i++) {
+                        var clause = clauses.get(i);
+                        var clauseRewriter = new ClauseInputParameterResolver(this, context, clause, dnfName, i);
+                        builder.clause(clauseRewriter.rewriteClause());
+                }
+                return builder.build();
+        }
+
+        private static void createSymbolicParameters(List<Literal> context, Dnf dnf, DnfBuilder builder) {
+                var positiveInContext = new HashSet<Variable>();
+                for (var literal : context) {
+                        positiveInContext.addAll(literal.getOutputVariables());
+                }
+                for (var symbolicParameter : dnf.getSymbolicParameters()) {
+                        var variable = symbolicParameter.getVariable();
+                        var isOutput = symbolicParameter.getDirection() == ParameterDirection.OUT ||
+                                        positiveInContext.contains(variable);
+                        var direction = isOutput ? ParameterDirection.OUT : ParameterDirection.IN;
+                        builder.parameter(variable, direction);
+                }
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AbstractTerm.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AbstractTerm.java
index d0ae3c12..5cecc35b 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AbstractTerm.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AbstractTerm.java
@@ -6,6 +6,7 @@
 package tools.refinery.store.query.term;
 
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 
 import java.util.Objects;
 
@@ -17,13 +18,18 @@ public abstract class AbstractTerm<T> implements Term<T> {
         }
 
         @Override
+        public Class<T> getType() {
+                return type;
+        }
+
+        @Override
         public boolean equalsWithSubstitution(LiteralEqualityHelper helper, AnyTerm other) {
-                return getClass().equals(other.getClass()) && type.equals(other.getType());
+                return other != null && getClass() == other.getClass() && type.equals(other.getType());
         }
 
         @Override
-        public Class<T> getType() {
-                return type;
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return Objects.hash(getClass(), type);
         }
 
         @Override
@@ -31,11 +37,11 @@ public abstract class AbstractTerm<T> implements Term<T> {
                 if (this == o) return true;
                 if (o == null || getClass() != o.getClass()) return false;
                 AbstractTerm<?> that = (AbstractTerm<?>) o;
-                return type.equals(that.type);
+                return equalsWithSubstitution(LiteralEqualityHelper.DEFAULT, that);
         }
 
         @Override
         public int hashCode() {
-                return Objects.hash(getClass(), type);
+                return hashCodeWithSubstitution(LiteralHashCodeHelper.DEFAULT);
         }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AnyDataVariable.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AnyDataVariable.java
index 192c39c5..3801bc11 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AnyDataVariable.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AnyDataVariable.java
@@ -6,6 +6,7 @@
 package tools.refinery.store.query.term;
 
 import org.jetbrains.annotations.Nullable;
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
 
 import java.util.Optional;
@@ -22,8 +23,18 @@ public abstract sealed class AnyDataVariable extends Variable implements AnyTerm
         }
 
         @Override
+        public boolean isNodeVariable() {
+                return false;
+        }
+
+        @Override
+        public boolean isDataVariable() {
+                return true;
+        }
+
+        @Override
         public NodeVariable asNodeVariable() {
-                throw new IllegalStateException("%s is a data variable".formatted(this));
+                throw new InvalidQueryException("%s is a data variable".formatted(this));
         }
 
         @Override
@@ -37,11 +48,6 @@ public abstract sealed class AnyDataVariable extends Variable implements AnyTerm
         }
 
         @Override
-        public boolean isUnifiable() {
-                return false;
-        }
-
-        @Override
         public abstract AnyDataVariable renew(@Nullable String name);
 
         @Override
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AnyTerm.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AnyTerm.java
index c12c0166..f136b68d 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AnyTerm.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AnyTerm.java
@@ -6,6 +6,7 @@
 package tools.refinery.store.query.term;
 
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.substitution.Substitution;
 
 import java.util.Set;
@@ -17,5 +18,7 @@ public sealed interface AnyTerm permits AnyDataVariable, Term {
 
         boolean equalsWithSubstitution(LiteralEqualityHelper helper, AnyTerm other);
 
+        int hashCodeWithSubstitution(LiteralHashCodeHelper helper);
+
         Set<AnyDataVariable> getInputVariables();
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/BinaryTerm.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/BinaryTerm.java
index 8ad17839..cdbf592a 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/BinaryTerm.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/BinaryTerm.java
@@ -5,7 +5,9 @@
  */
 package tools.refinery.store.query.term;
 
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.valuation.Valuation;
 
@@ -14,6 +16,8 @@ import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
+// {@link Object#equals(Object)} is implemented by {@link AbstractTerm}.
+@SuppressWarnings("squid:S2160")
 public abstract class BinaryTerm<R, T1, T2> extends AbstractTerm<R> {
         private final Class<T1> leftType;
         private final Class<T2> rightType;
@@ -23,11 +27,11 @@ public abstract class BinaryTerm<R, T1, T2> extends AbstractTerm<R> {
         protected BinaryTerm(Class<R> type, Class<T1> leftType, Class<T2> rightType, Term<T1> left, Term<T2> right) {
                 super(type);
                 if (!left.getType().equals(leftType)) {
-                        throw new IllegalArgumentException("Expected left %s to be of type %s, got %s instead".formatted(
+                        throw new InvalidQueryException("Expected left %s to be of type %s, got %s instead".formatted(
                                         left, leftType.getName(), left.getType().getName()));
                 }
                 if (!right.getType().equals(rightType)) {
-                        throw new IllegalArgumentException("Expected right %s to be of type %s, got %s instead".formatted(
+                        throw new InvalidQueryException("Expected right %s to be of type %s, got %s instead".formatted(
                                         right, rightType.getName(), right.getType().getName()));
                 }
                 this.leftType = leftType;
@@ -80,6 +84,12 @@ public abstract class BinaryTerm<R, T1, T2> extends AbstractTerm<R> {
         }
 
         @Override
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return Objects.hash(super.hashCodeWithSubstitution(helper), leftType.hashCode(), rightType.hashCode(),
+                                left.hashCodeWithSubstitution(helper), right.hashCodeWithSubstitution(helper));
+        }
+
+        @Override
         public Term<R> substitute(Substitution substitution) {
                 return doSubstitute(substitution, left.substitute(substitution), right.substitute(substitution));
         }
@@ -93,21 +103,4 @@ public abstract class BinaryTerm<R, T1, T2> extends AbstractTerm<R> {
                 inputVariables.addAll(right.getInputVariables());
                 return Collections.unmodifiableSet(inputVariables);
         }
-
-        @Override
-        public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                if (!super.equals(o)) return false;
-                BinaryTerm<?, ?, ?> that = (BinaryTerm<?, ?, ?>) o;
-                return Objects.equals(leftType, that.leftType) &&
-                                Objects.equals(rightType, that.rightType) &&
-                                Objects.equals(left, that.left) &&
-                                Objects.equals(right, that.right);
-        }
-
-        @Override
-        public int hashCode() {
-                return Objects.hash(super.hashCode(), leftType, rightType, left, right);
-        }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ConstantTerm.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ConstantTerm.java
index 2f6c56d1..415ae286 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ConstantTerm.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ConstantTerm.java
@@ -5,20 +5,24 @@
  */
 package tools.refinery.store.query.term;
 
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.valuation.Valuation;
 
 import java.util.Objects;
 import java.util.Set;
 
+// {@link Object#equals(Object)} is implemented by {@link AbstractTerm}.
+@SuppressWarnings("squid:S2160")
 public final class ConstantTerm<T> extends AbstractTerm<T> {
         private final T value;
 
         public ConstantTerm(Class<T> type, T value) {
                 super(type);
                 if (value != null && !type.isInstance(value)) {
-                        throw new IllegalArgumentException("Value %s is not an instance of %s".formatted(value, type.getName()));
+                        throw new InvalidQueryException("Value %s is not an instance of %s".formatted(value, type.getName()));
                 }
                 this.value = value;
         }
@@ -47,6 +51,11 @@ public final class ConstantTerm<T> extends AbstractTerm<T> {
         }
 
         @Override
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return Objects.hash(super.hashCodeWithSubstitution(helper), Objects.hash(value));
+        }
+
+        @Override
         public Set<AnyDataVariable> getInputVariables() {
                 return Set.of();
         }
@@ -55,17 +64,4 @@ public final class ConstantTerm<T> extends AbstractTerm<T> {
         public String toString() {
                 return value.toString();
         }
-
-        @Override
-        public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                ConstantTerm<?> that = (ConstantTerm<?>) o;
-                return Objects.equals(value, that.value);
-        }
-
-        @Override
-        public int hashCode() {
-                return Objects.hash(value);
-        }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/DataVariable.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/DataVariable.java
index 00950360..2206b522 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/DataVariable.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/DataVariable.java
@@ -6,7 +6,10 @@
 package tools.refinery.store.query.term;
 
 import org.jetbrains.annotations.Nullable;
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.store.query.literal.EquivalenceLiteral;
 import tools.refinery.store.query.literal.Literal;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.valuation.Valuation;
@@ -39,8 +42,8 @@ public final class DataVariable<T> extends AnyDataVariable implements Term<T> {
         @Override
         public <U> DataVariable<U> asDataVariable(Class<U> newType) {
                 if (!getType().equals(newType)) {
-                        throw new IllegalStateException("%s is not of type %s but of type %s".formatted(this, newType.getName(),
-                                        getType().getName()));
+                        throw new InvalidQueryException("%s is not of type %s but of type %s"
+                                        .formatted(this, newType.getName(), getType().getName()));
                 }
                 @SuppressWarnings("unchecked")
                 var result = (DataVariable<U>) this;
@@ -62,6 +65,16 @@ public final class DataVariable<T> extends AnyDataVariable implements Term<T> {
                 return other instanceof DataVariable<?> dataVariable && helper.variableEqual(this, dataVariable);
         }
 
+        @Override
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return helper.getVariableHashCode(this);
+        }
+
+        @Override
+        public int hashCodeWithSubstitution(int sequenceNumber) {
+                return Objects.hash(type, sequenceNumber);
+        }
+
         public Literal assign(AssignedValue<T> value) {
                 return value.toLiteral(this);
         }
@@ -79,4 +92,12 @@ public final class DataVariable<T> extends AnyDataVariable implements Term<T> {
         public int hashCode() {
                 return Objects.hash(super.hashCode(), type);
         }
+
+        public EquivalenceLiteral isEquivalent(DataVariable<T> other) {
+                return new EquivalenceLiteral(true, this, other);
+        }
+
+        public EquivalenceLiteral notEquivalent(DataVariable<T> other) {
+                return new EquivalenceLiteral(false, this, other);
+        }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/NodeVariable.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/NodeVariable.java
index a2f3261f..53c32e20 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/NodeVariable.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/NodeVariable.java
@@ -6,6 +6,7 @@
 package tools.refinery.store.query.term;
 
 import org.jetbrains.annotations.Nullable;
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.literal.ConstantLiteral;
 import tools.refinery.store.query.literal.EquivalenceLiteral;
 
@@ -22,11 +23,6 @@ public final class NodeVariable extends Variable {
         }
 
         @Override
-        public boolean isUnifiable() {
-                return true;
-        }
-
-        @Override
         public NodeVariable renew(@Nullable String name) {
                 return Variable.of(name);
         }
@@ -37,13 +33,28 @@ public final class NodeVariable extends Variable {
         }
 
         @Override
+        public boolean isNodeVariable() {
+                return true;
+        }
+
+        @Override
+        public boolean isDataVariable() {
+                return false;
+        }
+
+        @Override
         public NodeVariable asNodeVariable() {
                 return this;
         }
 
         @Override
         public <T> DataVariable<T> asDataVariable(Class<T> type) {
-                throw new IllegalStateException("%s is a node variable".formatted(this));
+                throw new InvalidQueryException("%s is a node variable".formatted(this));
+        }
+
+        @Override
+        public int hashCodeWithSubstitution(int sequenceNumber) {
+                return sequenceNumber;
         }
 
         public ConstantLiteral isConstant(int value) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Parameter.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Parameter.java
index e5a0cdf1..577ac6e0 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Parameter.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Parameter.java
@@ -9,11 +9,15 @@ import java.util.Objects;
 import java.util.Optional;
 
 public class Parameter {
-        public static final Parameter NODE_OUT = new Parameter(null, ParameterDirection.OUT);
+        public static final Parameter NODE_OUT = new Parameter(null);
 
         private final Class<?> dataType;
         private final ParameterDirection direction;
 
+        public Parameter(Class<?> dataType) {
+                this(dataType, ParameterDirection.OUT);
+        }
+
         public Parameter(Class<?> dataType, ParameterDirection direction) {
                 this.dataType = dataType;
                 this.direction = direction;
@@ -35,6 +39,10 @@ public class Parameter {
                 return direction;
         }
 
+        public boolean matches(Parameter other) {
+                return Objects.equals(dataType, other.dataType) && direction == other.direction;
+        }
+
         public boolean isAssignable(Variable variable) {
                 if (variable instanceof AnyDataVariable dataVariable) {
                         return dataVariable.getType().equals(dataType);
@@ -50,7 +58,7 @@ public class Parameter {
                 if (this == o) return true;
                 if (o == null || getClass() != o.getClass()) return false;
                 Parameter parameter = (Parameter) o;
-                return Objects.equals(dataType, parameter.dataType) && direction == parameter.direction;
+                return matches(parameter);
         }
 
         @Override
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ParameterDirection.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ParameterDirection.java
index cd0739be..da83f3c3 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ParameterDirection.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ParameterDirection.java
@@ -6,8 +6,8 @@
 package tools.refinery.store.query.term;
 
 public enum ParameterDirection {
-        OUT("@Out"),
-        IN("@In");
+        OUT("out"),
+        IN("in");
 
         private final String name;
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/UnaryTerm.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/UnaryTerm.java
index a46ebe31..a464ece5 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/UnaryTerm.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/UnaryTerm.java
@@ -5,13 +5,17 @@
  */
 package tools.refinery.store.query.term;
 
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.LiteralHashCodeHelper;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.valuation.Valuation;
 
 import java.util.Objects;
 import java.util.Set;
 
+// {@link Object#equals(Object)} is implemented by {@link AbstractTerm}.
+@SuppressWarnings("squid:S2160")
 public abstract class UnaryTerm<R, T> extends AbstractTerm<R> {
         private final Class<T> bodyType;
         private final Term<T> body;
@@ -19,7 +23,7 @@ public abstract class UnaryTerm<R, T> extends AbstractTerm<R> {
         protected UnaryTerm(Class<R> type, Class<T> bodyType, Term<T> body) {
                 super(type);
                 if (!body.getType().equals(bodyType)) {
-                        throw new IllegalArgumentException("Expected body %s to be of type %s, got %s instead".formatted(body,
+                        throw new InvalidQueryException("Expected body %s to be of type %s, got %s instead".formatted(body,
                                         bodyType.getName(), body.getType().getName()));
                 }
                 this.bodyType = bodyType;
@@ -52,6 +56,11 @@ public abstract class UnaryTerm<R, T> extends AbstractTerm<R> {
         }
 
         @Override
+        public int hashCodeWithSubstitution(LiteralHashCodeHelper helper) {
+                return Objects.hash(super.hashCodeWithSubstitution(helper), bodyType, body.hashCodeWithSubstitution(helper));
+        }
+
+        @Override
         public Term<R> substitute(Substitution substitution) {
                 return doSubstitute(substitution, body.substitute(substitution));
         }
@@ -62,18 +71,4 @@ public abstract class UnaryTerm<R, T> extends AbstractTerm<R> {
         public Set<AnyDataVariable> getInputVariables() {
                 return body.getInputVariables();
         }
-
-        @Override
-        public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                if (!super.equals(o)) return false;
-                UnaryTerm<?, ?> unaryTerm = (UnaryTerm<?, ?>) o;
-                return Objects.equals(bodyType, unaryTerm.bodyType) && Objects.equals(body, unaryTerm.body);
-        }
-
-        @Override
-        public int hashCode() {
-                return Objects.hash(super.hashCode(), bodyType, body);
-        }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Variable.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Variable.java
index a0268c8e..1b553704 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Variable.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Variable.java
@@ -38,16 +38,20 @@ public abstract sealed class Variable permits AnyDataVariable, NodeVariable {
                 return uniqueName;
         }
 
-        public abstract boolean isUnifiable();
-
         public abstract Variable renew(@Nullable String name);
 
         public abstract Variable renew();
 
+        public abstract boolean isNodeVariable();
+
+        public abstract boolean isDataVariable();
+
         public abstract NodeVariable asNodeVariable();
 
         public abstract <T> DataVariable<T> asDataVariable(Class<T> type);
 
+        public abstract int hashCodeWithSubstitution(int sequenceNumber);
+
         @Override
         public String toString() {
                 return getName();
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalitySumAggregator.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalitySumAggregator.java
index 5bbd3081..d31f00a2 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalitySumAggregator.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalitySumAggregator.java
@@ -70,7 +70,7 @@ public class UpperCardinalitySumAggregator implements StatefulAggregator<UpperCa
 
                 @Override
                 public UpperCardinality getResult() {
-                        return countUnbounded > 0 ? UpperCardinalities.UNBOUNDED : UpperCardinalities.valueOf(sumFiniteUpperBounds);
+                        return countUnbounded > 0 ? UpperCardinalities.UNBOUNDED : UpperCardinalities.atMost(sumFiniteUpperBounds);
                 }
 
                 @Override
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/utils/OrderStatisticTree.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/utils/OrderStatisticTree.java
index b568b99d..2d8a10d1 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/utils/OrderStatisticTree.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/utils/OrderStatisticTree.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2021 Rodion Efremov
  * Copyright (c) 2023 The Refinery Authors <https://refinery.tools/>
  *
- * SPDX-License-Identifier: MIT OR EPL-2.0
+ * SPDX-License-Identifier: MIT
  */
 package tools.refinery.store.query.utils;
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AbstractFunctionView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AbstractFunctionView.java
index fd37604e..f130fa59 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AbstractFunctionView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AbstractFunctionView.java
@@ -5,6 +5,7 @@
  */
 package tools.refinery.store.query.view;
 
+import tools.refinery.store.map.CursorAsIterator;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.dnf.FunctionalDependency;
 import tools.refinery.store.query.term.Parameter;
@@ -83,6 +84,20 @@ public abstract class AbstractFunctionView<T> extends SymbolView<T> {
         }
 
         @Override
+        public boolean canIndexSlot(int slot) {
+                return slot >= 0 && slot < getSymbol().arity();
+        }
+
+        @Override
+        public Iterable<Object[]> getAdjacent(Model model, int slot, Object value) {
+                if (!(value instanceof Tuple1 tuple1)) {
+                        return Set.of();
+                }
+                return (() -> new CursorAsIterator<>(model.getInterpretation(getSymbol()).getAdjacent(slot, tuple1.get(0)),
+                                this::forwardMap, this::filter));
+        }
+
+        @Override
         public List<Parameter> getParameters() {
                 return parameters;
         }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnySymbolView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnySymbolView.java
index 90b27ebb..7e9bf6df 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnySymbolView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnySymbolView.java
@@ -28,4 +28,12 @@ public sealed interface AnySymbolView extends Constraint permits SymbolView {
         boolean get(Model model, Object[] tuple);
 
         Iterable<Object[]> getAll(Model model);
+
+        default Iterable<Object[]> getAdjacent(Model model, int slot, Object value) {
+                throw new IllegalArgumentException("Cannot index slot " + slot);
+        }
+
+        default boolean canIndexSlot(int slot) {
+                return false;
+        }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FilteredView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FilteredView.java
index abae6e5c..924277ed 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FilteredView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FilteredView.java
@@ -5,6 +5,7 @@
  */
 package tools.refinery.store.query.view;
 
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.representation.Symbol;
 
@@ -66,7 +67,7 @@ public class FilteredView<T> extends TuplePreservingView<T> {
                         // The predicate doesn't need to handle the default value if it is null.
                 }
                 if (matchesDefaultValue) {
-                        throw new IllegalArgumentException("Tuples with default value %s cannot be enumerated in %s"
+                        throw new InvalidQueryException("Tuples with default value %s cannot be enumerated in %s"
                                         .formatted(defaultValue, getSymbol()));
                 }
         }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingView.java
index 6bc5a708..ed12cd9d 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingView.java
@@ -5,6 +5,7 @@
  */
 package tools.refinery.store.query.view;
 
+import tools.refinery.store.map.CursorAsIterator;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.term.Parameter;
 import tools.refinery.store.representation.Symbol;
@@ -14,6 +15,7 @@ import tools.refinery.store.tuple.Tuple1;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 
 public abstract class TuplePreservingView<T> extends SymbolView<T> {
         private final List<Parameter> parameters;
@@ -56,6 +58,20 @@ public abstract class TuplePreservingView<T> extends SymbolView<T> {
         }
 
         @Override
+        public boolean canIndexSlot(int slot) {
+                return slot >= 0 && slot < getSymbol().arity();
+        }
+
+        @Override
+        public Iterable<Object[]> getAdjacent(Model model, int slot, Object value) {
+                if (!(value instanceof Tuple1 tuple1)) {
+                        return Set.of();
+                }
+                return (() -> new CursorAsIterator<>(model.getInterpretation(getSymbol()).getAdjacent(slot, tuple1.get(0)),
+                                this::forwardMap, this::filter));
+        }
+
+        @Override
         public List<Parameter> getParameters() {
                 return parameters;
         }
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfBuilderLiteralEliminationTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfBuilderLiteralEliminationTest.java
index e17496e3..6a2dc0c7 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfBuilderLiteralEliminationTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfBuilderLiteralEliminationTest.java
@@ -20,7 +20,7 @@ import tools.refinery.store.representation.Symbol;
 import java.util.List;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static tools.refinery.store.query.literal.Literals.assume;
+import static tools.refinery.store.query.literal.Literals.check;
 import static tools.refinery.store.query.literal.Literals.not;
 import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo;
 
@@ -47,7 +47,7 @@ class DnfBuilderLiteralEliminationTest {
         void eliminateTrueAssumptionTest() {
                 var actual = Dnf.builder()
                                 .parameters(p, q)
-                                .clause(assume(BoolTerms.constant(true)), friendView.call(p, q))
+                                .clause(check(BoolTerms.constant(true)), friendView.call(p, q))
                                 .build();
                 var expected = Dnf.builder().parameters(p, q).clause(friendView.call(p, q)).build();
 
@@ -75,7 +75,7 @@ class DnfBuilderLiteralEliminationTest {
                 var actual = Dnf.builder()
                                 .parameters(p, q)
                                 .clause(friendView.call(p, q))
-                                .clause(friendView.call(q, p), assume(BoolTerms.constant(value)))
+                                .clause(friendView.call(q, p), check(BoolTerms.constant(value)))
                                 .build();
                 var expected = Dnf.builder().parameters(p, q).clause(friendView.call(p, q)).build();
 
@@ -207,4 +207,53 @@ class DnfBuilderLiteralEliminationTest {
 
                 assertThat(actual, structurallyEqualTo(expected));
         }
+
+        @Test
+        void removeContradictoryTest() {
+                var actual = Dnf.of(builder -> builder.clause((p, q) -> List.of(
+                                friendView.call(p, q),
+                                not(friendView.call(p, q))
+                )));
+                var expected = Dnf.builder().build();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void removeContradictoryUniversalTest() {
+                var actual = Dnf.of(builder -> builder.clause((p, q) -> List.of(
+                                friendView.call(q, q),
+                                friendView.call(p, q),
+                                not(friendView.call(p, Variable.of()))
+                )));
+                var expected = Dnf.builder().build();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void removeContradictoryExistentialUniversalTest() {
+                var actual = Dnf.of(builder -> builder.clause((p) -> List.of(
+                                friendView.call(p, Variable.of()),
+                                not(friendView.call(p, Variable.of()))
+                )));
+                var expected = Dnf.builder().build();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void removeContradictoryUniversalParameterTest() {
+                var actual = Dnf.of(builder -> {
+                        var p = builder.parameter("p");
+                        builder.clause((q) -> List.of(
+                                        friendView.call(q, q),
+                                        friendView.call(p, q),
+                                        not(friendView.call(p, Variable.of()))
+                        ));
+                });
+                var expected = Dnf.builder().parameter(p).build();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
 }
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfToDefinitionStringTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfToDefinitionStringTest.java
index d75d7f17..12cfaa4e 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfToDefinitionStringTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfToDefinitionStringTest.java
@@ -50,7 +50,7 @@ class DnfToDefinitionStringTest {
                 var dnf = Dnf.builder("Example").parameter(p, ParameterDirection.IN).clause().build();
 
                 assertThat(dnf.toDefinitionString(), is("""
-                                pred Example(@In p) <->
+                                pred Example(in p) <->
                                     <empty>.
                                 """));
         }
@@ -73,7 +73,7 @@ class DnfToDefinitionStringTest {
                                 .build();
 
                 assertThat(dnf.toDefinitionString(), is("""
-                                pred Example(@In p) <->
+                                pred Example(in p) <->
                                     !(@RelationView("key") friend(p, q)).
                                 """));
         }
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/HashCodeTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/HashCodeTest.java
new file mode 100644
index 00000000..0c8eaeed
--- /dev/null
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/HashCodeTest.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf;
+
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.store.query.view.KeyOnlyView;
+import tools.refinery.store.representation.Symbol;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+
+class HashCodeTest {
+        private static final Symbol<Boolean> person = Symbol.of("Person", 1);
+        private static final Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private static final AnySymbolView personView = new KeyOnlyView<>(person);
+        private static final AnySymbolView friendView = new KeyOnlyView<>(friend);
+        private static final NodeVariable p = Variable.of("p");
+        private static final NodeVariable q = Variable.of("q");
+
+        @Test
+        void flatEqualsTest() {
+                var expected = Dnf.builder("Expected").parameters(q).clause(personView.call(q)).build();
+                var actual = Dnf.builder("Actual").parameters(p).clause(personView.call(p)).build();
+
+                assertThat(actual.hashCodeWithSubstitution(), is(expected.hashCodeWithSubstitution()));
+        }
+
+        @Test
+        void flatNotEqualsTest() {
+                var expected = Dnf.builder("Expected").parameters(q).clause(friendView.call(q, q)).build();
+                var actual = Dnf.builder("Actual").parameters(p).clause(friendView.call(p, q)).build();
+
+                assertThat(actual.hashCodeWithSubstitution(), not(expected.hashCodeWithSubstitution()));
+        }
+
+        @Test
+        void deepEqualsTest() {
+                var expected2 = Dnf.builder("Expected2").parameters(p).clause(personView.call(p)).build();
+                var expected = Dnf.builder("Expected").parameters(q).clause(
+                                expected2.call(q)
+                ).build();
+                var actual = Dnf.builder("Actual").parameters(q).clause(
+                                expected2.call(q)
+                ).build();
+
+                assertThat(actual.hashCodeWithSubstitution(), is(expected.hashCodeWithSubstitution()));
+        }
+
+        @Test
+        void deepNotEqualsTest() {
+                var expected = Dnf.builder("Expected").parameters(q).clause(
+                                Dnf.builder("Expected2").parameters(p).clause(personView.call(p)).build().call(q)
+                ).build();
+                var actual = Dnf.builder("Actual").parameters(q).clause(
+                                Dnf.builder("Actual2").parameters(p).clause(personView.call(p)).build().call(q)
+                ).build();
+
+                assertThat(actual.hashCodeWithSubstitution(), not(expected.hashCodeWithSubstitution()));
+        }
+}
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/TopologicalSortTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/TopologicalSortTest.java
index e22dbb21..854bd469 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/TopologicalSortTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/TopologicalSortTest.java
@@ -6,6 +6,7 @@
 package tools.refinery.store.query.dnf;
 
 import org.junit.jupiter.api.Test;
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.term.NodeVariable;
 import tools.refinery.store.query.term.ParameterDirection;
 import tools.refinery.store.query.term.Variable;
@@ -80,7 +81,7 @@ class TopologicalSortTest {
                                                 example.call(r, t, q, s),
                                                 friendView.call(r, t)
                                 );
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidQueryException.class, builder::build);
         }
 
         @Test
@@ -93,7 +94,7 @@ class TopologicalSortTest {
                                                 example.call(p, q, r, s),
                                                 example.call(r, t, q, s)
                                 );
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidQueryException.class, builder::build);
         }
 
         @Test
@@ -107,6 +108,6 @@ class TopologicalSortTest {
                                                 example.call(r, t, q, s),
                                                 example.call(p, q, r, t)
                                 );
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidQueryException.class, builder::build);
         }
 }
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java
index c52d26b2..fc3f5d48 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java
@@ -28,9 +28,8 @@ import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.not;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static tools.refinery.store.query.literal.Literals.assume;
 import static tools.refinery.store.query.literal.Literals.not;
-import static tools.refinery.store.query.term.int_.IntTerms.*;
+import static tools.refinery.store.query.term.int_.IntTerms.INT_SUM;
 
 class VariableDirectionTest {
         private static final Symbol<Boolean> person = Symbol.of("Person", 1);
@@ -49,7 +48,7 @@ class VariableDirectionTest {
         @MethodSource("clausesWithVariableInput")
         void unboundOutVariableTest(List<? extends Literal> clause) {
                 var builder = Dnf.builder().parameter(p, ParameterDirection.OUT).clause(clause);
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidClauseException.class, builder::build);
         }
 
         @ParameterizedTest
@@ -101,7 +100,7 @@ class VariableDirectionTest {
                 var clauseWithEquivalence = new ArrayList<Literal>(clause);
                 clauseWithEquivalence.add(r.isEquivalent(p));
                 var builder = Dnf.builder().clause(clauseWithEquivalence);
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidClauseException.class, builder::build);
         }
 
         static Stream<Arguments> clausesNotBindingVariable() {
@@ -119,7 +118,7 @@ class VariableDirectionTest {
         @MethodSource("literalsWithPrivateVariable")
         void unboundTwicePrivateVariableTest(Literal literal) {
                 var builder = Dnf.builder().clause(not(personView.call(p)), literal);
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidClauseException.class, builder::build);
         }
 
         @ParameterizedTest
@@ -127,7 +126,7 @@ class VariableDirectionTest {
         void unboundTwiceByEquivalencePrivateVariableTest(Literal literal) {
                 var r = Variable.of("r");
                 var builder = Dnf.builder().clause(not(personView.call(r)), r.isEquivalent(p), literal);
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidClauseException.class, builder::build);
         }
 
         static Stream<Arguments> literalsWithPrivateVariable() {
@@ -160,7 +159,7 @@ class VariableDirectionTest {
         @MethodSource("literalsWithRequiredVariableInput")
         void unboundPrivateVariableTest(Literal literal) {
                 var builder = Dnf.builder().clause(literal);
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidClauseException.class, builder::build);
         }
 
         @ParameterizedTest
@@ -246,182 +245,6 @@ class VariableDirectionTest {
                 );
         }
 
-        @ParameterizedTest
-        @MethodSource("clausesWithDataVariableInput")
-        void unboundOutDataVariableTest(List<? extends Literal> clause) {
-                var builder = Dnf.builder().parameter(x, ParameterDirection.OUT).clause(clause);
-                assertThrows(IllegalArgumentException.class, builder::build);
-        }
-
-        @ParameterizedTest
-        @MethodSource("clausesWithDataVariableInput")
-        void unboundInDataVariableTest(List<? extends Literal> clause) {
-                var builder = Dnf.builder().parameter(x, ParameterDirection.IN).clause(clause);
-                var dnf = assertDoesNotThrow(builder::build);
-                var clauses = dnf.getClauses();
-                if (clauses.size() > 0) {
-                        assertThat(clauses.get(0).positiveVariables(), hasItem(x));
-                }
-        }
-
-        @ParameterizedTest
-        @MethodSource("clausesWithDataVariableInput")
-        void boundPrivateDataVariableTest(List<? extends Literal> clause) {
-                var clauseWithBinding = new ArrayList<Literal>(clause);
-                clauseWithBinding.add(x.assign(constant(27)));
-                var builder = Dnf.builder().clause(clauseWithBinding);
-                var dnf = assertDoesNotThrow(builder::build);
-                var clauses = dnf.getClauses();
-                if (clauses.size() > 0) {
-                        assertThat(clauses.get(0).positiveVariables(), hasItem(x));
-                }
-        }
-
-        static Stream<Arguments> clausesWithDataVariableInput() {
-                return Stream.concat(
-                                clausesNotBindingDataVariable(),
-                                literalToClauseArgumentStream(literalsWithRequiredDataVariableInput())
-                );
-        }
-
-        @ParameterizedTest
-        @MethodSource("clausesNotBindingDataVariable")
-        void unboundPrivateDataVariableTest(List<? extends Literal> clause) {
-                var builder = Dnf.builder().clause(clause);
-                var dnf = assertDoesNotThrow(builder::build);
-                var clauses = dnf.getClauses();
-                if (clauses.size() > 0) {
-                        assertThat(clauses.get(0).positiveVariables(), not(hasItem(x)));
-                }
-        }
-
-        static Stream<Arguments> clausesNotBindingDataVariable() {
-                return Stream.concat(
-                                Stream.of(
-                                                Arguments.of(List.of()),
-                                                Arguments.of(List.of(BooleanLiteral.TRUE)),
-                                                Arguments.of(List.of(BooleanLiteral.FALSE))
-                                ),
-                                literalToClauseArgumentStream(literalsWithPrivateDataVariable())
-                );
-        }
-
-        @ParameterizedTest
-        @MethodSource("literalsWithPrivateDataVariable")
-        void unboundTwicePrivateDataVariableTest(Literal literal) {
-                var builder = Dnf.builder().clause(not(ageView.call(p, x)), literal);
-                assertThrows(IllegalArgumentException.class, builder::build);
-        }
-
-        static Stream<Arguments> literalsWithPrivateDataVariable() {
-                var dnfWithOutput = Dnf.builder("WithDataOutput")
-                                .parameter(y, ParameterDirection.OUT)
-                                .parameter(q, ParameterDirection.OUT)
-                                .clause(ageView.call(q, y))
-                                .build();
-
-                return Stream.of(
-                                Arguments.of(not(ageView.call(q, x))),
-                                Arguments.of(y.assign(ageView.count(q, x))),
-                                Arguments.of(not(dnfWithOutput.call(x, q)))
-                );
-        }
-
-        @ParameterizedTest
-        @MethodSource("literalsWithRequiredDataVariableInput")
-        void unboundPrivateDataVariableTest(Literal literal) {
-                var builder = Dnf.builder().clause(literal);
-                assertThrows(IllegalArgumentException.class, builder::build);
-        }
-
-        static Stream<Arguments> literalsWithRequiredDataVariableInput() {
-                var dnfWithInput = Dnf.builder("WithDataInput")
-                                .parameter(y, ParameterDirection.IN)
-                                .parameter(q, ParameterDirection.OUT)
-                                .clause(ageView.call(q, x))
-                                .build();
-                // We are passing {@code y} to the parameter named {@code right} of {@code greaterEq}.
-                @SuppressWarnings("SuspiciousNameCombination")
-                var dnfWithInputToAggregate = Dnf.builder("WithDataInputToAggregate")
-                                .parameter(y, ParameterDirection.IN)
-                                .parameter(q, ParameterDirection.OUT)
-                                .parameter(x, ParameterDirection.OUT)
-                                .clause(
-                                                friendView.call(p, q),
-                                                ageView.call(q, x),
-                                                assume(greaterEq(x, y))
-                                )
-                                .build();
-
-                return Stream.of(
-                                Arguments.of(dnfWithInput.call(x, q)),
-                                Arguments.of(not(dnfWithInput.call(x, q))),
-                                Arguments.of(y.assign(dnfWithInput.count(x, q))),
-                                Arguments.of(y.assign(dnfWithInputToAggregate.aggregateBy(z, INT_SUM, x, q, z)))
-                );
-        }
-
-        @ParameterizedTest
-        @MethodSource("literalsWithDataVariableOutput")
-        void boundDataParameterTest(Literal literal) {
-                var builder = Dnf.builder().parameter(x, ParameterDirection.OUT).clause(literal);
-                var dnf = assertDoesNotThrow(builder::build);
-                assertThat(dnf.getClauses().get(0).positiveVariables(), hasItem(x));
-        }
-
-        @ParameterizedTest
-        @MethodSource("literalsWithDataVariableOutput")
-        void boundTwiceDataParameterTest(Literal literal) {
-                var builder = Dnf.builder().parameter(x, ParameterDirection.IN).clause(literal);
-                assertThrows(IllegalArgumentException.class, builder::build);
-        }
-
-        @ParameterizedTest
-        @MethodSource("literalsWithDataVariableOutput")
-        void boundPrivateDataVariableOutputTest(Literal literal) {
-                var dnfWithInput = Dnf.builder("WithInput")
-                                .parameter(x, ParameterDirection.IN)
-                                .clause(assume(greaterEq(x, constant(24))))
-                                .build();
-                var builder = Dnf.builder().clause(dnfWithInput.call(x), literal);
-                var dnf = assertDoesNotThrow(builder::build);
-                assertThat(dnf.getClauses().get(0).positiveVariables(), hasItem(x));
-        }
-
-        @ParameterizedTest
-        @MethodSource("literalsWithDataVariableOutput")
-        void boundTwicePrivateDataVariableOutputTest(Literal literal) {
-                var builder = Dnf.builder().clause(x.assign(constant(27)), literal);
-                assertThrows(IllegalArgumentException.class, builder::build);
-        }
-
-        static Stream<Arguments> literalsWithDataVariableOutput() {
-                var dnfWithOutput = Dnf.builder("WithOutput")
-                                .parameter(q, ParameterDirection.OUT)
-                                .clause(personView.call(q))
-                                .build();
-                var dnfWithDataOutput = Dnf.builder("WithDataOutput")
-                                .parameter(y, ParameterDirection.OUT)
-                                .parameter(q, ParameterDirection.OUT)
-                                .clause(ageView.call(q, y))
-                                .build();
-                var dnfWithOutputToAggregate = Dnf.builder("WithDataOutputToAggregate")
-                                .parameter(q, ParameterDirection.OUT)
-                                .parameter(y, ParameterDirection.OUT)
-                                .clause(ageView.call(q, y))
-                                .build();
-
-                return Stream.of(
-                                Arguments.of(x.assign(constant(24))),
-                                Arguments.of(ageView.call(q, x)),
-                                Arguments.of(x.assign(personView.count(q))),
-                                Arguments.of(x.assign(ageView.aggregate(INT_SUM, q))),
-                                Arguments.of(dnfWithDataOutput.call(x, q)),
-                                Arguments.of(x.assign(dnfWithOutput.count(q))),
-                                Arguments.of(x.assign(dnfWithOutputToAggregate.aggregateBy(z, INT_SUM, q, z)))
-                );
-        }
-
         private static Stream<Arguments> literalToClauseArgumentStream(Stream<Arguments> literalArgumentsStream) {
                 return literalArgumentsStream.map(arguments -> Arguments.of(List.of(arguments.get()[0])));
         }
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java
index 35910e08..ddd57e96 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java
@@ -7,15 +7,16 @@ package tools.refinery.store.query.literal;
 
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.dnf.InvalidClauseException;
 import tools.refinery.store.query.term.*;
 
 import java.util.List;
 import java.util.Set;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static tools.refinery.store.query.literal.Literals.not;
@@ -57,13 +58,13 @@ class AggregationLiteralTest {
         @Test
         void missingAggregationVariableTest() {
                 var aggregation = fakeConstraint.aggregateBy(y, INT_SUM, p, z);
-                assertThrows(IllegalArgumentException.class, () -> x.assign(aggregation));
+                assertThrows(InvalidQueryException.class, () -> x.assign(aggregation));
         }
 
         @Test
         void circularAggregationVariableTest() {
                 var aggregation = fakeConstraint.aggregateBy(x, INT_SUM, p, x);
-                assertThrows(IllegalArgumentException.class, () -> x.assign(aggregation));
+                assertThrows(InvalidQueryException.class, () -> x.assign(aggregation));
         }
 
         @Test
@@ -73,7 +74,7 @@ class AggregationLiteralTest {
                                                 not(fakeConstraint.call(p, y)),
                                                 x.assign(fakeConstraint.aggregateBy(y, INT_SUM, p, y))
                                 );
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidClauseException.class, builder::build);
         }
 
         @Test
@@ -83,6 +84,6 @@ class AggregationLiteralTest {
                                                 y.assign(constant(27)),
                                                 x.assign(fakeConstraint.aggregateBy(y, INT_SUM, p, y))
                                 );
-                assertThrows(IllegalArgumentException.class, builder::build);
+                assertThrows(InvalidClauseException.class, builder::build);
         }
 }
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/rewriter/DuplicateDnfRemoverTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/rewriter/DuplicateDnfRemoverTest.java
new file mode 100644
index 00000000..ebb24ab5
--- /dev/null
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/rewriter/DuplicateDnfRemoverTest.java
@@ -0,0 +1,164 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.rewriter;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.store.query.literal.Reduction;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.store.query.view.KeyOnlyView;
+import tools.refinery.store.representation.Symbol;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static tools.refinery.store.query.literal.Literals.not;
+
+class DuplicateDnfRemoverTest {
+        private final static Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private final static AnySymbolView friendView = new KeyOnlyView<>(friend);
+
+        private DuplicateDnfRemover sut;
+
+        @BeforeEach
+        void beforeEach() {
+                sut = new DuplicateDnfRemover();
+        }
+
+        @Test
+        void removeDuplicateSimpleTest() {
+                var one = Query.of("One", (builder, x, y) -> builder.clause(
+                                friendView.call(x, y),
+                                friendView.call(y, x)
+                ));
+                var two = Query.of("Two", (builder, x, y) -> builder.clause(
+                                friendView.call(x, y),
+                                friendView.call(y, x)
+                ));
+
+                var oneResult = sut.rewrite(one);
+                var twoResult = sut.rewrite(two);
+
+                assertThat(oneResult, is(twoResult));
+                assertThat(one, is(oneResult));
+        }
+
+        @Test
+        void notDuplicateSimpleTest() {
+                var one = Query.of("One", (builder, x, y) -> builder.clause(
+                                friendView.call(x, y),
+                                friendView.call(y, x)
+                ));
+                var two = Query.of("Two", (builder, x, y) -> builder.clause((z) -> List.of(
+                                friendView.call(x, y),
+                                friendView.call(y, z)
+                )));
+
+                var oneResult = sut.rewrite(one);
+                var twoResult = sut.rewrite(two);
+
+                assertThat(one, is(oneResult));
+                assertThat(two, is(twoResult));
+        }
+
+        @Test
+        void removeDuplicateRecursiveTest() {
+                var oneSubQuery = Query.of("OneSubQuery", (builder, x, y) -> builder.clause(
+                                friendView.call(x, y),
+                                friendView.call(y, x)
+                ));
+                var one = Query.of("One", (builder, x) -> builder.clause(
+                                oneSubQuery.call(x, Variable.of())
+                ));
+                var twoSubQuery = Query.of("TwoSubQuery", (builder, x, y) -> builder.clause(
+                                friendView.call(x, y),
+                                friendView.call(y, x)
+                ));
+                var two = Query.of("Two", (builder, x) -> builder.clause(
+                                twoSubQuery.call(x, Variable.of())
+                ));
+
+                var oneResult = sut.rewrite(one);
+                var twoResult = sut.rewrite(two);
+
+                assertThat(oneResult, is(twoResult));
+                assertThat(one, is(oneResult));
+        }
+
+        @Test
+        void notDuplicateRecursiveTest() {
+                var oneSubQuery = Query.of("OneSubQuery", (builder, x, y) -> builder.clause(
+                                friendView.call(x, y),
+                                friendView.call(y, x)
+                ));
+                var one = Query.of("One", (builder, x) -> builder.clause(
+                                oneSubQuery.call(x, Variable.of())
+                ));
+                var twoSubQuery = Query.of("TwoSubQuery", (builder, x, y) -> builder.clause(
+                                friendView.call(x, y),
+                                friendView.call(y, x)
+                ));
+                var two = Query.of("Two", (builder, x) -> builder.clause(
+                                twoSubQuery.call(Variable.of(), x)
+                ));
+
+                var oneResult = sut.rewrite(one);
+                var twoResult = sut.rewrite(two);
+
+                assertThat(one, is(oneResult));
+                assertThat(oneResult, is(not(twoResult)));
+
+                var oneCall = (AbstractCallLiteral) oneResult.getDnf().getClauses().get(0).literals().get(0);
+                var twoCall = (AbstractCallLiteral) twoResult.getDnf().getClauses().get(0).literals().get(0);
+
+                assertThat(oneCall.getTarget(), is(twoCall.getTarget()));
+        }
+
+        @Test
+        void removeContradictionTest() {
+                var oneSubQuery = Query.of("OneSubQuery", (builder, x, y) -> builder.clause(
+                                friendView.call(x, y),
+                                friendView.call(y, x)
+                ));
+                var twoSubQuery = Query.of("TwoSubQuery", (builder, x, y) -> builder.clause(
+                                friendView.call(x, y),
+                                friendView.call(y, x)
+                ));
+                var query = Query.of("Contradiction", (builder, x, y) -> builder.clause(
+                                oneSubQuery.call(x, y),
+                                not(twoSubQuery.call(x, y))
+                ));
+
+                var result = sut.rewrite(query);
+
+                assertThat(result.getDnf().getReduction(), is(Reduction.ALWAYS_FALSE));
+        }
+
+        @Test
+        void removeQuantifiedContradictionTest() {
+                var oneSubQuery = Query.of("OneSubQuery", (builder, x, y) -> builder.clause(
+                                friendView.call(x, y),
+                                friendView.call(y, x)
+                ));
+                var twoSubQuery = Query.of("TwoSubQuery", (builder, x, y) -> builder.clause(
+                                friendView.call(x, y),
+                                friendView.call(y, x)
+                ));
+                var query = Query.of("Contradiction", (builder, x) -> builder.clause(
+                                oneSubQuery.call(x, Variable.of()),
+                                not(twoSubQuery.call(x, Variable.of()))
+                ));
+
+                var result = sut.rewrite(query);
+
+                assertThat(result.getDnf().getReduction(), is(Reduction.ALWAYS_FALSE));
+        }
+}
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/rewriter/InputParameterResolverTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/rewriter/InputParameterResolverTest.java
new file mode 100644
index 00000000..ef0077e4
--- /dev/null
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/rewriter/InputParameterResolverTest.java
@@ -0,0 +1,228 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.rewriter;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.store.query.view.KeyOnlyView;
+import tools.refinery.store.representation.Symbol;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo;
+
+class InputParameterResolverTest {
+        private final static Symbol<Boolean> person = Symbol.of("Person", 1);
+        private final static Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private final static AnySymbolView personView = new KeyOnlyView<>(person);
+        private final static AnySymbolView friendView = new KeyOnlyView<>(friend);
+
+        private InputParameterResolver sut;
+
+        @BeforeEach
+        void beforeEach() {
+                sut = new InputParameterResolver();
+        }
+
+        @Test
+        void inlineSingleClauseTest() {
+                var dnf = Dnf.of("SubQuery", builder -> {
+                        var x = builder.parameter("x", ParameterDirection.OUT);
+                        builder.clause(friendView.call(x, Variable.of()));
+                });
+                var query = Query.of("Actual", (builder, x) -> builder.clause(
+                                dnf.call(x),
+                                personView.call(x)
+                ));
+
+                var actual = sut.rewrite(query);
+
+                var expected = Query.of("Expected", (builder, x) -> builder.clause(
+                                friendView.call(x, Variable.of()),
+                                personView.call(x)
+                ));
+
+                assertThat(actual.getDnf(), structurallyEqualTo(expected.getDnf()));
+        }
+
+        @Test
+        void inlineSingleClauseWIthInputTest() {
+                var dnf = Dnf.of("SubQuery", builder -> {
+                        var x = builder.parameter("x", ParameterDirection.IN);
+                        builder.clause(not(friendView.call(x, Variable.of())));
+                });
+                var query = Query.of("Actual", (builder, x) -> builder.clause(
+                                dnf.call(x),
+                                personView.call(x)
+                ));
+
+                var actual = sut.rewrite(query);
+
+                var expected = Query.of("Expected", (builder, x) -> builder.clause(
+                                personView.call(x),
+                                not(friendView.call(x, Variable.of()))
+                ));
+
+                assertThat(actual.getDnf(), structurallyEqualTo(expected.getDnf()));
+        }
+
+        @Test
+        void singleLiteralDemandSetTest() {
+                var dnf = Dnf.of("SubQuery", builder -> {
+                        var x = builder.parameter("x", ParameterDirection.IN);
+                        builder.clause(not(friendView.call(x, Variable.of())));
+                        builder.clause(not(friendView.call(Variable.of(), x)));
+                });
+                var query = Query.of("Actual", (builder, x) -> builder.clause(
+                                dnf.call(x),
+                                personView.call(x)
+                ));
+
+                var actual = sut.rewrite(query);
+
+                var expectedSubQuery = Dnf.of("ExpectedSubQuery", builder -> {
+                        var x = builder.parameter("x", ParameterDirection.OUT);
+                        builder.clause(
+                                        personView.call(x),
+                                        not(friendView.call(x, Variable.of()))
+                        );
+                        builder.clause(
+                                        personView.call(x),
+                                        not(friendView.call(Variable.of(), x))
+                        );
+                });
+                var expected = Query.of("Expected", (builder, x) -> builder.clause(
+                                personView.call(x),
+                                expectedSubQuery.call(x)
+                ));
+
+                assertThat(actual.getDnf(), structurallyEqualTo(expected.getDnf()));
+        }
+
+        @Test
+        void multipleLiteralDemandSetTest() {
+                var dnf = Dnf.of("SubQuery", builder -> {
+                        var x = builder.parameter("x", ParameterDirection.IN);
+                        var y = builder.parameter("y", ParameterDirection.IN);
+                        builder.clause(not(friendView.call(x, y)));
+                        builder.clause(not(friendView.call(y, x)));
+                });
+                var query = Query.of("Actual", (builder, p1) -> builder.clause(p2 -> List.of(
+                                not(dnf.call(p1, p2)),
+                                personView.call(p1),
+                                personView.call(p2)
+                )));
+
+                var actual = sut.rewrite(query);
+
+                var context = Dnf.of("Context", builder -> {
+                        var x = builder.parameter("x", ParameterDirection.OUT);
+                        var y = builder.parameter("y", ParameterDirection.OUT);
+                        builder.clause(
+                                        personView.call(x),
+                                        personView.call(y)
+                        );
+                });
+                var expectedSubQuery = Dnf.of("ExpectedSubQuery", builder -> {
+                        var x = builder.parameter("x", ParameterDirection.OUT);
+                        var y = builder.parameter("x", ParameterDirection.OUT);
+                        builder.clause(
+                                        context.call(x, y),
+                                        not(friendView.call(x, y))
+                        );
+                        builder.clause(
+                                        context.call(x, y),
+                                        not(friendView.call(y, x))
+                        );
+                });
+                var expected = Query.of("Expected", (builder, p1) -> builder.clause(p2 -> List.of(
+                                context.call(p1, p2),
+                                not(expectedSubQuery.call(p1, p2))
+                )));
+
+                assertThat(actual.getDnf(), structurallyEqualTo(expected.getDnf()));
+        }
+
+        @Test
+        void multipleParameterDemandSetTest() {
+                var dnf = Dnf.of("SubQuery", builder -> {
+                        var x = builder.parameter("x", ParameterDirection.IN);
+                        var y = builder.parameter("y", ParameterDirection.IN);
+                        builder.clause(not(friendView.call(x, y)));
+                        builder.clause(not(friendView.call(y, x)));
+                });
+                var query = Query.of("Actual", (builder, p1) -> builder.clause(
+                                not(dnf.call(p1, p1)),
+                                personView.call(p1)
+                ));
+
+                var actual = sut.rewrite(query);
+
+                var expectedSubQuery = Dnf.of("ExpectedSubQuery", builder -> {
+                        var x = builder.parameter("x", ParameterDirection.OUT);
+                        var y = builder.parameter("y", ParameterDirection.OUT);
+                        builder.clause(
+                                        y.isEquivalent(x),
+                                        personView.call(x),
+                                        not(friendView.call(x, x))
+                        );
+                });
+                var expected = Query.of("Expected", (builder, p1) -> builder.clause(
+                                personView.call(p1),
+                                not(expectedSubQuery.call(p1, p1))
+                ));
+
+                assertThat(actual.getDnf(), structurallyEqualTo(expected.getDnf()));
+        }
+
+        @Test
+        void eliminateDoubleNegationTest() {
+                var dnf = Dnf.of("SubQuery", builder -> {
+                        var x = builder.parameter("x", ParameterDirection.IN);
+                        builder.clause(not(friendView.call(x, Variable.of())));
+                });
+                var query = Query.of("Actual", (builder, p1) -> builder.clause(
+                                personView.call(p1),
+                                not(dnf.call(p1))
+                ));
+
+                var actual = sut.rewrite(query);
+
+                var expected = Query.of("Actual", (builder, p1) -> builder.clause(
+                                personView.call(p1),
+                                friendView.call(p1, Variable.of())
+                ));
+
+                assertThat(actual.getDnf(), structurallyEqualTo(expected.getDnf()));
+        }
+
+        @Test
+        void identityWhenNoWorkToDoTest() {
+                var dnf = Dnf.of("SubQuery", builder -> {
+                        var x = builder.parameter("x", ParameterDirection.OUT);
+                        builder.clause(
+                                        personView.call(x),
+                                        not(friendView.call(x, Variable.of()))
+                        );
+                });
+                var query = Query.of("Actual", (builder, p1) -> builder.clause(
+                                personView.call(p1),
+                                not(dnf.call(p1))
+                ));
+
+                var actual = sut.rewrite(query);
+
+                assertThat(actual, is(query));
+        }
+}
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/TermSubstitutionTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/term/TermSubstitutionTest.java
index 1cbc101a..1fae2492 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/TermSubstitutionTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/term/TermSubstitutionTest.java
@@ -9,8 +9,8 @@ import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import tools.refinery.store.query.dnf.Dnf;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.store.query.equality.DnfEqualityChecker;
+import tools.refinery.store.query.equality.SubstitutingLiteralEqualityHelper;
 import tools.refinery.store.query.substitution.Substitution;
 import tools.refinery.store.query.term.bool.BoolTerms;
 import tools.refinery.store.query.term.int_.IntTerms;
@@ -48,7 +48,7 @@ class TermSubstitutionTest {
         void substitutionTest(AnyTerm term) {
                 var substitutedTerm1 = term.substitute(substitution);
                 Assertions.assertNotEquals(term, substitutedTerm1, "Original term is not equal to substituted term");
-                var helper = new LiteralEqualityHelper(Dnf::equals, List.of(), List.of());
+                var helper = new SubstitutingLiteralEqualityHelper(DnfEqualityChecker.DEFAULT, List.of(), List.of());
                 Assertions.assertTrue(term.equalsWithSubstitution(helper, substitutedTerm1), "Terms are equal by helper");
                 // The {@link #substitution} is its own inverse.
                 var substitutedTerm2 = substitutedTerm1.substitute(substitution);
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/utils/OrderStatisticTreeTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/utils/OrderStatisticTreeTest.java
index cbb48603..0ac88ed7 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/utils/OrderStatisticTreeTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/utils/OrderStatisticTreeTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2021 Rodion Efremov
  * Copyright (c) 2023 The Refinery Authors <https://refinery.tools/>
  *
- * SPDX-License-Identifier: MIT OR EPL-2.0
+ * SPDX-License-Identifier: MIT
  */
 package tools.refinery.store.query.utils;
 
diff --git a/subprojects/store-reasoning-scope/build.gradle.kts b/subprojects/store-reasoning-scope/build.gradle.kts
new file mode 100644
index 00000000..6e41dc8e
--- /dev/null
+++ b/subprojects/store-reasoning-scope/build.gradle.kts
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+plugins {
+        id("tools.refinery.gradle.java-library")
+}
+
+dependencies {
+        api(project(":refinery-store-reasoning"))
+        implementation(libs.eclipseCollections.api)
+        implementation(libs.ortools)
+        runtimeOnly(libs.eclipseCollections)
+        testImplementation(project(":refinery-store-query-viatra"))
+}
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagatorAdapter.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagatorAdapter.java
new file mode 100644
index 00000000..c2d3f59e
--- /dev/null
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagatorAdapter.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.scope;
+
+import tools.refinery.store.adapter.ModelAdapter;
+import tools.refinery.store.reasoning.refinement.RefinementResult;
+import tools.refinery.store.reasoning.scope.internal.ScopePropagatorBuilderImpl;
+
+public interface ScopePropagatorAdapter extends ModelAdapter {
+        @Override
+        ScopePropagatorStoreAdapter getStoreAdapter();
+
+        RefinementResult propagate();
+
+        static ScopePropagatorBuilder builder() {
+                return new ScopePropagatorBuilderImpl();
+        }
+}
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagatorBuilder.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagatorBuilder.java
new file mode 100644
index 00000000..a17e04a4
--- /dev/null
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagatorBuilder.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.scope;
+
+import tools.refinery.store.adapter.ModelAdapterBuilder;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+
+public interface ScopePropagatorBuilder extends ModelAdapterBuilder {
+        ScopePropagatorBuilder countSymbol(Symbol<CardinalityInterval> countSymbol);
+
+        ScopePropagatorBuilder scope(PartialRelation type, CardinalityInterval interval);
+
+        @Override
+        ScopePropagatorStoreAdapter build(ModelStore store);
+}
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagatorStoreAdapter.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagatorStoreAdapter.java
new file mode 100644
index 00000000..65d9c38d
--- /dev/null
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagatorStoreAdapter.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.scope;
+
+import tools.refinery.store.adapter.ModelStoreAdapter;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+
+import java.util.Map;
+
+public interface ScopePropagatorStoreAdapter extends ModelStoreAdapter {
+        Map<PartialRelation, CardinalityInterval> getScopes();
+}
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/LowerTypeScopePropagator.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/LowerTypeScopePropagator.java
new file mode 100644
index 00000000..393c4b72
--- /dev/null
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/LowerTypeScopePropagator.java
@@ -0,0 +1,86 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.scope.internal;
+
+import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder;
+import tools.refinery.store.dse.transition.objectives.Criteria;
+import tools.refinery.store.dse.transition.objectives.Objectives;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.reasoning.ReasoningBuilder;
+import tools.refinery.store.reasoning.literal.CountCandidateLowerBoundLiteral;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+
+import java.util.Collection;
+import java.util.List;
+
+import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.store.query.term.int_.IntTerms.*;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.may;
+import static tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator.MULTI_VIEW;
+
+class LowerTypeScopePropagator extends TypeScopePropagator {
+        private final int lowerBound;
+
+        private LowerTypeScopePropagator(ScopePropagatorAdapterImpl adapter, int lowerBound, RelationalQuery allQuery,
+                                                                         RelationalQuery multiQuery) {
+                super(adapter, allQuery, multiQuery);
+                this.lowerBound = lowerBound;
+        }
+
+        @Override
+        public void updateBounds() {
+                constraint.setLb((lowerBound - getSingleCount()));
+        }
+
+        public static class Factory extends TypeScopePropagator.Factory {
+                private final PartialRelation type;
+                private final int lowerBound;
+                private final RelationalQuery allMay;
+                private final RelationalQuery multiMay;
+
+                public Factory(PartialRelation type, int lowerBound) {
+                        this.type = type;
+                        this.lowerBound = lowerBound;
+                        allMay = Query.of(type.name() + "#may", (builder, instance) -> builder.clause(
+                                        may(type.call(instance))
+                        ));
+                        multiMay = Query.of(type.name() + "#multiMay", (builder, instance) -> builder.clause(
+                                        may(type.call(instance)),
+                                        MULTI_VIEW.call(instance)
+                        ));
+                }
+
+                @Override
+                public TypeScopePropagator createPropagator(ScopePropagatorAdapterImpl adapter) {
+                        return new LowerTypeScopePropagator(adapter, lowerBound, allMay, multiMay);
+                }
+
+                @Override
+                protected Collection<AnyQuery> getQueries() {
+                        return List.of(allMay, multiMay);
+                }
+
+                @Override
+                public void configure(ModelStoreBuilder storeBuilder) {
+                        super.configure(storeBuilder);
+
+                        var requiredObjects = Query.of(type.name() + "#required", Integer.class, (builder, output) -> builder
+                                        .clause(Integer.class, currentCount -> List.of(
+                                                        new CountCandidateLowerBoundLiteral(currentCount, type, List.of(Variable.of())),
+                                                        output.assign(sub(currentCount, constant(lowerBound))),
+                                                        check(greater(currentCount, constant(0)))
+                                        )));
+
+                        storeBuilder.getAdapter(ReasoningBuilder.class).objective(Objectives.value(requiredObjects));
+                        storeBuilder.tryGetAdapter(DesignSpaceExplorationBuilder.class).ifPresent(dseBuilder ->
+                                        dseBuilder.accept(Criteria.whenNoMatch(requiredObjects)));
+                }
+        }
+}
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/RoundingUtil.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/RoundingUtil.java
new file mode 100644
index 00000000..a6d663ea
--- /dev/null
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/RoundingUtil.java
@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.scope.internal;
+
+final class RoundingUtil {
+        private static final double TOLERANCE = 0.01;
+
+        private RoundingUtil() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+
+        public static int roundUp(double value) {
+                double ceil = Math.ceil(value - TOLERANCE);
+                int intCeil = (int) ceil;
+                return Math.max(intCeil, 0);
+        }
+
+        public static int roundDown(double value) {
+                double floor = Math.floor(value + TOLERANCE);
+                int intFloor = (int) floor;
+                return Math.max(intFloor, 0);
+        }
+}
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/ScopePropagatorAdapterImpl.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/ScopePropagatorAdapterImpl.java
new file mode 100644
index 00000000..99c501ce
--- /dev/null
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/ScopePropagatorAdapterImpl.java
@@ -0,0 +1,253 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.scope.internal;
+
+import com.google.ortools.linearsolver.MPConstraint;
+import com.google.ortools.linearsolver.MPObjective;
+import com.google.ortools.linearsolver.MPSolver;
+import com.google.ortools.linearsolver.MPVariable;
+import org.eclipse.collections.api.factory.primitive.IntObjectMaps;
+import org.eclipse.collections.api.factory.primitive.IntSets;
+import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
+import org.eclipse.collections.api.set.primitive.MutableIntSet;
+import tools.refinery.store.model.Interpretation;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.query.ModelQueryAdapter;
+import tools.refinery.store.reasoning.refinement.RefinementResult;
+import tools.refinery.store.reasoning.scope.ScopePropagatorAdapter;
+import tools.refinery.store.reasoning.scope.ScopePropagatorStoreAdapter;
+import tools.refinery.store.representation.cardinality.*;
+import tools.refinery.store.tuple.Tuple;
+
+class ScopePropagatorAdapterImpl implements ScopePropagatorAdapter {
+        private final Model model;
+        private final ScopePropagatorStoreAdapterImpl storeAdapter;
+        private final ModelQueryAdapter queryEngine;
+        private final Interpretation<CardinalityInterval> countInterpretation;
+        private final MPSolver solver;
+        private final MPObjective objective;
+        private final MutableIntObjectMap<MPVariable> variables = IntObjectMaps.mutable.empty();
+        private final MutableIntSet activeVariables = IntSets.mutable.empty();
+        private final TypeScopePropagator[] propagators;
+        private boolean changed = true;
+
+        public ScopePropagatorAdapterImpl(Model model, ScopePropagatorStoreAdapterImpl storeAdapter) {
+                this.model = model;
+                this.storeAdapter = storeAdapter;
+                queryEngine = model.getAdapter(ModelQueryAdapter.class);
+                countInterpretation = model.getInterpretation(storeAdapter.getCountSymbol());
+                solver = MPSolver.createSolver("GLOP");
+                objective = solver.objective();
+                initializeVariables();
+                countInterpretation.addListener(this::countChanged, true);
+                var propagatorFactories = storeAdapter.getPropagatorFactories();
+                propagators = new TypeScopePropagator[propagatorFactories.size()];
+                for (int i = 0; i < propagators.length; i++) {
+                        propagators[i] = propagatorFactories.get(i).createPropagator(this);
+                }
+        }
+
+        @Override
+        public Model getModel() {
+                return model;
+        }
+
+        @Override
+        public ScopePropagatorStoreAdapter getStoreAdapter() {
+                return storeAdapter;
+        }
+
+        private void initializeVariables() {
+                var cursor = countInterpretation.getAll();
+                while (cursor.move()) {
+                        var interval = cursor.getValue();
+                        if (!interval.equals(CardinalityIntervals.ONE)) {
+                                int nodeId = cursor.getKey().get(0);
+                                createVariable(nodeId, interval);
+                                activeVariables.add(nodeId);
+                        }
+                }
+        }
+
+        private MPVariable createVariable(int nodeId, CardinalityInterval interval) {
+                double lowerBound = interval.lowerBound();
+                double upperBound = getUpperBound(interval);
+                var variable = solver.makeNumVar(lowerBound, upperBound, "x" + nodeId);
+                variables.put(nodeId, variable);
+                return variable;
+        }
+
+        private void countChanged(Tuple key, CardinalityInterval fromValue, CardinalityInterval toValue,
+                                                          boolean ignoredRestoring) {
+                int nodeId = key.get(0);
+                if ((toValue == null || toValue.equals(CardinalityIntervals.ONE))) {
+                        if (fromValue != null && !fromValue.equals(CardinalityIntervals.ONE)) {
+                                removeActiveVariable(toValue, nodeId);
+                        }
+                        return;
+                }
+                if (fromValue == null || fromValue.equals(CardinalityIntervals.ONE)) {
+                        activeVariables.add(nodeId);
+                }
+                var variable = variables.get(nodeId);
+                if (variable == null) {
+                        createVariable(nodeId, toValue);
+                        markAsChanged();
+                        return;
+                }
+                double lowerBound = toValue.lowerBound();
+                double upperBound = getUpperBound(toValue);
+                if (variable.lb() != lowerBound) {
+                        variable.setLb(lowerBound);
+                        markAsChanged();
+                }
+                if (variable.ub() != upperBound) {
+                        variable.setUb(upperBound);
+                        markAsChanged();
+                }
+        }
+
+        private void removeActiveVariable(CardinalityInterval toValue, int nodeId) {
+                var variable = variables.get(nodeId);
+                if (variable == null || !activeVariables.remove(nodeId)) {
+                        throw new AssertionError("Variable not active: " + nodeId);
+                }
+                if (toValue == null) {
+                        variable.setBounds(0, 0);
+                } else {
+                        // Until queries are flushed and the constraints can be properly updated,
+                        // the variable corresponding to the (previous) multi-object has to stand in for a single object.
+                        variable.setBounds(1, 1);
+                }
+                markAsChanged();
+        }
+
+        MPConstraint makeConstraint() {
+                return solver.makeConstraint();
+        }
+
+        MPVariable getVariable(int nodeId) {
+                var variable = variables.get(nodeId);
+                if (variable != null) {
+                        return variable;
+                }
+                var interval = countInterpretation.get(Tuple.of(nodeId));
+                if (interval == null || interval.equals(CardinalityIntervals.ONE)) {
+                        interval = CardinalityIntervals.NONE;
+                } else {
+                        activeVariables.add(nodeId);
+                        markAsChanged();
+                }
+                return createVariable(nodeId, interval);
+        }
+
+        void markAsChanged() {
+                changed = true;
+        }
+
+        @Override
+        public RefinementResult propagate() {
+                var result = RefinementResult.UNCHANGED;
+                RefinementResult currentRoundResult;
+                do {
+                        currentRoundResult = propagateOne();
+                        result = result.andThen(currentRoundResult);
+                        if (result.isRejected()) {
+                                return result;
+                        }
+                } while (currentRoundResult != RefinementResult.UNCHANGED);
+                return result;
+        }
+
+        private RefinementResult propagateOne() {
+                queryEngine.flushChanges();
+                if (!changed) {
+                        return RefinementResult.UNCHANGED;
+                }
+                changed = false;
+                for (var propagator : propagators) {
+                        propagator.updateBounds();
+                }
+                var result = RefinementResult.UNCHANGED;
+                if (activeVariables.isEmpty()) {
+                        return checkEmptiness();
+                }
+                var iterator = activeVariables.intIterator();
+                while (iterator.hasNext()) {
+                        int nodeId = iterator.next();
+                        var variable = variables.get(nodeId);
+                        if (variable == null) {
+                                throw new AssertionError("Missing active variable: " + nodeId);
+                        }
+                        result = result.andThen(propagateNode(nodeId, variable));
+                        if (result.isRejected()) {
+                                return result;
+                        }
+                }
+                return result;
+        }
+
+        private RefinementResult checkEmptiness() {
+                var emptinessCheckingResult = solver.solve();
+                return switch (emptinessCheckingResult) {
+                        case OPTIMAL, UNBOUNDED -> RefinementResult.UNCHANGED;
+                        case INFEASIBLE -> RefinementResult.REJECTED;
+                        default -> throw new IllegalStateException("Failed to check for consistency: " + emptinessCheckingResult);
+                };
+        }
+
+        private RefinementResult propagateNode(int nodeId, MPVariable variable) {
+                objective.setCoefficient(variable, 1);
+                try {
+                        objective.setMinimization();
+                        var minimizationResult = solver.solve();
+                        int lowerBound;
+                        switch (minimizationResult) {
+                        case OPTIMAL -> lowerBound = RoundingUtil.roundUp(objective.value());
+                        case UNBOUNDED -> lowerBound = 0;
+                        case INFEASIBLE -> {
+                                return RefinementResult.REJECTED;
+                        }
+                        default -> throw new IllegalStateException("Failed to solve for minimum of %s: %s"
+                                        .formatted(variable, minimizationResult));
+                        }
+
+                        objective.setMaximization();
+                        var maximizationResult = solver.solve();
+                        UpperCardinality upperBound;
+                        switch (maximizationResult) {
+                        case OPTIMAL -> upperBound = UpperCardinalities.atMost(RoundingUtil.roundDown(objective.value()));
+                        // Problem was feasible when minimizing, the only possible source of {@code UNBOUNDED_OR_INFEASIBLE} is
+                        // an unbounded maximization problem. See https://github.com/google/or-tools/issues/3319
+                        case UNBOUNDED, INFEASIBLE -> upperBound = UpperCardinalities.UNBOUNDED;
+                        default -> throw new IllegalStateException("Failed to solve for maximum of %s: %s"
+                                        .formatted(variable, minimizationResult));
+                        }
+
+                        var newInterval = CardinalityIntervals.between(lowerBound, upperBound);
+                        var oldInterval = countInterpretation.put(Tuple.of(nodeId), newInterval);
+                        if (newInterval.lowerBound() < oldInterval.lowerBound() ||
+                                        newInterval.upperBound().compareTo(oldInterval.upperBound()) > 0) {
+                                throw new IllegalArgumentException("Failed to refine multiplicity %s of node %d to %s"
+                                                .formatted(oldInterval, nodeId, newInterval));
+                        }
+                        return newInterval.equals(oldInterval) ? RefinementResult.UNCHANGED : RefinementResult.REFINED;
+                } finally {
+                        objective.setCoefficient(variable, 0);
+                }
+        }
+
+        private static double getUpperBound(CardinalityInterval interval) {
+                var upperBound = interval.upperBound();
+                if (upperBound instanceof FiniteUpperCardinality finiteUpperCardinality) {
+                        return finiteUpperCardinality.finiteUpperBound();
+                } else if (upperBound instanceof UnboundedUpperCardinality) {
+                        return Double.POSITIVE_INFINITY;
+                } else {
+                        throw new IllegalArgumentException("Unknown upper bound: " + upperBound);
+                }
+        }
+}
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/ScopePropagatorBuilderImpl.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/ScopePropagatorBuilderImpl.java
new file mode 100644
index 00000000..531a7440
--- /dev/null
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/ScopePropagatorBuilderImpl.java
@@ -0,0 +1,86 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.scope.internal;
+
+import com.google.ortools.Loader;
+import tools.refinery.store.adapter.AbstractModelAdapterBuilder;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.scope.ScopePropagatorBuilder;
+import tools.refinery.store.reasoning.scope.ScopePropagatorStoreAdapter;
+import tools.refinery.store.reasoning.translator.TranslationException;
+import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
+
+import java.util.*;
+
+public class ScopePropagatorBuilderImpl extends AbstractModelAdapterBuilder<ScopePropagatorStoreAdapter>
+                implements ScopePropagatorBuilder {
+        private Symbol<CardinalityInterval> countSymbol = MultiObjectTranslator.COUNT_STORAGE;
+        private final Map<PartialRelation, CardinalityInterval> scopes = new LinkedHashMap<>();
+        private List<TypeScopePropagator.Factory> typeScopePropagatorFactories;
+
+        @Override
+        public ScopePropagatorBuilder countSymbol(Symbol<CardinalityInterval> countSymbol) {
+                if (countSymbol.arity() != 1) {
+                        throw new IllegalArgumentException("Count symbol must have arty 1, got %s with arity %d instead"
+                                        .formatted(countSymbol, countSymbol.arity()));
+                }
+                if (!countSymbol.valueType().equals(CardinalityInterval.class)) {
+                        throw new IllegalArgumentException("Count symbol must have CardinalityInterval values");
+                }
+                if (countSymbol.defaultValue() != null) {
+                        throw new IllegalArgumentException("Count symbol must default value null");
+                }
+                this.countSymbol = countSymbol;
+                return this;
+        }
+
+        @Override
+        public ScopePropagatorBuilder scope(PartialRelation type, CardinalityInterval interval) {
+                if (type.arity() != 1) {
+                        throw new TranslationException(type, "Only types with arity 1 may have scopes, got %s with arity %d"
+                                        .formatted(type, type.arity()));
+                }
+                var newValue = scopes.compute(type, (ignoredKey, oldValue) ->
+                                oldValue == null ? interval : oldValue.meet(interval));
+                if (newValue.isEmpty()) {
+                        throw new TranslationException(type, "Unsatisfiable scope for type %s".formatted(type));
+                }
+                return this;
+        }
+
+        @Override
+        protected void doConfigure(ModelStoreBuilder storeBuilder) {
+                typeScopePropagatorFactories = new ArrayList<>(scopes.size());
+                for (var entry : scopes.entrySet()) {
+                        var type = entry.getKey();
+                        var bounds = entry.getValue();
+                        if (bounds.lowerBound() > 0) {
+                                var lowerFactory = new LowerTypeScopePropagator.Factory(type, bounds.lowerBound());
+                                typeScopePropagatorFactories.add(lowerFactory);
+                        }
+                        if (bounds.upperBound() instanceof FiniteUpperCardinality finiteUpperCardinality) {
+                                var upperFactory = new UpperTypeScopePropagator.Factory(type,
+                                                finiteUpperCardinality.finiteUpperBound());
+                                typeScopePropagatorFactories.add(upperFactory);
+                        }
+                }
+                for (var factory : typeScopePropagatorFactories) {
+                        factory.configure(storeBuilder);
+                }
+        }
+
+        @Override
+        protected ScopePropagatorStoreAdapter doBuild(ModelStore store) {
+                Loader.loadNativeLibraries();
+                return new ScopePropagatorStoreAdapterImpl(store, countSymbol, Collections.unmodifiableMap(scopes),
+                                Collections.unmodifiableList(typeScopePropagatorFactories));
+        }
+}
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/ScopePropagatorStoreAdapterImpl.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/ScopePropagatorStoreAdapterImpl.java
new file mode 100644
index 00000000..282ffe6f
--- /dev/null
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/ScopePropagatorStoreAdapterImpl.java
@@ -0,0 +1,58 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.scope.internal;
+
+import tools.refinery.store.adapter.ModelAdapter;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.scope.ScopePropagatorStoreAdapter;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+
+import java.util.List;
+import java.util.Map;
+
+// Not a record, because we want to control getter visibility.
+@SuppressWarnings("ClassCanBeRecord")
+class ScopePropagatorStoreAdapterImpl implements ScopePropagatorStoreAdapter {
+        private final ModelStore store;
+        private final Symbol<CardinalityInterval> countSymbol;
+        private final Map<PartialRelation, CardinalityInterval> scopes;
+        private final List<TypeScopePropagator.Factory> propagatorFactories;
+
+        public ScopePropagatorStoreAdapterImpl(
+                        ModelStore store, Symbol<CardinalityInterval> countSymbol,
+                        Map<PartialRelation, CardinalityInterval> scopes, List<TypeScopePropagator.Factory> propagatorFactories) {
+                this.store = store;
+                this.countSymbol = countSymbol;
+                this.scopes = scopes;
+                this.propagatorFactories = propagatorFactories;
+        }
+
+        @Override
+        public ModelStore getStore() {
+                return store;
+        }
+
+        Symbol<CardinalityInterval> getCountSymbol() {
+                return countSymbol;
+        }
+
+        @Override
+        public Map<PartialRelation, CardinalityInterval> getScopes() {
+                return scopes;
+        }
+
+        public List<TypeScopePropagator.Factory> getPropagatorFactories() {
+                return propagatorFactories;
+        }
+
+        @Override
+        public ModelAdapter createModelAdapter(Model model) {
+                return new ScopePropagatorAdapterImpl(model, this);
+        }
+}
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/TypeScopePropagator.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/TypeScopePropagator.java
new file mode 100644
index 00000000..cfb95829
--- /dev/null
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/TypeScopePropagator.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.scope.internal;
+
+import com.google.ortools.linearsolver.MPConstraint;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.query.ModelQueryAdapter;
+import tools.refinery.store.query.ModelQueryBuilder;
+import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.query.resultset.ResultSet;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.Collection;
+
+abstract class TypeScopePropagator {
+        private final ScopePropagatorAdapterImpl adapter;
+        private final ResultSet<Boolean> allNodes;
+        private final ResultSet<Boolean> multiNodes;
+        protected final MPConstraint constraint;
+
+        protected TypeScopePropagator(ScopePropagatorAdapterImpl adapter, RelationalQuery allQuery,
+                                                           RelationalQuery multiQuery) {
+                this.adapter = adapter;
+                var queryEngine = adapter.getModel().getAdapter(ModelQueryAdapter.class);
+                allNodes = queryEngine.getResultSet(allQuery);
+                multiNodes = queryEngine.getResultSet(multiQuery);
+                constraint = adapter.makeConstraint();
+                constraint.setBounds(0, Double.POSITIVE_INFINITY);
+                var cursor = multiNodes.getAll();
+                while (cursor.move()) {
+                        var variable = adapter.getVariable(cursor.getKey().get(0));
+                        constraint.setCoefficient(variable, 1);
+                }
+                allNodes.addListener(this::allChanged);
+                multiNodes.addListener(this::multiChanged);
+        }
+
+        public abstract void updateBounds();
+
+        protected int getSingleCount() {
+                return allNodes.size() - multiNodes.size();
+        }
+
+        private void allChanged(Tuple ignoredKey, Boolean ignoredOldValue, Boolean ignoredNewValue) {
+                adapter.markAsChanged();
+        }
+
+        private void multiChanged(Tuple key, Boolean ignoredOldValue, Boolean newValue) {
+                var variable = adapter.getVariable(key.get(0));
+                constraint.setCoefficient(variable, Boolean.TRUE.equals(newValue) ? 1 : 0);
+                adapter.markAsChanged();
+        }
+
+        public abstract static class Factory {
+                public abstract TypeScopePropagator createPropagator(ScopePropagatorAdapterImpl adapter);
+
+                protected abstract Collection<AnyQuery> getQueries();
+
+                public void configure(ModelStoreBuilder storeBuilder) {
+                        storeBuilder.getAdapter(ModelQueryBuilder.class).queries(getQueries());
+                }
+        }
+}
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/UpperTypeScopePropagator.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/UpperTypeScopePropagator.java
new file mode 100644
index 00000000..a0be0fb4
--- /dev/null
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/internal/UpperTypeScopePropagator.java
@@ -0,0 +1,59 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.scope.internal;
+
+import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+
+import java.util.Collection;
+import java.util.List;
+
+import static tools.refinery.store.reasoning.literal.PartialLiterals.must;
+import static tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator.MULTI_VIEW;
+
+class UpperTypeScopePropagator extends TypeScopePropagator {
+        private final int upperBound;
+
+        private UpperTypeScopePropagator(ScopePropagatorAdapterImpl adapter, int upperBound, RelationalQuery allQuery,
+                                                                         RelationalQuery multiQuery) {
+                super(adapter, allQuery, multiQuery);
+                this.upperBound = upperBound;
+        }
+
+        @Override
+        public void updateBounds() {
+                constraint.setUb(upperBound - getSingleCount());
+        }
+
+        public static class Factory extends TypeScopePropagator.Factory {
+                private final int upperBound;
+                private final RelationalQuery allMust;
+                private final RelationalQuery multiMust;
+
+                public Factory(PartialRelation type, int upperBound) {
+                        this.upperBound = upperBound;
+                        allMust = Query.of(type.name() + "#must", (builder, instance) -> builder.clause(
+                                        must(type.call(instance))
+                        ));
+                        multiMust = Query.of(type.name() + "#multiMust", (builder, instance) -> builder.clause(
+                                        must(type.call(instance)),
+                                        MULTI_VIEW.call(instance)
+                        ));
+                }
+
+                @Override
+                public TypeScopePropagator createPropagator(ScopePropagatorAdapterImpl adapter) {
+                        return new UpperTypeScopePropagator(adapter, upperBound, allMust, multiMust);
+                }
+
+                @Override
+                protected Collection<AnyQuery> getQueries() {
+                        return List.of(allMust, multiMust);
+                }
+        }
+}
diff --git a/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/MPSolverTest.java b/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/MPSolverTest.java
new file mode 100644
index 00000000..95c4ac68
--- /dev/null
+++ b/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/MPSolverTest.java
@@ -0,0 +1,83 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.scope;
+
+import com.google.ortools.Loader;
+import com.google.ortools.linearsolver.MPSolver;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.closeTo;
+import static org.hamcrest.Matchers.is;
+
+class MPSolverTest {
+        @BeforeAll
+        static void beforeAll() {
+                Loader.loadNativeLibraries();
+        }
+
+        @Test
+        void updateProblemTest() {
+                var solver = MPSolver.createSolver("GLOP");
+                var x = solver.makeNumVar(0, Double.POSITIVE_INFINITY, "x");
+                var y = solver.makeNumVar(0, 1, "y");
+                var constraint = solver.makeConstraint(5, 5);
+                constraint.setCoefficient(x, 1);
+                constraint.setCoefficient(y, 1);
+                var objective = solver.objective();
+
+                objective.setCoefficient(x, 1);
+                objective.setMinimization();
+                assertThat(solver.solve(), is(MPSolver.ResultStatus.OPTIMAL));
+                assertThat(objective.value(), closeTo(4, 0.01));
+
+                objective.setMaximization();
+                assertThat(solver.solve(), is(MPSolver.ResultStatus.OPTIMAL));
+                assertThat(objective.value(), closeTo(5, 0.01));
+
+                objective.setCoefficient(x, 0);
+                objective.setCoefficient(y, 1);
+                objective.setMinimization();
+                assertThat(solver.solve(), is(MPSolver.ResultStatus.OPTIMAL));
+                assertThat(objective.value(), closeTo(0, 0.01));
+
+                objective.setMaximization();
+                assertThat(solver.solve(), is(MPSolver.ResultStatus.OPTIMAL));
+                assertThat(objective.value(), closeTo(1, 0.01));
+        }
+
+        @Test
+        void unboundedIsInfeasibleTest() {
+                var solver = MPSolver.createSolver("GLOP");
+                var x = solver.makeNumVar(0, Double.POSITIVE_INFINITY, "x");
+                var objective = solver.objective();
+                objective.setCoefficient(x, 1);
+
+                objective.setMinimization();
+                assertThat(solver.solve(), is(MPSolver.ResultStatus.OPTIMAL));
+                assertThat(objective.value(), closeTo(0, 0.01));
+
+                objective.setMaximization();
+                assertThat(solver.solve(), is(MPSolver.ResultStatus.INFEASIBLE));
+        }
+
+        @Test
+        void constantTest() {
+                var solver = MPSolver.createSolver("GLOP");
+                var x = solver.makeNumVar(1, 1, "x");
+                var objective = solver.objective();
+                objective.setCoefficient(x, 1);
+
+                objective.setMinimization();
+                assertThat(solver.solve(), is(MPSolver.ResultStatus.OPTIMAL));
+                assertThat(objective.value(), closeTo(1, 0.01));
+
+                objective.setMaximization();
+                assertThat(solver.solve(), is(MPSolver.ResultStatus.OPTIMAL));
+                assertThat(objective.value(), closeTo(1, 0.01));
+        }
+}
diff --git a/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/MultiObjectTest.java b/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/MultiObjectTest.java
new file mode 100644
index 00000000..42ce2f56
--- /dev/null
+++ b/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/MultiObjectTest.java
@@ -0,0 +1,206 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.scope;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.model.Interpretation;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.ReasoningStoreAdapter;
+import tools.refinery.store.reasoning.refinement.RefinementResult;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
+import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.tuple.Tuple;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+class MultiObjectTest {
+        private static final PartialRelation person = new PartialRelation("Person", 1);
+
+        private ModelStore store;
+        private Model model;
+        private Interpretation<CardinalityInterval> countStorage;
+
+        @BeforeEach
+        void beforeEach() {
+                store = ModelStore.builder()
+                                .with(ViatraModelQueryAdapter.builder())
+                                .with(ReasoningAdapter.builder())
+                                .with(new MultiObjectTranslator())
+                                .with(PartialRelationTranslator.of(person)
+                                                .symbol(Symbol.of("Person", 1, TruthValue.class, TruthValue.FALSE)))
+                                .with(ScopePropagatorAdapter.builder()
+                                                .scope(person, CardinalityIntervals.between(5, 15)))
+                                .build();
+                model = null;
+                countStorage = null;
+        }
+
+        @Test
+        void oneMultiObjectSatisfiableTest() {
+                createModel(ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.SET))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .build());
+                assertThat(propagate(), is(RefinementResult.REFINED));
+                assertThat(countStorage.get(Tuple.of(0)), is(CardinalityIntervals.between(2, 12)));
+        }
+
+        @Test
+        void oneMultiObjectExistingBoundSatisfiableTest() {
+                createModel(ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.between(5, 20)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .build());
+                assertThat(propagate(), is(RefinementResult.REFINED));
+                assertThat(countStorage.get(Tuple.of(0)), is(CardinalityIntervals.between(5, 12)));
+        }
+
+        @Test
+        void oneMultiObjectUnsatisfiableUpperTest() {
+                createModel(ModelSeed.builder(21)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.SET))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .build());
+                assertThat(propagate(), is(RefinementResult.REJECTED));
+        }
+
+        @Test
+        void noMultiObjectSatisfiableTest() {
+                createModel(ModelSeed.builder(10)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder.reducedValue(CardinalityIntervals.ONE))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .build());
+                assertThat(propagate(), is(RefinementResult.UNCHANGED));
+        }
+
+        @Test
+        void noMultiObjectUnsatisfiableTest() {
+                createModel(ModelSeed.builder(2)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder.reducedValue(CardinalityIntervals.ONE))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .build());
+                assertThat(propagate(), is(RefinementResult.REJECTED));
+        }
+
+        @Test
+        void oneMultiObjectExistingBoundUnsatisfiableLowerTest() {
+                createModel(ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.atLeast(20)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .build());
+                assertThat(propagate(), is(RefinementResult.REJECTED));
+        }
+
+        @Test
+        void oneMultiObjectExistingBoundUnsatisfiableUpperTest() {
+                createModel(ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.atMost(1)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .build());
+                assertThat(propagate(), is(RefinementResult.REJECTED));
+        }
+
+        @Test
+        void twoMultiObjectsSatisfiableTest() {
+                createModel(ModelSeed.builder(5)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.SET)
+                                                .put(Tuple.of(1), CardinalityIntervals.SET))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .build());
+                assertThat(propagate(), is(RefinementResult.REFINED));
+                assertThat(countStorage.get(Tuple.of(0)), is(CardinalityIntervals.atMost(12)));
+                assertThat(countStorage.get(Tuple.of(1)), is(CardinalityIntervals.atMost(12)));
+        }
+
+        @Test
+        void twoMultiObjectsExistingBoundSatisfiableTest() {
+                createModel(ModelSeed.builder(5)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.between(7, 20))
+                                                .put(Tuple.of(1), CardinalityIntervals.atMost(11)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .build());
+                assertThat(propagate(), is(RefinementResult.REFINED));
+                assertThat(countStorage.get(Tuple.of(0)), is(CardinalityIntervals.between(7, 12)));
+                assertThat(countStorage.get(Tuple.of(1)), is(CardinalityIntervals.atMost(5)));
+        }
+
+        @Test
+        void twoMultiObjectsExistingBoundUnsatisfiableUpperTest() {
+                createModel(ModelSeed.builder(5)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.between(7, 20))
+                                                .put(Tuple.of(1), CardinalityIntervals.exactly(11)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .build());
+                assertThat(propagate(), is(RefinementResult.REJECTED));
+        }
+
+        @Test
+        void twoMultiObjectsExistingBoundUnsatisfiableLowerTest() {
+                createModel(ModelSeed.builder(3)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.LONE)
+                                                .put(Tuple.of(1), CardinalityIntervals.atMost(2)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .build());
+                assertThat(propagate(), is(RefinementResult.REJECTED));
+        }
+
+        @Test
+        void multiToSingleTest() {
+                createModel(ModelSeed.builder(5)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.LONE)
+                                                .put(Tuple.of(1), CardinalityIntervals.SET))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .build());
+                assertThat(propagate(), is(RefinementResult.REFINED));
+                assertThat(countStorage.get(Tuple.of(0)), is(CardinalityIntervals.LONE));
+                assertThat(countStorage.get(Tuple.of(1)), is(CardinalityIntervals.between(1, 12)));
+                countStorage.put(Tuple.of(0), CardinalityIntervals.ONE);
+                assertThat(propagate(), is(RefinementResult.REFINED));
+                assertThat(countStorage.get(Tuple.of(1)), is(CardinalityIntervals.between(1, 11)));
+                countStorage.put(Tuple.of(1), CardinalityIntervals.ONE);
+                assertThat(propagate(), is(RefinementResult.UNCHANGED));
+        }
+
+        private void createModel(ModelSeed modelSeed) {
+                model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(modelSeed);
+                countStorage = model.getInterpretation(MultiObjectTranslator.COUNT_STORAGE);
+        }
+
+        private RefinementResult propagate() {
+                return model.getAdapter(ScopePropagatorAdapter.class).propagate();
+        }
+}
diff --git a/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/internal/RoundingUtilTest.java b/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/internal/RoundingUtilTest.java
new file mode 100644
index 00000000..9daed660
--- /dev/null
+++ b/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/internal/RoundingUtilTest.java
@@ -0,0 +1,69 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.scope.internal;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+class RoundingUtilTest {
+        @ParameterizedTest
+        @MethodSource
+        void roundUpTest(double value, int expected) {
+                int actual = RoundingUtil.roundUp(value);
+                assertThat(actual, is(expected));
+        }
+
+        static Stream<Arguments> roundUpTest() {
+                return Stream.of(
+                                Arguments.of(0.0, 0),
+                                Arguments.of(-0.0, 0),
+                                Arguments.of(-0.9, 0),
+                                Arguments.of(-2, 0),
+                                Arguments.of(0.009, 0),
+                                Arguments.of(0.011, 1),
+                                Arguments.of(0.1, 1),
+                                Arguments.of(0.991, 1),
+                                Arguments.of(1, 1),
+                                Arguments.of(1.009, 1),
+                                Arguments.of(1.011, 2),
+                                Arguments.of(1.5, 2),
+                                Arguments.of(2, 2),
+                                Arguments.of(100.5, 101)
+                );
+        }
+
+        @ParameterizedTest
+        @MethodSource
+        void roundDownTest(double value, int expected) {
+                int actual = RoundingUtil.roundDown(value);
+                assertThat(actual, is(expected));
+        }
+
+        static Stream<Arguments> roundDownTest() {
+                return Stream.of(
+                                Arguments.of(0.0, 0),
+                                Arguments.of(-0.0, 0),
+                                Arguments.of(-0.9, 0),
+                                Arguments.of(-2, 0),
+                                Arguments.of(0.989, 0),
+                                Arguments.of(0.991, 1),
+                                Arguments.of(1, 1),
+                                Arguments.of(1.5, 1),
+                                Arguments.of(1.009, 1),
+                                Arguments.of(1.989, 1),
+                                Arguments.of(1.991, 2),
+                                Arguments.of(2, 2),
+                                Arguments.of(2.009, 2),
+                                Arguments.of(100.5, 100)
+                );
+        }
+}
diff --git a/subprojects/store-reasoning/build.gradle.kts b/subprojects/store-reasoning/build.gradle.kts
index abad0491..ed8355f3 100644
--- a/subprojects/store-reasoning/build.gradle.kts
+++ b/subprojects/store-reasoning/build.gradle.kts
@@ -9,5 +9,7 @@ plugins {
 }
 
 dependencies {
-        api(project(":refinery-store-query"))
+        api(project(":refinery-store-dse"))
+        testImplementation(testFixtures(project(":refinery-store-query")))
+        testImplementation(project(":refinery-store-query-viatra"))
 }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/MergeResult.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/MergeResult.java
deleted file mode 100644
index d3a216d8..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/MergeResult.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning;
-
-public enum MergeResult {
-        UNCHANGED,
-        REFINED,
-        REJECTED;
-
-        public MergeResult andAlso(MergeResult other) {
-                return switch (this) {
-                        case UNCHANGED -> other;
-                        case REFINED -> other == REJECTED ? REJECTED : REFINED;
-                        case REJECTED -> REJECTED;
-                };
-        }
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/PartialInterpretation.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/PartialInterpretation.java
deleted file mode 100644
index 4140d640..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/PartialInterpretation.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning;
-
-import tools.refinery.store.reasoning.representation.PartialSymbol;
-import tools.refinery.store.map.Cursor;
-import tools.refinery.store.tuple.Tuple;
-
-public non-sealed interface PartialInterpretation<A, C> extends AnyPartialInterpretation {
-        @Override
-        PartialSymbol<A, C> getPartialSymbol();
-
-        A get(Tuple key);
-
-        Cursor<Tuple, A> getAll();
-
-        MergeResult merge(Tuple key, A value);
-
-        C getConcrete(Tuple key);
-
-        Cursor<Tuple, C> getAllConcrete();
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningAdapter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningAdapter.java
index 6d5d6f89..1dda7ac1 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningAdapter.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningAdapter.java
@@ -5,26 +5,49 @@
  */
 package tools.refinery.store.reasoning;
 
+import org.jetbrains.annotations.Nullable;
 import tools.refinery.store.adapter.ModelAdapter;
-import tools.refinery.store.query.resultset.ResultSet;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.reasoning.internal.ReasoningBuilderImpl;
+import tools.refinery.store.reasoning.interpretation.AnyPartialInterpretation;
+import tools.refinery.store.reasoning.interpretation.PartialInterpretation;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.refinement.AnyPartialInterpretationRefiner;
+import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner;
 import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.tuple.Tuple1;
 
 public interface ReasoningAdapter extends ModelAdapter {
-        PartialRelation EXISTS = new PartialRelation("exists", 1);
+        PartialRelation EXISTS_SYMBOL = PartialSymbol.of("exists", 1);
+        PartialRelation EQUALS_SYMBOL = PartialSymbol.of("equals", 2);
 
         @Override
         ReasoningStoreAdapter getStoreAdapter();
 
-        default AnyPartialInterpretation getPartialInterpretation(AnyPartialSymbol partialSymbol) {
-                // Cast to disambiguate overloads.
-                var typedPartialSymbol = (PartialSymbol<?, ?>) partialSymbol;
-                return getPartialInterpretation(typedPartialSymbol);
+        default AnyPartialInterpretation getPartialInterpretation(Concreteness concreteness,
+                                                                                                                          AnyPartialSymbol partialSymbol) {
+                return getPartialInterpretation(concreteness, (PartialSymbol<?, ?>) partialSymbol);
         }
 
-        <A, C> PartialInterpretation<A, C> getPartialInterpretation(PartialSymbol<A, C> partialSymbol);
+        <A, C> PartialInterpretation<A, C> getPartialInterpretation(Concreteness concreteness,
+                                                                                                                                PartialSymbol<A, C> partialSymbol);
 
-        ResultSet<Boolean> getLiftedResultSet(Dnf query);
+        default AnyPartialInterpretationRefiner getRefiner(AnyPartialSymbol partialSymbol) {
+                return getRefiner((PartialSymbol<?, ?>) partialSymbol);
+        }
+
+        <A, C> PartialInterpretationRefiner<A, C> getRefiner(PartialSymbol<A, C> partialSymbol);
+
+        @Nullable
+        Tuple1 split(int parentMultiObject);
+
+        @Nullable
+        Tuple1 focus(int parentObject);
+
+        boolean cleanup(int nodeToDelete);
+
+        static ReasoningBuilder builder() {
+                return new ReasoningBuilderImpl();
+        }
 }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningBuilder.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningBuilder.java
index d3a337e8..79bce33e 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningBuilder.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningBuilder.java
@@ -6,27 +6,54 @@
 package tools.refinery.store.reasoning;
 
 import tools.refinery.store.adapter.ModelAdapterBuilder;
+import tools.refinery.store.dse.transition.objectives.Objective;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.reasoning.literal.Modality;
 import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.dnf.FunctionalQuery;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.reasoning.refinement.PartialModelInitializer;
+import tools.refinery.store.reasoning.refinement.StorageRefiner;
+import tools.refinery.store.reasoning.translator.AnyPartialSymbolTranslator;
+import tools.refinery.store.representation.Symbol;
 
 import java.util.Collection;
 import java.util.List;
 
 @SuppressWarnings("UnusedReturnValue")
 public interface ReasoningBuilder extends ModelAdapterBuilder {
-        default ReasoningBuilder liftedQueries(Dnf... liftedQueries) {
-                return liftedQueries(List.of(liftedQueries));
+        ReasoningBuilder requiredInterpretations(Collection<Concreteness> requiredInterpretations);
+
+        default ReasoningBuilder requiredInterpretations(Concreteness... requiredInterpretations) {
+                return requiredInterpretations(List.of(requiredInterpretations));
         }
 
-        default ReasoningBuilder liftedQueries(Collection<Dnf> liftedQueries) {
-                liftedQueries.forEach(this::liftedQuery);
+        ReasoningBuilder partialSymbol(AnyPartialSymbolTranslator translator);
+
+        <T> ReasoningBuilder storageRefiner(Symbol<T> symbol, StorageRefiner.Factory<T> refiner);
+
+        ReasoningBuilder initializer(PartialModelInitializer initializer);
+
+        ReasoningBuilder objective(Objective objective);
+
+        default ReasoningBuilder objectives(Objective... objectives) {
+                return objectives(List.of(objectives));
+        }
+
+        default ReasoningBuilder objectives(Collection<Objective> objectives) {
+                objectives.forEach(this::objective);
                 return this;
         }
 
-        ReasoningBuilder liftedQuery(Dnf liftedQuery);
+        <T> Query<T> lift(Modality modality, Concreteness concreteness, Query<T> query);
+
+        RelationalQuery lift(Modality modality, Concreteness concreteness, RelationalQuery query);
+
+        <T> FunctionalQuery<T> lift(Modality modality, Concreteness concreteness, FunctionalQuery<T> query);
 
-        Dnf lift(Modality modality, Dnf query);
+        Dnf lift(Modality modality, Concreteness concreteness, Dnf dnf);
 
         @Override
         ReasoningStoreAdapter build(ModelStore store);
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningStoreAdapter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningStoreAdapter.java
index c9795255..fe3cc3ea 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningStoreAdapter.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningStoreAdapter.java
@@ -7,15 +7,21 @@ package tools.refinery.store.reasoning;
 
 import tools.refinery.store.adapter.ModelStoreAdapter;
 import tools.refinery.store.model.Model;
+import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.reasoning.seed.ModelSeed;
 
 import java.util.Collection;
+import java.util.Set;
 
 public interface ReasoningStoreAdapter extends ModelStoreAdapter {
         Collection<AnyPartialSymbol> getPartialSymbols();
 
-        Collection<Dnf> getLiftedQueries();
+        Collection<AnyPartialSymbol> getRefinablePartialSymbols();
+
+        Set<Concreteness> getSupportedInterpretations();
+
+        Model createInitialModel(ModelSeed modelSeed);
 
         @Override
         ReasoningAdapter createModelAdapter(Model model);
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/FocusActionLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/FocusActionLiteral.java
new file mode 100644
index 00000000..5a6f22d2
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/FocusActionLiteral.java
@@ -0,0 +1,48 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.actions;
+
+import tools.refinery.store.dse.transition.actions.AbstractActionLiteral;
+import tools.refinery.store.dse.transition.actions.BoundActionLiteral;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+
+import java.util.List;
+
+public class FocusActionLiteral extends AbstractActionLiteral {
+        private final NodeVariable parentNode;
+        private final NodeVariable childNode;
+
+        public FocusActionLiteral(NodeVariable parentNode, NodeVariable childNode) {
+                this.parentNode = parentNode;
+                this.childNode = childNode;
+        }
+
+        public NodeVariable getParentNode() {
+                return parentNode;
+        }
+
+        public NodeVariable getChildNode() {
+                return childNode;
+        }
+
+        @Override
+        public List<NodeVariable> getInputVariables() {
+                return List.of(parentNode);
+        }
+
+        @Override
+        public List<NodeVariable> getOutputVariables() {
+                return List.of(childNode);
+        }
+
+        @Override
+        public BoundActionLiteral bindToModel(Model model) {
+                var reasoningAdapter = model.getAdapter(ReasoningAdapter.class);
+                return tuple -> reasoningAdapter.focus(tuple.get(0));
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/MergeActionLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/MergeActionLiteral.java
new file mode 100644
index 00000000..8d0d7961
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/MergeActionLiteral.java
@@ -0,0 +1,60 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.actions;
+
+import tools.refinery.store.dse.transition.actions.AbstractActionLiteral;
+import tools.refinery.store.dse.transition.actions.BoundActionLiteral;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.List;
+
+public class MergeActionLiteral<A, C> extends AbstractActionLiteral {
+        private final PartialSymbol<A, C> partialSymbol;
+        private final List<NodeVariable> parameters;
+        private final A value;
+
+        public MergeActionLiteral(PartialSymbol<A, C> partialSymbol, A value, List<NodeVariable> parameters) {
+                if (partialSymbol.arity() != parameters.size()) {
+                        throw new IllegalArgumentException("Expected %d parameters for partial symbol %s, got %d instead"
+                                        .formatted(partialSymbol.arity(), partialSymbol, parameters.size()));
+                }
+                this.partialSymbol = partialSymbol;
+                this.parameters = parameters;
+                this.value = value;
+        }
+
+        public PartialSymbol<A, C> getPartialSymbol() {
+                return partialSymbol;
+        }
+
+        public List<NodeVariable> getParameters() {
+                return parameters;
+        }
+
+        public A getValue() {
+                return value;
+        }
+
+        @Override
+        public List<NodeVariable> getInputVariables() {
+                return getParameters();
+        }
+
+        @Override
+        public List<NodeVariable> getOutputVariables() {
+                return List.of();
+        }
+
+        @Override
+        public BoundActionLiteral bindToModel(Model model) {
+                var refiner = model.getAdapter(ReasoningAdapter.class).getRefiner(partialSymbol);
+                return tuple -> refiner.merge(tuple, value) ? Tuple.of() : null;
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/PartialActionLiterals.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/PartialActionLiterals.java
new file mode 100644
index 00000000..990d11e5
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/PartialActionLiterals.java
@@ -0,0 +1,38 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.actions;
+
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.representation.TruthValue;
+
+import java.util.List;
+
+public final class PartialActionLiterals {
+        private PartialActionLiterals() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+
+        public static <A, C> MergeActionLiteral<A, C> merge(PartialSymbol<A, C> partialSymbol, A value,
+                                                                                                                NodeVariable... parameters) {
+                return new MergeActionLiteral<>(partialSymbol, value, List.of(parameters));
+        }
+
+        public static MergeActionLiteral<TruthValue, Boolean> add(PartialRelation partialRelation,
+                                                                                                                          NodeVariable... parameters) {
+                return merge(partialRelation, TruthValue.TRUE, parameters);
+        }
+
+        public static MergeActionLiteral<TruthValue, Boolean> remove(PartialRelation partialRelation,
+                                                                                                                                 NodeVariable... parameters) {
+                return merge(partialRelation, TruthValue.FALSE, parameters);
+        }
+
+        public static FocusActionLiteral focus(NodeVariable parent, NodeVariable child) {
+                return new FocusActionLiteral(parent, child);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialClauseRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialClauseRewriter.java
new file mode 100644
index 00000000..40993235
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialClauseRewriter.java
@@ -0,0 +1,223 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.internal;
+
+import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.dnf.DnfBuilder;
+import tools.refinery.store.query.dnf.DnfClause;
+import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.store.query.literal.AbstractCountLiteral;
+import tools.refinery.store.query.literal.CallPolarity;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.Aggregator;
+import tools.refinery.store.query.term.ConstantTerm;
+import tools.refinery.store.query.term.Term;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.term.int_.IntTerms;
+import tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.literal.*;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
+import tools.refinery.store.representation.cardinality.UpperCardinalities;
+
+import java.util.*;
+import java.util.function.BinaryOperator;
+
+class PartialClauseRewriter {
+        private final PartialQueryRewriter rewriter;
+        private final List<Literal> completedLiterals = new ArrayList<>();
+        private final Deque<Literal> workList = new ArrayDeque<>();
+        private final Set<Variable> positiveVariables = new LinkedHashSet<>();
+        private final Set<Variable> unmodifiablePositiveVariables = Collections.unmodifiableSet(positiveVariables);
+
+        public PartialClauseRewriter(PartialQueryRewriter rewriter) {
+                this.rewriter = rewriter;
+        }
+
+        public List<Literal> rewriteClause(DnfClause clause) {
+                workList.addAll(clause.literals());
+                while (!workList.isEmpty()) {
+                        var literal = workList.removeFirst();
+                        rewrite(literal);
+                }
+                return completedLiterals;
+        }
+
+        private void rewrite(Literal literal) {
+                if (!(literal instanceof AbstractCallLiteral callLiteral)) {
+                        markAsDone(literal);
+                        return;
+                }
+                if (callLiteral instanceof CountLowerBoundLiteral countLowerBoundLiteral) {
+                        rewriteCountLowerBound(countLowerBoundLiteral);
+                        return;
+                }
+                if (callLiteral instanceof CountUpperBoundLiteral countUpperBoundLiteral) {
+                        rewriteCountUpperBound(countUpperBoundLiteral);
+                        return;
+                }
+                if (callLiteral instanceof CountCandidateLowerBoundLiteral countCandidateLowerBoundLiteral) {
+                        rewriteCountCandidateLowerBound(countCandidateLowerBoundLiteral);
+                        return;
+                }
+                if (callLiteral instanceof CountCandidateUpperBoundLiteral countCandidateUpperBoundLiteral) {
+                        rewriteCountCandidateUpperBound(countCandidateUpperBoundLiteral);
+                        return;
+                }
+                var target = callLiteral.getTarget();
+                if (target instanceof Dnf dnf) {
+                        rewriteRecursively(callLiteral, dnf);
+                } else if (target instanceof ModalConstraint modalConstraint) {
+                        var modality = modalConstraint.modality();
+                        var concreteness = modalConstraint.concreteness();
+                        var constraint = modalConstraint.constraint();
+                        if (constraint instanceof Dnf dnf) {
+                                rewriteRecursively(callLiteral, modality, concreteness, dnf);
+                        } else if (constraint instanceof PartialRelation partialRelation) {
+                                rewrite(callLiteral, modality, concreteness, partialRelation);
+                        } else {
+                                throw new IllegalArgumentException("Cannot interpret modal constraint: " + modalConstraint);
+                        }
+                } else {
+                        markAsDone(literal);
+                }
+        }
+
+        private void rewriteCountLowerBound(CountLowerBoundLiteral literal) {
+                rewritePartialCount(literal, "lower", Modality.MUST, MultiObjectTranslator.LOWER_CARDINALITY_VIEW, 1,
+                                IntTerms::mul, IntTerms.INT_SUM);
+        }
+
+        private void rewriteCountUpperBound(CountUpperBoundLiteral literal) {
+                rewritePartialCount(literal, "upper", Modality.MAY, MultiObjectTranslator.UPPER_CARDINALITY_VIEW,
+                                UpperCardinalities.ONE, UpperCardinalityTerms::mul, UpperCardinalityTerms.UPPER_CARDINALITY_SUM);
+        }
+
+        private <T> void rewritePartialCount(AbstractCountLiteral<T> literal, String name, Modality modality,
+                                                                                 Constraint view, T one, BinaryOperator<Term<T>> mul, Aggregator<T, T> sum) {
+                var type = literal.getResultType();
+                var countResult = computeCountVariables(literal, Concreteness.PARTIAL, name);
+                var builder = countResult.builder();
+                var outputVariable = builder.parameter(type);
+                var variablesToCount = countResult.variablesToCount();
+
+                var literals = new ArrayList<Literal>();
+                literals.add(new ModalConstraint(modality, Concreteness.PARTIAL, literal.getTarget())
+                                .call(CallPolarity.POSITIVE, countResult.rewrittenArguments()));
+                switch (variablesToCount.size()) {
+                case 0 -> literals.add(outputVariable.assign(new ConstantTerm<>(type, one)));
+                case 1 -> literals.add(view.call(variablesToCount.get(0),
+                                outputVariable));
+                default -> {
+                        var firstCount = Variable.of(type);
+                        literals.add(view.call(variablesToCount.get(0), firstCount));
+                        int length = variablesToCount.size();
+                        Term<T> accumulator = firstCount;
+                        for (int i = 1; i < length; i++) {
+                                var countVariable = Variable.of(type);
+                                literals.add(view.call(variablesToCount.get(i), countVariable));
+                                accumulator = mul.apply(accumulator, countVariable);
+                        }
+                        literals.add(outputVariable.assign(accumulator));
+                }
+                }
+                builder.clause(literals);
+
+                var helperQuery = builder.build();
+                var aggregationVariable = Variable.of(type);
+                var helperArguments = countResult.helperArguments();
+                helperArguments.add(aggregationVariable);
+                workList.addFirst(literal.getResultVariable().assign(helperQuery.aggregateBy(aggregationVariable, sum,
+                                helperArguments)));
+        }
+
+        private void rewriteCountCandidateLowerBound(CountCandidateLowerBoundLiteral literal) {
+                rewriteCandidateCount(literal, "lower", Modality.MAY);
+        }
+
+        private void rewriteCountCandidateUpperBound(CountCandidateUpperBoundLiteral literal) {
+                rewriteCandidateCount(literal, "upper", Modality.MUST);
+        }
+
+        private void rewriteCandidateCount(AbstractCountLiteral<Integer> literal, String name, Modality modality) {
+                var countResult = computeCountVariables(literal, Concreteness.CANDIDATE, name);
+                var builder = countResult.builder();
+
+                var literals = new ArrayList<Literal>();
+                literals.add(new ModalConstraint(modality, Concreteness.CANDIDATE, literal.getTarget())
+                                .call(CallPolarity.POSITIVE, countResult.rewrittenArguments()));
+                for (var variable : countResult.variablesToCount()) {
+                        literals.add(new ModalConstraint(modality, Concreteness.CANDIDATE, ReasoningAdapter.EXISTS_SYMBOL)
+                                        .call(variable));
+                }
+                builder.clause(literals);
+
+                var helperQuery = builder.build();
+                workList.addFirst(literal.getResultVariable().assign(helperQuery.count(countResult.helperArguments())));
+        }
+
+        private CountResult computeCountVariables(AbstractCountLiteral<?> literal, Concreteness concreteness,
+                                                                                          String name) {
+                var target = literal.getTarget();
+                int arity = target.arity();
+                var parameters = target.getParameters();
+                var literalArguments = literal.getArguments();
+                var privateVariables = literal.getPrivateVariables(positiveVariables);
+                var builder = Dnf.builder("%s#%s#%s".formatted(target.name(), concreteness, name));
+                var rewrittenArguments = new ArrayList<Variable>(parameters.size());
+                var variablesToCount = new ArrayList<Variable>();
+                var helperArguments = new ArrayList<Variable>();
+                var literalToRewrittenArgumentMap = new HashMap<Variable, Variable>();
+                for (int i = 0; i < arity; i++) {
+                        var literalArgument = literalArguments.get(i);
+                        var parameter = parameters.get(i);
+                        var rewrittenArgument = literalToRewrittenArgumentMap.computeIfAbsent(literalArgument, key -> {
+                                helperArguments.add(key);
+                                var newArgument = builder.parameter(parameter);
+                                if (privateVariables.contains(key)) {
+                                        variablesToCount.add(newArgument);
+                                }
+                                return newArgument;
+                        });
+                        rewrittenArguments.add(rewrittenArgument);
+                }
+                return new CountResult(builder, rewrittenArguments, helperArguments, variablesToCount);
+        }
+
+        private void markAsDone(Literal literal) {
+                completedLiterals.add(literal);
+                positiveVariables.addAll(literal.getOutputVariables());
+        }
+
+        private void rewriteRecursively(AbstractCallLiteral callLiteral, Modality modality, Concreteness concreteness,
+                                                                        Dnf dnf) {
+                var liftedDnf = rewriter.getLifter().lift(modality, concreteness, dnf);
+                rewriteRecursively(callLiteral, liftedDnf);
+        }
+
+        private void rewriteRecursively(AbstractCallLiteral callLiteral, Dnf dnf) {
+                var rewrittenDnf = rewriter.rewrite(dnf);
+                var rewrittenLiteral = callLiteral.withTarget(rewrittenDnf);
+                markAsDone(rewrittenLiteral);
+        }
+
+        private void rewrite(AbstractCallLiteral callLiteral, Modality modality, Concreteness concreteness,
+                                                 PartialRelation partialRelation) {
+                var relationRewriter = rewriter.getRelationRewriter(partialRelation);
+                var literals = relationRewriter.rewriteLiteral(
+                                unmodifiablePositiveVariables, callLiteral, modality, concreteness);
+                int length = literals.size();
+                for (int i = length - 1; i >= 0; i--) {
+                        workList.addFirst(literals.get(i));
+                }
+        }
+
+        private record CountResult(DnfBuilder builder, List<Variable> rewrittenArguments, List<Variable> helperArguments,
+                                                           List<Variable> variablesToCount) {
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialQueryRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialQueryRewriter.java
new file mode 100644
index 00000000..79cba263
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialQueryRewriter.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.internal;
+
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.rewriter.AbstractRecursiveRewriter;
+import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter;
+import tools.refinery.store.reasoning.lifting.DnfLifter;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+
+import java.util.HashMap;
+import java.util.Map;
+
+class PartialQueryRewriter extends AbstractRecursiveRewriter {
+        private final DnfLifter lifter;
+        private final Map<PartialRelation, PartialRelationRewriter> relationRewriterMap = new HashMap<>();
+
+        PartialQueryRewriter(DnfLifter lifter) {
+                this.lifter = lifter;
+        }
+
+        DnfLifter getLifter() {
+                return lifter;
+        }
+
+        PartialRelationRewriter getRelationRewriter(PartialRelation partialRelation) {
+                var rewriter = relationRewriterMap.get(partialRelation);
+                if (rewriter == null) {
+                        throw new IllegalArgumentException("Do not know how to interpret partial relation: " + partialRelation);
+                }
+                return rewriter;
+        }
+
+        public void addRelationRewriter(PartialRelation partialRelation, PartialRelationRewriter interpreter) {
+                if (relationRewriterMap.put(partialRelation, interpreter) != null) {
+                        throw new IllegalArgumentException("Duplicate partial relation: " + partialRelation);
+                }
+        }
+
+        @Override
+        protected Dnf doRewrite(Dnf dnf) {
+                var builder = Dnf.builderFrom(dnf);
+                for (var clause : dnf.getClauses()) {
+                        var clauseRewriter = new PartialClauseRewriter(this);
+                        var rewrittenClauses = clauseRewriter.rewriteClause(clause);
+                        builder.clause(rewrittenClauses);
+                }
+                return builder.build();
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningAdapterImpl.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningAdapterImpl.java
index 1bd3ad2e..f91fdd07 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningAdapterImpl.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningAdapterImpl.java
@@ -5,20 +5,114 @@
  */
 package tools.refinery.store.reasoning.internal;
 
+import org.jetbrains.annotations.Nullable;
+import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.reasoning.ReasoningAdapter;
-import tools.refinery.store.reasoning.PartialInterpretation;
+import tools.refinery.store.reasoning.interpretation.AnyPartialInterpretation;
+import tools.refinery.store.reasoning.interpretation.PartialInterpretation;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.refinement.AnyPartialInterpretationRefiner;
+import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner;
+import tools.refinery.store.reasoning.refinement.StorageRefiner;
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
 import tools.refinery.store.reasoning.representation.PartialSymbol;
-import tools.refinery.store.query.dnf.Dnf;
-import tools.refinery.store.query.resultset.ResultSet;
+import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.tuple.Tuple;
+import tools.refinery.store.tuple.Tuple1;
 
-public class ReasoningAdapterImpl implements ReasoningAdapter {
+import java.util.HashMap;
+import java.util.Map;
+
+class ReasoningAdapterImpl implements ReasoningAdapter {
+        static final Symbol<Integer> NODE_COUNT_SYMBOL = Symbol.of("MODEL_SIZE", 0, Integer.class, 0);
         private final Model model;
         private final ReasoningStoreAdapterImpl storeAdapter;
+        private final Map<AnyPartialSymbol, AnyPartialInterpretation>[] partialInterpretations;
+        private final Map<AnyPartialSymbol, AnyPartialInterpretationRefiner> refiners;
+        private final StorageRefiner[] storageRefiners;
+        private final Interpretation<Integer> nodeCountInterpretation;
+        private final Interpretation<CardinalityInterval> countInterpretation;
 
         ReasoningAdapterImpl(Model model, ReasoningStoreAdapterImpl storeAdapter) {
                 this.model = model;
                 this.storeAdapter = storeAdapter;
+
+                int concretenessLength = Concreteness.values().length;
+                // Creation of a generic array.
+                @SuppressWarnings({"unchecked", "squid:S1905"})
+                var interpretationsArray = (Map<AnyPartialSymbol, AnyPartialInterpretation>[]) new Map[concretenessLength];
+                partialInterpretations = interpretationsArray;
+                createPartialInterpretations();
+
+                var refinerFactories = storeAdapter.getSymbolRefiners();
+                refiners = new HashMap<>(refinerFactories.size());
+                createRefiners();
+
+                storageRefiners = storeAdapter.createStorageRefiner(model);
+
+                nodeCountInterpretation = model.getInterpretation(NODE_COUNT_SYMBOL);
+                if (model.getStore().getSymbols().contains(MultiObjectTranslator.COUNT_STORAGE)) {
+                        countInterpretation = model.getInterpretation(MultiObjectTranslator.COUNT_STORAGE);
+                } else {
+                        countInterpretation = null;
+                }
+        }
+
+        private void createPartialInterpretations() {
+                var supportedInterpretations = storeAdapter.getSupportedInterpretations();
+                int concretenessLength = Concreteness.values().length;
+                var interpretationFactories = storeAdapter.getSymbolInterpreters();
+                for (int i = 0; i < concretenessLength; i++) {
+                        var concreteness = Concreteness.values()[i];
+                        if (supportedInterpretations.contains(concreteness)) {
+                                partialInterpretations[i] = new HashMap<>(interpretationFactories.size());
+                        }
+                }
+                // Create the partial interpretations in order so that factories may refer to interpretations of symbols
+                // preceding them in the ordered {@code interpretationFactories} map, e.g., for opposite interpretations.
+                for (var entry : interpretationFactories.entrySet()) {
+                        var partialSymbol = entry.getKey();
+                        var factory = entry.getValue();
+                        for (int i = 0; i < concretenessLength; i++) {
+                                if (partialInterpretations[i] != null) {
+                                        var concreteness = Concreteness.values()[i];
+                                        var interpretation = createPartialInterpretation(concreteness, factory, partialSymbol);
+                                        partialInterpretations[i].put(partialSymbol, interpretation);
+                                }
+                        }
+                }
+        }
+
+        private <A, C> PartialInterpretation<A, C> createPartialInterpretation(
+                        Concreteness concreteness, PartialInterpretation.Factory<A, C> interpreter, AnyPartialSymbol symbol) {
+                // The builder only allows well-typed assignment of interpreters to symbols.
+                @SuppressWarnings("unchecked")
+                var typedSymbol = (PartialSymbol<A, C>) symbol;
+                return interpreter.create(this, concreteness, typedSymbol);
+        }
+
+        private void createRefiners() {
+                var refinerFactories = storeAdapter.getSymbolRefiners();
+                // Create the partial interpretations refiners in order so that factories may refer to refiners of symbols
+                // preceding them in the ordered {@code interpretationFactories} map, e.g., for opposite interpretations.
+                for (var entry : refinerFactories.entrySet()) {
+                        var partialSymbol = entry.getKey();
+                        var factory = entry.getValue();
+                        var refiner = createRefiner(factory, partialSymbol);
+                        refiners.put(partialSymbol, refiner);
+                }
+        }
+
+        private <A, C> PartialInterpretationRefiner<A, C> createRefiner(
+                        PartialInterpretationRefiner.Factory<A, C> factory, AnyPartialSymbol symbol) {
+                // The builder only allows well-typed assignment of interpreters to symbols.
+                @SuppressWarnings("unchecked")
+                var typedSymbol = (PartialSymbol<A, C>) symbol;
+                return factory.create(this, typedSymbol);
         }
 
         @Override
@@ -32,12 +126,82 @@ public class ReasoningAdapterImpl implements ReasoningAdapter {
         }
 
         @Override
-        public <A, C> PartialInterpretation<A, C> getPartialInterpretation(PartialSymbol<A, C> partialSymbol) {
-                return null;
+        public <A, C> PartialInterpretation<A, C> getPartialInterpretation(Concreteness concreteness,
+                                                                                                                                           PartialSymbol<A, C> partialSymbol) {
+                var map = partialInterpretations[concreteness.ordinal()];
+                if (map == null) {
+                        throw new IllegalArgumentException("No interpretation for concreteness: " + concreteness);
+                }
+                var interpretation = map.get(partialSymbol);
+                if (interpretation == null) {
+                        throw new IllegalArgumentException("No interpretation for partial symbol: " + partialSymbol);
+                }
+                // The builder only allows well-typed assignment of interpreters to symbols.
+                @SuppressWarnings("unchecked")
+                var typedInterpretation = (PartialInterpretation<A, C>) interpretation;
+                return typedInterpretation;
+        }
+
+        @Override
+        public <A, C> PartialInterpretationRefiner<A, C> getRefiner(PartialSymbol<A, C> partialSymbol) {
+                var refiner = refiners.get(partialSymbol);
+                if (refiner == null) {
+                        throw new IllegalArgumentException("No refiner for partial symbol: " + partialSymbol);
+                }
+                // The builder only allows well-typed assignment of refiners to symbols.
+                @SuppressWarnings("unchecked")
+                var typedRefiner = (PartialInterpretationRefiner<A, C>) refiner;
+                return typedRefiner;
+        }
+
+        @Override
+        @Nullable
+        public Tuple1 split(int parentNode) {
+                int newNodeId = nodeCountInterpretation.get(Tuple.of());
+                nodeCountInterpretation.put(Tuple.of(), newNodeId + 1);
+                // Avoid creating an iterator object.
+                //noinspection ForLoopReplaceableByForEach
+                for (int i = 0; i < storageRefiners.length; i++) {
+                        if (!storageRefiners[i].split(parentNode, newNodeId)) {
+                                return null;
+                        }
+                }
+                return Tuple.of(newNodeId);
+        }
+
+        @Override
+        public @Nullable Tuple1 focus(int parentObject) {
+                if (countInterpretation == null) {
+                        throw new IllegalStateException("Cannot focus without " + MultiObjectTranslator.class.getSimpleName());
+                }
+                var tuple = Tuple.of(parentObject);
+                var count = countInterpretation.get(tuple);
+                if (CardinalityIntervals.ONE.equals(count)) {
+                        return tuple;
+                }
+                if (CardinalityIntervals.LONE.equals(count)) {
+                        countInterpretation.put(tuple, CardinalityIntervals.ONE);
+                        return tuple;
+                }
+                if (CardinalityIntervals.NONE.equals(count)) {
+                        return null;
+                }
+                return split(parentObject);
         }
 
         @Override
-        public ResultSet<Boolean> getLiftedResultSet(Dnf query) {
-                return null;
+        public boolean cleanup(int nodeToDelete) {
+                // Avoid creating an iterator object.
+                //noinspection ForLoopReplaceableByForEach
+                for (int i = 0; i < storageRefiners.length; i++) {
+                        if (!storageRefiners[i].cleanup(nodeToDelete)) {
+                                return false;
+                        }
+                }
+                int currentModelSize = nodeCountInterpretation.get(Tuple.of());
+                if (nodeToDelete == currentModelSize - 1) {
+                        nodeCountInterpretation.put(Tuple.of(), nodeToDelete);
+                }
+                return true;
         }
 }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java
index aa71496c..d2cd2eb0 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java
@@ -6,26 +6,166 @@
 package tools.refinery.store.reasoning.internal;
 
 import tools.refinery.store.adapter.AbstractModelAdapterBuilder;
+import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder;
+import tools.refinery.store.dse.transition.objectives.Objective;
+import tools.refinery.store.dse.transition.objectives.Objectives;
 import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.query.ModelQueryBuilder;
 import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.dnf.FunctionalQuery;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.dnf.RelationalQuery;
 import tools.refinery.store.reasoning.ReasoningBuilder;
+import tools.refinery.store.reasoning.interpretation.PartialInterpretation;
+import tools.refinery.store.reasoning.refinement.DefaultStorageRefiner;
+import tools.refinery.store.reasoning.translator.AnyPartialSymbolTranslator;
+import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
+import tools.refinery.store.reasoning.lifting.DnfLifter;
+import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner;
+import tools.refinery.store.reasoning.refinement.PartialModelInitializer;
+import tools.refinery.store.reasoning.refinement.StorageRefiner;
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
+import tools.refinery.store.representation.AnySymbol;
+import tools.refinery.store.representation.Symbol;
+
+import java.util.*;
 
 public class ReasoningBuilderImpl extends AbstractModelAdapterBuilder<ReasoningStoreAdapterImpl>
                 implements ReasoningBuilder {
+        private final DnfLifter lifter = new DnfLifter();
+        private final PartialQueryRewriter queryRewriter = new PartialQueryRewriter(lifter);
+        private Set<Concreteness> requiredInterpretations = Set.of(Concreteness.values());
+        private final Map<AnyPartialSymbol, AnyPartialSymbolTranslator> translators = new LinkedHashMap<>();
+        private final Map<AnyPartialSymbol, PartialInterpretation.Factory<?, ?>> symbolInterpreters =
+                        new LinkedHashMap<>();
+        private final Map<AnyPartialSymbol, PartialInterpretationRefiner.Factory<?, ?>> symbolRefiners =
+                        new LinkedHashMap<>();
+        private final Map<AnySymbol, StorageRefiner.Factory<?>> registeredStorageRefiners = new LinkedHashMap<>();
+        private final List<PartialModelInitializer> initializers = new ArrayList<>();
+        private final List<Objective> objectives = new ArrayList<>();
+
+        @Override
+        public ReasoningBuilder requiredInterpretations(Collection<Concreteness> requiredInterpretations) {
+                this.requiredInterpretations = Set.copyOf(requiredInterpretations);
+                return this;
+        }
+
+        @Override
+        public ReasoningBuilder partialSymbol(AnyPartialSymbolTranslator translator) {
+                var partialSymbol = translator.getPartialSymbol();
+                var oldConfiguration = translators.put(partialSymbol, translator);
+                if (oldConfiguration != null && oldConfiguration != translator) {
+                        throw new IllegalArgumentException("Duplicate configuration for symbol: " + partialSymbol);
+                }
+                return this;
+        }
+
         @Override
-        public ReasoningBuilder liftedQuery(Dnf liftedQuery) {
-                return null;
+        public <T> ReasoningBuilder storageRefiner(Symbol<T> symbol, StorageRefiner.Factory<T> refiner) {
+                checkNotConfigured();
+                if (registeredStorageRefiners.put(symbol, refiner) != null) {
+                        throw new IllegalArgumentException("Duplicate representation refiner for symbol: " + symbol);
+                }
+                return this;
+        }
+
+        @Override
+        public ReasoningBuilder initializer(PartialModelInitializer initializer) {
+                checkNotConfigured();
+                initializers.add(initializer);
+                return this;
         }
 
         @Override
-        public Dnf lift(Modality modality, Dnf query) {
+        public ReasoningBuilder objective(Objective objective) {
                 checkNotConfigured();
-                return null;
+                objectives.add(objective);
+                return this;
+        }
+
+        @Override
+        public <T> Query<T> lift(Modality modality, Concreteness concreteness, Query<T> query) {
+                return lifter.lift(modality, concreteness, query);
+        }
+
+        @Override
+        public RelationalQuery lift(Modality modality, Concreteness concreteness, RelationalQuery query) {
+                return lifter.lift(modality, concreteness, query);
+        }
+
+        @Override
+        public <T> FunctionalQuery<T> lift(Modality modality, Concreteness concreteness, FunctionalQuery<T> query) {
+                return lifter.lift(modality, concreteness, query);
+        }
+
+        @Override
+        public Dnf lift(Modality modality, Concreteness concreteness, Dnf dnf) {
+                return lifter.lift(modality, concreteness, dnf);
+        }
+
+        @Override
+        protected void doConfigure(ModelStoreBuilder storeBuilder) {
+                storeBuilder.symbols(ReasoningAdapterImpl.NODE_COUNT_SYMBOL);
+                for (var translator : translators.values()) {
+                        translator.configure(storeBuilder);
+                        if (translator instanceof PartialRelationTranslator relationConfiguration) {
+                                doConfigure(storeBuilder, relationConfiguration);
+                        } else {
+                                throw new IllegalArgumentException("Unknown partial symbol translator %s for partial symbol %s"
+                                                .formatted(translator, translator.getPartialSymbol()));
+                        }
+                }
+                storeBuilder.symbols(registeredStorageRefiners.keySet());
+                var queryBuilder = storeBuilder.getAdapter(ModelQueryBuilder.class);
+                queryBuilder.rewriter(queryRewriter);
+                if (!objectives.isEmpty()) {
+                        storeBuilder.tryGetAdapter(DesignSpaceExplorationBuilder.class)
+                                        .ifPresent(dseBuilder -> dseBuilder.objective(Objectives.sum(objectives)));
+                }
+        }
+
+        private void doConfigure(ModelStoreBuilder storeBuilder, PartialRelationTranslator relationConfiguration) {
+                var partialRelation = relationConfiguration.getPartialRelation();
+                queryRewriter.addRelationRewriter(partialRelation, relationConfiguration.getRewriter());
+                var interpretationFactory = relationConfiguration.getInterpretationFactory();
+                interpretationFactory.configure(storeBuilder, requiredInterpretations);
+                symbolInterpreters.put(partialRelation, interpretationFactory);
+                var refiner = relationConfiguration.getInterpretationRefiner();
+                if (refiner != null) {
+                        symbolRefiners.put(partialRelation, refiner);
+                }
         }
 
         @Override
         public ReasoningStoreAdapterImpl doBuild(ModelStore store) {
-                return null;
+                return new ReasoningStoreAdapterImpl(store, requiredInterpretations,
+                                Collections.unmodifiableMap(symbolInterpreters), Collections.unmodifiableMap(symbolRefiners),
+                                getStorageRefiners(store), Collections.unmodifiableList(initializers));
+        }
+
+        private Map<AnySymbol, StorageRefiner.Factory<?>> getStorageRefiners(ModelStore store) {
+                var symbols = store.getSymbols();
+                var storageRefiners = new LinkedHashMap<AnySymbol, StorageRefiner.Factory<?>>(symbols.size());
+                for (var symbol : symbols) {
+                        var refiner = registeredStorageRefiners.remove(symbol);
+                        if (refiner == null) {
+                                if (symbol.arity() == 0) {
+                                        // Arity-0 symbols don't need a default refiner, because they are unaffected by object
+                                        // creation/removal. Only a custom refiner ({@code refiner != null}) might need to update them.
+                                        continue;
+                                }
+                                // By default, copy over all affected tuples on object creation and remove all affected tuples on
+                                // object removal.
+                                refiner = DefaultStorageRefiner.factory();
+                        }
+                        storageRefiners.put(symbol, refiner);
+                }
+                if (!registeredStorageRefiners.isEmpty()) {
+                        throw new IllegalArgumentException("Unused storage refiners: " + registeredStorageRefiners.keySet());
+                }
+                return Collections.unmodifiableMap(storageRefiners);
         }
 }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningStoreAdapterImpl.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningStoreAdapterImpl.java
index cdddd8d6..8eb5a034 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningStoreAdapterImpl.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningStoreAdapterImpl.java
@@ -5,19 +5,45 @@
  */
 package tools.refinery.store.reasoning.internal;
 
-import tools.refinery.store.reasoning.ReasoningStoreAdapter;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.ModelQueryAdapter;
+import tools.refinery.store.reasoning.ReasoningStoreAdapter;
+import tools.refinery.store.reasoning.interpretation.PartialInterpretation;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner;
+import tools.refinery.store.reasoning.refinement.PartialModelInitializer;
+import tools.refinery.store.reasoning.refinement.StorageRefiner;
 import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+import tools.refinery.store.representation.AnySymbol;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
-public class ReasoningStoreAdapterImpl implements ReasoningStoreAdapter {
+class ReasoningStoreAdapterImpl implements ReasoningStoreAdapter {
         private final ModelStore store;
+        private final Set<Concreteness> supportedInterpretations;
+        private final Map<AnyPartialSymbol, PartialInterpretation.Factory<?, ?>> symbolInterpreters;
+        private final Map<AnyPartialSymbol, PartialInterpretationRefiner.Factory<?, ?>> symbolRefiners;
+        private final Map<AnySymbol, StorageRefiner.Factory<?>> storageRefiners;
+        private final List<PartialModelInitializer> initializers;
 
-        ReasoningStoreAdapterImpl(ModelStore store) {
+        ReasoningStoreAdapterImpl(ModelStore store, Set<Concreteness> supportedInterpretations,
+                                                          Map<AnyPartialSymbol, PartialInterpretation.Factory<?, ?>> symbolInterpreters,
+                                                          Map<AnyPartialSymbol, PartialInterpretationRefiner.Factory<?, ?>> symbolRefiners,
+                                                          Map<AnySymbol, StorageRefiner.Factory<?>> storageRefiners,
+                                                          List<PartialModelInitializer> initializers) {
                 this.store = store;
+                this.supportedInterpretations = supportedInterpretations;
+                this.symbolInterpreters = symbolInterpreters;
+                this.symbolRefiners = symbolRefiners;
+                this.storageRefiners = storageRefiners;
+                this.initializers = initializers;
         }
 
         @Override
@@ -26,13 +52,59 @@ public class ReasoningStoreAdapterImpl implements ReasoningStoreAdapter {
         }
 
         @Override
+        public Set<Concreteness> getSupportedInterpretations() {
+                return supportedInterpretations;
+        }
+
+        @Override
         public Collection<AnyPartialSymbol> getPartialSymbols() {
-                return null;
+                return symbolInterpreters.keySet();
         }
 
         @Override
-        public Collection<Dnf> getLiftedQueries() {
-                return null;
+        public Collection<AnyPartialSymbol> getRefinablePartialSymbols() {
+                return symbolRefiners.keySet();
+        }
+
+        // Use of wildcard return value only in internal method not exposed as API, so there is less chance of confusion.
+        @SuppressWarnings("squid:S1452")
+        Map<AnyPartialSymbol, PartialInterpretation.Factory<?, ?>> getSymbolInterpreters() {
+                return symbolInterpreters;
+        }
+
+        // Use of wildcard return value only in internal method not exposed as API, so there is less chance of confusion.
+        @SuppressWarnings("squid:S1452")
+        Map<AnyPartialSymbol, PartialInterpretationRefiner.Factory<?, ?>> getSymbolRefiners() {
+                return symbolRefiners;
+        }
+
+        StorageRefiner[] createStorageRefiner(Model model) {
+                var refiners = new StorageRefiner[storageRefiners.size()];
+                int i = 0;
+                for (var entry : storageRefiners.entrySet()) {
+                        var symbol = entry.getKey();
+                        var factory = entry.getValue();
+                        refiners[i] = createStorageRefiner(factory, model, symbol);
+                        i++;
+                }
+                return refiners;
+        }
+
+        private <T> StorageRefiner createStorageRefiner(StorageRefiner.Factory<T> factory, Model model, AnySymbol symbol) {
+                // The builder only allows well-typed assignment of refiners to symbols.
+                @SuppressWarnings("unchecked")
+                var typedSymbol = (Symbol<T>) symbol;
+                return factory.create(typedSymbol, model);
+        }
+
+        public Model createInitialModel(ModelSeed modelSeed) {
+                var model = store.createEmptyModel();
+                model.getInterpretation(ReasoningAdapterImpl.NODE_COUNT_SYMBOL).put(Tuple.of(), modelSeed.getNodeCount());
+                for (var initializer : initializers) {
+                        initializer.initialize(model, modelSeed);
+                }
+                model.getAdapter(ModelQueryAdapter.class).flushChanges();
+                return model;
         }
 
         @Override
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/AbstractPartialInterpretation.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/AbstractPartialInterpretation.java
new file mode 100644
index 00000000..ed291eac
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/AbstractPartialInterpretation.java
@@ -0,0 +1,38 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.interpretation;
+
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+
+public abstract class AbstractPartialInterpretation<A, C> implements PartialInterpretation<A, C> {
+        private final ReasoningAdapter adapter;
+        private final PartialSymbol<A, C> partialSymbol;
+        private final Concreteness concreteness;
+
+        protected AbstractPartialInterpretation(ReasoningAdapter adapter, Concreteness concreteness,
+                                                                                        PartialSymbol<A, C> partialSymbol) {
+                this.adapter = adapter;
+                this.partialSymbol = partialSymbol;
+                this.concreteness = concreteness;
+        }
+
+        @Override
+        public ReasoningAdapter getAdapter() {
+                return adapter;
+        }
+
+        @Override
+        public PartialSymbol<A, C> getPartialSymbol() {
+                return partialSymbol;
+        }
+
+        @Override
+        public Concreteness getConcreteness() {
+                return concreteness;
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/AnyPartialInterpretation.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/AnyPartialInterpretation.java
index 000171a1..cd709bc4 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/AnyPartialInterpretation.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/AnyPartialInterpretation.java
@@ -3,8 +3,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.reasoning;
+package tools.refinery.store.reasoning.interpretation;
 
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
 
 public sealed interface AnyPartialInterpretation permits PartialInterpretation {
@@ -12,7 +14,5 @@ public sealed interface AnyPartialInterpretation permits PartialInterpretation {
 
         AnyPartialSymbol getPartialSymbol();
 
-        int countUnfinished();
-
-        int countErrors();
+        Concreteness getConcreteness();
 }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialInterpretation.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialInterpretation.java
new file mode 100644
index 00000000..86ffe751
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialInterpretation.java
@@ -0,0 +1,34 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.interpretation;
+
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.Set;
+
+public non-sealed interface PartialInterpretation<A, C> extends AnyPartialInterpretation {
+        @Override
+        PartialSymbol<A, C> getPartialSymbol();
+
+        A get(Tuple key);
+
+        Cursor<Tuple, A> getAll();
+
+        @FunctionalInterface
+        interface Factory<A, C> {
+                PartialInterpretation<A, C> create(ReasoningAdapter adapter, Concreteness concreteness,
+                                                                                   PartialSymbol<A, C> partialSymbol);
+
+                default void configure(ModelStoreBuilder storeBuilder, Set<Concreteness> requiredInterpretations) {
+                        // Nothing to configure by default.
+                }
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialRelationRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialRelationRewriter.java
new file mode 100644
index 00000000..6ad35c20
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialRelationRewriter.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.interpretation;
+
+import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.literal.Modality;
+
+import java.util.List;
+import java.util.Set;
+
+@FunctionalInterface
+public interface PartialRelationRewriter {
+        List<Literal> rewriteLiteral(Set<Variable> positiveVariables, AbstractCallLiteral literal, Modality modality,
+                                                                 Concreteness concreteness);
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationInterpretationFactory.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationInterpretationFactory.java
new file mode 100644
index 00000000..5cdaa185
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationInterpretationFactory.java
@@ -0,0 +1,195 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.interpretation;
+
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.query.ModelQueryAdapter;
+import tools.refinery.store.query.ModelQueryBuilder;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.resultset.ResultSet;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.Set;
+
+public class QueryBasedRelationInterpretationFactory implements PartialInterpretation.Factory<TruthValue, Boolean> {
+        private final Query<Boolean> may;
+        private final Query<Boolean> must;
+        private final Query<Boolean> candidateMay;
+        private final Query<Boolean> candidateMust;
+
+        public QueryBasedRelationInterpretationFactory(
+                        Query<Boolean> may, Query<Boolean> must, Query<Boolean> candidateMay, Query<Boolean> candidateMust) {
+                this.may = may;
+                this.must = must;
+                this.candidateMay = candidateMay;
+                this.candidateMust = candidateMust;
+        }
+
+        @Override
+        public PartialInterpretation<TruthValue, Boolean> create(
+                        ReasoningAdapter adapter, Concreteness concreteness, PartialSymbol<TruthValue, Boolean> partialSymbol) {
+                var queryEngine = adapter.getModel().getAdapter(ModelQueryAdapter.class);
+                ResultSet<Boolean> mayResultSet;
+                ResultSet<Boolean> mustResultSet;
+                switch (concreteness) {
+                case PARTIAL -> {
+                        mayResultSet = queryEngine.getResultSet(may);
+                        mustResultSet = queryEngine.getResultSet(must);
+                }
+                case CANDIDATE -> {
+                        mayResultSet = queryEngine.getResultSet(candidateMay);
+                        mustResultSet = queryEngine.getResultSet(candidateMust);
+                }
+                default -> throw new IllegalArgumentException("Unknown concreteness: " + concreteness);
+                }
+                if (mayResultSet.equals(mustResultSet)) {
+                        return new TwoValuedInterpretation(adapter, concreteness, partialSymbol, mustResultSet);
+                } else {
+                        return new FourValuedInterpretation(
+                                        adapter, concreteness, partialSymbol, mayResultSet, mustResultSet);
+                }
+        }
+
+        @Override
+        public void configure(ModelStoreBuilder storeBuilder, Set<Concreteness> requiredInterpretations) {
+                var queryBuilder = storeBuilder.getAdapter(ModelQueryBuilder.class);
+                if (requiredInterpretations.contains(Concreteness.PARTIAL)) {
+                        queryBuilder.queries(may, must);
+                }
+                if (requiredInterpretations.contains(Concreteness.CANDIDATE)) {
+                        queryBuilder.queries(candidateMay, candidateMust);
+                }
+        }
+
+        private static class TwoValuedInterpretation extends AbstractPartialInterpretation<TruthValue, Boolean> {
+                private final ResultSet<Boolean> resultSet;
+
+                protected TwoValuedInterpretation(
+                                ReasoningAdapter adapter, Concreteness concreteness, PartialSymbol<TruthValue, Boolean> partialSymbol,
+                                ResultSet<Boolean> resultSet) {
+                        super(adapter, concreteness, partialSymbol);
+                        this.resultSet = resultSet;
+                }
+
+                @Override
+                public TruthValue get(Tuple key) {
+                        return TruthValue.toTruthValue(resultSet.get(key));
+                }
+
+                @Override
+                public Cursor<Tuple, TruthValue> getAll() {
+                        return new TwoValuedCursor(resultSet.getAll());
+                }
+
+                private record TwoValuedCursor(Cursor<Tuple, Boolean> cursor) implements Cursor<Tuple, TruthValue> {
+                        @Override
+                        public Tuple getKey() {
+                                return cursor.getKey();
+                        }
+
+                        @Override
+                        public TruthValue getValue() {
+                                return TruthValue.toTruthValue(cursor.getValue());
+                        }
+
+                        @Override
+                        public boolean isTerminated() {
+                                return cursor.isTerminated();
+                        }
+
+                        @Override
+                        public boolean move() {
+                                return cursor.move();
+                        }
+                }
+        }
+
+        private static class FourValuedInterpretation extends AbstractPartialInterpretation<TruthValue, Boolean> {
+                private final ResultSet<Boolean> mayResultSet;
+                private final ResultSet<Boolean> mustResultSet;
+
+                public FourValuedInterpretation(
+                                ReasoningAdapter adapter, Concreteness concreteness, PartialSymbol<TruthValue, Boolean> partialSymbol,
+                                ResultSet<Boolean> mayResultSet, ResultSet<Boolean> mustResultSet) {
+                        super(adapter, concreteness, partialSymbol);
+                        this.mayResultSet = mayResultSet;
+                        this.mustResultSet = mustResultSet;
+                }
+
+                @Override
+                public TruthValue get(Tuple key) {
+                        boolean isMay = mayResultSet.get(key);
+                        boolean isMust = mustResultSet.get(key);
+                        if (isMust) {
+                                return isMay ? TruthValue.TRUE : TruthValue.ERROR;
+                        } else {
+                                return isMay ? TruthValue.UNKNOWN : TruthValue.FALSE;
+                        }
+                }
+
+                @Override
+                public Cursor<Tuple, TruthValue> getAll() {
+                        return new FourValuedCursor();
+                }
+
+                private final class FourValuedCursor implements Cursor<Tuple, TruthValue> {
+                        private final Cursor<Tuple, Boolean> mayCursor;
+                        private Cursor<Tuple, Boolean> mustCursor;
+
+                        private FourValuedCursor() {
+                                this.mayCursor = mayResultSet.getAll();
+                        }
+
+                        @Override
+                        public Tuple getKey() {
+                                return mustCursor == null ? mayCursor.getKey() : mustCursor.getKey();
+                        }
+
+                        @Override
+                        public TruthValue getValue() {
+                                if (mustCursor != null) {
+                                        return TruthValue.ERROR;
+                                }
+                                if (Boolean.TRUE.equals(mustResultSet.get(mayCursor.getKey()))) {
+                                        return TruthValue.TRUE;
+                                }
+                                return TruthValue.UNKNOWN;
+                        }
+
+                        @Override
+                        public boolean isTerminated() {
+                                return mustCursor != null && mustCursor.isTerminated();
+                        }
+
+                        @Override
+                        public boolean move() {
+                                if (mayCursor.isTerminated()) {
+                                        return moveMust();
+                                }
+                                if (mayCursor.move()) {
+                                        return true;
+                                }
+                                mustCursor = mustResultSet.getAll();
+                                return moveMust();
+                        }
+
+                        private boolean moveMust() {
+                                while (mustCursor.move()) {
+                                        // We already iterated over {@code TRUE} truth values with {@code mayCursor}.
+                                        if (!Boolean.TRUE.equals(mayResultSet.get(mustCursor.getKey()))) {
+                                                return true;
+                                        }
+                                }
+                                return false;
+                        }
+                }
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java
new file mode 100644
index 00000000..78fdbb89
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java
@@ -0,0 +1,63 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.interpretation;
+
+import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.literal.Modality;
+
+import java.util.List;
+import java.util.Set;
+
+public class QueryBasedRelationRewriter implements PartialRelationRewriter {
+        private final RelationalQuery may;
+        private final RelationalQuery must;
+        private final RelationalQuery candidateMay;
+        private final RelationalQuery candidateMust;
+
+        public QueryBasedRelationRewriter(RelationalQuery may, RelationalQuery must, RelationalQuery candidateMay,
+                                                                          RelationalQuery candidateMust) {
+                this.may = may;
+                this.must = must;
+                this.candidateMay = candidateMay;
+                this.candidateMust = candidateMust;
+        }
+
+        public RelationalQuery getMay() {
+                return may;
+        }
+
+        public RelationalQuery getMust() {
+                return must;
+        }
+
+        public RelationalQuery getCandidateMay() {
+                return candidateMay;
+        }
+
+        public RelationalQuery getCandidateMust() {
+                return candidateMust;
+        }
+
+        @Override
+        public List<Literal> rewriteLiteral(Set<Variable> positiveVariables, AbstractCallLiteral literal,
+                                                                                Modality modality, Concreteness concreteness) {
+                var query = switch (concreteness) {
+                        case PARTIAL -> switch (modality) {
+                                case MAY -> may;
+                                case MUST -> must;
+                        };
+                        case CANDIDATE -> switch (modality) {
+                                case MAY -> candidateMay;
+                                case MUST -> candidateMust;
+                        };
+                };
+                return List.of(literal.withTarget(query.getDnf()));
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ClauseLifter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ClauseLifter.java
new file mode 100644
index 00000000..17916c02
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ClauseLifter.java
@@ -0,0 +1,182 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.lifting;
+
+import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.dnf.DnfClause;
+import tools.refinery.store.query.literal.*;
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.literal.ModalConstraint;
+import tools.refinery.store.reasoning.literal.Modality;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+class ClauseLifter {
+        private final Modality modality;
+        private final Concreteness concreteness;
+        private final DnfClause clause;
+        private final Set<NodeVariable> quantifiedVariables;
+        private final Set<NodeVariable> existentialQuantifiersToAdd;
+
+        public ClauseLifter(Modality modality, Concreteness concreteness, Dnf dnf, DnfClause clause) {
+                this.modality = modality;
+                this.concreteness = concreteness;
+                this.clause = clause;
+                quantifiedVariables = getQuantifiedNodeVariables(dnf, clause);
+                existentialQuantifiersToAdd = new LinkedHashSet<>(quantifiedVariables);
+        }
+
+        private static Set<NodeVariable> getQuantifiedNodeVariables(Dnf dnf, DnfClause clause) {
+                var quantifiedVariables = clause.positiveVariables().stream()
+                                .filter(Variable::isNodeVariable)
+                                .map(Variable::asNodeVariable)
+                                .collect(Collectors.toCollection(LinkedHashSet::new));
+                for (var symbolicParameter : dnf.getSymbolicParameters()) {
+                        if (symbolicParameter.getVariable() instanceof NodeVariable nodeParameter) {
+                                quantifiedVariables.remove(nodeParameter);
+                        }
+                }
+                return Collections.unmodifiableSet(quantifiedVariables);
+        }
+
+        public List<Literal> liftClause() {
+                var liftedLiterals = new ArrayList<Literal>();
+                for (var literal : clause.literals()) {
+                        var liftedLiteral = liftLiteral(literal);
+                        liftedLiterals.add(liftedLiteral);
+                }
+                var existsConstraint = ModalConstraint.of(modality, concreteness, ReasoningAdapter.EXISTS_SYMBOL);
+                for (var quantifiedVariable : existentialQuantifiersToAdd) {
+                        liftedLiterals.add(existsConstraint.call(quantifiedVariable));
+                }
+                return liftedLiterals;
+        }
+
+        private Literal liftLiteral(Literal literal) {
+                if (literal instanceof CallLiteral callLiteral) {
+                        return liftCallLiteral(callLiteral);
+                } else if (literal instanceof EquivalenceLiteral equivalenceLiteral) {
+                        return liftEquivalenceLiteral(equivalenceLiteral);
+                } else if (literal instanceof ConstantLiteral ||
+                                literal instanceof AssignLiteral<?> ||
+                                literal instanceof CheckLiteral) {
+                        return literal;
+                } else if (literal instanceof AbstractCountLiteral<?>) {
+                        throw new IllegalArgumentException("Count literal %s cannot be lifted".formatted(literal));
+                } else if (literal instanceof AggregationLiteral<?, ?>) {
+                        throw new IllegalArgumentException("Aggregation literal %s cannot be lifted".formatted(literal));
+                } else if (literal instanceof RepresentativeElectionLiteral) {
+                        throw new IllegalArgumentException("SCC literal %s cannot be lifted".formatted(literal));
+                } else {
+                        throw new IllegalArgumentException("Unknown literal to lift: " + literal);
+                }
+        }
+
+        private Literal liftCallLiteral(CallLiteral callLiteral) {
+                var polarity = callLiteral.getPolarity();
+                return switch (polarity) {
+                        case POSITIVE -> {
+                                Constraint target = callLiteral.getTarget();
+                                var arguments = callLiteral.getArguments();
+                                yield ModalConstraint.of(modality, concreteness, target).call(CallPolarity.POSITIVE, arguments);
+                        }
+                        case NEGATIVE -> callNegationHelper(callLiteral);
+                        case TRANSITIVE -> callTransitiveHelper(callLiteral);
+                };
+        }
+
+        private Literal callNegationHelper(CallLiteral callLiteral) {
+                var target = callLiteral.getTarget();
+                var originalArguments = callLiteral.getArguments();
+                var negatedModality = modality.negate();
+                var privateVariables = callLiteral.getPrivateVariables(clause.positiveVariables());
+                if (privateVariables.isEmpty()) {
+                        // If there is no universal quantification, we may directly call the original Dnf.
+                        return ModalConstraint.of(negatedModality, concreteness, target)
+                                        .call(CallPolarity.NEGATIVE, originalArguments);
+                }
+
+                var builder = Dnf.builder("%s#negation#%s#%s#%s"
+                                .formatted(target.name(), modality, concreteness, privateVariables));
+                var uniqueOriginalArguments = List.copyOf(new LinkedHashSet<>(originalArguments));
+
+                var alwaysInputVariables = callLiteral.getInputVariables(Set.of());
+                for (var variable : uniqueOriginalArguments) {
+                        var direction = alwaysInputVariables.contains(variable) ? ParameterDirection.IN : ParameterDirection.OUT;
+                        builder.parameter(variable, direction);
+                }
+
+                var literals = new ArrayList<Literal>();
+                var liftedConstraint = ModalConstraint.of(negatedModality, concreteness, target);
+                literals.add(liftedConstraint.call(CallPolarity.POSITIVE, originalArguments));
+
+                var existsConstraint = ModalConstraint.of(negatedModality, concreteness, ReasoningAdapter.EXISTS_SYMBOL);
+                for (var variable : uniqueOriginalArguments) {
+                        if (privateVariables.contains(variable)) {
+                                literals.add(existsConstraint.call(variable));
+                        }
+                }
+
+                builder.clause(literals);
+                var liftedTarget = builder.build();
+                return liftedTarget.call(CallPolarity.NEGATIVE, uniqueOriginalArguments);
+        }
+
+        private Literal callTransitiveHelper(CallLiteral callLiteral) {
+                var target = callLiteral.getTarget();
+                var originalArguments = callLiteral.getArguments();
+                var liftedTarget = ModalConstraint.of(modality, concreteness, target);
+
+                var existsConstraint = ModalConstraint.of(modality, concreteness, ReasoningAdapter.EXISTS_SYMBOL);
+                var existingEndHelperName = "%s#exisitingEnd#%s#%s".formatted(target.name(), modality, concreteness);
+                var existingEndHelper = Dnf.of(existingEndHelperName, builder -> {
+                        var start = builder.parameter("start");
+                        var end = builder.parameter("end");
+                        builder.clause(
+                                        liftedTarget.call(start, end),
+                                        existsConstraint.call(end)
+                        );
+                });
+
+                // The start and end of a transitive path is always a node.
+                var pathEnd = (NodeVariable) originalArguments.get(1);
+                if (quantifiedVariables.contains(pathEnd)) {
+                        // The end of the path needs existential quantification anyway, so we don't need a second helper.
+                        // We replace the call to EXISTS with the transitive path call.
+                        existentialQuantifiersToAdd.remove(pathEnd);
+                        return existingEndHelper.call(CallPolarity.TRANSITIVE, originalArguments);
+                }
+
+                var transitiveHelperName = "%s#transitive#%s#%s".formatted(target.name(), modality, concreteness);
+                var transitiveHelper = Dnf.of(transitiveHelperName, builder -> {
+                        var start = builder.parameter("start");
+                        var end = builder.parameter("end");
+                        // Make sure the end of the path is not existentially quantified.
+                        builder.clause(liftedTarget.call(start, end));
+                        builder.clause(middle -> List.of(
+                                        existingEndHelper.callTransitive(start, middle),
+                                        liftedTarget.call(middle, end)
+                        ));
+                });
+
+                return transitiveHelper.call(CallPolarity.POSITIVE, originalArguments);
+        }
+
+        private Literal liftEquivalenceLiteral(EquivalenceLiteral equivalenceLiteral) {
+                if (equivalenceLiteral.isPositive()) {
+                        return ModalConstraint.of(modality, concreteness, ReasoningAdapter.EQUALS_SYMBOL)
+                                        .call(CallPolarity.POSITIVE, equivalenceLiteral.getLeft(), equivalenceLiteral.getRight());
+                }
+                return ModalConstraint.of(modality.negate(), concreteness, ReasoningAdapter.EQUALS_SYMBOL)
+                                .call(CallPolarity.NEGATIVE, equivalenceLiteral.getLeft(), equivalenceLiteral.getRight());
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/DnfLifter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/DnfLifter.java
index ac41d170..889f595f 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/DnfLifter.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/DnfLifter.java
@@ -5,124 +5,68 @@
  */
 package tools.refinery.store.reasoning.lifting;
 
-import org.jetbrains.annotations.Nullable;
-import tools.refinery.store.query.dnf.Dnf;
-import tools.refinery.store.query.dnf.DnfBuilder;
-import tools.refinery.store.query.dnf.DnfClause;
-import tools.refinery.store.query.literal.CallLiteral;
-import tools.refinery.store.query.literal.CallPolarity;
+import tools.refinery.store.query.dnf.*;
+import tools.refinery.store.query.equality.DnfEqualityChecker;
 import tools.refinery.store.query.literal.Literal;
-import tools.refinery.store.query.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.reasoning.ReasoningAdapter;
-import tools.refinery.store.reasoning.literal.ModalConstraint;
+import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.literal.Modality;
-import tools.refinery.store.reasoning.literal.PartialLiterals;
-import tools.refinery.store.util.CycleDetectingMapper;
 
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class DnfLifter {
-        private final CycleDetectingMapper<ModalDnf, Dnf> mapper = new CycleDetectingMapper<>(ModalDnf::toString,
-                        this::doLift);
+        private final Map<ModalDnf, Dnf> cache = new HashMap<>();
 
-        public Dnf lift(Modality modality, Dnf query) {
-                return mapper.map(new ModalDnf(modality, query));
+        public <T> Query<T> lift(Modality modality, Concreteness concreteness, Query<T> query) {
+                var liftedDnf = lift(modality, concreteness, query.getDnf());
+                return query.withDnf(liftedDnf);
+        }
+
+        public RelationalQuery lift(Modality modality, Concreteness concreteness, RelationalQuery query) {
+                var liftedDnf = lift(modality, concreteness, query.getDnf());
+                return query.withDnf(liftedDnf);
+        }
+
+        public <T> FunctionalQuery<T> lift(Modality modality, Concreteness concreteness, FunctionalQuery<T> query) {
+                var liftedDnf = lift(modality, concreteness, query.getDnf());
+                return query.withDnf(liftedDnf);
+        }
+
+        public Dnf lift(Modality modality, Concreteness concreteness, Dnf dnf) {
+                return cache.computeIfAbsent(new ModalDnf(modality, concreteness, dnf), this::doLift);
         }
 
         private Dnf doLift(ModalDnf modalDnf) {
                 var modality = modalDnf.modality();
+                var concreteness = modalDnf.concreteness();
                 var dnf = modalDnf.dnf();
-                var builder = Dnf.builder();
+                var builder = Dnf.builder(decorateName(dnf.name(), modality, concreteness));
                 builder.symbolicParameters(dnf.getSymbolicParameters());
-                boolean changed = false;
+                builder.functionalDependencies(dnf.getFunctionalDependencies());
                 for (var clause : dnf.getClauses()) {
-                        if (liftClause(modality, dnf, clause, builder)) {
-                                changed = true;
-                        }
+                        builder.clause(liftClause(modality, concreteness, dnf, clause));
                 }
-                if (changed) {
-                        return builder.build();
+                var liftedDnf = builder.build();
+                if (dnf.equalsWithSubstitution(DnfEqualityChecker.DEFAULT, liftedDnf)) {
+                        return dnf;
                 }
-                return dnf;
+                return liftedDnf;
         }
 
-        private boolean liftClause(Modality modality, Dnf originalDnf, DnfClause clause, DnfBuilder builder) {
-                boolean changed = false;
-                var quantifiedVariables = getQuantifiedDataVariables(originalDnf, clause);
-                var literals = clause.literals();
-                var liftedLiterals = new ArrayList<Literal>(literals.size());
-                for (var literal : literals) {
-                        Literal liftedLiteral = liftLiteral(modality, literal);
-                        if (liftedLiteral == null) {
-                                liftedLiteral = literal;
-                        } else {
-                                changed = true;
-                        }
-                        liftedLiterals.add(liftedLiteral);
-                        var variable = isExistsLiteralForVariable(modality, liftedLiteral);
-                        if (variable != null) {
-                                // If we already quantify over the existence of the variable with the expected modality,
-                                // we don't need to insert quantification manually.
-                                quantifiedVariables.remove(variable);
-                        }
-                }
-                for (var quantifiedVariable : quantifiedVariables) {
-                        // Quantify over data variables that are not already quantified with the expected modality.
-                        liftedLiterals.add(new CallLiteral(CallPolarity.POSITIVE,
-                                        new ModalConstraint(modality, ReasoningAdapter.EXISTS), List.of(quantifiedVariable)));
-                }
-                builder.clause(liftedLiterals);
-                return changed || !quantifiedVariables.isEmpty();
-        }
-
-        private static LinkedHashSet<Variable> getQuantifiedDataVariables(Dnf originalDnf, DnfClause clause) {
-                var quantifiedVariables = new LinkedHashSet<>(clause.positiveVariables());
-                for (var symbolicParameter : originalDnf.getSymbolicParameters()) {
-                        // The existence of parameters will be checked outside this DNF.
-                        quantifiedVariables.remove(symbolicParameter.getVariable());
-                }
-                quantifiedVariables.removeIf(variable -> !(variable instanceof NodeVariable));
-                return quantifiedVariables;
+        private List<Literal> liftClause(Modality modality, Concreteness concreteness, Dnf dnf, DnfClause clause) {
+                var lifter = new ClauseLifter(modality, concreteness, dnf, clause);
+                return lifter.liftClause();
         }
 
-        @Nullable
-        private Variable isExistsLiteralForVariable(Modality modality, Literal literal) {
-                if (literal instanceof CallLiteral callLiteral &&
-                                callLiteral.getPolarity() == CallPolarity.POSITIVE &&
-                                callLiteral.getTarget() instanceof ModalConstraint modalConstraint &&
-                                modalConstraint.modality() == modality &&
-                                modalConstraint.constraint().equals(ReasoningAdapter.EXISTS)) {
-                        return callLiteral.getArguments().get(0);
+        private record ModalDnf(Modality modality, Concreteness concreteness, Dnf dnf) {
+                @Override
+                public String toString() {
+                        return "%s %s %s".formatted(modality, concreteness, dnf.name());
                 }
-                return null;
         }
 
-        @Nullable
-        private Literal liftLiteral(Modality modality, Literal literal) {
-                if (!(literal instanceof CallLiteral callLiteral)) {
-                        return null;
-                }
-                var target = callLiteral.getTarget();
-                if (target instanceof ModalConstraint modalTarget) {
-                        var actualTarget = modalTarget.constraint();
-                        if (actualTarget instanceof Dnf dnf) {
-                                var targetModality = modalTarget.modality();
-                                var liftedTarget = lift(targetModality, dnf);
-                                return new CallLiteral(callLiteral.getPolarity(), liftedTarget, callLiteral.getArguments());
-                        }
-                        // No more lifting to be done, pass any modal call to a partial symbol through.
-                        return null;
-                } else if (target instanceof Dnf dnf) {
-                        var polarity = callLiteral.getPolarity();
-                        var liftedTarget = lift(modality.commute(polarity), dnf);
-                        // Use == instead of equals(), because lift will return the same object by reference is there are no
-                        // changes made during lifting.
-                        return liftedTarget == target ? null : new CallLiteral(polarity, liftedTarget, callLiteral.getArguments());
-                } else {
-                        return PartialLiterals.addModality(callLiteral, modality);
-                }
+        public static String decorateName(String name, Modality modality, Concreteness concreteness) {
+                return "%s#%s#%s".formatted(name, modality, concreteness);
         }
 }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ModalDnf.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ModalDnf.java
deleted file mode 100644
index 16fb8fbf..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ModalDnf.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning.lifting;
-
-import tools.refinery.store.query.dnf.Dnf;
-import tools.refinery.store.reasoning.literal.Modality;
-
-record ModalDnf(Modality modality, Dnf dnf) {
-        @Override
-        public String toString() {
-                return "%s %s".formatted(modality, dnf.name());
-        }
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Concreteness.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Concreteness.java
new file mode 100644
index 00000000..43ac5904
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Concreteness.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.literal;
+
+import java.util.Locale;
+
+public enum Concreteness {
+        PARTIAL,
+        CANDIDATE;
+
+        @Override
+        public String toString() {
+                return name().toLowerCase(Locale.ROOT);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateLowerBoundLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateLowerBoundLiteral.java
new file mode 100644
index 00000000..91dd2b72
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateLowerBoundLiteral.java
@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.literal;
+
+import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.store.query.literal.AbstractCountLiteral;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.Variable;
+
+import java.util.List;
+
+public class CountCandidateLowerBoundLiteral extends AbstractCountLiteral<Integer> {
+        public CountCandidateLowerBoundLiteral(DataVariable<Integer> resultVariable, Constraint target,
+                                                                                   List<Variable> arguments) {
+                super(Integer.class, resultVariable, target, arguments);
+        }
+
+        @Override
+        protected Integer zero() {
+                return 0;
+        }
+
+        @Override
+        protected Integer one() {
+                return 1;
+        }
+
+        @Override
+        protected Literal doSubstitute(Substitution substitution, List<Variable> substitutedArguments) {
+                return new CountCandidateLowerBoundLiteral(substitution.getTypeSafeSubstitute(getResultVariable()), getTarget(),
+                                substitutedArguments);
+        }
+
+        @Override
+        public AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments) {
+                return new CountCandidateLowerBoundLiteral(getResultVariable(), newTarget, newArguments);
+        }
+
+        @Override
+        protected String operatorName() {
+                return "@LowerBound(\"candidate\") count";
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateUpperBoundLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateUpperBoundLiteral.java
new file mode 100644
index 00000000..94c9399d
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateUpperBoundLiteral.java
@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.literal;
+
+import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.store.query.literal.AbstractCountLiteral;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.Variable;
+
+import java.util.List;
+
+public class CountCandidateUpperBoundLiteral extends AbstractCountLiteral<Integer> {
+        public CountCandidateUpperBoundLiteral(DataVariable<Integer> resultVariable, Constraint target,
+                                                                                   List<Variable> arguments) {
+                super(Integer.class, resultVariable, target, arguments);
+        }
+
+        @Override
+        protected Integer zero() {
+                return 0;
+        }
+
+        @Override
+        protected Integer one() {
+                return 1;
+        }
+
+        @Override
+        protected Literal doSubstitute(Substitution substitution, List<Variable> substitutedArguments) {
+                return new CountCandidateUpperBoundLiteral(substitution.getTypeSafeSubstitute(getResultVariable()), getTarget(),
+                                substitutedArguments);
+        }
+
+        @Override
+        public AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments) {
+                return new CountCandidateUpperBoundLiteral(getResultVariable(), newTarget, newArguments);
+        }
+
+        @Override
+        protected String operatorName() {
+                return "@UpperBound(\"candidate\") count";
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountLowerBoundLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountLowerBoundLiteral.java
new file mode 100644
index 00000000..b75b0cab
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountLowerBoundLiteral.java
@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.literal;
+
+import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.store.query.literal.AbstractCountLiteral;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.Variable;
+
+import java.util.List;
+
+public class CountLowerBoundLiteral extends AbstractCountLiteral<Integer> {
+        public CountLowerBoundLiteral(DataVariable<Integer> resultVariable, Constraint target,
+                                                                  List<Variable> arguments) {
+                super(Integer.class, resultVariable, target, arguments);
+        }
+
+        @Override
+        protected Integer zero() {
+                return 0;
+        }
+
+        @Override
+        protected Integer one() {
+                return 1;
+        }
+
+        @Override
+        protected Literal doSubstitute(Substitution substitution, List<Variable> substitutedArguments) {
+                return new CountLowerBoundLiteral(substitution.getTypeSafeSubstitute(getResultVariable()), getTarget(),
+                                substitutedArguments);
+        }
+
+        @Override
+        public AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments) {
+                return new CountLowerBoundLiteral(getResultVariable(), newTarget, newArguments);
+        }
+
+        @Override
+        protected String operatorName() {
+                return "@LowerBound(\"partial\") count";
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountUpperBoundLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountUpperBoundLiteral.java
new file mode 100644
index 00000000..03842143
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountUpperBoundLiteral.java
@@ -0,0 +1,51 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.literal;
+
+import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.store.query.literal.AbstractCountLiteral;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.representation.cardinality.UpperCardinalities;
+import tools.refinery.store.representation.cardinality.UpperCardinality;
+
+import java.util.List;
+
+public class CountUpperBoundLiteral extends AbstractCountLiteral<UpperCardinality> {
+        public CountUpperBoundLiteral(DataVariable<UpperCardinality> resultVariable, Constraint target,
+                                                                  List<Variable> arguments) {
+                super(UpperCardinality.class, resultVariable, target, arguments);
+        }
+
+        @Override
+        protected UpperCardinality zero() {
+                return UpperCardinalities.ZERO;
+        }
+
+        @Override
+        protected UpperCardinality one() {
+                return UpperCardinalities.UNBOUNDED;
+        }
+
+        @Override
+        protected Literal doSubstitute(Substitution substitution, List<Variable> substitutedArguments) {
+                return new CountUpperBoundLiteral(substitution.getTypeSafeSubstitute(getResultVariable()), getTarget(),
+                                substitutedArguments);
+        }
+
+        @Override
+        public AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments) {
+                return new CountUpperBoundLiteral(getResultVariable(), newTarget, newArguments);
+        }
+
+        @Override
+        protected String operatorName() {
+                return "@UpperBound(\"partial\") count";
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalConstraint.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalConstraint.java
index 4e5a6099..2235a95d 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalConstraint.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalConstraint.java
@@ -6,18 +6,29 @@
 package tools.refinery.store.reasoning.literal;
 
 import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.equality.LiteralEqualityHelper;
 import tools.refinery.store.query.literal.Reduction;
 import tools.refinery.store.query.term.Parameter;
+import tools.refinery.store.query.view.AnySymbolView;
 
 import java.util.List;
 
-public record ModalConstraint(Modality modality, Constraint constraint) implements Constraint {
-        private static final String FORMAT = "%s %s";
+public record ModalConstraint(Modality modality, Concreteness concreteness, Constraint constraint)
+                implements Constraint {
+        public ModalConstraint {
+                if (constraint instanceof AnySymbolView || constraint instanceof ModalConstraint) {
+                        throw new InvalidQueryException("Already concrete constraints cannot be abstracted");
+                }
+        }
+
+        public ModalConstraint(Modality modality, Constraint constraint) {
+                this(modality, Concreteness.PARTIAL, constraint);
+        }
 
         @Override
         public String name() {
-                return FORMAT.formatted(modality, constraint.name());
+                return formatName(constraint.name());
         }
 
         @Override
@@ -36,16 +47,33 @@ public record ModalConstraint(Modality modality, Constraint constraint) implemen
                         return false;
                 }
                 var otherModalConstraint = (ModalConstraint) other;
-                return modality == otherModalConstraint.modality && constraint.equals(helper, otherModalConstraint.constraint);
+                return modality == otherModalConstraint.modality &&
+                                concreteness == otherModalConstraint.concreteness &&
+                                constraint.equals(helper, otherModalConstraint.constraint);
         }
 
         @Override
         public String toReferenceString() {
-                return FORMAT.formatted(modality, constraint.toReferenceString());
+                return formatName(constraint.toReferenceString());
         }
 
         @Override
         public String toString() {
-                return FORMAT.formatted(modality, constraint);
+                return formatName(constraint.toString());
+        }
+
+        private String formatName(String constraintName) {
+                if (concreteness == Concreteness.PARTIAL) {
+                        return "%s %s".formatted(modality, constraintName);
+                }
+                return "%s %s %s".formatted(modality, concreteness, constraintName);
+        }
+
+        public static Constraint of(Modality modality, Concreteness concreteness, Constraint constraint) {
+                if (constraint instanceof AnySymbolView || constraint instanceof ModalConstraint) {
+                        // Symbol views and lifted constraints are already concrete. Thus, they cannot be abstracted at all.
+                        return constraint;
+                }
+                return new ModalConstraint(modality, concreteness, constraint);
         }
 }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Modality.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Modality.java
index 96466d5c..c99a0399 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Modality.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Modality.java
@@ -11,14 +11,12 @@ import java.util.Locale;
 
 public enum Modality {
         MUST,
-        MAY,
-        CURRENT;
+        MAY;
 
         public Modality negate() {
                 return switch(this) {
                         case MUST -> MAY;
                         case MAY -> MUST;
-                        case CURRENT -> CURRENT;
                 };
         }
 
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialLiterals.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialLiterals.java
index 0e46a795..2614c26e 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialLiterals.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialLiterals.java
@@ -5,6 +5,7 @@
  */
 package tools.refinery.store.reasoning.literal;
 
+import tools.refinery.store.query.InvalidQueryException;
 import tools.refinery.store.query.literal.CallLiteral;
 
 public final class PartialLiterals {
@@ -13,24 +14,28 @@ public final class PartialLiterals {
         }
 
         public static CallLiteral may(CallLiteral literal) {
-                return addModality(literal, Modality.MAY);
+                return addModality(literal, Modality.MAY, Concreteness.PARTIAL);
         }
 
         public static CallLiteral must(CallLiteral literal) {
-                return addModality(literal, Modality.MUST);
+                return addModality(literal, Modality.MUST, Concreteness.PARTIAL);
         }
 
-        public static CallLiteral current(CallLiteral literal) {
-                return addModality(literal, Modality.CURRENT);
+        public static CallLiteral candidateMay(CallLiteral literal) {
+                return addModality(literal, Modality.MAY, Concreteness.CANDIDATE);
         }
 
-        public static CallLiteral addModality(CallLiteral literal, Modality modality) {
+        public static CallLiteral candidateMust(CallLiteral literal) {
+                return addModality(literal, Modality.MUST, Concreteness.CANDIDATE);
+        }
+
+        public static CallLiteral addModality(CallLiteral literal, Modality modality, Concreteness concreteness) {
                 var target = literal.getTarget();
                 if (target instanceof ModalConstraint) {
-                        throw new IllegalArgumentException("Literal %s already has modality".formatted(literal));
+                        throw new InvalidQueryException("Literal %s already has modality".formatted(literal));
                 }
                 var polarity = literal.getPolarity();
-                var modalTarget = new ModalConstraint(modality.commute(polarity), target);
+                var modalTarget = new ModalConstraint(modality.commute(polarity), concreteness, target);
                 return new CallLiteral(polarity, modalTarget, literal.getArguments());
         }
 }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/AbstractPartialInterpretationRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/AbstractPartialInterpretationRefiner.java
new file mode 100644
index 00000000..a7fc5b7e
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/AbstractPartialInterpretationRefiner.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.refinement;
+
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+
+public abstract class AbstractPartialInterpretationRefiner<A, C> implements PartialInterpretationRefiner<A, C> {
+        private final ReasoningAdapter adapter;
+        private final PartialSymbol<A, C> partialSymbol;
+
+        protected AbstractPartialInterpretationRefiner(ReasoningAdapter adapter, PartialSymbol<A, C> partialSymbol) {
+                this.adapter = adapter;
+                this.partialSymbol = partialSymbol;
+        }
+
+        @Override
+        public ReasoningAdapter getAdapter() {
+                return adapter;
+        }
+
+        @Override
+        public PartialSymbol<A, C> getPartialSymbol() {
+                return partialSymbol;
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/AnyPartialInterpretationRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/AnyPartialInterpretationRefiner.java
new file mode 100644
index 00000000..6c381511
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/AnyPartialInterpretationRefiner.java
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.refinement;
+
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
+
+public sealed interface AnyPartialInterpretationRefiner permits PartialInterpretationRefiner {
+        ReasoningAdapter getAdapter();
+
+        AnyPartialSymbol getPartialSymbol();
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/ConcreteSymbolRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/ConcreteSymbolRefiner.java
new file mode 100644
index 00000000..ebb9b824
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/ConcreteSymbolRefiner.java
@@ -0,0 +1,38 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.refinement;
+
+import tools.refinery.store.model.Interpretation;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.Objects;
+
+public class ConcreteSymbolRefiner<A, C> extends AbstractPartialInterpretationRefiner<A, C> {
+        private final Interpretation<A> interpretation;
+
+        public ConcreteSymbolRefiner(ReasoningAdapter adapter, PartialSymbol<A, C> partialSymbol,
+                                                                 Symbol<A> concreteSymbol) {
+                super(adapter, partialSymbol);
+                interpretation = adapter.getModel().getInterpretation(concreteSymbol);
+        }
+
+        @Override
+        public boolean merge(Tuple key, A value) {
+                var currentValue = interpretation.get(key);
+                var mergedValue = getPartialSymbol().abstractDomain().commonRefinement(currentValue, value);
+                if (!Objects.equals(currentValue, mergedValue)) {
+                        interpretation.put(key, mergedValue);
+                }
+                return true;
+        }
+
+        public static <A1, C1> Factory<A1, C1> of(Symbol<A1> concreteSymbol) {
+                return (adapter, partialSymbol) -> new ConcreteSymbolRefiner<>(adapter, partialSymbol, concreteSymbol);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/DefaultStorageRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/DefaultStorageRefiner.java
new file mode 100644
index 00000000..d4ec2e8b
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/DefaultStorageRefiner.java
@@ -0,0 +1,79 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.refinement;
+
+import tools.refinery.store.model.Interpretation;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+public class DefaultStorageRefiner<T> implements StorageRefiner {
+        private static final StorageRefiner.Factory<Object> FACTORY = DefaultStorageRefiner::new;
+
+        private final Interpretation<T> interpretation;
+
+        public DefaultStorageRefiner(Symbol<T> symbol, Model model) {
+                interpretation = model.getInterpretation(symbol);
+        }
+
+        @Override
+        public boolean split(int parentNode, int childNode) {
+                var symbol = interpretation.getSymbol();
+                int arity = symbol.arity();
+                for (int i = 0; i < arity; i++) {
+                        int adjacentSize = interpretation.getAdjacentSize(i, parentNode);
+                        if (adjacentSize == 0) {
+                                continue;
+                        }
+                        var toSetKeys = new Tuple[adjacentSize];
+                        // This is safe, because we won't pass the array to the outside.
+                        @SuppressWarnings("unchecked")
+                        var toSetValues = (T[]) new Object[adjacentSize];
+                        var cursor = interpretation.getAdjacent(i, parentNode);
+                        int j = 0;
+                        while (cursor.move()) {
+                                toSetKeys[j] = cursor.getKey().set(i, childNode);
+                                toSetValues[j] = cursor.getValue();
+                                j++;
+                        }
+                        for (j = 0; j < adjacentSize; j++) {
+                                interpretation.put(toSetKeys[j], toSetValues[j]);
+                        }
+                }
+                return true;
+        }
+
+        @Override
+        public boolean cleanup(int nodeToDelete) {
+                var symbol = interpretation.getSymbol();
+                int arity = symbol.arity();
+                var defaultValue = symbol.defaultValue();
+                for (int i = 0; i < arity; i++) {
+                        int adjacentSize = interpretation.getAdjacentSize(i, nodeToDelete);
+                        if (adjacentSize == 0) {
+                                continue;
+                        }
+                        var toDelete = new Tuple[adjacentSize];
+                        var cursor = interpretation.getAdjacent(i, nodeToDelete);
+                        int j = 0;
+                        while (cursor.move()) {
+                                toDelete[j] = cursor.getKey();
+                                j++;
+                        }
+                        for (j = 0; j < adjacentSize; j++) {
+                                interpretation.put(toDelete[j], defaultValue);
+                        }
+                }
+                return true;
+        }
+
+        public static <T> StorageRefiner.Factory<T> factory() {
+                // This is safe, because {@code FACTORY} doesn't depend on {@code T} at all.
+                @SuppressWarnings("unchecked")
+                var typedFactory = (StorageRefiner.Factory<T>) FACTORY;
+                return typedFactory;
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/PartialInterpretationRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/PartialInterpretationRefiner.java
new file mode 100644
index 00000000..f48d1d1f
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/PartialInterpretationRefiner.java
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.refinement;
+
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.tuple.Tuple;
+
+public non-sealed interface PartialInterpretationRefiner<A, C> extends AnyPartialInterpretationRefiner {
+        @Override
+        PartialSymbol<A, C> getPartialSymbol();
+
+        boolean merge(Tuple key, A value);
+
+        @FunctionalInterface
+        interface Factory<A, C> {
+                PartialInterpretationRefiner<A, C> create(ReasoningAdapter adapter, PartialSymbol<A, C> partialSymbol);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/PartialModelInitializer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/PartialModelInitializer.java
new file mode 100644
index 00000000..0c82695c
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/PartialModelInitializer.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.refinement;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+
+@FunctionalInterface
+public interface PartialModelInitializer {
+        void initialize(Model model, ModelSeed modelSeed);
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/RefinementBasedInitializer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/RefinementBasedInitializer.java
new file mode 100644
index 00000000..b6bccb01
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/RefinementBasedInitializer.java
@@ -0,0 +1,34 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.refinement;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+
+public class RefinementBasedInitializer<A, C> implements PartialModelInitializer {
+        private final PartialSymbol<A, C> partialSymbol;
+
+        public RefinementBasedInitializer(PartialSymbol<A, C> partialSymbol) {
+                this.partialSymbol = partialSymbol;
+        }
+
+        @Override
+        public void initialize(Model model, ModelSeed modelSeed) {
+                var refiner = model.getAdapter(ReasoningAdapter.class).getRefiner(partialSymbol);
+                var defaultValue = partialSymbol.abstractDomain().unknown();
+                var cursor = modelSeed.getCursor(partialSymbol, defaultValue);
+                while (cursor.move()) {
+                        var key = cursor.getKey();
+                        var value = cursor.getValue();
+                        if (!refiner.merge(key, value)) {
+                                throw new IllegalArgumentException("Failed to merge value %s for key %s into %s"
+                                                .formatted(value, key, partialSymbol));
+                        }
+                }
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/RefinementResult.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/RefinementResult.java
new file mode 100644
index 00000000..1bc537d1
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/RefinementResult.java
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.refinement;
+
+public enum RefinementResult {
+        UNCHANGED,
+        REFINED,
+        REJECTED;
+
+        public RefinementResult andThen(RefinementResult next) {
+                return switch (this) {
+                        case UNCHANGED -> next;
+                        case REFINED -> next == REJECTED ? REJECTED : REFINED;
+                        case REJECTED -> REJECTED;
+                };
+        }
+
+        public boolean isRejected() {
+                return this == REJECTED;
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/StorageRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/StorageRefiner.java
new file mode 100644
index 00000000..004696fd
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/refinement/StorageRefiner.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.refinement;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.representation.Symbol;
+
+public interface StorageRefiner {
+        boolean split(int parentNode, int childNode);
+
+        boolean cleanup(int nodeToDelete);
+
+        @FunctionalInterface
+        interface Factory<T> {
+                StorageRefiner create(Symbol<T> symbol, Model model);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialFunction.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialFunction.java
index d58d026f..e59c8af8 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialFunction.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialFunction.java
@@ -15,11 +15,6 @@ public record PartialFunction<A, C>(String name, int arity, AbstractDomain<A, C>
         }
 
         @Override
-        public C defaultConcreteValue() {
-                return null;
-        }
-
-        @Override
         public boolean equals(Object o) {
                 return this == o;
         }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialRelation.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialRelation.java
index 6b2f050b..4ccb7033 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialRelation.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialRelation.java
@@ -26,11 +26,6 @@ public record PartialRelation(String name, int arity) implements PartialSymbol<T
         }
 
         @Override
-        public Boolean defaultConcreteValue() {
-                return false;
-        }
-
-        @Override
         public List<Parameter> getParameters() {
                 var parameters = new Parameter[arity];
                 Arrays.fill(parameters, Parameter.NODE_OUT);
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialSymbol.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialSymbol.java
index 3a08bdd8..38b2e466 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialSymbol.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialSymbol.java
@@ -13,5 +13,11 @@ public sealed interface PartialSymbol<A, C> extends AnyPartialSymbol permits Par
 
         A defaultValue();
 
-        C defaultConcreteValue();
+        static PartialRelation of(String name, int arity) {
+                return new PartialRelation(name, arity);
+        }
+
+        static <A, C> PartialFunction<A, C> of(String name, int arity, AbstractDomain<A, C> abstractDomain) {
+                return new PartialFunction<>(name, arity, abstractDomain);
+        }
 }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/MapBasedSeed.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/MapBasedSeed.java
new file mode 100644
index 00000000..8b1c3bb3
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/MapBasedSeed.java
@@ -0,0 +1,111 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.seed;
+
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.Cursors;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.Map;
+import java.util.Objects;
+
+record MapBasedSeed<T>(int arity, Class<T> valueType, T reducedValue, Map<Tuple, T> map) implements Seed<T> {
+        @Override
+        public T get(Tuple key) {
+                var value = map.get(key);
+                return value == null ? reducedValue : value;
+        }
+
+        @Override
+        public Cursor<Tuple, T> getCursor(T defaultValue, int nodeCount) {
+                if (Objects.equals(defaultValue, reducedValue)) {
+                        return Cursors.of(map);
+                }
+                return new CartesianProductCursor<>(arity, nodeCount, reducedValue, defaultValue, map);
+        }
+
+        private static class CartesianProductCursor<T> implements Cursor<Tuple, T> {
+                private final int nodeCount;
+                private final T reducedValue;
+                private final T defaultValue;
+                private final Map<Tuple, T> map;
+                private final int[] counter;
+                private State state = State.INITIAL;
+                private Tuple key;
+                private T value;
+
+                private CartesianProductCursor(int arity, int nodeCount, T reducedValue, T defaultValue, Map<Tuple, T> map) {
+                        this.nodeCount = nodeCount;
+                        this.reducedValue = reducedValue;
+                        this.defaultValue = defaultValue;
+                        this.map = map;
+                        counter = new int[arity];
+                }
+
+                @Override
+                public Tuple getKey() {
+                        return key;
+                }
+
+                @Override
+                public T getValue() {
+                        return value;
+                }
+
+                @Override
+                public boolean isTerminated() {
+                        return state == State.TERMINATED;
+                }
+
+                @Override
+                public boolean move() {
+                        return switch (state) {
+                                case INITIAL -> {
+                                        state = State.STARTED;
+                                        yield checkValue() || moveToNext();
+                                }
+                                case STARTED -> moveToNext();
+                                case TERMINATED -> false;
+                        };
+                }
+
+                private boolean moveToNext() {
+                        do {
+                                increment();
+                        } while (state != State.TERMINATED && !checkValue());
+                        return state != State.TERMINATED;
+                }
+
+                private void increment() {
+                        int i = counter.length - 1;
+                        while (i >= 0) {
+                                counter[i]++;
+                                if (counter[i] < nodeCount) {
+                                        return;
+                                }
+                                counter[i] = 0;
+                                i--;
+                        }
+                        state = State.TERMINATED;
+                }
+
+                private boolean checkValue() {
+                        key = Tuple.of(counter);
+                        var valueInMap = map.get(key);
+                        if (Objects.equals(valueInMap, defaultValue)) {
+                                return false;
+                        }
+                        value = valueInMap == null ? reducedValue : valueInMap;
+                        return true;
+                }
+
+                private enum State {
+                        INITIAL,
+                        STARTED,
+                        TERMINATED
+                }
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/ModelSeed.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/ModelSeed.java
new file mode 100644
index 00000000..e6b3eaf9
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/ModelSeed.java
@@ -0,0 +1,95 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.seed;
+
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+
+public class ModelSeed {
+        private final int nodeCount;
+        private final Map<AnyPartialSymbol, Seed<?>> seeds;
+
+        private ModelSeed(int nodeCount, Map<AnyPartialSymbol, Seed<?>> seeds) {
+                this.nodeCount = nodeCount;
+                this.seeds = seeds;
+        }
+
+        public int getNodeCount() {
+                return nodeCount;
+        }
+
+        public <A> Seed<A> getSeed(PartialSymbol<A, ?> partialSymbol) {
+                var seed = seeds.get(partialSymbol);
+                if (seed == null) {
+                        throw new IllegalArgumentException("No seed for partial symbol " + partialSymbol);
+                }
+                // The builder makes sure only well-typed seeds can be added.
+                @SuppressWarnings("unchecked")
+                var typedSeed = (Seed<A>) seed;
+                return typedSeed;
+        }
+
+        public boolean containsSeed(AnyPartialSymbol symbol) {
+                return seeds.containsKey(symbol);
+        }
+
+        public Set<AnyPartialSymbol> getSeededSymbols() {
+                return Collections.unmodifiableSet(seeds.keySet());
+        }
+
+        public <A> Cursor<Tuple, A> getCursor(PartialSymbol<A, ?> partialSymbol, A defaultValue) {
+                return getSeed(partialSymbol).getCursor(defaultValue, nodeCount);
+        }
+
+        public static Builder builder(int nodeCount) {
+                return new Builder(nodeCount);
+        }
+
+        public static class Builder {
+                private final int nodeCount;
+                private final Map<AnyPartialSymbol, Seed<?>> seeds = new LinkedHashMap<>();
+
+                private Builder(int nodeCount) {
+                        if (nodeCount < 0) {
+                                throw new IllegalArgumentException("Node count must not be negative");
+                        }
+                        this.nodeCount = nodeCount;
+                }
+
+                public <A> Builder seed(PartialSymbol<A, ?> partialSymbol, Seed<A> seed) {
+                        if (seed.arity() != partialSymbol.arity()) {
+                                throw new IllegalStateException("Expected seed of arity %d for partial symbol %s, but got %d instead"
+                                                .formatted(partialSymbol.arity(), partialSymbol, seed.arity()));
+                        }
+                        if (!seed.valueType().equals(partialSymbol.abstractDomain().abstractType())) {
+                                throw new IllegalStateException("Expected seed of type %s for partial symbol %s, but got %s instead"
+                                                .formatted(partialSymbol.abstractDomain().abstractType(), partialSymbol, seed.valueType()));
+                        }
+                        if (seeds.put(partialSymbol, seed) != null) {
+                                throw new IllegalArgumentException("Duplicate seed for partial symbol " + partialSymbol);
+                        }
+                        return this;
+                }
+
+                public <A> Builder seed(PartialSymbol<A, ?> partialSymbol, Consumer<Seed.Builder<A>> callback) {
+                        var builder = Seed.builder(partialSymbol);
+                        callback.accept(builder);
+                        return seed(partialSymbol, builder.build());
+                }
+
+                public ModelSeed build() {
+                        return new ModelSeed(nodeCount, Collections.unmodifiableMap(seeds));
+                }
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/Seed.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/Seed.java
index 08079f12..732efbcc 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/Seed.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/Seed.java
@@ -6,14 +6,73 @@
 package tools.refinery.store.reasoning.seed;
 
 import tools.refinery.store.map.Cursor;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple;
 
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 public interface Seed<T> {
         int arity();
 
+        Class<T> valueType();
+
         T reducedValue();
 
         T get(Tuple key);
 
         Cursor<Tuple, T> getCursor(T defaultValue, int nodeCount);
+
+        static <T> Builder<T> builder(int arity, Class<T> valueType, T reducedValue) {
+                return new Builder<>(arity, valueType, reducedValue);
+        }
+
+        static <T> Builder<T> builder(Symbol<T> symbol) {
+                return builder(symbol.arity(), symbol.valueType(), symbol.defaultValue());
+        }
+
+        static <T> Builder<T> builder(PartialSymbol<T, ?> partialSymbol) {
+                return builder(partialSymbol.arity(), partialSymbol.abstractDomain().abstractType(),
+                                partialSymbol.defaultValue());
+        }
+
+        @SuppressWarnings("UnusedReturnValue")
+        class Builder<T> {
+                private final int arity;
+                private final Class<T> valueType;
+                private T reducedValue;
+                private final Map<Tuple, T> map = new LinkedHashMap<>();
+
+                private Builder(int arity, Class<T> valueType, T reducedValue) {
+                        this.arity = arity;
+                        this.valueType = valueType;
+                        this.reducedValue = reducedValue;
+                }
+
+                public Builder<T> reducedValue(T reducedValue) {
+                        this.reducedValue = reducedValue;
+                        return this;
+                }
+
+                public Builder<T> put(Tuple key, T value) {
+                        if (key.getSize() != arity) {
+                                throw new IllegalArgumentException("Expected %s to have %d elements".formatted(key, arity));
+                        }
+                        map.put(key, value);
+                        return this;
+                }
+
+                public Builder<T> putAll(Map<Tuple, T> map) {
+                        for (var entry : map.entrySet()) {
+                                put(entry.getKey(), entry.getValue());
+                        }
+                        return this;
+                }
+
+                public Seed<T> build() {
+                        return new MapBasedSeed<>(arity, valueType, reducedValue, Collections.unmodifiableMap(map));
+                }
+        }
 }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/SeedInitializer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/SeedInitializer.java
new file mode 100644
index 00000000..9af457d8
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/SeedInitializer.java
@@ -0,0 +1,28 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.seed;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.reasoning.refinement.PartialModelInitializer;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.representation.Symbol;
+
+public class SeedInitializer<T> implements PartialModelInitializer {
+        private final Symbol<T> symbol;
+        private final PartialSymbol<T, ?> partialSymbol;
+
+        public SeedInitializer(Symbol<T> symbol, PartialSymbol<T, ?> partialSymbol) {
+                this.symbol = symbol;
+                this.partialSymbol = partialSymbol;
+        }
+
+        @Override
+        public void initialize(Model model, ModelSeed modelSeed) {
+                var interpretation = model.getInterpretation(symbol);
+                var cursor = modelSeed.getCursor(partialSymbol, symbol.defaultValue());
+                interpretation.putAll(cursor);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/UniformSeed.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/UniformSeed.java
deleted file mode 100644
index 451d1513..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/seed/UniformSeed.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning.seed;
-
-import tools.refinery.store.map.Cursor;
-import tools.refinery.store.tuple.Tuple;
-
-public record UniformSeed<T>(int arity, T reducedValue) implements Seed<T> {
-        public UniformSeed {
-                if (arity < 0) {
-                        throw new IllegalArgumentException("Arity must not be negative");
-                }
-        }
-
-        @Override
-        public T get(Tuple key) {
-                return reducedValue;
-        }
-
-        @Override
-        public Cursor<Tuple, T> getCursor(T defaultValue, int nodeCount) {
-                return null;
-        }
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/Advice.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/Advice.java
deleted file mode 100644
index d6a9e02c..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/Advice.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning.translator;
-
-import tools.refinery.store.query.substitution.Substitution;
-import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
-import tools.refinery.store.reasoning.representation.PartialRelation;
-import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.literal.Literal;
-
-import java.util.*;
-
-public final class Advice {
-        private final AnyPartialSymbol source;
-        private final PartialRelation target;
-        private final AdviceSlot slot;
-        private final boolean mandatory;
-        private final List<Variable> parameters;
-        private final List<Literal> literals;
-        private boolean processed;
-
-        public Advice(AnyPartialSymbol source, PartialRelation target, AdviceSlot slot, boolean mandatory, List<Variable> parameters, List<Literal> literals) {
-                if (mandatory && !slot.isMonotonic()) {
-                        throw new IllegalArgumentException("Only monotonic advice can be mandatory");
-                }
-                this.source = source;
-                this.target = target;
-                this.slot = slot;
-                this.mandatory = mandatory;
-                checkArity(parameters);
-                this.parameters = parameters;
-                this.literals = literals;
-        }
-
-        public AnyPartialSymbol source() {
-                return source;
-        }
-
-        public PartialRelation target() {
-                return target;
-        }
-
-        public AdviceSlot slot() {
-                return slot;
-        }
-
-        public boolean mandatory() {
-                return mandatory;
-        }
-
-        public List<Variable> parameters() {
-                return parameters;
-        }
-
-        public List<Literal> literals() {
-                return literals;
-        }
-
-        public boolean processed() {
-                return processed;
-        }
-
-        public List<Literal> substitute(List<Variable> substituteParameters) {
-                checkArity(substituteParameters);
-                markProcessed();
-                // Use a renewing substitution to remove any non-parameter variables and avoid clashed between variables
-                // coming from different advice in the same clause.
-                var substitution = Substitution.builder().putManyChecked(parameters, substituteParameters).renewing().build();
-                return literals.stream().map(literal -> literal.substitute(substitution)).toList();
-        }
-
-        private void markProcessed() {
-                processed = true;
-        }
-
-        public void checkProcessed() {
-                if (mandatory && !processed) {
-                        throw new IllegalStateException("Mandatory advice %s was not processed".formatted(this));
-                }
-        }
-
-        private void checkArity(List<Variable> toCheck) {
-                if (toCheck.size() != target.arity()) {
-                        throw new IllegalArgumentException("%s needs %d parameters, but got %s".formatted(target.name(),
-                                        target.arity(), parameters.size()));
-                }
-        }
-
-        public static Builder builderFor(AnyPartialSymbol source, PartialRelation target, AdviceSlot slot) {
-                return new Builder(source, target, slot);
-        }
-
-
-        @Override
-        public String toString() {
-                return "Advice[source=%s, target=%s, slot=%s, mandatory=%s, parameters=%s, literals=%s]".formatted(source,
-                                target, slot, mandatory, parameters, literals);
-        }
-
-        public static class Builder {
-                private final AnyPartialSymbol source;
-                private final PartialRelation target;
-                private final AdviceSlot slot;
-                private boolean mandatory;
-                private final List<Variable> parameters = new ArrayList<>();
-                private final List<Literal> literals = new ArrayList<>();
-
-                private Builder(AnyPartialSymbol source, PartialRelation target, AdviceSlot slot) {
-                        this.source = source;
-                        this.target = target;
-                        this.slot = slot;
-                }
-
-                public Builder mandatory(boolean mandatory) {
-                        this.mandatory = mandatory;
-                        return this;
-                }
-
-                public Builder mandatory() {
-                        return mandatory(false);
-                }
-
-                public Builder parameters(List<Variable> variables) {
-                        parameters.addAll(variables);
-                        return this;
-                }
-
-                public Builder parameters(Variable... variables) {
-                        return parameters(List.of(variables));
-                }
-
-                public Builder parameter(Variable variable) {
-                        parameters.add(variable);
-                        return this;
-                }
-
-                public Builder literals(Collection<Literal> literals) {
-                        this.literals.addAll(literals);
-                        return this;
-                }
-
-                public Builder literals(Literal... literals) {
-                        return literals(List.of(literals));
-                }
-
-                public Builder literal(Literal literal) {
-                        literals.add(literal);
-                        return this;
-                }
-
-                public Advice build() {
-                        return new Advice(source, target, slot, mandatory, Collections.unmodifiableList(parameters),
-                                        Collections.unmodifiableList(literals));
-                }
-        }
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/AdviceSlot.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/AdviceSlot.java
deleted file mode 100644
index bab20340..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/AdviceSlot.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning.translator;
-
-import tools.refinery.store.representation.TruthValue;
-
-public enum AdviceSlot {
-        EXTEND_MUST(true),
-
-        RESTRICT_MAY(true),
-
-        /**
-         * Same as {@link #RESTRICT_MAY}, but only active if the value of the relation is not {@link TruthValue#TRUE} or
-         * {@link TruthValue#ERROR}.
-         */
-        RESTRICT_NEW(false);
-
-        private final boolean monotonic;
-
-        AdviceSlot(boolean monotonic) {
-                this.monotonic = monotonic;
-        }
-
-        public boolean isMonotonic() {
-                return monotonic;
-        }
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/AnyPartialSymbolTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/AnyPartialSymbolTranslator.java
new file mode 100644
index 00000000..48c84348
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/AnyPartialSymbolTranslator.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator;
+
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.model.ModelStoreConfiguration;
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
+
+public sealed interface AnyPartialSymbolTranslator extends ModelStoreConfiguration permits PartialSymbolTranslator {
+        AnyPartialSymbol getPartialSymbol();
+
+        void configure(ModelStoreBuilder storeBuilder);
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java
new file mode 100644
index 00000000..c2039afc
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java
@@ -0,0 +1,390 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator;
+
+import tools.refinery.store.dse.transition.Rule;
+import tools.refinery.store.dse.transition.objectives.Criteria;
+import tools.refinery.store.dse.transition.objectives.Criterion;
+import tools.refinery.store.dse.transition.objectives.Objective;
+import tools.refinery.store.dse.transition.objectives.Objectives;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.query.Constraint;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.dnf.QueryBuilder;
+import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.query.view.MayView;
+import tools.refinery.store.query.view.MustView;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.ReasoningBuilder;
+import tools.refinery.store.reasoning.interpretation.PartialInterpretation;
+import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter;
+import tools.refinery.store.reasoning.interpretation.QueryBasedRelationInterpretationFactory;
+import tools.refinery.store.reasoning.interpretation.QueryBasedRelationRewriter;
+import tools.refinery.store.reasoning.lifting.DnfLifter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.reasoning.literal.PartialLiterals;
+import tools.refinery.store.reasoning.refinement.ConcreteSymbolRefiner;
+import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner;
+import tools.refinery.store.reasoning.refinement.PartialModelInitializer;
+import tools.refinery.store.reasoning.refinement.StorageRefiner;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.representation.AnySymbol;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+
+import java.util.ArrayList;
+import java.util.function.BiConsumer;
+
+import static tools.refinery.store.query.literal.Literals.not;
+
+@SuppressWarnings("UnusedReturnValue")
+public final class PartialRelationTranslator extends PartialSymbolTranslator<TruthValue, Boolean> {
+        private final PartialRelation partialRelation;
+        private PartialRelationRewriter rewriter;
+        private RelationalQuery query;
+        private RelationalQuery may;
+        private RelationalQuery must;
+        private RelationalQuery candidateMay;
+        private RelationalQuery candidateMust;
+        private RoundingMode roundingMode;
+
+        private PartialRelationTranslator(PartialRelation partialRelation) {
+                super(partialRelation);
+                this.partialRelation = partialRelation;
+        }
+
+        public PartialRelation getPartialRelation() {
+                return partialRelation;
+        }
+
+        @Override
+        public PartialRelationTranslator symbol(AnySymbol storageSymbol) {
+                super.symbol(storageSymbol);
+                return this;
+        }
+
+        @Override
+        public <T> PartialRelationTranslator symbol(Symbol<T> storageSymbol,
+                                                                                                StorageRefiner.Factory<T> storageRefiner) {
+                super.symbol(storageSymbol, storageRefiner);
+                return this;
+        }
+
+        @Override
+        public PartialRelationTranslator interpretation(
+                        PartialInterpretation.Factory<TruthValue, Boolean> interpretationFactory) {
+                super.interpretation(interpretationFactory);
+                return this;
+        }
+
+        @Override
+        public PartialRelationTranslator refiner(
+                        PartialInterpretationRefiner.Factory<TruthValue, Boolean> interpretationRefiner) {
+                super.refiner(interpretationRefiner);
+                return this;
+        }
+
+        public PartialRelationTranslator rewriter(PartialRelationRewriter rewriter) {
+                checkNotConfigured();
+                if (this.rewriter != null) {
+                        throw new IllegalArgumentException("Rewriter was already set");
+                }
+                this.rewriter = rewriter;
+                return this;
+        }
+
+        @Override
+        public PartialRelationTranslator initializer(PartialModelInitializer initializer) {
+                super.initializer(initializer);
+                return this;
+        }
+
+        @Override
+        public PartialRelationTranslator decision(Rule decisionRule) {
+                super.decision(decisionRule);
+                return this;
+        }
+
+        @Override
+        public PartialRelationTranslator accept(Criterion acceptanceCriterion) {
+                super.accept(acceptanceCriterion);
+                return this;
+        }
+
+        @Override
+        public PartialRelationTranslator exclude(Criterion exclusionCriterion) {
+                super.exclude(exclusionCriterion);
+                return this;
+        }
+
+        @Override
+        public PartialRelationTranslator objective(Objective objective) {
+                super.objective(objective);
+                return this;
+        }
+
+        public PartialRelationTranslator query(RelationalQuery query) {
+                checkNotConfigured();
+                if (this.query != null) {
+                        throw new IllegalArgumentException("Query was already set");
+                }
+                this.query = query;
+                return this;
+        }
+
+        public PartialRelationTranslator may(RelationalQuery may) {
+                checkNotConfigured();
+                if (this.may != null) {
+                        throw new IllegalArgumentException("May query was already set");
+                }
+                this.may = may;
+                return this;
+        }
+
+        public PartialRelationTranslator mayNever() {
+                var never = createQuery(partialRelation.name() + "#never", (builder, parameters) -> {});
+                may(never);
+                return this;
+        }
+
+        public PartialRelationTranslator must(RelationalQuery must) {
+                checkNotConfigured();
+                if (this.must != null) {
+                        throw new IllegalArgumentException("Must query was already set");
+                }
+                this.must = must;
+                return this;
+        }
+
+        public PartialRelationTranslator candidate(RelationalQuery candidate) {
+                candidateMay(candidate);
+                candidateMust(candidate);
+                return this;
+        }
+
+        public PartialRelationTranslator candidateMay(RelationalQuery candidateMay) {
+                checkNotConfigured();
+                if (this.candidateMay != null) {
+                        throw new IllegalArgumentException("Candidate may query was already set");
+                }
+                this.candidateMay = candidateMay;
+                return this;
+        }
+
+        public PartialRelationTranslator candidateMust(RelationalQuery candidateMust) {
+                checkNotConfigured();
+                if (this.candidateMust != null) {
+                        throw new IllegalArgumentException("Candidate must query was already set");
+                }
+                this.candidateMust = candidateMust;
+                return this;
+        }
+
+        public PartialRelationTranslator roundingMode(RoundingMode roundingMode) {
+                checkNotConfigured();
+                if (this.roundingMode != null) {
+                        throw new IllegalArgumentException("Rounding mode was already set");
+                }
+                this.roundingMode = roundingMode;
+                return this;
+        }
+
+        @Override
+        protected void doConfigure(ModelStoreBuilder storeBuilder) {
+                setFallbackRoundingMode();
+                createFallbackQueryFromRewriter();
+                liftQueries(storeBuilder);
+                createFallbackQueriesFromSymbol();
+                setFallbackCandidateQueries();
+                createFallbackRewriter();
+                createFallbackInterpretation();
+                createFallbackRefiner();
+                createFallbackExclude();
+                createFallbackObjective();
+                super.doConfigure(storeBuilder);
+        }
+
+        private void setFallbackRoundingMode() {
+                if (roundingMode == null) {
+                        roundingMode = query == null && storageSymbol != null ? RoundingMode.PREFER_FALSE : RoundingMode.NONE;
+                }
+        }
+
+        private RelationalQuery createQuery(String name, BiConsumer<QueryBuilder, NodeVariable[]> callback) {
+                int arity = partialRelation.arity();
+                var queryBuilder = Query.builder(name);
+                var parameters = new NodeVariable[arity];
+                for (int i = 0; i < arity; i++) {
+                        parameters[i] = queryBuilder.parameter("p" + 1);
+                }
+                callback.accept(queryBuilder, parameters);
+                return queryBuilder.build();
+        }
+
+        private RelationalQuery createQuery(String name, Constraint constraint) {
+                return createQuery(name, (builder, parameters) -> builder.clause(constraint.call(parameters)));
+        }
+
+        private void createFallbackQueryFromRewriter() {
+                if (rewriter != null && query == null) {
+                        query = createQuery(partialRelation.name(), partialRelation);
+                }
+        }
+
+        private void createFallbackQueriesFromSymbol() {
+                if (storageSymbol == null || storageSymbol.valueType() != TruthValue.class) {
+                        return;
+                }
+                // We checked in the guard clause that this is safe.
+                @SuppressWarnings("unchecked")
+                var typedStorageSymbol = (Symbol<TruthValue>) storageSymbol;
+                var defaultValue = typedStorageSymbol.defaultValue();
+                if (may == null && !defaultValue.may()) {
+                        may = createQuery(DnfLifter.decorateName(partialRelation.name(), Modality.MAY, Concreteness.PARTIAL),
+                                        new MayView(typedStorageSymbol));
+                }
+                if (must == null && !defaultValue.must()) {
+                        must = createQuery(DnfLifter.decorateName(partialRelation.name(), Modality.MUST, Concreteness.PARTIAL),
+                                        new MustView(typedStorageSymbol));
+                }
+        }
+
+        private void liftQueries(ModelStoreBuilder storeBuilder) {
+                if (rewriter instanceof QueryBasedRelationRewriter queryBasedRelationRewriter) {
+                        liftQueriesFromQueryBasedRewriter(queryBasedRelationRewriter);
+                } else if (query != null) {
+                        liftQueriesFromFourValuedQuery(storeBuilder);
+                }
+        }
+
+        private void liftQueriesFromQueryBasedRewriter(QueryBasedRelationRewriter queryBasedRelationRewriter) {
+                if (may == null) {
+                        may = queryBasedRelationRewriter.getMay();
+                }
+                if (must == null) {
+                        must = queryBasedRelationRewriter.getMust();
+                }
+                if (candidateMay == null) {
+                        candidateMay = queryBasedRelationRewriter.getCandidateMay();
+                }
+                if (candidateMust == null) {
+                        candidateMust = queryBasedRelationRewriter.getCandidateMust();
+                }
+        }
+
+        private void liftQueriesFromFourValuedQuery(ModelStoreBuilder storeBuilder) {
+                var reasoningBuilder = storeBuilder.getAdapter(ReasoningBuilder.class);
+                if (may == null) {
+                        may = reasoningBuilder.lift(Modality.MAY, Concreteness.PARTIAL, query);
+                }
+                if (must == null) {
+                        must = reasoningBuilder.lift(Modality.MUST, Concreteness.PARTIAL, query);
+                }
+                if (candidateMay == null) {
+                        candidateMay = reasoningBuilder.lift(Modality.MAY, Concreteness.CANDIDATE, query);
+                }
+                if (candidateMust == null) {
+                        candidateMust = reasoningBuilder.lift(Modality.MAY, Concreteness.CANDIDATE, query);
+                }
+        }
+
+        private void setFallbackCandidateQueries() {
+                if (candidateMay == null) {
+                        candidateMay = switch (roundingMode) {
+                                case NONE, PREFER_TRUE -> may;
+                                case PREFER_FALSE -> must;
+                        };
+                }
+                if (candidateMust == null) {
+                        candidateMust = switch (roundingMode) {
+                                case NONE, PREFER_FALSE -> must;
+                                case PREFER_TRUE -> may;
+                        };
+                }
+        }
+
+        private void createFallbackRewriter() {
+                if (rewriter == null) {
+                        rewriter = new QueryBasedRelationRewriter(may, must, candidateMay, candidateMust);
+                }
+        }
+
+        private void createFallbackInterpretation() {
+                if (interpretationFactory == null) {
+                        interpretationFactory = new QueryBasedRelationInterpretationFactory(may, must, candidateMay, candidateMust);
+                }
+        }
+
+        private void createFallbackRefiner() {
+                if (interpretationRefiner == null && storageSymbol != null && storageSymbol.valueType() == TruthValue.class) {
+                        // We checked in the condition that this is safe.
+                        @SuppressWarnings("unchecked")
+                        var typedStorageSymbol = (Symbol<TruthValue>) storageSymbol;
+                        interpretationRefiner = ConcreteSymbolRefiner.of(typedStorageSymbol);
+                }
+        }
+
+        private void createFallbackExclude() {
+                if (excludeWasSet) {
+                        return;
+                }
+                var excludeQuery = createQuery("exclude", (builder, parameters) -> {
+                        var literals = new ArrayList<Literal>(parameters.length + 2);
+                        literals.add(PartialLiterals.must(partialRelation.call(parameters)));
+                        literals.add(not(PartialLiterals.may(partialRelation.call(parameters))));
+                        for (var parameter : parameters) {
+                                literals.add(PartialLiterals.must(ReasoningAdapter.EXISTS_SYMBOL.call(parameter)));
+                        }
+                        builder.clause(literals);
+                });
+                exclude = Criteria.whenHasMatch(excludeQuery);
+        }
+
+        private void createFallbackObjective() {
+                if (acceptWasSet && objectiveWasSet) {
+                        return;
+                }
+                var invalidCandidate = createQuery("invalidCandidate", (builder, parameters) -> builder
+                                .clause(
+                                                PartialLiterals.candidateMust(partialRelation.call(parameters)),
+                                                not(PartialLiterals.candidateMay(partialRelation.call(parameters)))
+                                )
+                                .clause(
+                                                PartialLiterals.candidateMust(partialRelation.call(parameters)),
+                                                not(PartialLiterals.may(partialRelation.call(parameters)))
+                                )
+                                .clause(
+                                                PartialLiterals.must(partialRelation.call(parameters)),
+                                                not(PartialLiterals.candidateMay(partialRelation.call(parameters)))
+                                ));
+                var reject = createQuery("reject", (builder, parameters) -> {
+                        var literals = new ArrayList<Literal>(parameters.length + 1);
+                        literals.add(invalidCandidate.call(parameters));
+                        for (var parameter : parameters) {
+                                literals.add(PartialLiterals.candidateMust(ReasoningAdapter.EXISTS_SYMBOL.call(parameter)));
+                        }
+                        builder.clause(literals);
+                });
+                if (!acceptWasSet) {
+                        accept = Criteria.whenNoMatch(reject);
+                }
+                if (!objectiveWasSet) {
+                        objective = Objectives.count(reject);
+                }
+        }
+
+        public PartialRelationRewriter getRewriter() {
+                checkConfigured();
+                return rewriter;
+        }
+
+        public static PartialRelationTranslator of(PartialRelation relation) {
+                return new PartialRelationTranslator(relation);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialSymbolTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialSymbolTranslator.java
new file mode 100644
index 00000000..6cdb287d
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialSymbolTranslator.java
@@ -0,0 +1,212 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator;
+
+import org.jetbrains.annotations.Nullable;
+import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder;
+import tools.refinery.store.dse.transition.Rule;
+import tools.refinery.store.dse.transition.objectives.Criterion;
+import tools.refinery.store.dse.transition.objectives.Objective;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.reasoning.ReasoningBuilder;
+import tools.refinery.store.reasoning.interpretation.PartialInterpretation;
+import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner;
+import tools.refinery.store.reasoning.refinement.PartialModelInitializer;
+import tools.refinery.store.reasoning.refinement.StorageRefiner;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.reasoning.seed.SeedInitializer;
+import tools.refinery.store.representation.AnySymbol;
+import tools.refinery.store.representation.Symbol;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@SuppressWarnings("UnusedReturnValue")
+public abstract sealed class PartialSymbolTranslator<A, C> implements AnyPartialSymbolTranslator
+                permits PartialRelationTranslator {
+        private final PartialSymbol<A, C> partialSymbol;
+        private boolean configured = false;
+        protected PartialInterpretationRefiner.Factory<A, C> interpretationRefiner;
+        protected AnySymbol storageSymbol;
+        protected StorageRefiner.Factory<?> storageRefiner;
+        protected PartialInterpretation.Factory<A, C> interpretationFactory;
+        protected PartialModelInitializer initializer;
+        protected List<Rule> decisionRules = new ArrayList<>();
+        protected boolean acceptWasSet;
+        protected @Nullable Criterion accept;
+        protected boolean excludeWasSet;
+        protected @Nullable Criterion exclude;
+        protected boolean objectiveWasSet;
+        protected @Nullable Objective objective;
+
+        PartialSymbolTranslator(PartialSymbol<A, C> partialSymbol) {
+                this.partialSymbol = partialSymbol;
+        }
+
+        @Override
+        public PartialSymbol<A, C> getPartialSymbol() {
+                return partialSymbol;
+        }
+
+        @Override
+        public void apply(ModelStoreBuilder storeBuilder) {
+                storeBuilder.getAdapter(ReasoningBuilder.class).partialSymbol(this);
+        }
+
+        public boolean isConfigured() {
+                return configured;
+        }
+
+        protected void checkConfigured() {
+                if (!configured) {
+                        throw new IllegalStateException("Partial symbol was not configured");
+                }
+        }
+
+        protected void checkNotConfigured() {
+                if (configured) {
+                        throw new IllegalStateException("Partial symbol was already configured");
+                }
+        }
+
+        public PartialSymbolTranslator<A, C> symbol(AnySymbol storageSymbol) {
+                return symbol((Symbol<?>) storageSymbol, null);
+        }
+
+        public <T> PartialSymbolTranslator<A, C> symbol(Symbol<T> storageSymbol,
+                                                                                                        StorageRefiner.Factory<T> storageRefiner) {
+                checkNotConfigured();
+                if (this.storageSymbol != null) {
+                        throw new IllegalStateException("Representation symbol was already set");
+                }
+                this.storageSymbol = storageSymbol;
+                this.storageRefiner = storageRefiner;
+                return this;
+        }
+
+        public PartialSymbolTranslator<A, C> interpretation(PartialInterpretation.Factory<A, C> interpretationFactory) {
+                checkNotConfigured();
+                if (this.interpretationFactory != null) {
+                        throw new IllegalStateException("Interpretation factory was already set");
+                }
+                this.interpretationFactory = interpretationFactory;
+                return this;
+        }
+
+        public PartialSymbolTranslator<A, C> refiner(PartialInterpretationRefiner.Factory<A, C> interpretationRefiner) {
+                checkNotConfigured();
+                if (this.interpretationRefiner != null) {
+                        throw new IllegalStateException("Interpretation refiner was already set");
+                }
+                this.interpretationRefiner = interpretationRefiner;
+                return this;
+        }
+
+        public PartialSymbolTranslator<A, C> initializer(PartialModelInitializer initializer) {
+                checkNotConfigured();
+                if (this.initializer != null) {
+                        throw new IllegalStateException("Initializer was already set");
+                }
+                this.initializer = initializer;
+                return this;
+        }
+
+        public PartialSymbolTranslator<A, C> decision(Rule decisionRule) {
+                decisionRules.add(decisionRule);
+                return this;
+        }
+
+        public PartialSymbolTranslator<A, C> accept(@Nullable Criterion acceptanceCriterion) {
+                if (acceptWasSet) {
+                        throw new IllegalStateException("Accept was already set");
+                }
+                this.accept = acceptanceCriterion;
+                acceptWasSet = true;
+                return this;
+        }
+
+        public PartialSymbolTranslator<A, C> exclude(@Nullable Criterion exclusionCriterion) {
+                if (excludeWasSet) {
+                        throw new IllegalStateException("Exclude was already set");
+                }
+                this.exclude = exclusionCriterion;
+                excludeWasSet = true;
+                return this;
+        }
+
+        public PartialSymbolTranslator<A, C> objective(Objective objective) {
+                if (objectiveWasSet) {
+                        throw new IllegalStateException("Objective was already set");
+                }
+                this.objective = objective;
+                objectiveWasSet = true;
+                return this;
+        }
+
+        @Override
+        public void configure(ModelStoreBuilder storeBuilder) {
+                checkNotConfigured();
+                doConfigure(storeBuilder);
+                configured = true;
+        }
+
+        protected void doConfigure(ModelStoreBuilder storeBuilder) {
+                if (interpretationFactory == null) {
+                        throw new IllegalArgumentException("Interpretation factory must be set");
+                }
+                var reasoningBuilder = storeBuilder.getAdapter(ReasoningBuilder.class);
+                if (storageSymbol != null) {
+                        storeBuilder.symbol(storageSymbol);
+                        if (storageRefiner != null) {
+                                registerStorageRefiner(reasoningBuilder, storageRefiner);
+                        }
+                }
+                createFallbackInitializer();
+                if (initializer != null) {
+                        reasoningBuilder.initializer(initializer);
+                }
+                storeBuilder.tryGetAdapter(DesignSpaceExplorationBuilder.class).ifPresent(dseBuilder -> {
+                        dseBuilder.transformations(decisionRules);
+                        if (accept != null) {
+                                dseBuilder.accept(accept);
+                        }
+                        if (exclude != null) {
+                                dseBuilder.exclude(exclude);
+                        }
+                });
+                if (objective != null) {
+                        reasoningBuilder.objective(objective);
+                }
+        }
+
+        private <T> void registerStorageRefiner(ReasoningBuilder reasoningBuilder, StorageRefiner.Factory<T> factory) {
+                // The builder only allows setting a well-typed representation refiner.
+                @SuppressWarnings("unchecked")
+                var typedStorageSymbol = (Symbol<T>) storageSymbol;
+                reasoningBuilder.storageRefiner(typedStorageSymbol, factory);
+        }
+
+        private void createFallbackInitializer() {
+                if (initializer == null &&
+                                storageSymbol != null &&
+                                storageSymbol.valueType().equals(partialSymbol.abstractDomain().abstractType())) {
+                        // The guard clause makes this safe.
+                        @SuppressWarnings("unchecked")
+                        var typedStorageSymbol = (Symbol<A>) storageSymbol;
+                        initializer = new SeedInitializer<>(typedStorageSymbol, partialSymbol);
+                }
+        }
+
+        public PartialInterpretation.Factory<A, C> getInterpretationFactory() {
+                checkConfigured();
+                return interpretationFactory;
+        }
+
+        public PartialInterpretationRefiner.Factory<A, C> getInterpretationRefiner() {
+                checkConfigured();
+                return interpretationRefiner;
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/RoundingMode.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/RoundingMode.java
new file mode 100644
index 00000000..dd956a50
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/RoundingMode.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator;
+
+public enum RoundingMode {
+        NONE,
+        PREFER_TRUE,
+        PREFER_FALSE
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/TranslatedRelation.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/TranslatedRelation.java
deleted file mode 100644
index 4a5a8843..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/TranslatedRelation.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning.translator;
-
-import tools.refinery.store.model.Model;
-import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.literal.CallPolarity;
-import tools.refinery.store.query.literal.Literal;
-import tools.refinery.store.reasoning.PartialInterpretation;
-import tools.refinery.store.reasoning.literal.Modality;
-import tools.refinery.store.reasoning.representation.PartialRelation;
-import tools.refinery.store.representation.TruthValue;
-
-import java.util.List;
-
-public interface TranslatedRelation {
-        PartialRelation getSource();
-
-        void configure(List<Advice> advices);
-
-        List<Literal> call(CallPolarity polarity, Modality modality, List<Variable> arguments);
-
-        PartialInterpretation<TruthValue, Boolean> createPartialInterpretation(Model model);
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/TranslationException.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/TranslationException.java
new file mode 100644
index 00000000..edb886ba
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/TranslationException.java
@@ -0,0 +1,35 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator;
+
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
+
+public class TranslationException extends RuntimeException {
+        private final transient AnyPartialSymbol partialSymbol;
+
+        public TranslationException(AnyPartialSymbol partialSymbol) {
+                this.partialSymbol = partialSymbol;
+        }
+
+        public TranslationException(AnyPartialSymbol partialSymbol, String message) {
+                super(message);
+                this.partialSymbol = partialSymbol;
+        }
+
+        public TranslationException(AnyPartialSymbol partialSymbol, String message, Throwable cause) {
+                super(message, cause);
+                this.partialSymbol = partialSymbol;
+        }
+
+        public TranslationException(AnyPartialSymbol partialSymbol, Throwable cause) {
+                super(cause);
+                this.partialSymbol = partialSymbol;
+        }
+
+        public AnyPartialSymbol getPartialSymbol() {
+                return partialSymbol;
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/TranslationUnit.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/TranslationUnit.java
deleted file mode 100644
index 6e44a7d7..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/TranslationUnit.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning.translator;
-
-import tools.refinery.store.model.Model;
-import tools.refinery.store.reasoning.ReasoningBuilder;
-
-import java.util.Collection;
-
-public abstract class TranslationUnit {
-        private ReasoningBuilder reasoningBuilder;
-
-        protected ReasoningBuilder getReasoningBuilder() {
-                return reasoningBuilder;
-        }
-
-        public void setPartialInterpretationBuilder(ReasoningBuilder reasoningBuilder) {
-                this.reasoningBuilder = reasoningBuilder;
-                configureReasoningBuilder();
-        }
-
-        protected void configureReasoningBuilder() {
-                // Nothing to configure by default.
-        }
-
-        public abstract Collection<TranslatedRelation> getTranslatedRelations();
-
-        public abstract void initializeModel(Model model, int nodeCount);
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/base/BaseDecisionInterpretation.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/base/BaseDecisionInterpretation.java
deleted file mode 100644
index 2a151aa2..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/base/BaseDecisionInterpretation.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning.translator.base;
-
-import tools.refinery.store.map.Cursor;
-import tools.refinery.store.model.Interpretation;
-import tools.refinery.store.query.resultset.ResultSet;
-import tools.refinery.store.reasoning.MergeResult;
-import tools.refinery.store.reasoning.PartialInterpretation;
-import tools.refinery.store.reasoning.ReasoningAdapter;
-import tools.refinery.store.reasoning.representation.PartialRelation;
-import tools.refinery.store.representation.TruthValue;
-import tools.refinery.store.tuple.Tuple;
-
-public class BaseDecisionInterpretation implements PartialInterpretation<TruthValue, Boolean> {
-        private final ReasoningAdapter reasoningAdapter;
-        private PartialRelation partialRelation;
-        private final ResultSet<Boolean> mustResultSet;
-        private final ResultSet<Boolean> mayResultSet;
-        private final ResultSet<Boolean> errorResultSet;
-        private final ResultSet<Boolean> currentResultSet;
-        private final Interpretation<TruthValue> interpretation;
-
-        public BaseDecisionInterpretation(ReasoningAdapter reasoningAdapter, ResultSet<Boolean> mustResultSet,
-                                                                          ResultSet<Boolean> mayResultSet, ResultSet<Boolean> errorResultSet,
-                                                                          ResultSet<Boolean> currentResultSet, Interpretation<TruthValue> interpretation) {
-                this.reasoningAdapter = reasoningAdapter;
-                this.mustResultSet = mustResultSet;
-                this.mayResultSet = mayResultSet;
-                this.errorResultSet = errorResultSet;
-                this.currentResultSet = currentResultSet;
-                this.interpretation = interpretation;
-        }
-
-        @Override
-        public ReasoningAdapter getAdapter() {
-                return reasoningAdapter;
-        }
-
-        @Override
-        public int countUnfinished() {
-                return 0;
-        }
-
-        @Override
-        public int countErrors() {
-                return errorResultSet.size();
-        }
-
-        @Override
-        public PartialRelation getPartialSymbol() {
-                return partialRelation;
-        }
-
-        @Override
-        public TruthValue get(Tuple key) {
-                return null;
-        }
-
-        @Override
-        public Cursor<Tuple, TruthValue> getAll() {
-                return null;
-        }
-
-        @Override
-        public MergeResult merge(Tuple key, TruthValue value) {
-                TruthValue newValue;
-                switch (value) {
-                case UNKNOWN -> {
-                        return MergeResult.UNCHANGED;
-                }
-                case TRUE -> newValue = mayResultSet.get(key) ? TruthValue.TRUE : TruthValue.ERROR;
-                case FALSE -> newValue = mustResultSet.get(key) ? TruthValue.ERROR : TruthValue.FALSE;
-                case ERROR -> newValue = TruthValue.ERROR;
-                default -> throw new IllegalArgumentException("Unknown truth value: " + value);
-                }
-                var oldValue = interpretation.put(key, newValue);
-                return oldValue == TruthValue.ERROR ? MergeResult.UNCHANGED : MergeResult.REFINED;
-        }
-
-        @Override
-        public Boolean getConcrete(Tuple key) {
-                return currentResultSet.get(key);
-        }
-
-        @Override
-        public Cursor<Tuple, Boolean> getAllConcrete() {
-                return null;
-        }
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/base/BaseDecisionTranslationUnit.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/base/BaseDecisionTranslationUnit.java
deleted file mode 100644
index a1e4b816..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/base/BaseDecisionTranslationUnit.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning.translator.base;
-
-import tools.refinery.store.model.Model;
-import tools.refinery.store.reasoning.representation.PartialRelation;
-import tools.refinery.store.reasoning.seed.Seed;
-import tools.refinery.store.reasoning.seed.UniformSeed;
-import tools.refinery.store.reasoning.translator.TranslatedRelation;
-import tools.refinery.store.reasoning.translator.TranslationUnit;
-import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
-
-import java.util.Collection;
-import java.util.List;
-
-public class BaseDecisionTranslationUnit extends TranslationUnit {
-        private final PartialRelation partialRelation;
-        private final Seed<TruthValue> seed;
-        private final Symbol<TruthValue> symbol;
-
-        public BaseDecisionTranslationUnit(PartialRelation partialRelation, Seed<TruthValue> seed) {
-                if (seed.arity() != partialRelation.arity()) {
-                        throw new IllegalArgumentException("Expected seed with arity %d for %s, got arity %s"
-                                        .formatted(partialRelation.arity(), partialRelation, seed.arity()));
-                }
-                this.partialRelation = partialRelation;
-                this.seed = seed;
-                symbol = Symbol.of(partialRelation.name(), partialRelation.arity(), TruthValue.class, TruthValue.UNKNOWN);
-        }
-
-        public BaseDecisionTranslationUnit(PartialRelation partialRelation) {
-                this(partialRelation, new UniformSeed<>(partialRelation.arity(), TruthValue.UNKNOWN));
-        }
-
-        @Override
-        public Collection<TranslatedRelation> getTranslatedRelations() {
-                return List.of(new TranslatedBaseDecision(getReasoningBuilder(), partialRelation, symbol));
-        }
-
-        @Override
-        public void initializeModel(Model model, int nodeCount) {
-                var interpretation = model.getInterpretation(symbol);
-                interpretation.putAll(seed.getCursor(TruthValue.UNKNOWN, nodeCount));
-        }
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/base/TranslatedBaseDecision.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/base/TranslatedBaseDecision.java
deleted file mode 100644
index 4782eb46..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/base/TranslatedBaseDecision.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning.translator.base;
-
-import tools.refinery.store.model.Model;
-import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.literal.CallPolarity;
-import tools.refinery.store.query.literal.Literal;
-import tools.refinery.store.reasoning.PartialInterpretation;
-import tools.refinery.store.reasoning.ReasoningBuilder;
-import tools.refinery.store.reasoning.literal.Modality;
-import tools.refinery.store.reasoning.representation.PartialRelation;
-import tools.refinery.store.reasoning.translator.Advice;
-import tools.refinery.store.reasoning.translator.TranslatedRelation;
-import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
-
-import java.util.List;
-
-class TranslatedBaseDecision implements TranslatedRelation {
-        private final ReasoningBuilder reasoningBuilder;
-        private final PartialRelation partialRelation;
-        private final Symbol<TruthValue> symbol;
-
-        public TranslatedBaseDecision(ReasoningBuilder reasoningBuilder, PartialRelation partialRelation,
-                                                                  Symbol<TruthValue> symbol) {
-                this.reasoningBuilder = reasoningBuilder;
-                this.partialRelation = partialRelation;
-                this.symbol = symbol;
-        }
-
-        @Override
-        public PartialRelation getSource() {
-                return partialRelation;
-        }
-
-        @Override
-        public void configure(List<Advice> advices) {
-
-        }
-
-        @Override
-        public List<Literal> call(CallPolarity polarity, Modality modality, List<Variable> arguments) {
-                return null;
-        }
-
-        @Override
-        public PartialInterpretation<TruthValue, Boolean> createPartialInterpretation(Model model) {
-                return null;
-        }
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslator.java
new file mode 100644
index 00000000..5c3298ac
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslator.java
@@ -0,0 +1,255 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.containment;
+
+import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder;
+import tools.refinery.store.dse.transition.Rule;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.model.ModelStoreConfiguration;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.query.literal.Connectivity;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.literal.RepresentativeElectionLiteral;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.store.reasoning.lifting.DnfLifter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.literal.CountLowerBoundLiteral;
+import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.reasoning.refinement.RefinementBasedInitializer;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
+import tools.refinery.store.reasoning.translator.RoundingMode;
+import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
+import tools.refinery.store.reasoning.translator.multiplicity.ConstrainedMultiplicity;
+import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.store.query.term.int_.IntTerms.constant;
+import static tools.refinery.store.query.term.int_.IntTerms.less;
+import static tools.refinery.store.reasoning.ReasoningAdapter.EXISTS_SYMBOL;
+import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add;
+import static tools.refinery.store.reasoning.actions.PartialActionLiterals.focus;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.*;
+
+public class ContainmentHierarchyTranslator implements ModelStoreConfiguration {
+        public static final PartialRelation CONTAINED_SYMBOL = new PartialRelation("contained", 1);
+        public static final PartialRelation INVALID_CONTAINER = new PartialRelation("invalidContainer",
+                        1);
+        public static final PartialRelation CONTAINS_SYMBOL = new PartialRelation("contains", 2);
+
+        private final Symbol<InferredContainment> containsStorage = Symbol.of("CONTAINS", 2, InferredContainment.class,
+                        InferredContainment.UNKNOWN);
+        private final AnySymbolView forbiddenContainsView = new ForbiddenContainsView(containsStorage);
+        private final RelationalQuery containsMayNewTargetHelper;
+        private final RelationalQuery containsMayExistingHelper;
+        private final RelationalQuery weakComponents;
+        private final RelationalQuery strongComponents;
+        private final Map<PartialRelation, ContainmentInfo> containmentInfoMap;
+
+        public ContainmentHierarchyTranslator(Map<PartialRelation, ContainmentInfo> containmentInfoMap) {
+                this.containmentInfoMap = containmentInfoMap;
+
+                var name = CONTAINS_SYMBOL.name();
+
+                containsMayNewTargetHelper = Query.of(name + "#mayNewTargetHelper", (builder, child) -> builder
+                                .clause(Integer.class, existingContainers -> List.of(
+                                                may(CONTAINED_SYMBOL.call(child)),
+                                                new CountLowerBoundLiteral(existingContainers, CONTAINS_SYMBOL, List.of(Variable.of(), child)),
+                                                check(less(existingContainers, constant(1)))
+                                )));
+
+                containsMayExistingHelper = Query.of(name + "#mayExistingHelper", (builder, parent, child) -> builder
+                                .clause(Integer.class, existingContainers -> List.of(
+                                                must(CONTAINS_SYMBOL.call(parent, child)),
+                                                not(forbiddenContainsView.call(parent, child))
+                                                // Violation of monotonicity:
+                                                // Containment edges violating upper multiplicity will not be marked as {@code ERROR}, but the
+                                                // {@code invalidNumberOfContainers} error pattern will already mark the node as invalid.
+                                )));
+
+                var mustExistBothContains = Query.of(name + "#mustExistBoth", (builder, parent, child) -> builder.clause(
+                                must(CONTAINS_SYMBOL.call(parent, child)),
+                                must(EXISTS_SYMBOL.call(parent)),
+                                must(EXISTS_SYMBOL.call(child))
+                ));
+
+                weakComponents = Query.of(name + "#weakComponents", (builder, node, representative) -> builder.clause(
+                                new RepresentativeElectionLiteral(Connectivity.WEAK, mustExistBothContains.getDnf(), node,
+                                                representative)
+                ));
+
+                strongComponents = Query.of(name + "#strongComponents", (builder, node, representative) -> builder.clause(
+                                new RepresentativeElectionLiteral(Connectivity.STRONG, mustExistBothContains.getDnf(), node,
+                                                representative)
+                ));
+        }
+
+        @Override
+        public void apply(ModelStoreBuilder storeBuilder) {
+                storeBuilder.symbol(containsStorage);
+                translateContains(storeBuilder);
+                translateInvalidContainer(storeBuilder);
+                for (var entry : containmentInfoMap.entrySet()) {
+                        var linkType = entry.getKey();
+                        var info = entry.getValue();
+                        translateContainmentLinkType(storeBuilder, linkType, info);
+                        translateInvalidMultiplicity(storeBuilder, linkType, info);
+                }
+                translateFocusNotContained(storeBuilder);
+        }
+
+        private void translateContainmentLinkType(ModelStoreBuilder storeBuilder, PartialRelation linkType,
+                                                                                          ContainmentInfo info) {
+                var name = linkType.name();
+                var sourceType = info.sourceType();
+                var targetType = info.targetType();
+                var upperCardinality = info.multiplicity().multiplicity().upperBound();
+
+                var mayNewSourceHelper = Query.of(name + "#mayNewSourceHelper", (builder, parent) -> {
+                        var literals = new ArrayList<Literal>();
+                        literals.add(may(sourceType.call(parent)));
+                        if (upperCardinality instanceof FiniteUpperCardinality finiteUpperCardinality) {
+                                var existingCount = Variable.of("existingCount", Integer.class);
+                                literals.add(new CountLowerBoundLiteral(existingCount, linkType, List.of(parent, Variable.of())));
+                                literals.add(check(less(existingCount, constant(finiteUpperCardinality.finiteUpperBound()))));
+                        }
+                        builder.clause(literals);
+                });
+
+                var mayNewTargetHelper = Query.of(name + "#mayNewTargetHelper", (builder, child) -> builder.clause(
+                                containsMayNewTargetHelper.call(child),
+                                may(targetType.call(child))
+                ));
+
+                var forbiddenLinkView = new ForbiddenContainmentLinkView(containsStorage, linkType);
+
+                var mayNewHelper = Query.of(name + "#mayNewHelper", (builder, parent, child) -> builder.clause(
+                                mayNewSourceHelper.call(parent),
+                                mayNewTargetHelper.call(child),
+                                not(must(CONTAINS_SYMBOL.call(parent, child))),
+                                not(forbiddenLinkView.call(parent, child))
+                ));
+
+                var mayExistingHelper = Query.of(name + "#mayExistingHelper", (builder, parent, child) -> builder.clause(
+                                must(linkType.call(parent, child)),
+                                containsMayExistingHelper.call(parent, child),
+                                may(sourceType.call(parent)),
+                                may(targetType.call(child)),
+                                not(forbiddenLinkView.call(parent, child))
+                                // Violation of monotonicity:
+                                // Containment edges violating upper multiplicity will not be marked as {@code ERROR}, but the
+                                // {@code invalidNumberOfContainers} error pattern will already mark the node as invalid.
+                ));
+
+                var may = Query.of(name + "#may", (builder, parent, child) -> builder
+                                .clause(
+                                                mayNewHelper.call(parent, child),
+                                                not(weakComponents.call(parent, Variable.of()))
+                                )
+                                .clause(representative -> List.of(
+                                                mayNewHelper.call(parent, child),
+                                                weakComponents.call(parent, representative),
+                                                // Violation of para-consistency:
+                                                // If there is a surely existing node with at least two containers, its (transitive) containers
+                                                // will end up in the same weakly connected component, and we will spuriously mark the
+                                                // containment edge between the (transitive) containers as {@code FALSE}. However, such
+                                                // models can never be finished.
+                                                //
+                                                // Violation of monotonicity:
+                                                // if the a {@code TRUE} value is added to the representation in the previous situation,
+                                                // we'll check strongly connected components instead of weakly connected ones. Therefore, the
+                                                // view for the partial symbol will change from {@code FALSE} to {@code TRUE}. This doesn't
+                                                // affect the overall inconsistency of the partial model (due to the surely existing node
+                                                // with multiple containers).
+                                                not(weakComponents.call(child, representative))
+                                ))
+                                .clause(
+                                                mayExistingHelper.call(parent, child),
+                                                not(strongComponents.call(parent, Variable.of()))
+                                )
+                                .clause(representative -> List.of(
+                                                mayExistingHelper.call(parent, child),
+                                                strongComponents.call(parent, representative),
+                                                not(strongComponents.call(child, representative))
+                                )));
+
+                storeBuilder.with(PartialRelationTranslator.of(linkType)
+                                .may(may)
+                                .must(Query.of(name + "#must", (builder, parent, child) -> builder.clause(
+                                                new MustContainmentLinkView(containsStorage, linkType).call(parent, child)
+                                )))
+                                .roundingMode(RoundingMode.PREFER_FALSE)
+                                .refiner(ContainmentLinkRefiner.of(linkType, containsStorage, info.sourceType(), info.targetType()))
+                                .initializer(new RefinementBasedInitializer<>(linkType))
+                                .decision(Rule.of(linkType.name(), (builder, source, target) -> builder
+                                                .clause(
+                                                                may(linkType.call(source, target)),
+                                                                not(candidateMust(linkType.call(source, target))),
+                                                                not(MultiObjectTranslator.MULTI_VIEW.call(source))
+                                                )
+                                                .action(focusedTarget -> List.of(
+                                                                focus(target, focusedTarget),
+                                                                add(linkType, source, focusedTarget)
+                                                )))));
+        }
+
+        private void translateInvalidMultiplicity(ModelStoreBuilder storeBuilder, PartialRelation linkType,
+                                                                                          ContainmentInfo info) {
+                storeBuilder.with(new InvalidMultiplicityErrorTranslator(info.sourceType(), linkType, false,
+                                info.multiplicity()));
+        }
+
+        private void translateContains(ModelStoreBuilder storeBuilder) {
+                var name = CONTAINS_SYMBOL.name();
+                var mustName = DnfLifter.decorateName(name, Modality.MUST, Concreteness.PARTIAL);
+
+                storeBuilder.with(PartialRelationTranslator.of(CONTAINS_SYMBOL)
+                                .query(Query.of(name, (builder, parent, child) -> {
+                                        for (var linkType : containmentInfoMap.keySet()) {
+                                                builder.clause(linkType.call(parent, child));
+                                        }
+                                }))
+                                .must(Query.of(mustName, (builder, parent, child) -> builder.clause(
+                                                new MustContainsView(containsStorage).call(parent, child)
+                                ))));
+        }
+
+        private void translateInvalidContainer(ModelStoreBuilder storeBuilder) {
+                storeBuilder.with(new InvalidMultiplicityErrorTranslator(CONTAINED_SYMBOL, CONTAINS_SYMBOL, true,
+                                ConstrainedMultiplicity.of(CardinalityIntervals.ONE, INVALID_CONTAINER)));
+        }
+
+        private void translateFocusNotContained(ModelStoreBuilder storeBuilder) {
+                var dseBuilderOption = storeBuilder.tryGetAdapter(DesignSpaceExplorationBuilder.class);
+                if (dseBuilderOption.isEmpty()) {
+                        return;
+                }
+                var dseBuilder = dseBuilderOption.get();
+                dseBuilder.transformation(Rule.of("NOT_CONTAINED", (builder, multi) -> builder
+                                .clause(
+                                                MultiObjectTranslator.MULTI_VIEW.call(multi),
+                                                not(may(CONTAINED_SYMBOL.call(multi)))
+                                )
+                                .clause((container) -> List.of(
+                                                MultiObjectTranslator.MULTI_VIEW.call(multi),
+                                                must(CONTAINS_SYMBOL.call(container, multi)),
+                                                not(MultiObjectTranslator.MULTI_VIEW.call(container))
+                                ))
+                                .action(
+                                                focus(multi, Variable.of())
+                                )));
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentInfo.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentInfo.java
new file mode 100644
index 00000000..e3457fa7
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentInfo.java
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.containment;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.TranslationException;
+import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
+
+public record ContainmentInfo(PartialRelation sourceType, Multiplicity multiplicity,
+                                                          PartialRelation targetType) {
+        public ContainmentInfo {
+                if (sourceType.arity() != 1) {
+                        throw new TranslationException(sourceType, "Expected source type %s to be of arity 1, got %d instead"
+                                                        .formatted(sourceType, sourceType.arity()));
+                }
+                if (targetType.arity() != 1) {
+                        throw new TranslationException(targetType, "Expected target type %s to be of arity 1, got %d instead"
+                                        .formatted(targetType, targetType.arity()));
+                }
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentLinkRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentLinkRefiner.java
new file mode 100644
index 00000000..497ed98f
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentLinkRefiner.java
@@ -0,0 +1,128 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.containment;
+
+import tools.refinery.store.model.Interpretation;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner;
+import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+class ContainmentLinkRefiner extends AbstractPartialInterpretationRefiner<TruthValue, Boolean> {
+        private final Factory factory;
+        private final Interpretation<InferredContainment> interpretation;
+        private final PartialInterpretationRefiner<TruthValue, Boolean> sourceRefiner;
+        private final PartialInterpretationRefiner<TruthValue, Boolean> targetRefiner;
+
+        public ContainmentLinkRefiner(ReasoningAdapter adapter, PartialSymbol<TruthValue, Boolean> partialSymbol,
+                                                                  Factory factory) {
+                super(adapter, partialSymbol);
+                this.factory = factory;
+                interpretation = adapter.getModel().getInterpretation(factory.symbol);
+                sourceRefiner = adapter.getRefiner(factory.sourceType);
+                targetRefiner = adapter.getRefiner(factory.targetType);
+        }
+
+        @Override
+        public boolean merge(Tuple key, TruthValue value) {
+                var oldValue = interpretation.get(key);
+                var newValue = mergeLink(oldValue, value);
+                if (oldValue != newValue) {
+                        interpretation.put(key, newValue);
+                }
+                if (value.must()) {
+                        return sourceRefiner.merge(Tuple.of(key.get(0)), TruthValue.TRUE) &&
+                                        targetRefiner.merge(Tuple.of(key.get(1)), TruthValue.TRUE);
+                }
+                return true;
+        }
+
+        public InferredContainment mergeLink(InferredContainment oldValue, TruthValue toMerge) {
+                return switch (toMerge) {
+                        case UNKNOWN -> oldValue;
+                        case TRUE -> mustLink(oldValue);
+                        case FALSE -> forbidLink(oldValue);
+                        case ERROR -> errorLink(oldValue);
+                };
+        }
+
+        public InferredContainment mustLink(InferredContainment oldValue) {
+                var mustLinks = oldValue.mustLinks();
+                if (oldValue.contains().may() && mustLinks.isEmpty() && oldValue.forbiddenLinks().isEmpty()) {
+                        return factory.trueLink;
+                }
+                if (mustLinks.contains(factory.linkType)) {
+                        return oldValue;
+                }
+                return new InferredContainment(oldValue.contains().merge(TruthValue.TRUE),
+                                addToSet(mustLinks, factory.linkType), oldValue.forbiddenLinks());
+        }
+
+        public InferredContainment forbidLink(InferredContainment oldValue) {
+                var forbiddenLinks = oldValue.forbiddenLinks();
+                if (oldValue.contains() == TruthValue.UNKNOWN && oldValue.mustLinks().isEmpty() && forbiddenLinks.isEmpty()) {
+                        return factory.falseLinkUnknownContains;
+                }
+                if (forbiddenLinks.contains(factory.linkType)) {
+                        return oldValue;
+                }
+                return new InferredContainment(oldValue.contains(), oldValue.mustLinks(),
+                                addToSet(forbiddenLinks, factory.linkType));
+        }
+
+        public InferredContainment errorLink(InferredContainment oldValue) {
+                return new InferredContainment(TruthValue.ERROR, addToSet(oldValue.mustLinks(), factory.linkType),
+                                addToSet(oldValue.forbiddenLinks(), factory.linkType));
+        }
+
+        private static Set<PartialRelation> addToSet(Set<PartialRelation> oldSet, PartialRelation linkType) {
+                if (oldSet.isEmpty()) {
+                        return Set.of(linkType);
+                }
+                var newElements = new ArrayList<PartialRelation>(oldSet.size() + 1);
+                newElements.addAll(oldSet);
+                newElements.add(linkType);
+                return Set.copyOf(newElements);
+        }
+
+        public static PartialInterpretationRefiner.Factory<TruthValue, Boolean> of(
+                        PartialRelation linkType, Symbol<InferredContainment> symbol, PartialRelation sourceType,
+                        PartialRelation targetType) {
+                return new Factory(linkType, symbol, sourceType, targetType);
+        }
+
+        private static class Factory implements PartialInterpretationRefiner.Factory<TruthValue, Boolean> {
+                public final PartialRelation linkType;
+                public final Symbol<InferredContainment> symbol;
+                public final PartialRelation targetType;
+                public final PartialRelation sourceType;
+                public final InferredContainment trueLink;
+                public final InferredContainment falseLinkUnknownContains;
+
+                public Factory(PartialRelation linkType, Symbol<InferredContainment> symbol, PartialRelation sourceType,
+                                           PartialRelation targetType) {
+                        this.linkType = linkType;
+                        this.symbol = symbol;
+                        this.sourceType = sourceType;
+                        this.targetType = targetType;
+                        trueLink = new InferredContainment(TruthValue.TRUE, Set.of(linkType), Set.of());
+                        falseLinkUnknownContains = new InferredContainment(TruthValue.FALSE, Set.of(), Set.of(linkType));
+                }
+
+                @Override
+                public PartialInterpretationRefiner<TruthValue, Boolean> create(
+                                ReasoningAdapter adapter, PartialSymbol<TruthValue, Boolean> partialSymbol) {
+                        return new ContainmentLinkRefiner(adapter, partialSymbol, this);
+                }
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ForbiddenContainmentLinkView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ForbiddenContainmentLinkView.java
new file mode 100644
index 00000000..cf0e2971
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ForbiddenContainmentLinkView.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.containment;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+class ForbiddenContainmentLinkView extends InferredContainmentLinkView {
+        public ForbiddenContainmentLinkView(Symbol<InferredContainment> symbol, PartialRelation link) {
+                super(symbol, "must", link);
+        }
+
+        @Override
+        protected boolean doFilter(Tuple key, InferredContainment value) {
+                return value.forbiddenLinks().contains(link);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ForbiddenContainsView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ForbiddenContainsView.java
new file mode 100644
index 00000000..efe674f1
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ForbiddenContainsView.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.containment;
+
+import tools.refinery.store.query.view.TuplePreservingView;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+class ForbiddenContainsView extends TuplePreservingView<InferredContainment> {
+        public ForbiddenContainsView(Symbol<InferredContainment> symbol) {
+                super(symbol, "contains#forbidden");
+        }
+
+        @Override
+        protected boolean doFilter(Tuple key, InferredContainment value) {
+                return !value.contains().may();
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/InferredContainment.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/InferredContainment.java
new file mode 100644
index 00000000..90802864
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/InferredContainment.java
@@ -0,0 +1,37 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.containment;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.representation.TruthValue;
+
+import java.util.Set;
+
+record InferredContainment(TruthValue contains, Set<PartialRelation> mustLinks,
+                                                   Set<PartialRelation> forbiddenLinks) {
+        public static final InferredContainment UNKNOWN = new InferredContainment(
+                        TruthValue.UNKNOWN, Set.of(), Set.of());
+
+        public InferredContainment(TruthValue contains, Set<PartialRelation> mustLinks,
+                                                           Set<PartialRelation> forbiddenLinks) {
+                this.contains = adjustContains(contains, mustLinks, forbiddenLinks);
+                this.mustLinks = mustLinks;
+                this.forbiddenLinks = forbiddenLinks;
+        }
+
+        private static TruthValue adjustContains(TruthValue contains, Set<PartialRelation> mustLinks,
+                                                                                         Set<PartialRelation> forbiddenLinks) {
+                var result = contains;
+                if (!mustLinks.isEmpty()) {
+                        result = result.merge(TruthValue.TRUE);
+                }
+                boolean hasErrorLink = mustLinks.stream().anyMatch(forbiddenLinks::contains);
+                if (mustLinks.size() >= 2 || hasErrorLink) {
+                        result = result.merge(TruthValue.ERROR);
+                }
+                return result;
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/InferredContainmentLinkView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/InferredContainmentLinkView.java
new file mode 100644
index 00000000..d187ad91
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/InferredContainmentLinkView.java
@@ -0,0 +1,35 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.containment;
+
+import tools.refinery.store.query.view.TuplePreservingView;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.representation.Symbol;
+
+import java.util.Objects;
+
+abstract class InferredContainmentLinkView extends TuplePreservingView<InferredContainment> {
+        protected final PartialRelation link;
+
+        protected InferredContainmentLinkView(Symbol<InferredContainment> symbol, String name, PartialRelation link) {
+                super(symbol, link.name() + "#" + name);
+                this.link = link;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+                if (this == o) return true;
+                if (o == null || getClass() != o.getClass()) return false;
+                if (!super.equals(o)) return false;
+                InferredContainmentLinkView that = (InferredContainmentLinkView) o;
+                return Objects.equals(link, that.link);
+        }
+
+        @Override
+        public int hashCode() {
+                return Objects.hash(super.hashCode(), link);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/MustContainmentLinkView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/MustContainmentLinkView.java
new file mode 100644
index 00000000..474942d6
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/MustContainmentLinkView.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.containment;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+class MustContainmentLinkView extends InferredContainmentLinkView {
+        public MustContainmentLinkView(Symbol<InferredContainment> symbol, PartialRelation link) {
+                super(symbol, "must", link);
+        }
+
+        @Override
+        protected boolean doFilter(Tuple key, InferredContainment value) {
+                return value.mustLinks().contains(link);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/MustContainsView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/MustContainsView.java
new file mode 100644
index 00000000..6bc62a59
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/MustContainsView.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.containment;
+
+import tools.refinery.store.query.view.TuplePreservingView;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+class MustContainsView extends TuplePreservingView<InferredContainment> {
+        public MustContainsView(Symbol<InferredContainment> symbol) {
+                super(symbol, "contains#must");
+        }
+
+        @Override
+        protected boolean doFilter(Tuple key, InferredContainment value) {
+                return value.contains().must();
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/CrossReferenceUtils.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/CrossReferenceUtils.java
new file mode 100644
index 00000000..c4a2f2b3
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/CrossReferenceUtils.java
@@ -0,0 +1,57 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.crossreference;
+
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.reasoning.literal.CountLowerBoundLiteral;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
+import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.store.query.term.int_.IntTerms.constant;
+import static tools.refinery.store.query.term.int_.IntTerms.less;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.may;
+
+class CrossReferenceUtils {
+        private CrossReferenceUtils() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+
+        public static RelationalQuery createMayHelper(PartialRelation linkType, PartialRelation type,
+                                                                                                  Multiplicity multiplicity, boolean inverse) {
+                String name;
+                NodeVariable variable;
+                List<Variable> arguments;
+                if (inverse) {
+                        name = "Target";
+                        variable = Variable.of("target");
+                        arguments = List.of(Variable.of("source"), variable);
+                } else {
+                        name = "Source";
+                        variable = Variable.of("source");
+                        arguments = List.of(variable, Variable.of("target"));
+                }
+                var builder = Query.builder(linkType.name() + "#mayNew" + name);
+                builder.parameter(variable);
+                var literals = new ArrayList<Literal>();
+                literals.add(may(type.call(variable)));
+                if (multiplicity.multiplicity().upperBound() instanceof FiniteUpperCardinality finiteUpperCardinality) {
+                        var existingLinks = Variable.of("existingLinks", Integer.class);
+                        literals.add(new CountLowerBoundLiteral(existingLinks, linkType, arguments));
+                        literals.add(check(less(existingLinks, constant(finiteUpperCardinality.finiteUpperBound()))));
+                }
+                builder.clause(literals);
+                return builder.build();
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInfo.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInfo.java
new file mode 100644
index 00000000..d8c6a5ea
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInfo.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.crossreference;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
+
+public record DirectedCrossReferenceInfo(PartialRelation sourceType, Multiplicity sourceMultiplicity,
+                                                                                 PartialRelation targetType, Multiplicity targetMultiplicity) {
+        public boolean isConstrained() {
+                return sourceMultiplicity.isConstrained() || targetMultiplicity.isConstrained();
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceRefiner.java
new file mode 100644
index 00000000..0700f9f7
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceRefiner.java
@@ -0,0 +1,46 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.crossreference;
+
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.refinement.ConcreteSymbolRefiner;
+import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.tuple.Tuple;
+
+class DirectedCrossReferenceRefiner extends ConcreteSymbolRefiner<TruthValue, Boolean> {
+        private final PartialInterpretationRefiner<TruthValue, Boolean> sourceRefiner;
+        private final PartialInterpretationRefiner<TruthValue, Boolean> targetRefiner;
+
+        public DirectedCrossReferenceRefiner(ReasoningAdapter adapter, PartialSymbol<TruthValue, Boolean> partialSymbol,
+                                                                                 Symbol<TruthValue> concreteSymbol, PartialRelation sourceType,
+                                                                                 PartialRelation targetType) {
+                super(adapter, partialSymbol, concreteSymbol);
+                sourceRefiner = adapter.getRefiner(sourceType);
+                targetRefiner = adapter.getRefiner(targetType);
+        }
+
+        @Override
+        public boolean merge(Tuple key, TruthValue value) {
+                if (!super.merge(key, value)) {
+                        return false;
+                }
+                if (value.must()) {
+                        return sourceRefiner.merge(Tuple.of(key.get(0)), TruthValue.TRUE) &&
+                                        targetRefiner.merge(Tuple.of(key.get(1)), TruthValue.TRUE);
+                }
+                return true;
+        }
+
+        public static Factory<TruthValue, Boolean> of(Symbol<TruthValue> concreteSymbol, PartialRelation sourceType,
+                                                                                                  PartialRelation targetType) {
+                return (adapter, partialSymbol) -> new DirectedCrossReferenceRefiner(adapter, partialSymbol, concreteSymbol,
+                                sourceType, targetType);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceTranslator.java
new file mode 100644
index 00000000..9028337c
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceTranslator.java
@@ -0,0 +1,94 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.crossreference;
+
+import tools.refinery.store.dse.transition.Rule;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.model.ModelStoreConfiguration;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.query.view.ForbiddenView;
+import tools.refinery.store.reasoning.lifting.DnfLifter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.reasoning.refinement.RefinementBasedInitializer;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
+import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator;
+import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+
+import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.*;
+import static tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator.MULTI_VIEW;
+
+public class DirectedCrossReferenceTranslator implements ModelStoreConfiguration {
+        private final PartialRelation linkType;
+        private final DirectedCrossReferenceInfo info;
+        private final Symbol<TruthValue> symbol;
+
+        public DirectedCrossReferenceTranslator(PartialRelation linkType, DirectedCrossReferenceInfo info) {
+                this.linkType = linkType;
+                this.info = info;
+                symbol = Symbol.of(linkType.name(), 2, TruthValue.class, TruthValue.UNKNOWN);
+        }
+
+        @Override
+        public void apply(ModelStoreBuilder storeBuilder) {
+                var name = linkType.name();
+                var sourceType = info.sourceType();
+                var targetType = info.targetType();
+                var mayNewSource = createMayHelper(sourceType, info.sourceMultiplicity(), false);
+                var mayNewTarget = createMayHelper(targetType, info.targetMultiplicity(), true);
+                var forbiddenView = new ForbiddenView(symbol);
+                var mayName = DnfLifter.decorateName(name, Modality.MAY, Concreteness.PARTIAL);
+
+                storeBuilder.with(PartialRelationTranslator.of(linkType)
+                                .symbol(symbol)
+                                .may(Query.of(mayName, (builder, source, target) -> {
+                                        builder.clause(
+                                                        mayNewSource.call(source),
+                                                        mayNewTarget.call(target),
+                                                        not(forbiddenView.call(source, target))
+                                        );
+                                        if (info.isConstrained()) {
+                                                // Violation of monotonicity:
+                                                // Edges violating upper multiplicity will not be marked as {@code ERROR}, but the
+                                                // corresponding error pattern will already mark the node as invalid.
+                                                builder.clause(
+                                                                must(linkType.call(source, target)),
+                                                                not(forbiddenView.call(source, target)),
+                                                                may(sourceType.call(source)),
+                                                                may(targetType.call(target))
+                                                );
+                                        }
+                                }))
+                                .refiner(DirectedCrossReferenceRefiner.of(symbol, sourceType, targetType))
+                                .initializer(new RefinementBasedInitializer<>(linkType))
+                                .decision(Rule.of(linkType.name(), (builder, source, target) -> builder
+                                                .clause(
+                                                                may(linkType.call(source, target)),
+                                                                not(candidateMust(linkType.call(source, target))),
+                                                                not(MULTI_VIEW.call(source)),
+                                                                not(MULTI_VIEW.call(target))
+                                                )
+                                                .action(
+                                                                add(linkType, source, target)
+                                                ))));
+
+                storeBuilder.with(new InvalidMultiplicityErrorTranslator(sourceType, linkType, false,
+                                info.sourceMultiplicity()));
+
+                storeBuilder.with(new InvalidMultiplicityErrorTranslator(targetType, linkType, true,
+                                info.targetMultiplicity()));
+        }
+
+        private RelationalQuery createMayHelper(PartialRelation type, Multiplicity multiplicity, boolean inverse) {
+                return CrossReferenceUtils.createMayHelper(linkType, type, multiplicity, inverse);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInfo.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInfo.java
new file mode 100644
index 00000000..fe99bc54
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInfo.java
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.crossreference;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
+
+public record UndirectedCrossReferenceInfo(PartialRelation type, Multiplicity multiplicity) {
+        public boolean isConstrained() {
+                return multiplicity.isConstrained();
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceRefiner.java
new file mode 100644
index 00000000..43c1462b
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceRefiner.java
@@ -0,0 +1,44 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.crossreference;
+
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.refinement.ConcreteSymbolRefiner;
+import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.tuple.Tuple;
+
+class UndirectedCrossReferenceRefiner extends ConcreteSymbolRefiner<TruthValue, Boolean> {
+        private final PartialInterpretationRefiner<TruthValue, Boolean> sourceRefiner;
+
+        public UndirectedCrossReferenceRefiner(ReasoningAdapter adapter, PartialSymbol<TruthValue, Boolean> partialSymbol,
+                                                                                   Symbol<TruthValue> concreteSymbol, PartialRelation sourceType) {
+                super(adapter, partialSymbol, concreteSymbol);
+                sourceRefiner = adapter.getRefiner(sourceType);
+        }
+
+        @Override
+        public boolean merge(Tuple key, TruthValue value) {
+                int source = key.get(0);
+                int target = key.get(1);
+                if (!super.merge(key, value) || !super.merge(Tuple.of(target, source), value)) {
+                        return false;
+                }
+                if (value.must()) {
+                        return sourceRefiner.merge(Tuple.of(source), TruthValue.TRUE) &&
+                                        sourceRefiner.merge(Tuple.of(target), TruthValue.TRUE);
+                }
+                return true;
+        }
+
+        public static Factory<TruthValue, Boolean> of(Symbol<TruthValue> concreteSymbol, PartialRelation sourceType) {
+                return (adapter, partialSymbol) -> new UndirectedCrossReferenceRefiner(adapter, partialSymbol, concreteSymbol,
+                                sourceType);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceTranslator.java
new file mode 100644
index 00000000..c554e2a4
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceTranslator.java
@@ -0,0 +1,83 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.crossreference;
+
+import tools.refinery.store.dse.transition.Rule;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.model.ModelStoreConfiguration;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.view.ForbiddenView;
+import tools.refinery.store.reasoning.lifting.DnfLifter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.reasoning.refinement.RefinementBasedInitializer;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
+import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+
+import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.*;
+import static tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator.MULTI_VIEW;
+
+public class UndirectedCrossReferenceTranslator implements ModelStoreConfiguration {
+        private final PartialRelation linkType;
+        private final UndirectedCrossReferenceInfo info;
+        private final Symbol<TruthValue> symbol;
+
+        public UndirectedCrossReferenceTranslator(PartialRelation linkType, UndirectedCrossReferenceInfo info) {
+                this.linkType = linkType;
+                this.info = info;
+                symbol = Symbol.of(linkType.name(), 2, TruthValue.class, TruthValue.UNKNOWN);
+        }
+
+        @Override
+        public void apply(ModelStoreBuilder storeBuilder) {
+                var name = linkType.name();
+                var type = info.type();
+                var forbiddenView = new ForbiddenView(symbol);
+                var mayName = DnfLifter.decorateName(name, Modality.MAY, Concreteness.PARTIAL);
+
+                var mayNewSource = CrossReferenceUtils.createMayHelper(linkType, type, info.multiplicity(), false);
+
+                storeBuilder.with(PartialRelationTranslator.of(linkType)
+                                .symbol(symbol)
+                                .may(Query.of(mayName, (builder, source, target) -> {
+                                        builder.clause(
+                                                        mayNewSource.call(source),
+                                                        mayNewSource.call(target),
+                                                        not(forbiddenView.call(source, target))
+                                        );
+                                        if (info.isConstrained()) {
+                                                // Violation of monotonicity:
+                                                // Edges violating upper multiplicity will not be marked as {@code ERROR}, but the
+                                                // corresponding error pattern will already mark the node as invalid.
+                                                builder.clause(
+                                                                must(linkType.call(source, target)),
+                                                                not(forbiddenView.call(source, target)),
+                                                                may(type.call(source)),
+                                                                may(type.call(target))
+                                                );
+                                        }
+                                }))
+                                .refiner(UndirectedCrossReferenceRefiner.of(symbol, type))
+                                .initializer(new RefinementBasedInitializer<>(linkType))
+                                .decision(Rule.of(linkType.name(), (builder, source, target) -> builder
+                                                .clause(
+                                                                may(linkType.call(source, target)),
+                                                                not(candidateMust(linkType.call(source, target))),
+                                                                not(MULTI_VIEW.call(source)),
+                                                                not(MULTI_VIEW.call(target))
+                                                )
+                                                .action(
+                                                                add(linkType, source, target)
+                                                ))));
+
+                storeBuilder.with(new InvalidMultiplicityErrorTranslator(type, linkType, false, info.multiplicity()));
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ContainedTypeHierarchyBuilder.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ContainedTypeHierarchyBuilder.java
new file mode 100644
index 00000000..a21da3d4
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ContainedTypeHierarchyBuilder.java
@@ -0,0 +1,33 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.metamodel;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.TranslationException;
+import tools.refinery.store.reasoning.translator.containment.ContainmentHierarchyTranslator;
+import tools.refinery.store.reasoning.translator.typehierarchy.TypeHierarchyBuilder;
+
+import java.util.Collection;
+
+public class ContainedTypeHierarchyBuilder extends TypeHierarchyBuilder {
+        ContainedTypeHierarchyBuilder() {
+        }
+
+        boolean isInvalidType(PartialRelation type) {
+                return !typeInfoMap.containsKey(type);
+        }
+
+        void setContainedTypes(Collection<PartialRelation> containedTypes) {
+                for (var containedType : containedTypes) {
+                        var currentInfo = typeInfoMap.get(containedType);
+                        if (currentInfo == null) {
+                                throw new TranslationException(containedType, "Invalid contained type: " + containedType);
+                        }
+                        var newInfo = currentInfo.addSupertype(ContainmentHierarchyTranslator.CONTAINED_SYMBOL);
+                        typeInfoMap.put(containedType, newInfo);
+                }
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/Metamodel.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/Metamodel.java
new file mode 100644
index 00000000..72b836ff
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/Metamodel.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.metamodel;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.containment.ContainmentInfo;
+import tools.refinery.store.reasoning.translator.crossreference.DirectedCrossReferenceInfo;
+import tools.refinery.store.reasoning.translator.crossreference.UndirectedCrossReferenceInfo;
+import tools.refinery.store.reasoning.translator.typehierarchy.TypeHierarchy;
+
+import java.util.Map;
+
+public record Metamodel(TypeHierarchy typeHierarchy, Map<PartialRelation, ContainmentInfo> containmentHierarchy,
+                                                Map<PartialRelation, DirectedCrossReferenceInfo> directedCrossReferences,
+                                                Map<PartialRelation, UndirectedCrossReferenceInfo> undirectedCrossReferences,
+                                                Map<PartialRelation, PartialRelation> oppositeReferences) {
+        public static MetamodelBuilder builder() {
+                return new MetamodelBuilder();
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelBuilder.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelBuilder.java
new file mode 100644
index 00000000..ad0288ed
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelBuilder.java
@@ -0,0 +1,225 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.metamodel;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.TranslationException;
+import tools.refinery.store.reasoning.translator.containment.ContainmentHierarchyTranslator;
+import tools.refinery.store.reasoning.translator.containment.ContainmentInfo;
+import tools.refinery.store.reasoning.translator.crossreference.DirectedCrossReferenceInfo;
+import tools.refinery.store.reasoning.translator.crossreference.UndirectedCrossReferenceInfo;
+import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
+import tools.refinery.store.reasoning.translator.multiplicity.UnconstrainedMultiplicity;
+import tools.refinery.store.reasoning.translator.typehierarchy.TypeInfo;
+
+import java.util.*;
+
+public class MetamodelBuilder {
+        private final ContainedTypeHierarchyBuilder typeHierarchyBuilder = new ContainedTypeHierarchyBuilder();
+        private final Map<PartialRelation, ReferenceInfo> referenceInfoMap = new LinkedHashMap<>();
+        private final Set<PartialRelation> containedTypes = new HashSet<>();
+        private final Map<PartialRelation, ContainmentInfo> containmentHierarchy = new LinkedHashMap<>();
+        private final Map<PartialRelation, DirectedCrossReferenceInfo> directedCrossReferences = new LinkedHashMap<>();
+        private final Map<PartialRelation, UndirectedCrossReferenceInfo> undirectedCrossReferences = new LinkedHashMap<>();
+        private final Map<PartialRelation, PartialRelation> oppositeReferences = new LinkedHashMap<>();
+
+        MetamodelBuilder() {
+                typeHierarchyBuilder.type(ContainmentHierarchyTranslator.CONTAINED_SYMBOL, true);
+        }
+
+        public MetamodelBuilder type(PartialRelation partialRelation, TypeInfo typeInfo) {
+                typeHierarchyBuilder.type(partialRelation, typeInfo);
+                return this;
+
+        }
+
+        public MetamodelBuilder type(PartialRelation partialRelation, boolean abstractType,
+                                                                 PartialRelation... supertypes) {
+                typeHierarchyBuilder.type(partialRelation, abstractType, supertypes);
+                return this;
+        }
+
+        public MetamodelBuilder type(PartialRelation partialRelation, boolean abstractType,
+                                                                 Collection<PartialRelation> supertypes) {
+                typeHierarchyBuilder.type(partialRelation, abstractType, supertypes);
+                return this;
+        }
+
+        public MetamodelBuilder type(PartialRelation partialRelation, PartialRelation... supertypes) {
+                typeHierarchyBuilder.type(partialRelation, supertypes);
+                return this;
+        }
+
+        public MetamodelBuilder type(PartialRelation partialRelation, Collection<PartialRelation> supertypes) {
+                typeHierarchyBuilder.type(partialRelation, supertypes);
+                return this;
+        }
+
+        public MetamodelBuilder types(Collection<Map.Entry<PartialRelation, TypeInfo>> entries) {
+                typeHierarchyBuilder.types(entries);
+                return this;
+        }
+
+        public MetamodelBuilder types(Map<PartialRelation, TypeInfo> map) {
+                typeHierarchyBuilder.types(map);
+                return this;
+        }
+
+        public MetamodelBuilder reference(PartialRelation linkType, ReferenceInfo info) {
+                if (linkType.arity() != 2) {
+                        throw new TranslationException(linkType,
+                                        "Only references of arity 2 are supported, got %s with %d instead".formatted(
+                                                        linkType, linkType.arity()));
+                }
+                var putResult = referenceInfoMap.put(linkType, info);
+                if (putResult != null && !putResult.equals(info)) {
+                        throw new TranslationException(linkType, "Duplicate reference info for partial relation: " + linkType);
+                }
+                return this;
+        }
+
+        public MetamodelBuilder reference(PartialRelation linkType, PartialRelation sourceType, boolean containment,
+                                                                          Multiplicity multiplicity, PartialRelation targetType,
+                                                                          PartialRelation opposite) {
+                return reference(linkType, new ReferenceInfo(containment, sourceType, multiplicity, targetType, opposite));
+        }
+
+        public MetamodelBuilder reference(PartialRelation linkType, PartialRelation sourceType, Multiplicity multiplicity,
+                                                                          PartialRelation targetType, PartialRelation opposite) {
+                return reference(linkType, sourceType, false, multiplicity, targetType, opposite);
+        }
+
+        public MetamodelBuilder reference(PartialRelation linkType, PartialRelation sourceType,
+                                                                          boolean containment, PartialRelation targetType, PartialRelation opposite) {
+                return reference(linkType, sourceType, containment, UnconstrainedMultiplicity.INSTANCE, targetType, opposite);
+        }
+
+        public MetamodelBuilder reference(PartialRelation linkType, PartialRelation sourceType, PartialRelation targetType,
+                                                                          PartialRelation opposite) {
+                return reference(linkType, sourceType, UnconstrainedMultiplicity.INSTANCE, targetType, opposite);
+        }
+
+        public MetamodelBuilder reference(PartialRelation linkType, PartialRelation sourceType, boolean containment,
+                                                                          Multiplicity multiplicity, PartialRelation targetType) {
+                return reference(linkType, sourceType, containment, multiplicity, targetType, null);
+        }
+
+        public MetamodelBuilder reference(PartialRelation linkType, PartialRelation sourceType, Multiplicity multiplicity,
+                                                                          PartialRelation targetType) {
+                return reference(linkType, sourceType, multiplicity, targetType, null);
+        }
+
+        public MetamodelBuilder reference(PartialRelation linkType, PartialRelation sourceType, boolean containment,
+                                                                          PartialRelation targetType) {
+                return reference(linkType, sourceType, containment, targetType, null);
+        }
+
+        public MetamodelBuilder reference(PartialRelation linkType, PartialRelation sourceType,
+                                                                          PartialRelation targetType) {
+                return reference(linkType, sourceType, targetType, null);
+        }
+
+        public MetamodelBuilder references(Collection<Map.Entry<PartialRelation, ReferenceInfo>> entries) {
+                for (var entry : entries) {
+                        reference(entry.getKey(), entry.getValue());
+                }
+                return this;
+        }
+
+        public MetamodelBuilder references(Map<PartialRelation, ReferenceInfo> map) {
+                return references(map.entrySet());
+        }
+
+        public Metamodel build() {
+                for (var entry : referenceInfoMap.entrySet()) {
+                        var linkType = entry.getKey();
+                        var info = entry.getValue();
+                        processReferenceInfo(linkType, info);
+                }
+                typeHierarchyBuilder.setContainedTypes(containedTypes);
+                var typeHierarchy = typeHierarchyBuilder.build();
+                return new Metamodel(typeHierarchy, Collections.unmodifiableMap(containmentHierarchy),
+                                Collections.unmodifiableMap(directedCrossReferences),
+                                Collections.unmodifiableMap(undirectedCrossReferences),
+                                Collections.unmodifiableMap(oppositeReferences));
+        }
+
+        private void processReferenceInfo(PartialRelation linkType, ReferenceInfo info) {
+                if (oppositeReferences.containsKey(linkType) || containmentHierarchy.containsKey(linkType)) {
+                        // We already processed this reference while processing its opposite.
+                        return;
+                }
+                var sourceType = info.sourceType();
+                var targetType = info.targetType();
+                if (typeHierarchyBuilder.isInvalidType(sourceType)) {
+                        throw new TranslationException(linkType, "Source type %s of %s is not in type hierarchy"
+                                        .formatted(sourceType, linkType));
+                }
+                if (typeHierarchyBuilder.isInvalidType(targetType)) {
+                        throw new TranslationException(linkType, "Target type %s of %s is not in type hierarchy"
+                                        .formatted(targetType, linkType));
+                }
+                var opposite = info.opposite();
+                Multiplicity targetMultiplicity = UnconstrainedMultiplicity.INSTANCE;
+                if (opposite != null) {
+                        var oppositeInfo = referenceInfoMap.get(opposite);
+                        validateOpposite(linkType, info, opposite, oppositeInfo);
+                        targetMultiplicity = oppositeInfo.multiplicity();
+                        if (oppositeInfo.containment()) {
+                                // Skip processing this reference and process it once we encounter its containment opposite.
+                                return;
+                        }
+                        if (opposite.equals(linkType)) {
+                                if (!sourceType.equals(targetType)) {
+                                        throw new TranslationException(linkType,
+                                                        "Target %s of undirected reference %s differs from source %s".formatted(
+                                                                        targetType, linkType, sourceType));
+                                }
+                                undirectedCrossReferences.put(linkType, new UndirectedCrossReferenceInfo(sourceType,
+                                                info.multiplicity()));
+                                return;
+                        }
+                        oppositeReferences.put(opposite, linkType);
+                }
+                if (info.containment()) {
+                        if (!UnconstrainedMultiplicity.INSTANCE.equals(targetMultiplicity)) {
+                                throw new TranslationException(opposite, "Invalid opposite %s with multiplicity %s of containment %s"
+                                                .formatted(opposite, targetMultiplicity, linkType));
+                        }
+                        containedTypes.add(targetType);
+                        containmentHierarchy.put(linkType, new ContainmentInfo(sourceType, info.multiplicity(), targetType));
+                        return;
+                }
+                directedCrossReferences.put(linkType, new DirectedCrossReferenceInfo(sourceType, info.multiplicity(),
+                                targetType, targetMultiplicity));
+        }
+
+        private static void validateOpposite(PartialRelation linkType, ReferenceInfo info, PartialRelation opposite,
+                                                                                 ReferenceInfo oppositeInfo) {
+                var sourceType = info.sourceType();
+                var targetType = info.targetType();
+                if (oppositeInfo == null) {
+                        throw new TranslationException(linkType, "Opposite %s of %s is not defined"
+                                        .formatted(opposite, linkType));
+                }
+                if (!linkType.equals(oppositeInfo.opposite())) {
+                        throw new TranslationException(opposite, "Expected %s to have opposite %s, got %s instead"
+                                        .formatted(opposite, linkType, oppositeInfo.opposite()));
+                }
+                if (!targetType.equals(oppositeInfo.sourceType())) {
+                        throw new TranslationException(linkType, "Expected %s to have source type %s, got %s instead"
+                                        .formatted(opposite, targetType, oppositeInfo.sourceType()));
+                }
+                if (!sourceType.equals(oppositeInfo.targetType())) {
+                        throw new TranslationException(linkType, "Expected %s to have target type %s, got %s instead"
+                                        .formatted(opposite, sourceType, oppositeInfo.targetType()));
+                }
+                if (oppositeInfo.containment() && info.containment()) {
+                        throw new TranslationException(opposite, "Opposite %s of containment %s cannot be containment"
+                                        .formatted(opposite, linkType));
+                }
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTranslator.java
new file mode 100644
index 00000000..5afa58f2
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTranslator.java
@@ -0,0 +1,37 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.metamodel;
+
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.model.ModelStoreConfiguration;
+import tools.refinery.store.reasoning.translator.containment.ContainmentHierarchyTranslator;
+import tools.refinery.store.reasoning.translator.crossreference.DirectedCrossReferenceTranslator;
+import tools.refinery.store.reasoning.translator.crossreference.UndirectedCrossReferenceTranslator;
+import tools.refinery.store.reasoning.translator.opposite.OppositeRelationTranslator;
+import tools.refinery.store.reasoning.translator.typehierarchy.TypeHierarchyTranslator;
+
+public class MetamodelTranslator implements ModelStoreConfiguration {
+        private final Metamodel metamodel;
+
+        public MetamodelTranslator(Metamodel metamodel) {
+                this.metamodel = metamodel;
+        }
+
+        @Override
+        public void apply(ModelStoreBuilder storeBuilder) {
+                storeBuilder.with(new TypeHierarchyTranslator(metamodel.typeHierarchy()));
+                storeBuilder.with(new ContainmentHierarchyTranslator(metamodel.containmentHierarchy()));
+                for (var entry : metamodel.directedCrossReferences().entrySet()) {
+                        storeBuilder.with(new DirectedCrossReferenceTranslator(entry.getKey(), entry.getValue()));
+                }
+                for (var entry : metamodel.undirectedCrossReferences().entrySet()) {
+                        storeBuilder.with(new UndirectedCrossReferenceTranslator(entry.getKey(), entry.getValue()));
+                }
+                for (var entry : metamodel.oppositeReferences().entrySet()) {
+                        storeBuilder.with(new OppositeRelationTranslator(entry.getKey(), entry.getValue()));
+                }
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfo.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfo.java
new file mode 100644
index 00000000..9a6b4012
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfo.java
@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.metamodel;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
+
+public record ReferenceInfo(boolean containment, PartialRelation sourceType, Multiplicity multiplicity,
+                                                        PartialRelation targetType, PartialRelation opposite) {
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRefiner.java
new file mode 100644
index 00000000..d8db4ec4
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRefiner.java
@@ -0,0 +1,64 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiobject;
+
+import tools.refinery.store.model.Interpretation;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.tuple.Tuple;
+
+public class EqualsRefiner extends AbstractPartialInterpretationRefiner<TruthValue, Boolean> {
+        private final Interpretation<CardinalityInterval> countInterpretation;
+
+        private EqualsRefiner(ReasoningAdapter adapter, PartialSymbol<TruthValue, Boolean> partialSymbol,
+                          Symbol<CardinalityInterval> countSymbol) {
+                super(adapter, partialSymbol);
+                countInterpretation = adapter.getModel().getInterpretation(countSymbol);
+        }
+
+        @Override
+        public boolean merge(Tuple key, TruthValue value) {
+                if (value == TruthValue.UNKNOWN) {
+                        return true;
+                }
+                if (value == TruthValue.ERROR) {
+                        return false;
+                }
+                int left = key.get(0);
+                int right = key.get(1);
+                boolean isDiagonal = left == right;
+                if (isDiagonal && value == TruthValue.FALSE) {
+                        return false;
+                }
+                if (!isDiagonal) {
+                        return !value.may();
+                }
+                if (value != TruthValue.TRUE) {
+                        throw new IllegalArgumentException("Unknown TruthValue: " + value);
+                }
+                // {@code isDiagonal} is true, so this could be {@code left} or {@code right}.
+                var unaryKey = Tuple.of(left);
+                var currentCount = countInterpretation.get(unaryKey);
+                if (currentCount == null) {
+                        return false;
+                }
+                var newCount = currentCount.meet(CardinalityIntervals.LONE);
+                if (newCount.isEmpty()) {
+                        return false;
+                }
+                countInterpretation.put(unaryKey, newCount);
+                return true;
+        }
+
+        public static Factory<TruthValue, Boolean> of(Symbol<CardinalityInterval> countSymbol) {
+                return (adapter, partialSymbol) -> new EqualsRefiner(adapter, partialSymbol, countSymbol);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRelationRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRelationRewriter.java
new file mode 100644
index 00000000..61b9488c
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRelationRewriter.java
@@ -0,0 +1,85 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiobject;
+
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.store.query.literal.CallLiteral;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.store.reasoning.interpretation.QueryBasedRelationRewriter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.representation.cardinality.UpperCardinalities;
+import tools.refinery.store.representation.cardinality.UpperCardinality;
+
+import java.util.List;
+import java.util.Set;
+
+import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.constant;
+import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.lessEq;
+
+class EqualsRelationRewriter extends QueryBasedRelationRewriter {
+        private EqualsRelationRewriter(RelationalQuery may, RelationalQuery must) {
+                super(may, must, may, may);
+        }
+
+        @Override
+        public List<Literal> rewriteLiteral(Set<Variable> positiveVariables, AbstractCallLiteral literal,
+                                                                                Modality modality, Concreteness concreteness) {
+                if (!(literal instanceof CallLiteral callLiteral)) {
+                        return super.rewriteLiteral(positiveVariables, literal, modality, concreteness);
+                }
+                var left = callLiteral.getArguments().get(0).asNodeVariable();
+                var right = callLiteral.getArguments().get(1).asNodeVariable();
+                boolean useMay = modality == Modality.MAY || concreteness == Concreteness.CANDIDATE;
+                return switch (callLiteral.getPolarity()) {
+                        case POSITIVE, TRANSITIVE -> {
+                                if (useMay) {
+                                        if (positiveVariables.contains(left) || positiveVariables.contains(right)) {
+                                                // No need to enumerate arguments if at least one is already bound, since they will be unified.
+                                                yield List.of(left.isEquivalent(right));
+                                        } else {
+                                                yield List.of(
+                                                                left.isEquivalent(right),
+                                                                getMay().call(left, right)
+                                                );
+                                        }
+                                } else {
+                                        yield List.of(
+                                                        left.isEquivalent(right),
+                                                        getMust().call(left, right)
+                                        );
+                                }
+                        }
+                        case NEGATIVE -> {
+                                if (useMay) {
+                                        yield List.of(left.notEquivalent(right));
+                                } else {
+                                        yield super.rewriteLiteral(positiveVariables, literal, modality, concreteness);
+                                }
+                        }
+                };
+        }
+
+        public static EqualsRelationRewriter of(AnySymbolView upperCardinalityView) {
+                var may = Query.of("equals#may", (builder, p1, p2) -> builder
+                                .clause(
+                                                p1.isEquivalent(p2),
+                                                upperCardinalityView.call(p1, Variable.of(UpperCardinality.class))
+                                ));
+                var must = Query.of("equals#must", (builder, p1, p2) -> builder
+                                .clause(UpperCardinality.class, upper -> List.of(
+                                                p1.isEquivalent(p2),
+                                                upperCardinalityView.call(p1, upper),
+                                                check(lessEq(upper, constant(UpperCardinalities.ONE)))
+                                )));
+                return new EqualsRelationRewriter(may, must);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/ExistsRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/ExistsRefiner.java
new file mode 100644
index 00000000..f134fe92
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/ExistsRefiner.java
@@ -0,0 +1,55 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiobject;
+
+import tools.refinery.store.model.Interpretation;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.tuple.Tuple;
+
+public class ExistsRefiner extends AbstractPartialInterpretationRefiner<TruthValue, Boolean> {
+        private final Interpretation<CardinalityInterval> countInterpretation;
+
+        private ExistsRefiner(ReasoningAdapter adapter, PartialSymbol<TruthValue, Boolean> partialSymbol,
+                                                   Symbol<CardinalityInterval> countSymbol) {
+                super(adapter, partialSymbol);
+                countInterpretation = adapter.getModel().getInterpretation(countSymbol);
+        }
+
+        @Override
+        public boolean merge(Tuple key, TruthValue value) {
+                var currentCount = countInterpretation.get(key);
+                if (currentCount == null) {
+                        return false;
+                }
+                CardinalityInterval newCount;
+                switch (value) {
+                case UNKNOWN -> {
+                        return true;
+                }
+                case TRUE -> newCount = currentCount.meet(CardinalityIntervals.SOME);
+                case FALSE -> newCount = currentCount.meet(CardinalityIntervals.NONE);
+                case ERROR -> {
+                        return false;
+                }
+                default -> throw new IllegalArgumentException("Unknown TruthValue: " + value);
+                }
+                if (newCount.isEmpty()) {
+                        return false;
+                }
+                countInterpretation.put(key, newCount);
+                return true;
+        }
+
+        public static Factory<TruthValue, Boolean> of(Symbol<CardinalityInterval> countSymbol) {
+                return (adapter, partialSymbol) -> new ExistsRefiner(adapter, partialSymbol, countSymbol);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/LowerCardinalityView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/LowerCardinalityView.java
new file mode 100644
index 00000000..9873888c
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/LowerCardinalityView.java
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiobject;
+
+import tools.refinery.store.query.term.Parameter;
+import tools.refinery.store.query.view.AbstractFunctionView;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+
+class LowerCardinalityView extends AbstractFunctionView<CardinalityInterval> {
+        public LowerCardinalityView(Symbol<CardinalityInterval> symbol) {
+                super(symbol, "lower", new Parameter(Integer.class));
+        }
+
+        @Override
+        protected Object forwardMapValue(CardinalityInterval value) {
+                return value.lowerBound();
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectInitializer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectInitializer.java
new file mode 100644
index 00000000..f11ab46b
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectInitializer.java
@@ -0,0 +1,131 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiobject;
+
+import org.jetbrains.annotations.NotNull;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.refinement.PartialModelInitializer;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+import tools.refinery.store.reasoning.translator.TranslationException;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.function.Function;
+
+class MultiObjectInitializer implements PartialModelInitializer {
+        private final Symbol<CardinalityInterval> countSymbol;
+
+        public MultiObjectInitializer(Symbol<CardinalityInterval> countSymbol) {
+                this.countSymbol = countSymbol;
+        }
+
+        @Override
+        public void initialize(Model model, ModelSeed modelSeed) {
+                var intervals = initializeIntervals(modelSeed);
+                initializeExists(intervals, modelSeed);
+                initializeEquals(intervals, modelSeed);
+                var countInterpretation = model.getInterpretation(countSymbol);
+                var uniqueTable = new HashMap<CardinalityInterval, CardinalityInterval>();
+                for (int i = 0; i < intervals.length; i++) {
+                        var interval = intervals[i];
+                        if (interval.isEmpty()) {
+                                throw new TranslationException(ReasoningAdapter.EXISTS_SYMBOL,
+                                                "Inconsistent existence or equality for node " + i);
+                        }
+                        var uniqueInterval = uniqueTable.computeIfAbsent(intervals[i], Function.identity());
+                        countInterpretation.put(Tuple.of(i), uniqueInterval);
+                }
+        }
+
+        @NotNull
+        private CardinalityInterval[] initializeIntervals(ModelSeed modelSeed) {
+                var intervals = new CardinalityInterval[modelSeed.getNodeCount()];
+                if (modelSeed.containsSeed(MultiObjectTranslator.COUNT_SYMBOL)) {
+                        Arrays.fill(intervals, CardinalityIntervals.ONE);
+                        var cursor = modelSeed.getCursor(MultiObjectTranslator.COUNT_SYMBOL, CardinalityIntervals.ONE);
+                        while (cursor.move()) {
+                                int i = cursor.getKey().get(0);
+                                checkNodeId(intervals, i);
+                                intervals[i] = cursor.getValue();
+                        }
+                } else {
+                        Arrays.fill(intervals, CardinalityIntervals.SET);
+                        if (!modelSeed.containsSeed(ReasoningAdapter.EXISTS_SYMBOL) ||
+                                        !modelSeed.containsSeed(ReasoningAdapter.EQUALS_SYMBOL)) {
+                                throw new TranslationException(MultiObjectTranslator.COUNT_SYMBOL,
+                                                "Seed for %s and %s is required if there is no seed for %s".formatted(
+                                                                ReasoningAdapter.EXISTS_SYMBOL, ReasoningAdapter.EQUALS_SYMBOL,
+                                                                MultiObjectTranslator.COUNT_SYMBOL));
+                        }
+                }
+                return intervals;
+        }
+
+        private void initializeExists(CardinalityInterval[] intervals, ModelSeed modelSeed) {
+                if (!modelSeed.containsSeed(ReasoningAdapter.EXISTS_SYMBOL)) {
+                        return;
+                }
+                var cursor = modelSeed.getCursor(ReasoningAdapter.EXISTS_SYMBOL, TruthValue.UNKNOWN);
+                while (cursor.move()) {
+                        int i = cursor.getKey().get(0);
+                        checkNodeId(intervals, i);
+                        switch (cursor.getValue()) {
+                        case TRUE -> intervals[i] = intervals[i].meet(CardinalityIntervals.SOME);
+                        case FALSE -> intervals[i] = intervals[i].meet(CardinalityIntervals.NONE);
+                        case ERROR -> throw new TranslationException(ReasoningAdapter.EXISTS_SYMBOL,
+                                        "Inconsistent existence for node " + i);
+                        default -> throw new TranslationException(ReasoningAdapter.EXISTS_SYMBOL,
+                                        "Invalid existence truth value %s for node %d".formatted(cursor.getValue(), i));
+                        }
+                }
+        }
+
+        private void initializeEquals(CardinalityInterval[] intervals, ModelSeed modelSeed) {
+                if (!modelSeed.containsSeed(ReasoningAdapter.EQUALS_SYMBOL)) {
+                        return;
+                }
+                var seed = modelSeed.getSeed(ReasoningAdapter.EQUALS_SYMBOL);
+                var cursor = seed.getCursor(TruthValue.FALSE, modelSeed.getNodeCount());
+                while (cursor.move()) {
+                        var key = cursor.getKey();
+                        int i = key.get(0);
+                        int otherIndex = key.get(1);
+                        if (i != otherIndex) {
+                                throw new TranslationException(ReasoningAdapter.EQUALS_SYMBOL,
+                                                "Off-diagonal equivalence (%d, %d) is not permitted".formatted(i, otherIndex));
+                        }
+                        checkNodeId(intervals, i);
+                        switch (cursor.getValue()) {
+                        case TRUE -> intervals[i] = intervals[i].meet(CardinalityIntervals.LONE);
+                        case UNKNOWN -> {
+                                // Nothing do to, {@code intervals} is initialized with unknown equality.
+                        }
+                        case ERROR -> throw new TranslationException(ReasoningAdapter.EQUALS_SYMBOL,
+                                        "Inconsistent equality for node " + i);
+                        default -> throw new TranslationException(ReasoningAdapter.EQUALS_SYMBOL,
+                                        "Invalid equality truth value %s for node %d".formatted(cursor.getValue(), i));
+                        }
+                }
+                for (int i = 0; i < intervals.length; i++) {
+                        if (seed.get(Tuple.of(i, i)) == TruthValue.FALSE) {
+                                throw new TranslationException(ReasoningAdapter.EQUALS_SYMBOL, "Inconsistent equality for node " + i);
+                        }
+                }
+        }
+
+        private void checkNodeId(CardinalityInterval[] intervals, int nodeId) {
+                if (nodeId < 0 || nodeId >= intervals.length) {
+                        throw new IllegalArgumentException("Expected node id %d to be lower than model size %d"
+                                        .formatted(nodeId, intervals.length));
+                }
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectStorageRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectStorageRefiner.java
new file mode 100644
index 00000000..e48934d8
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectStorageRefiner.java
@@ -0,0 +1,45 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiobject;
+
+import tools.refinery.store.model.Interpretation;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.reasoning.refinement.StorageRefiner;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.tuple.Tuple;
+
+class MultiObjectStorageRefiner implements StorageRefiner {
+        private final Interpretation<CardinalityInterval> countInterpretation;
+
+        public MultiObjectStorageRefiner(Symbol<CardinalityInterval> countSymbol, Model model) {
+                countInterpretation = model.getInterpretation(countSymbol);
+        }
+
+        @Override
+        public boolean split(int parentNode, int childNode) {
+                var parentKey = Tuple.of(parentNode);
+                var parentCount = countInterpretation.get(parentKey);
+                if (parentCount == null) {
+                        return false;
+                }
+                var newParentCount = parentCount.take(1);
+                if (newParentCount.isEmpty()) {
+                        return false;
+                }
+                var childKey = Tuple.of(childNode);
+                countInterpretation.put(parentKey, newParentCount);
+                countInterpretation.put(childKey, CardinalityIntervals.ONE);
+                return true;
+        }
+
+        @Override
+        public boolean cleanup(int nodeToDelete) {
+                var previousCount = countInterpretation.put(Tuple.of(nodeToDelete), null);
+                return previousCount.lowerBound() == 0;
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectTranslator.java
new file mode 100644
index 00000000..05704096
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectTranslator.java
@@ -0,0 +1,86 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiobject;
+
+import tools.refinery.store.dse.transition.objectives.Criteria;
+import tools.refinery.store.dse.transition.objectives.Objectives;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.model.ModelStoreConfiguration;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.term.int_.IntTerms;
+import tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms;
+import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.ReasoningBuilder;
+import tools.refinery.store.reasoning.representation.PartialFunction;
+import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
+import tools.refinery.store.reasoning.translator.RoundingMode;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.cardinality.CardinalityDomain;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.store.representation.cardinality.UpperCardinalities;
+import tools.refinery.store.representation.cardinality.UpperCardinality;
+
+import java.util.List;
+
+import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.store.query.term.int_.IntTerms.*;
+
+public class MultiObjectTranslator implements ModelStoreConfiguration {
+        public static final Symbol<CardinalityInterval> COUNT_STORAGE = Symbol.of("COUNT", 1, CardinalityInterval.class,
+                        null);
+        public static final AnySymbolView LOWER_CARDINALITY_VIEW = new LowerCardinalityView(COUNT_STORAGE);
+        public static final AnySymbolView UPPER_CARDINALITY_VIEW = new UpperCardinalityView(COUNT_STORAGE);
+        public static final AnySymbolView MULTI_VIEW = new MultiView(COUNT_STORAGE);
+        public static final PartialFunction<CardinalityInterval, Integer> COUNT_SYMBOL = new PartialFunction<>("COUNT", 1,
+                        CardinalityDomain.INSTANCE);
+
+        @Override
+        public void apply(ModelStoreBuilder storeBuilder) {
+                storeBuilder.symbol(COUNT_STORAGE);
+
+                var aboveLowerBound = Query.of("count#aboveLowerBound", Integer.class, (builder, node, output) -> builder
+                                .clause(Integer.class, lowerBound -> List.of(
+                                                LOWER_CARDINALITY_VIEW.call(node, lowerBound),
+                                                output.assign(sub(lowerBound, IntTerms.constant(1))),
+                                                check(greater(output, IntTerms.constant(0)))
+                                )));
+                var missingCardinality = Query.of("count#missing", Integer.class, (builder, output) -> builder
+                                .clause(
+                                                output.assign(aboveLowerBound.aggregate(INT_SUM, Variable.of()))
+                                ));
+
+                storeBuilder.with(PartialRelationTranslator.of(ReasoningAdapter.EXISTS_SYMBOL)
+                                .may(Query.of("exists#may", (builder, p1) -> builder
+                                                .clause(UpperCardinality.class, upper -> List.of(
+                                                                UPPER_CARDINALITY_VIEW.call(p1, upper),
+                                                                check(UpperCardinalityTerms.greaterEq(upper,
+                                                                                UpperCardinalityTerms.constant(UpperCardinalities.ONE)))
+                                                ))))
+                                .must(Query.of("exists#must", (builder, p1) -> builder
+                                                .clause(Integer.class, lower -> List.of(
+                                                                LOWER_CARDINALITY_VIEW.call(p1, lower),
+                                                                check(greaterEq(lower, constant(1)))
+                                                ))))
+                                .roundingMode(RoundingMode.PREFER_FALSE)
+                                .refiner(ExistsRefiner.of(COUNT_STORAGE))
+                                .exclude(null)
+                                .accept(Criteria.whenNoMatch(aboveLowerBound))
+                                .objective(Objectives.value(missingCardinality)));
+
+                storeBuilder.with(PartialRelationTranslator.of(ReasoningAdapter.EQUALS_SYMBOL)
+                                .rewriter(EqualsRelationRewriter.of(UPPER_CARDINALITY_VIEW))
+                                .refiner(EqualsRefiner.of(COUNT_STORAGE))
+                                .exclude(null)
+                                .accept(null)
+                                .objective(null));
+
+                var reasoningBuilder = storeBuilder.getAdapter(ReasoningBuilder.class);
+                reasoningBuilder.initializer(new MultiObjectInitializer(COUNT_STORAGE));
+                reasoningBuilder.storageRefiner(COUNT_STORAGE, MultiObjectStorageRefiner::new);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiView.java
new file mode 100644
index 00000000..498bcd83
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiView.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiobject;
+
+import tools.refinery.store.query.view.TuplePreservingView;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.tuple.Tuple;
+
+class MultiView extends TuplePreservingView<CardinalityInterval> {
+        protected MultiView(Symbol<CardinalityInterval> symbol) {
+                super(symbol, "multi");
+        }
+
+        @Override
+        protected boolean doFilter(Tuple key, CardinalityInterval value) {
+                return !CardinalityIntervals.ONE.equals(value);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/UpperCardinalityView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/UpperCardinalityView.java
new file mode 100644
index 00000000..6be6ae1b
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/UpperCardinalityView.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiobject;
+
+import tools.refinery.store.query.term.Parameter;
+import tools.refinery.store.query.view.AbstractFunctionView;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.store.representation.cardinality.UpperCardinality;
+
+class UpperCardinalityView extends AbstractFunctionView<CardinalityInterval> {
+        public UpperCardinalityView(Symbol<CardinalityInterval> symbol) {
+                super(symbol, "upper", new Parameter(UpperCardinality.class));
+        }
+
+        @Override
+        protected Object forwardMapValue(CardinalityInterval value) {
+                return value.upperBound();
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/ConstrainedMultiplicity.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/ConstrainedMultiplicity.java
new file mode 100644
index 00000000..9db9cc96
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/ConstrainedMultiplicity.java
@@ -0,0 +1,37 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiplicity;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.TranslationException;
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.representation.cardinality.NonEmptyCardinalityInterval;
+
+public record ConstrainedMultiplicity(NonEmptyCardinalityInterval multiplicity, PartialRelation errorSymbol)
+                implements Multiplicity {
+        public ConstrainedMultiplicity {
+                if (multiplicity.equals(CardinalityIntervals.SET)) {
+                        throw new TranslationException(errorSymbol, "Expected a constrained cardinality interval");
+                }
+                if (errorSymbol.arity() != 1) {
+                        throw new TranslationException(errorSymbol, "Expected error symbol %s to have arity 1, got %d instead"
+                                        .formatted(errorSymbol, errorSymbol.arity()));
+                }
+        }
+
+        public static ConstrainedMultiplicity of(CardinalityInterval multiplicity, PartialRelation errorSymbol) {
+                if (!(multiplicity instanceof NonEmptyCardinalityInterval nonEmptyCardinalityInterval)) {
+                        throw new TranslationException(errorSymbol, "Inconsistent multiplicity");
+                }
+                return new ConstrainedMultiplicity(nonEmptyCardinalityInterval, errorSymbol);
+        }
+
+        @Override
+        public boolean isConstrained() {
+                return true;
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/InvalidMultiplicityErrorTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/InvalidMultiplicityErrorTranslator.java
new file mode 100644
index 00000000..ee982f4f
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/InvalidMultiplicityErrorTranslator.java
@@ -0,0 +1,139 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiplicity;
+
+import tools.refinery.store.dse.transition.objectives.Objectives;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.model.ModelStoreConfiguration;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.term.int_.IntTerms;
+import tools.refinery.store.reasoning.lifting.DnfLifter;
+import tools.refinery.store.reasoning.literal.*;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
+import tools.refinery.store.reasoning.translator.TranslationException;
+import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
+import tools.refinery.store.representation.cardinality.UpperCardinalities;
+import tools.refinery.store.representation.cardinality.UpperCardinality;
+
+import java.util.List;
+
+import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.store.query.term.int_.IntTerms.INT_SUM;
+import static tools.refinery.store.query.term.int_.IntTerms.constant;
+import static tools.refinery.store.query.term.int_.IntTerms.greater;
+import static tools.refinery.store.query.term.int_.IntTerms.sub;
+import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.constant;
+import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.less;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.candidateMust;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.must;
+
+public class InvalidMultiplicityErrorTranslator implements ModelStoreConfiguration {
+        private final PartialRelation nodeType;
+        private final PartialRelation linkType;
+        private final boolean inverse;
+        private final Multiplicity multiplicity;
+
+        public InvalidMultiplicityErrorTranslator(PartialRelation nodeType, PartialRelation linkType,
+                                                                                          boolean inverse, Multiplicity multiplicity) {
+                if (nodeType.arity() != 1) {
+                        throw new TranslationException(linkType, "Node type must be of arity 1, got %s with arity %d instead"
+                                        .formatted(nodeType, nodeType.arity()));
+                }
+                if (linkType.arity() != 2) {
+                        throw new TranslationException(linkType, "Link type must be of arity 2, got %s with arity %d instead"
+                                        .formatted(linkType, linkType.arity()));
+                }
+                this.nodeType = nodeType;
+                this.linkType = linkType;
+                this.inverse = inverse;
+                this.multiplicity = multiplicity;
+        }
+
+        @Override
+        public void apply(ModelStoreBuilder storeBuilder) {
+                if (!(multiplicity instanceof ConstrainedMultiplicity constrainedMultiplicity)) {
+                        return;
+                }
+
+                var name = constrainedMultiplicity.errorSymbol().name();
+                var cardinalityInterval = constrainedMultiplicity.multiplicity();
+                var node = Variable.of("node");
+                var other = Variable.of("other");
+                List<Variable> arguments = inverse ? List.of(other, node) : List.of(node, other);
+                var mustBuilder = Query.builder(DnfLifter.decorateName(name, Modality.MUST, Concreteness.PARTIAL))
+                                .parameter(node);
+                var candidateMayBuilder = Query.builder(DnfLifter.decorateName(name, Modality.MAY, Concreteness.PARTIAL))
+                                .parameter(node);
+                var candidateMustBuilder = Query.builder(DnfLifter.decorateName(name, Modality.MUST, Concreteness.PARTIAL))
+                                .parameter(node);
+                var missingOutput = Variable.of("missing", Integer.class);
+                var missingBuilder = Query.builder(name + "#missingMultiplicity").parameter(node).output(missingOutput);
+
+                int lowerBound = cardinalityInterval.lowerBound();
+                if (lowerBound > 0) {
+                        var lowerBoundCardinality = UpperCardinalities.atMost(lowerBound);
+                        mustBuilder.clause(UpperCardinality.class, existingContents -> List.of(
+                                        must(nodeType.call(node)),
+                                        new CountUpperBoundLiteral(existingContents, linkType, arguments),
+                                        check(less(existingContents, constant(lowerBoundCardinality)))
+                        ));
+                        candidateMayBuilder.clause(Integer.class, existingContents -> List.of(
+                                        candidateMust(nodeType.call(node)),
+                                        new CountCandidateLowerBoundLiteral(existingContents, linkType, arguments),
+                                        check(IntTerms.less(existingContents, constant(lowerBound)))
+                        ));
+                        candidateMustBuilder.clause(Integer.class, existingContents -> List.of(
+                                        candidateMust(nodeType.call(node)),
+                                        new CountCandidateUpperBoundLiteral(existingContents, linkType, arguments),
+                                        check(IntTerms.less(existingContents, constant(lowerBound)))
+                        ));
+                        missingBuilder.clause(Integer.class, existingContents -> List.of(
+                                        candidateMust(nodeType.call(node)),
+                                        new CountCandidateLowerBoundLiteral(existingContents, linkType, arguments),
+                                        missingOutput.assign(sub(constant(lowerBound), existingContents)),
+                                        check(greater(missingOutput, constant(0)))
+                        ));
+                }
+
+                if (cardinalityInterval.upperBound() instanceof FiniteUpperCardinality finiteUpperCardinality) {
+                        int upperBound = finiteUpperCardinality.finiteUpperBound();
+                        mustBuilder.clause(Integer.class, existingContents -> List.of(
+                                        must(nodeType.call(node)),
+                                        new CountLowerBoundLiteral(existingContents, linkType, arguments),
+                                        check(greater(existingContents, constant(upperBound)))
+                        ));
+                        candidateMayBuilder.clause(Integer.class, existingContents -> List.of(
+                                        candidateMust(nodeType.call(node)),
+                                        new CountCandidateUpperBoundLiteral(existingContents, linkType, arguments),
+                                        check(greater(existingContents, constant(upperBound)))
+                        ));
+                        candidateMustBuilder.clause(Integer.class, existingContents -> List.of(
+                                        candidateMust(nodeType.call(node)),
+                                        new CountCandidateLowerBoundLiteral(existingContents, linkType, arguments),
+                                        check(greater(existingContents, constant(upperBound)))
+                        ));
+                        missingBuilder.clause(Integer.class, existingContents -> List.of(
+                                        candidateMust(nodeType.call(node)),
+                                        new CountCandidateUpperBoundLiteral(existingContents, linkType, arguments),
+                                        missingOutput.assign(sub(existingContents, constant(upperBound))),
+                                        check(greater(missingOutput, constant(0)))
+                        ));
+                }
+
+                var objective = Query.of(name + "#objective", Integer.class, (builder, output) -> builder.clause(
+                                output.assign(missingBuilder.build().aggregate(INT_SUM, Variable.of()))
+                ));
+
+                storeBuilder.with(PartialRelationTranslator.of(constrainedMultiplicity.errorSymbol())
+                                .mayNever()
+                                .must(mustBuilder.build())
+                                .candidateMay(candidateMayBuilder.build())
+                                .candidateMust(candidateMustBuilder.build())
+                                .objective(Objectives.value(objective)));
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/Multiplicity.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/Multiplicity.java
new file mode 100644
index 00000000..d1d6dd1e
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/Multiplicity.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiplicity;
+
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+
+public sealed interface Multiplicity permits ConstrainedMultiplicity, UnconstrainedMultiplicity {
+        CardinalityInterval multiplicity();
+
+        boolean isConstrained();
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/UnconstrainedMultiplicity.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/UnconstrainedMultiplicity.java
new file mode 100644
index 00000000..2159b88c
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/UnconstrainedMultiplicity.java
@@ -0,0 +1,28 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiplicity;
+
+import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+
+// Singleton implementation, because there is only a single complete interval.
+@SuppressWarnings("squid:S6548")
+public final class UnconstrainedMultiplicity implements Multiplicity {
+        public static final UnconstrainedMultiplicity INSTANCE = new UnconstrainedMultiplicity();
+
+        private UnconstrainedMultiplicity() {
+        }
+
+        @Override
+        public CardinalityInterval multiplicity() {
+                return CardinalityIntervals.SET;
+        }
+
+        @Override
+        public boolean isConstrained() {
+                return true;
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeInterpretation.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeInterpretation.java
new file mode 100644
index 00000000..7290ab40
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeInterpretation.java
@@ -0,0 +1,77 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.opposite;
+
+
+import tools.refinery.store.map.AnyVersionedMap;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.interpretation.AbstractPartialInterpretation;
+import tools.refinery.store.reasoning.interpretation.PartialInterpretation;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.Set;
+
+class OppositeInterpretation<A, C> extends AbstractPartialInterpretation<A, C> {
+        private final PartialInterpretation<A, C> opposite;
+
+        private OppositeInterpretation(ReasoningAdapter adapter, Concreteness concreteness,
+                                                                   PartialSymbol<A, C> partialSymbol, PartialInterpretation<A, C> opposite) {
+                super(adapter, concreteness, partialSymbol);
+                this.opposite = opposite;
+        }
+
+        @Override
+        public A get(Tuple key) {
+                return opposite.get(OppositeUtils.flip(key));
+        }
+
+        @Override
+        public Cursor<Tuple, A> getAll() {
+                return new OppositeCursor<>(opposite.getAll());
+        }
+
+        public static <A1, C1> Factory<A1, C1> of(PartialSymbol<A1, C1> oppositeSymbol) {
+                return (adapter, concreteness, partialSymbol) -> {
+                        var opposite = adapter.getPartialInterpretation(concreteness, oppositeSymbol);
+                        return new OppositeInterpretation<>(adapter, concreteness, partialSymbol, opposite);
+                };
+        }
+
+        private record OppositeCursor<T>(Cursor<Tuple, T> opposite) implements Cursor<Tuple, T> {
+                @Override
+                public Tuple getKey() {
+                        return OppositeUtils.flip(opposite.getKey());
+                }
+
+                @Override
+                public T getValue() {
+                        return opposite.getValue();
+                }
+
+                @Override
+                public boolean isTerminated() {
+                        return opposite.isTerminated();
+                }
+
+                @Override
+                public boolean move() {
+                        return opposite.move();
+                }
+
+                @Override
+                public Set<AnyVersionedMap> getDependingMaps() {
+                        return opposite.getDependingMaps();
+                }
+
+                @Override
+                public boolean isDirty() {
+                        return opposite.isDirty();
+                }
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeRefiner.java
new file mode 100644
index 00000000..d09684df
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeRefiner.java
@@ -0,0 +1,32 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.opposite;
+
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner;
+import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.tuple.Tuple;
+
+public class OppositeRefiner<A, C> extends AbstractPartialInterpretationRefiner<A, C> {
+        private final PartialInterpretationRefiner<A, C> opposite;
+
+        protected OppositeRefiner(ReasoningAdapter adapter, PartialSymbol<A, C> partialSymbol,
+                                                          PartialSymbol<A, C> oppositeSymbol) {
+                super(adapter, partialSymbol);
+                opposite = adapter.getRefiner(oppositeSymbol);
+        }
+
+        @Override
+        public boolean merge(Tuple key, A value) {
+                var oppositeKey = OppositeUtils.flip(key);
+                return opposite.merge(oppositeKey, value);
+        }
+
+        public static <A1, C1> Factory<A1, C1> of(PartialSymbol<A1, C1> oppositeSymbol) {
+                return (adapter, partialSymbol) -> new OppositeRefiner<>(adapter, partialSymbol, oppositeSymbol);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeRelationTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeRelationTranslator.java
new file mode 100644
index 00000000..6e15a628
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeRelationTranslator.java
@@ -0,0 +1,62 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.opposite;
+
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.model.ModelStoreConfiguration;
+import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.literal.ModalConstraint;
+import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.reasoning.refinement.RefinementBasedInitializer;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
+import tools.refinery.store.reasoning.translator.TranslationException;
+
+import java.util.List;
+import java.util.Set;
+
+public class OppositeRelationTranslator implements ModelStoreConfiguration, PartialRelationRewriter {
+        private final PartialRelation linkType;
+        private final PartialRelation opposite;
+
+        public OppositeRelationTranslator(PartialRelation linkType, PartialRelation opposite) {
+                if (linkType.arity() != 2) {
+                        throw new TranslationException(linkType,
+                                        "Expected relation with opposite %s to have arity 2, got %d instead"
+                                                        .formatted(linkType, linkType.arity()));
+                }
+                if (opposite.arity() != 2) {
+                        throw new TranslationException(linkType,
+                                        "Expected opposite %s of %s to have arity 2, got %d instead"
+                                                        .formatted(opposite, linkType, opposite.arity()));
+                }
+                this.linkType = linkType;
+                this.opposite = opposite;
+        }
+
+        @Override
+        public void apply(ModelStoreBuilder storeBuilder) {
+                storeBuilder.with(PartialRelationTranslator.of(linkType)
+                                .rewriter(this)
+                                .interpretation(OppositeInterpretation.of(opposite))
+                                .refiner(OppositeRefiner.of(opposite))
+                                .initializer(new RefinementBasedInitializer<>(linkType)));
+        }
+
+        @Override
+        public List<Literal> rewriteLiteral(Set<Variable> positiveVariables, AbstractCallLiteral literal,
+                                                                                Modality modality, Concreteness concreteness) {
+                var arguments = literal.getArguments();
+                var newArguments = List.of(arguments.get(1), arguments.get(0));
+                var modalOpposite = new ModalConstraint(modality, concreteness, opposite);
+                var oppositeLiteral = literal.withArguments(modalOpposite, newArguments);
+                return List.of(oppositeLiteral);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeUtils.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeUtils.java
new file mode 100644
index 00000000..2a9e6b5d
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeUtils.java
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.opposite;
+
+import tools.refinery.store.tuple.Tuple;
+import tools.refinery.store.tuple.Tuple2;
+
+final class OppositeUtils {
+        private OppositeUtils() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+
+        public static Tuple flip(Tuple tuple) {
+                if (!(tuple instanceof Tuple2 tuple2)) {
+                        throw new IllegalArgumentException("Cannot flip tuple: " + tuple);
+                }
+                return Tuple.of(tuple2.value1(), tuple2.value0());
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/predicate/PredicateTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/predicate/PredicateTranslator.java
new file mode 100644
index 00000000..b401118e
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/predicate/PredicateTranslator.java
@@ -0,0 +1,93 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.predicate;
+
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.model.ModelStoreConfiguration;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.view.ForbiddenView;
+import tools.refinery.store.query.view.MayView;
+import tools.refinery.store.query.view.MustView;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
+import tools.refinery.store.reasoning.translator.TranslationException;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+
+import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.may;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.must;
+
+public class PredicateTranslator implements ModelStoreConfiguration {
+        private final PartialRelation relation;
+        private final RelationalQuery query;
+        private final boolean mutable;
+        private final TruthValue defaultValue;
+
+        public PredicateTranslator(PartialRelation relation, RelationalQuery query, boolean mutable,
+                                                           TruthValue defaultValue) {
+                if (relation.arity() != query.arity()) {
+                        throw new TranslationException(relation, "Expected arity %d query for partial relation %s, got %d instead"
+                                        .formatted(relation.arity(), relation, query.arity()));
+                }
+                if (defaultValue.must()) {
+                        throw new TranslationException(relation, "Default value must be UNKNOWN or FALSE");
+                }
+                this.relation = relation;
+                this.query = query;
+                this.mutable = mutable;
+                this.defaultValue = defaultValue;
+        }
+
+        @Override
+        public void apply(ModelStoreBuilder storeBuilder) {
+                var translator = PartialRelationTranslator.of(relation)
+                                .query(query);
+                if (mutable) {
+                        var symbol = Symbol.of(relation.name(), relation.arity(), TruthValue.class, defaultValue);
+                        translator.symbol(symbol);
+
+                        var parameters = new NodeVariable[relation.arity()];
+                        for (int i = 0; i < parameters.length; i++) {
+                                parameters[i] = Variable.of("p" + i);
+                        }
+
+                        var must = Query.builder()
+                                        .parameters(parameters)
+                                        .clause(must(query.call(parameters)))
+                                        .clause(new MustView(symbol).call(parameters))
+                                        .build();
+                        translator.must(must);
+
+                        var mayLiterals = new Literal[2];
+                        mayLiterals[0] = may(query.call(parameters));
+                        if (defaultValue.may()) {
+                                mayLiterals[1] = not(new ForbiddenView(symbol).call(parameters));
+                        } else {
+                                mayLiterals[1] = new MayView(symbol).call(parameters);
+                        }
+                        var may = Query.builder()
+                                        .parameters(parameters)
+                                        .clause(mayLiterals)
+                                        .build();
+                        translator.may(may);
+                } else if (defaultValue.may()) {
+                        // If all values are permitted, we don't need to check for any forbidden values in the model.
+                        // If the result of this predicate of {@code ERROR}, some other partial relation (that we check for)
+                        // will be {@code ERROR} as well.
+                        translator.exclude(null);
+                        translator.accept(null);
+                        translator.objective(null);
+                } else {
+                        translator.mayNever();
+                }
+                storeBuilder.with(translator);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/proxy/PartialRelationTranslatorProxy.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/proxy/PartialRelationTranslatorProxy.java
new file mode 100644
index 00000000..45dc5bd2
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/proxy/PartialRelationTranslatorProxy.java
@@ -0,0 +1,52 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.proxy;
+
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.model.ModelStoreConfiguration;
+import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.literal.ModalConstraint;
+import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
+
+import java.util.List;
+import java.util.Set;
+
+public class PartialRelationTranslatorProxy implements ModelStoreConfiguration, PartialRelationRewriter {
+        private final PartialRelation partialRelation;
+        private final PartialRelation targetRelation;
+        private final boolean mutable;
+
+        public PartialRelationTranslatorProxy(PartialRelation partialRelation, PartialRelation targetRelation,
+                                                                                  boolean mutable) {
+                this.partialRelation = partialRelation;
+                this.targetRelation = targetRelation;
+                this.mutable = mutable;
+        }
+
+        @Override
+        public void apply(ModelStoreBuilder storeBuilder) {
+                var translator = PartialRelationTranslator.of(partialRelation)
+                                .interpretation(((adapter, concreteness, partialSymbol) ->
+                                                adapter.getPartialInterpretation(concreteness, targetRelation)))
+                                .rewriter(this);
+                if (mutable) {
+                        translator.refiner((adapter, partialSymbol) -> adapter.getRefiner(targetRelation));
+                }
+                storeBuilder.with(translator);
+        }
+
+        @Override
+        public List<Literal> rewriteLiteral(Set<Variable> positiveVariables, AbstractCallLiteral literal,
+                                                                                Modality modality, Concreteness concreteness) {
+                return List.of(literal.withTarget(ModalConstraint.of(modality, concreteness, targetRelation)));
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/CandidateTypeView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/CandidateTypeView.java
new file mode 100644
index 00000000..faf1b958
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/CandidateTypeView.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.typehierarchy;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+class CandidateTypeView extends InferredTypeView {
+        public CandidateTypeView(Symbol<InferredType> symbol, PartialRelation type) {
+                super(symbol, "candidate", type);
+        }
+
+        @Override
+        protected boolean doFilter(Tuple key, InferredType value) {
+                return type.equals(value.candidateType());
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/EliminatedType.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/EliminatedType.java
deleted file mode 100644
index 6e4728db..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/EliminatedType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning.translator.typehierarchy;
-
-import tools.refinery.store.reasoning.representation.PartialRelation;
-
-record EliminatedType(PartialRelation replacement) implements TypeAnalysisResult {
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredMayTypeView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredMayTypeView.java
deleted file mode 100644
index 40de4644..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredMayTypeView.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning.translator.typehierarchy;
-
-import tools.refinery.store.reasoning.representation.PartialRelation;
-import tools.refinery.store.query.view.TuplePreservingView;
-import tools.refinery.store.tuple.Tuple;
-
-import java.util.Objects;
-
-class InferredMayTypeView extends TuplePreservingView<InferredType> {
-        private final PartialRelation type;
-
-        InferredMayTypeView(PartialRelation type) {
-                super(TypeHierarchyTranslationUnit.INFERRED_TYPE_SYMBOL, "%s#may".formatted(type));
-                this.type = type;
-        }
-
-        @Override
-        protected boolean doFilter(Tuple key, InferredType value) {
-                return value.mayConcreteTypes().contains(type);
-        }
-
-        @Override
-        public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                if (!super.equals(o)) return false;
-                InferredMayTypeView that = (InferredMayTypeView) o;
-                return Objects.equals(type, that.type);
-        }
-
-        @Override
-        public int hashCode() {
-                return Objects.hash(super.hashCode(), type);
-        }
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredType.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredType.java
index fd05158b..1ae94ae1 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredType.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredType.java
@@ -11,18 +11,18 @@ import java.util.Collections;
 import java.util.Set;
 
 record InferredType(Set<PartialRelation> mustTypes, Set<PartialRelation> mayConcreteTypes,
-                                        PartialRelation currentType) {
+                                        PartialRelation candidateType) {
         public static final InferredType UNTYPED = new InferredType(Set.of(), Set.of(), null);
 
         public InferredType(Set<PartialRelation> mustTypes, Set<PartialRelation> mayConcreteTypes,
-                                                PartialRelation currentType) {
+                                                PartialRelation candidateType) {
                 this.mustTypes = Collections.unmodifiableSet(mustTypes);
                 this.mayConcreteTypes = Collections.unmodifiableSet(mayConcreteTypes);
-                this.currentType = currentType;
+                this.candidateType = candidateType;
         }
 
         public boolean isConsistent() {
-                return currentType != null || mustTypes.isEmpty();
+                return candidateType != null || mustTypes.isEmpty();
         }
 
         public boolean isMust(PartialRelation partialRelation) {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeRefiner.java
new file mode 100644
index 00000000..40a7b3fa
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeRefiner.java
@@ -0,0 +1,38 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.typehierarchy;
+
+import tools.refinery.store.model.Interpretation;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.tuple.Tuple;
+
+class InferredTypeRefiner extends AbstractPartialInterpretationRefiner<TruthValue, Boolean> {
+        private final Interpretation<InferredType> interpretation;
+        private final TypeAnalysisResult result;
+
+        private InferredTypeRefiner(ReasoningAdapter adapter, PartialSymbol<TruthValue, Boolean> partialSymbol,
+                                                                Symbol<InferredType> symbol, TypeAnalysisResult result) {
+                super(adapter, partialSymbol);
+                interpretation = adapter.getModel().getInterpretation(symbol);
+                this.result = result;
+        }
+
+        @Override
+        public boolean merge(Tuple key, TruthValue value) {
+                var currentType = interpretation.get(key);
+                var newType = result.merge(currentType, value);
+                interpretation.put(key, newType);
+                return true;
+        }
+
+        public static Factory<TruthValue, Boolean> of(Symbol<InferredType> symbol, TypeAnalysisResult result) {
+                return (adapter, partialSymbol) -> new InferredTypeRefiner(adapter, partialSymbol, symbol, result);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredMustTypeView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeView.java
index 1a121547..3c074df5 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredMustTypeView.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeView.java
@@ -1,35 +1,30 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
 package tools.refinery.store.reasoning.translator.typehierarchy;
 
-import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.query.view.TuplePreservingView;
-import tools.refinery.store.tuple.Tuple;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.representation.Symbol;
 
 import java.util.Objects;
 
-class InferredMustTypeView extends TuplePreservingView<InferredType> {
-        private final PartialRelation type;
+abstract class InferredTypeView extends TuplePreservingView<InferredType> {
+        protected final PartialRelation type;
 
-        InferredMustTypeView(PartialRelation type) {
-                super(TypeHierarchyTranslationUnit.INFERRED_TYPE_SYMBOL, "%s#must".formatted(type));
+        protected InferredTypeView(Symbol<InferredType> symbol, String name, PartialRelation type) {
+                super(symbol, type.name() + "#" + name);
                 this.type = type;
         }
 
         @Override
-        protected boolean doFilter(Tuple key, InferredType value) {
-                return value.mustTypes().contains(type);
-        }
-
-        @Override
         public boolean equals(Object o) {
                 if (this == o) return true;
                 if (o == null || getClass() != o.getClass()) return false;
                 if (!super.equals(o)) return false;
-                InferredMustTypeView that = (InferredMustTypeView) o;
+                InferredTypeView that = (InferredTypeView) o;
                 return Objects.equals(type, that.type);
         }
 
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/MayTypeView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/MayTypeView.java
new file mode 100644
index 00000000..dcaf61c5
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/MayTypeView.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.typehierarchy;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+class MayTypeView extends InferredTypeView {
+        public MayTypeView(Symbol<InferredType> symbol, PartialRelation type) {
+                super(symbol, "may", type);
+        }
+
+        @Override
+        protected boolean doFilter(Tuple key, InferredType value) {
+                return value.mayConcreteTypes().contains(type);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/MustTypeView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/MustTypeView.java
new file mode 100644
index 00000000..833e1594
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/MustTypeView.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.typehierarchy;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+class MustTypeView extends InferredTypeView {
+        public MustTypeView(Symbol<InferredType> symbol, PartialRelation type) {
+                super(symbol, "must", type);
+        }
+
+        @Override
+        protected boolean doFilter(Tuple key, InferredType value) {
+                return value.mustTypes().contains(type);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/PreservedType.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/PreservedType.java
deleted file mode 100644
index 0696f4c3..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/PreservedType.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning.translator.typehierarchy;
-
-import tools.refinery.store.reasoning.representation.PartialRelation;
-import tools.refinery.store.representation.TruthValue;
-
-import java.util.*;
-
-final class PreservedType implements TypeAnalysisResult {
-        private final ExtendedTypeInfo extendedTypeInfo;
-        private final List<PartialRelation> directSubtypes;
-        private final List<ExtendedTypeInfo> allExternalTypeInfoList;
-        private final InferredType inferredType;
-
-        public PreservedType(ExtendedTypeInfo extendedTypeInfo, List<ExtendedTypeInfo> allExternalTypeInfoList) {
-                this.extendedTypeInfo = extendedTypeInfo;
-                directSubtypes = List.copyOf(extendedTypeInfo.getDirectSubtypes());
-                this.allExternalTypeInfoList = allExternalTypeInfoList;
-                inferredType = propagateMust(extendedTypeInfo.getAllSupertypesAndSelf(),
-                                extendedTypeInfo.getConcreteSubtypesAndSelf());
-        }
-
-        public PartialRelation type() {
-                return extendedTypeInfo.getType();
-        }
-
-        public List<PartialRelation> getDirectSubtypes() {
-                return directSubtypes;
-        }
-
-        public boolean isAbstractType() {
-                return extendedTypeInfo.isAbstractType();
-        }
-
-        public boolean isVacuous() {
-                return isAbstractType() && directSubtypes.isEmpty();
-        }
-
-        public InferredType asInferredType() {
-                return inferredType;
-        }
-
-        public InferredType merge(InferredType inferredType, TruthValue value) {
-                return switch (value) {
-                        case UNKNOWN -> inferredType;
-                        case TRUE -> addMust(inferredType);
-                        case FALSE -> removeMay(inferredType);
-                        case ERROR -> addError(inferredType);
-                };
-        }
-
-        private InferredType addMust(InferredType inferredType) {
-                var originalMustTypes = inferredType.mustTypes();
-                if (originalMustTypes.contains(type())) {
-                        return inferredType;
-                }
-                var mustTypes = new HashSet<>(originalMustTypes);
-                extendedTypeInfo.addMust(mustTypes);
-                var originalMayConcreteTypes = inferredType.mayConcreteTypes();
-                var mayConcreteTypes = new LinkedHashSet<>(originalMayConcreteTypes);
-                Set<PartialRelation> mayConcreteTypesResult;
-                if (mayConcreteTypes.retainAll(extendedTypeInfo.getConcreteSubtypesAndSelf())) {
-                        mayConcreteTypesResult = mayConcreteTypes;
-                } else {
-                        mayConcreteTypesResult = originalMayConcreteTypes;
-                }
-                return propagateMust(mustTypes, mayConcreteTypesResult);
-        }
-
-        private InferredType removeMay(InferredType inferredType) {
-                var originalMayConcreteTypes = inferredType.mayConcreteTypes();
-                var mayConcreteTypes = new LinkedHashSet<>(originalMayConcreteTypes);
-                if (!mayConcreteTypes.removeAll(extendedTypeInfo.getConcreteSubtypesAndSelf())) {
-                        return inferredType;
-                }
-                return propagateMust(inferredType.mustTypes(), mayConcreteTypes);
-        }
-
-        private InferredType addError(InferredType inferredType) {
-                var originalMustTypes = inferredType.mustTypes();
-                if (originalMustTypes.contains(type())) {
-                        if (inferredType.mayConcreteTypes().isEmpty()) {
-                                return inferredType;
-                        }
-                        return new InferredType(originalMustTypes, Set.of(), null);
-                }
-                var mustTypes = new HashSet<>(originalMustTypes);
-                extendedTypeInfo.addMust(mustTypes);
-                return new InferredType(mustTypes, Set.of(), null);
-        }
-
-        private InferredType propagateMust(Set<PartialRelation> originalMustTypes,
-                                                                           Set<PartialRelation> mayConcreteTypes) {
-                // It is possible that there is not type at all, do not force one by propagation.
-                var maybeUntyped = originalMustTypes.isEmpty();
-                // Para-consistent case, do not propagate must types to avoid logical explosion.
-                var paraConsistentOrSurelyUntyped = mayConcreteTypes.isEmpty();
-                if (maybeUntyped || paraConsistentOrSurelyUntyped) {
-                        return new InferredType(originalMustTypes, mayConcreteTypes, null);
-                }
-                var currentType = computeCurrentType(mayConcreteTypes);
-                var mustTypes = new HashSet<>(originalMustTypes);
-                boolean changed = false;
-                for (var newMustExtendedTypeInfo : allExternalTypeInfoList) {
-                        var newMustType = newMustExtendedTypeInfo.getType();
-                        if (mustTypes.contains(newMustType)) {
-                                continue;
-                        }
-                        if (newMustExtendedTypeInfo.allowsAllConcreteTypes(mayConcreteTypes)) {
-                                newMustExtendedTypeInfo.addMust(mustTypes);
-                                changed = true;
-                        }
-                }
-                if (!changed) {
-                        return new InferredType(originalMustTypes, mayConcreteTypes, currentType);
-                }
-                return new InferredType(mustTypes, mayConcreteTypes, currentType);
-        }
-
-        /**
-         * Returns a concrete type that is allowed by a (consistent, i.e., nonempty) set of <b>may</b> concrete types.
-         *
-         * @param mayConcreteTypes The set of allowed concrete types. Must not be empty.
-         * @return The first concrete type that is allowed by {@code matConcreteTypes}.
-         */
-        private PartialRelation computeCurrentType(Set<PartialRelation> mayConcreteTypes) {
-                for (var concreteExtendedTypeInfo : allExternalTypeInfoList) {
-                        var concreteType = concreteExtendedTypeInfo.getType();
-                        if (!concreteExtendedTypeInfo.isAbstractType() && mayConcreteTypes.contains(concreteType)) {
-                                return concreteType;
-                        }
-                }
-                // We have already filtered out the para-consistent case in {@link #propagateMust(Set<PartialRelation>,
-                // Set<PartialRelation>}.
-                throw new AssertionError("No concrete type in %s".formatted(mayConcreteTypes));
-        }
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisResult.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisResult.java
index fbf8a7c9..ebe0d1b9 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisResult.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisResult.java
@@ -5,5 +5,141 @@
  */
 package tools.refinery.store.reasoning.translator.typehierarchy;
 
-sealed interface TypeAnalysisResult permits EliminatedType, PreservedType {
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.representation.TruthValue;
+
+import java.util.*;
+
+public final class TypeAnalysisResult {
+        private final ExtendedTypeInfo extendedTypeInfo;
+        private final List<PartialRelation> directSubtypes;
+        private final List<ExtendedTypeInfo> allExternalTypeInfoList;
+        private final InferredType inferredType;
+
+        public TypeAnalysisResult(ExtendedTypeInfo extendedTypeInfo, List<ExtendedTypeInfo> allExternalTypeInfoList) {
+                this.extendedTypeInfo = extendedTypeInfo;
+                directSubtypes = List.copyOf(extendedTypeInfo.getDirectSubtypes());
+                this.allExternalTypeInfoList = allExternalTypeInfoList;
+                inferredType = propagateMust(extendedTypeInfo.getAllSupertypesAndSelf(),
+                                extendedTypeInfo.getConcreteSubtypesAndSelf());
+        }
+
+        public PartialRelation type() {
+                return extendedTypeInfo.getType();
+        }
+
+        public List<PartialRelation> getDirectSubtypes() {
+                return directSubtypes;
+        }
+
+        public boolean isAbstractType() {
+                return extendedTypeInfo.isAbstractType();
+        }
+
+        public boolean isVacuous() {
+                return isAbstractType() && directSubtypes.isEmpty();
+        }
+
+        public InferredType asInferredType() {
+                return inferredType;
+        }
+
+        public boolean isSubtypeOf(TypeAnalysisResult other) {
+                return extendedTypeInfo.getAllSubtypes().contains(other.type());
+        }
+
+        public InferredType merge(InferredType inferredType, TruthValue value) {
+                return switch (value) {
+                        case UNKNOWN -> inferredType;
+                        case TRUE -> addMust(inferredType);
+                        case FALSE -> removeMay(inferredType);
+                        case ERROR -> addError(inferredType);
+                };
+        }
+
+        private InferredType addMust(InferredType inferredType) {
+                var originalMustTypes = inferredType.mustTypes();
+                if (originalMustTypes.contains(type())) {
+                        return inferredType;
+                }
+                var mustTypes = new HashSet<>(originalMustTypes);
+                extendedTypeInfo.addMust(mustTypes);
+                var originalMayConcreteTypes = inferredType.mayConcreteTypes();
+                var mayConcreteTypes = new LinkedHashSet<>(originalMayConcreteTypes);
+                Set<PartialRelation> mayConcreteTypesResult;
+                if (mayConcreteTypes.retainAll(extendedTypeInfo.getConcreteSubtypesAndSelf())) {
+                        mayConcreteTypesResult = mayConcreteTypes;
+                } else {
+                        mayConcreteTypesResult = originalMayConcreteTypes;
+                }
+                return propagateMust(mustTypes, mayConcreteTypesResult);
+        }
+
+        private InferredType removeMay(InferredType inferredType) {
+                var originalMayConcreteTypes = inferredType.mayConcreteTypes();
+                var mayConcreteTypes = new LinkedHashSet<>(originalMayConcreteTypes);
+                if (!mayConcreteTypes.removeAll(extendedTypeInfo.getConcreteSubtypesAndSelf())) {
+                        return inferredType;
+                }
+                return propagateMust(inferredType.mustTypes(), mayConcreteTypes);
+        }
+
+        private InferredType addError(InferredType inferredType) {
+                var originalMustTypes = inferredType.mustTypes();
+                if (originalMustTypes.contains(type())) {
+                        if (inferredType.mayConcreteTypes().isEmpty()) {
+                                return inferredType;
+                        }
+                        return new InferredType(originalMustTypes, Set.of(), null);
+                }
+                var mustTypes = new HashSet<>(originalMustTypes);
+                extendedTypeInfo.addMust(mustTypes);
+                return new InferredType(mustTypes, Set.of(), null);
+        }
+
+        private InferredType propagateMust(Set<PartialRelation> originalMustTypes,
+                                                                           Set<PartialRelation> mayConcreteTypes) {
+                // It is possible that there is not type at all, do not force one by propagation.
+                var maybeUntyped = originalMustTypes.isEmpty();
+                // Para-consistent case, do not propagate must types to avoid logical explosion.
+                var paraConsistentOrSurelyUntyped = mayConcreteTypes.isEmpty();
+                if (maybeUntyped || paraConsistentOrSurelyUntyped) {
+                        return new InferredType(originalMustTypes, mayConcreteTypes, null);
+                }
+                var currentType = computeCurrentType(mayConcreteTypes);
+                var mustTypes = new HashSet<>(originalMustTypes);
+                boolean changed = false;
+                for (var newMustExtendedTypeInfo : allExternalTypeInfoList) {
+                        var newMustType = newMustExtendedTypeInfo.getType();
+                        if (mustTypes.contains(newMustType)) {
+                                continue;
+                        }
+                        if (newMustExtendedTypeInfo.allowsAllConcreteTypes(mayConcreteTypes)) {
+                                newMustExtendedTypeInfo.addMust(mustTypes);
+                                changed = true;
+                        }
+                }
+                if (!changed) {
+                        return new InferredType(originalMustTypes, mayConcreteTypes, currentType);
+                }
+                return new InferredType(mustTypes, mayConcreteTypes, currentType);
+        }
+
+        /**
+         * Returns a concrete type that is allowed by a (consistent, i.e., nonempty) set of <b>may</b> concrete types.
+         *
+         * @param mayConcreteTypes The set of allowed concrete types. Must not be empty.
+         * @return The first concrete type that is allowed by {@code matConcreteTypes}.
+         */
+        private PartialRelation computeCurrentType(Set<PartialRelation> mayConcreteTypes) {
+                for (var concreteExtendedTypeInfo : allExternalTypeInfoList) {
+                        var concreteType = concreteExtendedTypeInfo.getType();
+                        if (!concreteExtendedTypeInfo.isAbstractType() && mayConcreteTypes.contains(concreteType)) {
+                                return concreteType;
+                        }
+                }
+                // We have already filtered out the para-consistent case in {@link #propagateMust(Set<PartialRelation>,
+                // Set<PartialRelation>}.
+                throw new AssertionError("No concrete type in %s".formatted(mayConcreteTypes));
+        }
 }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchy.java
index e97ce954..3f918c97 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzer.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchy.java
@@ -6,17 +6,20 @@
 package tools.refinery.store.reasoning.translator.typehierarchy;
 
 import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.TranslationException;
 
 import java.util.*;
 
-class TypeAnalyzer {
+public class TypeHierarchy {
+        private final Set<PartialRelation> allTypes;
         private final Map<PartialRelation, ExtendedTypeInfo> extendedTypeInfoMap;
         private final Map<PartialRelation, PartialRelation> replacements = new LinkedHashMap<>();
         private final InferredType unknownType;
-        private final Map<PartialRelation, TypeAnalysisResult> analysisResults;
+        private final Map<PartialRelation, TypeAnalysisResult> preservedTypes;
 
-        public TypeAnalyzer(Map<PartialRelation, TypeInfo> typeInfoMap) {
+        TypeHierarchy(Map<PartialRelation, TypeInfo> typeInfoMap) {
                 int size = typeInfoMap.size();
+                allTypes = Collections.unmodifiableSet(new LinkedHashSet<>(typeInfoMap.keySet()));
                 extendedTypeInfoMap = new LinkedHashMap<>(size);
                 var concreteTypes = new LinkedHashSet<PartialRelation>();
                 int index = 0;
@@ -34,15 +37,39 @@ class TypeAnalyzer {
                 computeAllAndConcreteSubtypes();
                 computeDirectSubtypes();
                 eliminateTrivialSupertypes();
-                analysisResults = computeAnalysisResults();
+                preservedTypes = computeAnalysisResults();
+        }
+
+        public boolean isEmpty() {
+                return extendedTypeInfoMap.isEmpty();
         }
 
         public InferredType getUnknownType() {
                 return unknownType;
         }
 
-        public Map<PartialRelation, TypeAnalysisResult> getAnalysisResults() {
-                return analysisResults;
+        public Set<PartialRelation> getAllTypes() {
+                return allTypes;
+        }
+
+        public Map<PartialRelation, TypeAnalysisResult> getPreservedTypes() {
+                return preservedTypes;
+        }
+
+        public Map<PartialRelation, PartialRelation> getEliminatedTypes() {
+                return Collections.unmodifiableMap(replacements);
+        }
+
+        public TypeAnalysisResult getAnalysisResult(PartialRelation type) {
+                var preservedResult = preservedTypes.get(type);
+                if (preservedResult != null) {
+                        return preservedResult;
+                }
+                var eliminatedResult = replacements.get(type);
+                if (eliminatedResult != null) {
+                        return preservedTypes.get(eliminatedResult);
+                }
+                throw new IllegalArgumentException("Unknown type: " + type);
         }
 
         private void computeAllSupertypes() {
@@ -53,7 +80,13 @@ class TypeAnalyzer {
                                 var found = new HashSet<PartialRelation>();
                                 var allSupertypes = extendedTypeInfo.getAllSupertypes();
                                 for (var supertype : allSupertypes) {
-                                        found.addAll(extendedTypeInfoMap.get(supertype).getAllSupertypes());
+                                        var supertypeInfo = extendedTypeInfoMap.get(supertype);
+                                        if (supertypeInfo == null) {
+                                                throw new TranslationException(extendedTypeInfo.getType(),
+                                                                "Supertype %s of %s is missing from the type hierarchy"
+                                                                                .formatted(supertype, extendedTypeInfo.getType()));
+                                        }
+                                        found.addAll(supertypeInfo.getAllSupertypes());
                                 }
                                 if (allSupertypes.addAll(found)) {
                                         changed = true;
@@ -70,7 +103,7 @@ class TypeAnalyzer {
                         }
                         for (var supertype : extendedTypeInfo.getAllSupertypes()) {
                                 if (type.equals(supertype)) {
-                                        throw new IllegalArgumentException("%s cannot be a supertype of itself".formatted(type));
+                                        throw new TranslationException(type, "%s cannot be a supertype of itself".formatted(type));
                                 }
                                 var supertypeInfo = extendedTypeInfoMap.get(supertype);
                                 supertypeInfo.getAllSubtypes().add(type);
@@ -95,25 +128,37 @@ class TypeAnalyzer {
         }
 
         private void eliminateTrivialSupertypes() {
-                boolean changed;
-                do {
+                Set<PartialRelation> toInspect = new HashSet<>(extendedTypeInfoMap.keySet());
+                while (!toInspect.isEmpty()) {
                         var toRemove = new ArrayList<PartialRelation>();
-                        for (var entry : extendedTypeInfoMap.entrySet()) {
-                                var extendedTypeInfo = entry.getValue();
-                                boolean isAbstract = extendedTypeInfo.isAbstractType();
-                                // Do not eliminate abstract types with 0 subtypes, because they can be used para-consistently, i.e.,
-                                // an object determined to <b>must</b> have an abstract type with 0 subtypes <b>may not</b> ever exist.
-                                boolean hasSingleDirectSubtype = extendedTypeInfo.getDirectSubtypes().size() == 1;
-                                if (isAbstract && hasSingleDirectSubtype) {
-                                        toRemove.add(entry.getKey());
+                        for (var partialRelation : toInspect) {
+                                var extendedTypeInfo = extendedTypeInfoMap.get(partialRelation);
+                                if (extendedTypeInfo != null && isTrivialSupertype(extendedTypeInfo)) {
+                                        toRemove.add(partialRelation);
                                 }
                         }
-                        toRemove.forEach(this::removeTrivialType);
-                        changed = !toRemove.isEmpty();
-                } while (changed);
+                        toInspect.clear();
+                        for (var partialRelation : toRemove) {
+                                removeTrivialType(partialRelation, toInspect);
+                        }
+                }
+        }
+
+        private boolean isTrivialSupertype(ExtendedTypeInfo extendedTypeInfo) {
+                if (!extendedTypeInfo.isAbstractType()) {
+                        return false;
+                }
+                var subtypeIterator = extendedTypeInfo.getDirectSubtypes().iterator();
+                if (!subtypeIterator.hasNext()) {
+                        // Do not eliminate abstract types with 0 subtypes, because they can be used para-consistently, i.e.,
+                        // an object determined to <b>must</b> have an abstract type with 0 subtypes <b>may not</b> ever exist.
+                        return false;
+                }
+                var directSubtype = subtypeIterator.next();
+                return !extendedTypeInfoMap.get(directSubtype).isAbstractType() && !subtypeIterator.hasNext();
         }
 
-        private void removeTrivialType(PartialRelation trivialType) {
+        private void removeTrivialType(PartialRelation trivialType, Set<PartialRelation> toInspect) {
                 var extendedTypeInfo = extendedTypeInfoMap.get(trivialType);
                 var iterator = extendedTypeInfo.getDirectSubtypes().iterator();
                 if (!iterator.hasNext()) {
@@ -125,7 +170,6 @@ class TypeAnalyzer {
                         throw new AssertionError("Expected trivial supertype %s to have at most 1 direct subtype"
                                         .formatted(trivialType));
                 }
-                replacements.put(trivialType, replacement);
                 for (var supertype : extendedTypeInfo.getAllSupertypes()) {
                         var extendedSupertypeInfo = extendedTypeInfoMap.get(supertype);
                         if (!extendedSupertypeInfo.getAllSubtypes().remove(trivialType)) {
@@ -134,6 +178,9 @@ class TypeAnalyzer {
                         var directSubtypes = extendedSupertypeInfo.getDirectSubtypes();
                         if (directSubtypes.remove(trivialType)) {
                                 directSubtypes.add(replacement);
+                                if (extendedSupertypeInfo.isAbstractType() && directSubtypes.size() == 1) {
+                                        toInspect.add(supertype);
+                                }
                         }
                 }
                 for (var subtype : extendedTypeInfo.getAllSubtypes()) {
@@ -156,17 +203,13 @@ class TypeAnalyzer {
 
         private Map<PartialRelation, TypeAnalysisResult> computeAnalysisResults() {
                 var allExtendedTypeInfoList = sortTypes();
-                var results = new LinkedHashMap<PartialRelation, TypeAnalysisResult>(
-                                allExtendedTypeInfoList.size() + replacements.size());
+                var preservedResults = new LinkedHashMap<PartialRelation, TypeAnalysisResult>(
+                                allExtendedTypeInfoList.size());
                 for (var extendedTypeInfo : allExtendedTypeInfoList) {
                         var type = extendedTypeInfo.getType();
-                        results.put(type, new PreservedType(extendedTypeInfo, allExtendedTypeInfoList));
-                }
-                for (var entry : replacements.entrySet()) {
-                        var type = entry.getKey();
-                        results.put(type, new EliminatedType(entry.getValue()));
+                        preservedResults.put(type, new TypeAnalysisResult(extendedTypeInfo, allExtendedTypeInfoList));
                 }
-                return Collections.unmodifiableMap(results);
+                return Collections.unmodifiableMap(preservedResults);
         }
 
         private List<ExtendedTypeInfo> sortTypes() {
@@ -204,4 +247,8 @@ class TypeAnalyzer {
                 }
                 return Collections.unmodifiableList(sorted);
         }
+
+        public static TypeHierarchyBuilder builder() {
+                return new TypeHierarchyBuilder();
+        }
 }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyBuilder.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyBuilder.java
new file mode 100644
index 00000000..ce8fda05
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyBuilder.java
@@ -0,0 +1,66 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.typehierarchy;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.TranslationException;
+
+import java.util.*;
+
+@SuppressWarnings("UnusedReturnValue")
+public class TypeHierarchyBuilder {
+        protected final Map<PartialRelation, TypeInfo> typeInfoMap = new LinkedHashMap<>();
+
+        protected TypeHierarchyBuilder() {
+        }
+
+        public TypeHierarchyBuilder type(PartialRelation partialRelation, TypeInfo typeInfo) {
+                if (partialRelation.arity() != 1) {
+                        throw new TranslationException(partialRelation,
+                                        "Only types of arity 1 are supported, got %s with %d instead"
+                                                        .formatted(partialRelation, partialRelation.arity()));
+                }
+                var putResult = typeInfoMap.put(partialRelation, typeInfo);
+                if (putResult != null && !putResult.equals(typeInfo)) {
+                        throw new TranslationException(partialRelation,
+                                        "Duplicate type info for partial relation: " + partialRelation);
+                }
+                return this;
+        }
+
+        public TypeHierarchyBuilder type(PartialRelation partialRelation, boolean abstractType,
+                                                                         PartialRelation... supertypes) {
+                return type(partialRelation, abstractType, Set.of(supertypes));
+        }
+
+        public TypeHierarchyBuilder type(PartialRelation partialRelation, boolean abstractType,
+                                                                         Collection<PartialRelation> supertypes) {
+                return type(partialRelation, new TypeInfo(supertypes, abstractType));
+        }
+
+        public TypeHierarchyBuilder type(PartialRelation partialRelation, PartialRelation... supertypes) {
+                return type(partialRelation, List.of(supertypes));
+        }
+
+        public TypeHierarchyBuilder type(PartialRelation partialRelation, Collection<PartialRelation> supertypes) {
+                return type(partialRelation, false, supertypes);
+        }
+
+        public TypeHierarchyBuilder types(Collection<Map.Entry<PartialRelation, TypeInfo>> entries) {
+                for (var entry : entries) {
+                        type(entry.getKey(), entry.getValue());
+                }
+                return this;
+        }
+
+        public TypeHierarchyBuilder types(Map<PartialRelation, TypeInfo> map) {
+                return types(map.entrySet());
+        }
+
+        public TypeHierarchy build() {
+                return new TypeHierarchy(typeInfoMap);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyInitializer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyInitializer.java
new file mode 100644
index 00000000..c74f1e78
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyInitializer.java
@@ -0,0 +1,61 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.typehierarchy;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.reasoning.refinement.PartialModelInitializer;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.function.Function;
+
+public class TypeHierarchyInitializer implements PartialModelInitializer {
+        private final TypeHierarchy typeHierarchy;
+        private final Symbol<InferredType> typeSymbol;
+
+        public TypeHierarchyInitializer(TypeHierarchy typeHierarchy, Symbol<InferredType> typeSymbol) {
+                this.typeHierarchy = typeHierarchy;
+                this.typeSymbol = typeSymbol;
+        }
+
+        @Override
+        public void initialize(Model model, ModelSeed modelSeed) {
+                var inferredTypes = new InferredType[modelSeed.getNodeCount()];
+                Arrays.fill(inferredTypes, typeHierarchy.getUnknownType());
+                for (var type : typeHierarchy.getAllTypes()) {
+                        initializeType(type, inferredTypes, modelSeed);
+                }
+                var typeInterpretation = model.getInterpretation(typeSymbol);
+                var uniqueTable = new HashMap<InferredType, InferredType>();
+                for (int i = 0; i < inferredTypes.length; i++) {
+                        var uniqueType = uniqueTable.computeIfAbsent(inferredTypes[i], Function.identity());
+                        typeInterpretation.put(Tuple.of(i), uniqueType);
+                }
+        }
+
+        private void initializeType(PartialRelation type, InferredType[] inferredTypes, ModelSeed modelSeed) {
+                var cursor = modelSeed.getCursor(type, TruthValue.UNKNOWN);
+                var analysisResult = typeHierarchy.getAnalysisResult(type);
+                while (cursor.move()) {
+                        var i = cursor.getKey().get(0);
+                        checkNodeId(inferredTypes, i);
+                        var value = cursor.getValue();
+                        inferredTypes[i] = analysisResult.merge(inferredTypes[i], value);
+                }
+        }
+
+        private void checkNodeId(InferredType[] inferredTypes, int nodeId) {
+                if (nodeId < 0 || nodeId >= inferredTypes.length) {
+                        throw new IllegalArgumentException("Expected node id %d to be lower than model size %d"
+                                        .formatted(nodeId, inferredTypes.length));
+                }
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslationUnit.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslationUnit.java
deleted file mode 100644
index 06e3c05f..00000000
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslationUnit.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning.translator.typehierarchy;
-
-import tools.refinery.store.model.Model;
-import tools.refinery.store.reasoning.representation.PartialRelation;
-import tools.refinery.store.reasoning.translator.TranslatedRelation;
-import tools.refinery.store.reasoning.translator.TranslationUnit;
-import tools.refinery.store.representation.Symbol;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-public class TypeHierarchyTranslationUnit extends TranslationUnit {
-        static final Symbol<InferredType> INFERRED_TYPE_SYMBOL = Symbol.of(
-                        "inferredType", 1, InferredType.class, InferredType.UNTYPED);
-
-        private final TypeAnalyzer typeAnalyzer;
-
-        public TypeHierarchyTranslationUnit(Map<PartialRelation, TypeInfo> typeInfoMap) {
-                typeAnalyzer = new TypeAnalyzer(typeInfoMap);
-        }
-
-        @Override
-        public Collection<TranslatedRelation> getTranslatedRelations() {
-                return List.of();
-        }
-
-        @Override
-        public void initializeModel(Model model, int nodeCount) {
-
-        }
-}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslator.java
new file mode 100644
index 00000000..dc8a1d36
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslator.java
@@ -0,0 +1,110 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.typehierarchy;
+
+import tools.refinery.store.dse.transition.Rule;
+import tools.refinery.store.dse.transition.actions.ActionLiteral;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.model.ModelStoreConfiguration;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.reasoning.ReasoningBuilder;
+import tools.refinery.store.reasoning.actions.PartialActionLiterals;
+import tools.refinery.store.reasoning.literal.PartialLiterals;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
+import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
+import tools.refinery.store.reasoning.translator.proxy.PartialRelationTranslatorProxy;
+import tools.refinery.store.representation.Symbol;
+
+import java.util.ArrayList;
+
+import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.candidateMust;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.may;
+
+public class TypeHierarchyTranslator implements ModelStoreConfiguration {
+        private final Symbol<InferredType> typeSymbol = Symbol.of("TYPE", 1, InferredType.class, InferredType.UNTYPED);
+        private final TypeHierarchy typeHierarchy;
+
+        public TypeHierarchyTranslator(TypeHierarchy typeHierarchy) {
+                this.typeHierarchy = typeHierarchy;
+        }
+
+        @Override
+        public void apply(ModelStoreBuilder storeBuilder) {
+                if (typeHierarchy.isEmpty()) {
+                        return;
+                }
+
+                storeBuilder.symbol(typeSymbol);
+
+                for (var entry : typeHierarchy.getPreservedTypes().entrySet()) {
+                        storeBuilder.with(createPreservedTypeTranslator(entry.getKey(), entry.getValue()));
+                }
+
+                for (var entry : typeHierarchy.getEliminatedTypes().entrySet()) {
+                        storeBuilder.with(createEliminatedTypeTranslator(entry.getKey(), entry.getValue()));
+                }
+
+                var reasoningBuilder = storeBuilder.getAdapter(ReasoningBuilder.class);
+                reasoningBuilder.initializer(new TypeHierarchyInitializer(typeHierarchy, typeSymbol));
+        }
+
+        private ModelStoreConfiguration createPreservedTypeTranslator(PartialRelation type, TypeAnalysisResult result) {
+                var may = Query.of(type.name() + "#partial#may", (builder, p1) -> {
+                        if (!result.isAbstractType()) {
+                                builder.clause(new MayTypeView(typeSymbol, type).call(p1));
+                        }
+                        for (var subtype : result.getDirectSubtypes()) {
+                                builder.clause(may(subtype.call(p1)));
+                        }
+                });
+
+                var must = Query.of(type.name() + "#partial#must", (builder, p1) -> builder.clause(
+                                new MustTypeView(typeSymbol, type).call(p1)
+                ));
+
+                var candidate = Query.of(type.name() + "#candidate", (builder, p1) -> {
+                        if (!result.isAbstractType()) {
+                                builder.clause(new CandidateTypeView(typeSymbol, type).call(p1));
+                        }
+                        for (var subtype : result.getDirectSubtypes()) {
+                                builder.clause(PartialLiterals.candidateMust(subtype.call(p1)));
+                        }
+                });
+
+                var translator = PartialRelationTranslator.of(type)
+                                .may(may)
+                                .must(must)
+                                .candidate(candidate)
+                                .refiner(InferredTypeRefiner.of(typeSymbol, result));
+
+                if (!result.isAbstractType()) {
+                        var decision = Rule.of(type.name(), (builder, instance) -> builder
+                                        .clause(
+                                                        may(type.call(instance)),
+                                                        not(candidateMust(type.call(instance))),
+                                                        not(MultiObjectTranslator.MULTI_VIEW.call(instance))
+                                        )
+                                        .action(() -> {
+                                                var actionLiterals = new ArrayList<ActionLiteral>();
+                                                actionLiterals.add(PartialActionLiterals.add(type, instance));
+                                                for (var subtype : result.getDirectSubtypes()) {
+                                                        actionLiterals.add(PartialActionLiterals.remove(subtype, instance));
+                                                }
+                                                return actionLiterals;
+                                        }));
+                        translator.decision(decision);
+                }
+
+                return translator;
+        }
+
+        private ModelStoreConfiguration createEliminatedTypeTranslator(
+                        PartialRelation type, PartialRelation replacement) {
+                return new PartialRelationTranslatorProxy(type, replacement, true);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeInfo.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeInfo.java
index 9f897e46..e6bdaff2 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeInfo.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeInfo.java
@@ -9,43 +9,15 @@ import tools.refinery.store.reasoning.representation.PartialRelation;
 
 import java.util.*;
 
-public record TypeInfo(Collection<PartialRelation> supertypes, boolean abstractType) {
-        public static Builder builder() {
-                return new Builder();
+public record TypeInfo(Set<PartialRelation> supertypes, boolean abstractType) {
+        public TypeInfo(Collection<PartialRelation> supertypes, boolean abstractType) {
+                this(Set.copyOf(supertypes), abstractType);
         }
 
-        public static class Builder {
-                private final Set<PartialRelation> supertypes = new LinkedHashSet<>();
-                private boolean abstractType;
-
-                private Builder() {
-                }
-
-                public Builder supertypes(Collection<PartialRelation> supertypes) {
-                        this.supertypes.addAll(supertypes);
-                        return this;
-                }
-
-                public Builder supertypes(PartialRelation... supertypes) {
-                        return supertypes(List.of(supertypes));
-                }
-
-                public Builder supertype(PartialRelation supertype) {
-                        supertypes.add(supertype);
-                        return this;
-                }
-
-                public Builder abstractType(boolean abstractType) {
-                        this.abstractType = abstractType;
-                        return this;
-                }
-
-                public Builder abstractType() {
-                        return abstractType(true);
-                }
-
-                public TypeInfo build() {
-                        return new TypeInfo(Collections.unmodifiableSet(supertypes), abstractType);
-                }
+        public TypeInfo addSupertype(PartialRelation newSupertype) {
+                var newSupertypes = new ArrayList<PartialRelation>(supertypes.size() + 1);
+                newSupertypes.addAll(supertypes);
+                newSupertypes.add(newSupertype);
+                return new TypeInfo(newSupertypes, abstractType);
         }
 }
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java
new file mode 100644
index 00000000..77560a68
--- /dev/null
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java
@@ -0,0 +1,108 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning;
+
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.ModelQueryAdapter;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.query.view.ForbiddenView;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
+import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.tuple.Tuple;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
+import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.store.reasoning.ReasoningAdapter.EQUALS_SYMBOL;
+import static tools.refinery.store.reasoning.ReasoningAdapter.EXISTS_SYMBOL;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.may;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.must;
+
+class PartialModelTest {
+        @Test
+        void partialModelTest() {
+                var person = new PartialRelation("Person", 1);
+                var friend = new PartialRelation("friend", 2);
+                var lonely = new PartialRelation("lonely", 1);
+
+                var personStorage = Symbol.of("Person", 1, TruthValue.class, TruthValue.FALSE);
+                var friendStorage = Symbol.of("friend", 2, TruthValue.class, TruthValue.UNKNOWN);
+
+                var store = ModelStore.builder()
+                                .with(ViatraModelQueryAdapter.builder())
+                                .with(ReasoningAdapter.builder())
+                                .with(new MultiObjectTranslator())
+                                .with(PartialRelationTranslator.of(person)
+                                                .symbol(personStorage))
+                                .with(PartialRelationTranslator.of(friend)
+                                                .symbol(friendStorage)
+                                                .may(Query.of("mayFriend", (builder, p1, p2) -> builder.clause(
+                                                                may(person.call(p1)),
+                                                                may(person.call(p2)),
+                                                                not(must(EQUALS_SYMBOL.call(p1, p2))),
+                                                                not(new ForbiddenView(friendStorage).call(p1, p2))
+                                                ))))
+                                .with(PartialRelationTranslator.of(lonely)
+                                                .query(Query.of("lonely", (builder, p1) -> builder.clause(
+                                                                person.call(p1),
+                                                                not(friend.call(p1, Variable.of())))
+                                                )))
+                                .build();
+
+                var modelSeed = ModelSeed.builder(4)
+                                .seed(EXISTS_SYMBOL, builder -> builder
+                                                .put(Tuple.of(0), TruthValue.TRUE)
+                                                .put(Tuple.of(1), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(2), TruthValue.TRUE)
+                                                .put(Tuple.of(3), TruthValue.TRUE))
+                                .seed(EQUALS_SYMBOL, builder -> builder
+                                                .put(Tuple.of(0, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 1), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(2, 2), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(3, 3), TruthValue.TRUE))
+                                .seed(person, builder -> builder
+                                                .put(Tuple.of(0), TruthValue.TRUE)
+                                                .put(Tuple.of(1), TruthValue.TRUE)
+                                                .put(Tuple.of(2), TruthValue.UNKNOWN))
+                                .seed(friend, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 2), TruthValue.FALSE))
+                                .build();
+                var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(modelSeed);
+
+                var queryAdapter = model.getAdapter(ModelQueryAdapter.class);
+                var reasoningAdapter = model.getAdapter(ReasoningAdapter.class);
+                var friendInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, friend);
+                var friendRefiner = reasoningAdapter.getRefiner(friend);
+
+                assertThat(friendInterpretation.get(Tuple.of(0, 1)), is(TruthValue.TRUE));
+                assertThat(friendInterpretation.get(Tuple.of(1, 0)), is(TruthValue.UNKNOWN));
+                assertThat(friendInterpretation.get(Tuple.of(3, 0)), is(TruthValue.FALSE));
+
+                assertThat(friendRefiner.merge(Tuple.of(0, 1), TruthValue.FALSE), is(true));
+                assertThat(friendRefiner.merge(Tuple.of(1, 0), TruthValue.TRUE), is(true));
+                var splitResult = reasoningAdapter.split(1);
+                assertThat(splitResult, not(nullValue()));
+                var newPerson = splitResult.get(0);
+                queryAdapter.flushChanges();
+
+                assertThat(friendInterpretation.get(Tuple.of(0, 1)), is(TruthValue.ERROR));
+                assertThat(friendInterpretation.get(Tuple.of(1, 0)), is(TruthValue.TRUE));
+                assertThat(friendInterpretation.get(Tuple.of(0, newPerson)), is(TruthValue.ERROR));
+                assertThat(friendInterpretation.get(Tuple.of(newPerson, 0)), is(TruthValue.TRUE));
+        }
+}
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/lifting/DnfLifterTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/lifting/DnfLifterTest.java
new file mode 100644
index 00000000..793d1cec
--- /dev/null
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/lifting/DnfLifterTest.java
@@ -0,0 +1,395 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.lifting;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.store.query.view.FunctionView;
+import tools.refinery.store.query.view.MustView;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.literal.ModalConstraint;
+import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.store.query.term.int_.IntTerms.*;
+import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo;
+
+class DnfLifterTest {
+        private static final Symbol<TruthValue> friendSymbol = Symbol.of("friend", 2, TruthValue.class,
+                        TruthValue.UNKNOWN);
+        private static final AnySymbolView friendMustView = new MustView(friendSymbol);
+        private static final Symbol<Integer> age = Symbol.of("age", 1, Integer.class);
+        private static final FunctionView<Integer> ageView = new FunctionView<>(age);
+        private static final PartialRelation person = PartialSymbol.of("Person", 1);
+        private static final PartialRelation friend = PartialSymbol.of("friend", 2);
+
+        private DnfLifter sut;
+
+        @BeforeEach
+        void beforeEach() {
+                sut = new DnfLifter();
+        }
+
+        @Test
+        void liftPartialRelationCallTest() {
+                var input = Query.of("Actual", (builder, p1) -> builder.clause((v1) -> List.of(
+                        friend.call(p1, v1)
+                ))).getDnf();
+                var actual = sut.lift(Modality.MUST, Concreteness.PARTIAL, input);
+
+                var expected = Query.of("Expected", (builder, p1) -> builder.clause((v1) -> List.of(
+                                ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, friend).call(p1, v1),
+                                ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, ReasoningAdapter.EXISTS_SYMBOL).call(v1)
+                ))).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftPartialDnfCallTest() {
+                var called = Query.of("Called", (builder, p1, p2) -> builder.clause(
+                                friend.call(p1, p2),
+                                friend.call(p2, p1)
+                ));
+                var input = Query.of("Actual", (builder, p1) -> builder.clause((v1) -> List.of(
+                                called.call(p1, v1)
+                ))).getDnf();
+                var actual = sut.lift(Modality.MUST, Concreteness.PARTIAL, input);
+
+                var expected = Query.of("Expected", (builder, p1) -> builder.clause((v1) -> List.of(
+                                ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, called.getDnf()).call(p1, v1),
+                                ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, ReasoningAdapter.EXISTS_SYMBOL).call(v1)
+                ))).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftSymbolViewCallTest() {
+                var input = Query.of("Actual", (builder, p1) -> builder.clause((v1) -> List.of(
+                                friendMustView.call(p1, v1)
+                ))).getDnf();
+                var actual = sut.lift(Modality.MUST, Concreteness.PARTIAL, input);
+
+                var expected = Query.of("Expected", (builder, p1) -> builder.clause((v1) -> List.of(
+                                friendMustView.call(p1, v1),
+                                ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, ReasoningAdapter.EXISTS_SYMBOL).call(v1)
+                ))).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftPartialRelationNegativeCallTest() {
+                var input = Query.of("Actual", (builder, p1) -> builder.clause((v1) -> List.of(
+                                not(friend.call(p1, v1)),
+                                friend.call(v1, p1)
+                ))).getDnf();
+                var actual = sut.lift(Modality.MUST, Concreteness.PARTIAL, input);
+
+                var expected = Query.of("Expected", (builder, p1) -> builder.clause((v1) -> List.of(
+                                not(ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, friend).call(p1, v1)),
+                                ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, friend).call(v1, p1),
+                                ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, ReasoningAdapter.EXISTS_SYMBOL).call(v1)
+                ))).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftPartialRelationQuantifiedNegativeCallTest() {
+                var input = Query.of("Actual", (builder, p1) -> builder.clause((v1) -> List.of(
+                                person.call(p1),
+                                not(friend.call(p1, v1))
+                ))).getDnf();
+                var actual = sut.lift(Modality.MAY, Concreteness.PARTIAL, input);
+
+                var helper = Query.of("Helper", (builder, p1, p2) -> builder.clause(
+                                ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, friend).call(p1, p2),
+                                ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, ReasoningAdapter.EXISTS_SYMBOL).call(p2)
+                ));
+                var expected = Query.of("Expected", (builder, p1) -> builder.clause((v1) -> List.of(
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, person).call(p1),
+                                not(helper.call(p1, v1))
+                ))).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftSymbolViewQuantifiedNegativeCallTest() {
+                var input = Query.of("Actual", (builder, p1) -> builder.clause((v1) -> List.of(
+                                person.call(p1),
+                                not(friendMustView.call(p1, v1))
+                ))).getDnf();
+                var actual = sut.lift(Modality.MAY, Concreteness.PARTIAL, input);
+
+                var helper = Query.of("Helper", (builder, p1, p2) -> builder.clause(
+                                friendMustView.call(p1, p2),
+                                ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, ReasoningAdapter.EXISTS_SYMBOL).call(p2)
+                ));
+                var expected = Query.of("Expected", (builder, p1) -> builder.clause((v1) -> List.of(
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, person).call(p1),
+                                not(helper.call(p1, v1))
+                ))).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftPartialRelationQuantifiedNegativeDiagonalCallTest() {
+                var input = Query.of("Actual", (builder) -> builder.clause((v1) -> List.of(
+                                not(friend.call(v1, v1))
+                ))).getDnf();
+                var actual = sut.lift(Modality.MAY, Concreteness.PARTIAL, input);
+
+                var helper = Query.of("Helper", (builder, p1) -> builder.clause(
+                                ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, friend).call(p1, p1),
+                                ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, ReasoningAdapter.EXISTS_SYMBOL).call(p1)
+                ));
+                var expected = Query.of("Expected", (builder) -> builder.clause((v1) -> List.of(
+                                not(helper.call(v1))
+                ))).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftPartialDnfQuantifiedNegativeInputCallTest() {
+                var called = Dnf.of("Called", builder -> {
+                        var p1 = builder.parameter("p1", ParameterDirection.IN);
+                        var p2 = builder.parameter("p2", ParameterDirection.OUT);
+                        builder.clause(
+                                        friend.call(p1, p2),
+                                        friend.call(p2, p1)
+                        );
+                });
+                var input = Query.of("Actual", (builder, p1) -> builder.clause((v1) -> List.of(
+                                person.call(p1),
+                                not(called.call(p1, v1))
+                ))).getDnf();
+                var actual = sut.lift(Modality.MAY, Concreteness.PARTIAL, input);
+
+                var helper = Dnf.of("Helper", builder -> {
+                        var p1 = builder.parameter("p1", ParameterDirection.IN);
+                        var p2 = builder.parameter("p2", ParameterDirection.OUT);
+                        builder.clause(
+                                        ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, called).call(p1, p2),
+                                        ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, ReasoningAdapter.EXISTS_SYMBOL).call(p2)
+                        );
+                });
+                var expected = Query.of("Expected", (builder, p1) -> builder.clause((v1) -> List.of(
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, person).call(p1),
+                                not(helper.call(p1, v1))
+                ))).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftPartialRelationTransitiveCallTest() {
+                var input = Query.of("Actual", (builder, p1, p2)-> builder.clause(
+                                friend.callTransitive(p1, p2),
+                                not(person.call(p2))
+                )).getDnf();
+                var actual = sut.lift(Modality.MAY, Concreteness.PARTIAL, input);
+
+                var helper = Query.of("Helper", (builder, p1, p2) -> builder.clause(
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, friend).call(p1, p2),
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, ReasoningAdapter.EXISTS_SYMBOL).call(p2)
+                ));
+                var helper2 = Query.of("Helper2", (builder, p1, p2) -> {
+                        builder.clause(
+                                        ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, friend).call(p1, p2)
+                        );
+                        builder.clause((v1) -> List.of(
+                                        helper.callTransitive(p1, v1),
+                                        ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, friend).call(v1, p2)
+                        ));
+                });
+                var expected = Query.of("Expected", (builder, p1, p2) -> builder.clause(
+                                helper2.call(p1, p2),
+                                not(ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, person).call(p2))
+                )).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftPartialSymbolTransitiveCallTest() {
+                var input = Query.of("Actual", (builder, p1, p2)-> builder.clause(
+                                friendMustView.callTransitive(p1, p2),
+                                not(person.call(p2))
+                )).getDnf();
+                var actual = sut.lift(Modality.MAY, Concreteness.PARTIAL, input);
+
+                var endExistsHelper = Query.of("EndExistsHelper", (builder, p1, p2) -> builder.clause(
+                                friendMustView.call(p1, p2),
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, ReasoningAdapter.EXISTS_SYMBOL).call(p2)
+                ));
+                var transitiveHelper = Query.of("TransitiveHelper", (builder, p1, p2) -> {
+                        builder.clause(
+                                        friendMustView.call(p1, p2)
+                        );
+                        builder.clause((v1) -> List.of(
+                                        endExistsHelper.callTransitive(p1, v1),
+                                        friendMustView.call(v1, p2)
+                        ));
+                });
+                var expected = Query.of("Expected", (builder, p1, p2) -> builder.clause(
+                                transitiveHelper.call(p1, p2),
+                                not(ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, person).call(p2))
+                )).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftPartialRelationTransitiveCallExistsTest() {
+                var input = Query.of("Actual", (builder, p1) -> builder.clause((v1) -> List.of(
+                                friend.callTransitive(p1, v1),
+                                not(person.call(v1))
+                ))).getDnf();
+                var actual = sut.lift(Modality.MAY, Concreteness.PARTIAL, input);
+
+                var helper = Query.of("Helper", (builder, p1, p2) -> builder.clause(
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, friend).call(p1, p2),
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, ReasoningAdapter.EXISTS_SYMBOL).call(p2)
+                ));
+                var expected = Query.of("Expected", (builder, p1) -> builder.clause((v1) -> List.of(
+                                helper.callTransitive(p1, v1),
+                                not(ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, person).call(v1))
+                ))).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftMultipleTransitiveCallExistsTest() {
+                var input = Query.of("Actual", (builder, p1) -> builder.clause((v1) -> List.of(
+                                friend.callTransitive(p1, v1),
+                                friendMustView.callTransitive(p1, v1),
+                                not(person.call(v1))
+                ))).getDnf();
+                var actual = sut.lift(Modality.MAY, Concreteness.PARTIAL, input);
+
+                var helper = Query.of("Helper", (builder, p1, p2) -> builder.clause(
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, friend).call(p1, p2),
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, ReasoningAdapter.EXISTS_SYMBOL).call(p2)
+                ));
+                var helper2 = Query.of("Helper2", (builder, p1, p2) -> builder.clause(
+                                friendMustView.call(p1, p2),
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, ReasoningAdapter.EXISTS_SYMBOL).call(p2)
+                ));
+                var expected = Query.of("Expected", (builder, p1) -> builder.clause((v1) -> List.of(
+                                helper.callTransitive(p1, v1),
+                                helper2.callTransitive(p1, v1),
+                                not(ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, person).call(v1))
+                ))).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftEquivalentTest() {
+                var input = Query.of("Actual", (builder, p1, p2) -> builder.clause(
+                                p1.isEquivalent(p2),
+                                person.call(p1)
+                )).getDnf();
+                var actual = sut.lift(Modality.MAY, Concreteness.PARTIAL, input);
+
+                var expected = Query.of("Expected", (builder, p1, p2) -> builder.clause(
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, person).call(p1),
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, ReasoningAdapter.EQUALS_SYMBOL).call(p2, p1)
+                )).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftNotEquivalentTest() {
+                var input = Query.of("Actual", (builder, p1, p2) -> builder.clause(
+                                not(p1.isEquivalent(p2)),
+                                friend.call(p1, p2)
+                )).getDnf();
+                var actual = sut.lift(Modality.MAY, Concreteness.PARTIAL, input);
+
+                var expected = Query.of("Expected", (builder, p1, p2) -> builder.clause(
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, friend).call(p1, p2),
+                                not(ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, ReasoningAdapter.EQUALS_SYMBOL).call(p1, p2))
+                )).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftConstantTest() {
+                var input = Query.of("Actual", (builder, p1) -> builder.clause((v1) -> List.of(
+                                v1.isConstant(0),
+                                friend.call(v1, p1)
+                ))).getDnf();
+                var actual = sut.lift(Modality.MAY, Concreteness.PARTIAL, input);
+
+                var expected = Query.of("Expected", (builder, p1) -> builder.clause((v1) -> List.of(
+                                v1.isConstant(0),
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, friend).call(v1, p1),
+                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, ReasoningAdapter.EXISTS_SYMBOL).call(v1)
+                ))).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftAssignTest() {
+                var input = Query.of("Actual", Integer.class, (builder, p1, output) -> builder
+                                .clause(Integer.class, (d1) -> List.of(
+                                                person.call(p1),
+                                                ageView.call(p1, d1),
+                                                output.assign(mul(constant(2), d1))
+                                ))).getDnf();
+                var actual = sut.lift(Modality.MAY, Concreteness.PARTIAL, input);
+
+                var expected = Query.of("Expected", Integer.class, (builder, p1, output) -> builder
+                                .clause(Integer.class, (d1) -> List.of(
+                                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, person).call(p1),
+                                                ageView.call(p1, d1),
+                                                output.assign(mul(constant(2), d1))
+                                ))).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+
+        @Test
+        void liftCheckTest() {
+                var input = Query.of("Actual", (builder, p1) -> builder.clause(Integer.class, (d1) -> List.of(
+                                person.call(p1),
+                                ageView.call(p1, d1),
+                                check(greaterEq(d1, constant(21)))
+                ))).getDnf();
+                var actual = sut.lift(Modality.MAY, Concreteness.CANDIDATE, input);
+
+                var expected = Query.of("Expected", (builder, p1) -> builder.clause(Integer.class, (d1) -> List.of(
+                                ModalConstraint.of(Modality.MAY, Concreteness.CANDIDATE, person).call(p1),
+                                ageView.call(p1, d1),
+                                check(greaterEq(d1, constant(21)))
+                ))).getDnf();
+
+                assertThat(actual, structurallyEqualTo(expected));
+        }
+}
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java
new file mode 100644
index 00000000..bbfaff84
--- /dev/null
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java
@@ -0,0 +1,128 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.containment;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.ReasoningStoreAdapter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
+import tools.refinery.store.reasoning.translator.multiplicity.UnconstrainedMultiplicity;
+import tools.refinery.store.reasoning.translator.typehierarchy.TypeHierarchy;
+import tools.refinery.store.reasoning.translator.typehierarchy.TypeHierarchyTranslator;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.Map;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static tools.refinery.store.reasoning.translator.containment.ContainmentHierarchyTranslator.CONTAINED_SYMBOL;
+import static tools.refinery.store.reasoning.translator.containment.ContainmentHierarchyTranslator.CONTAINS_SYMBOL;
+import static tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator.COUNT_SYMBOL;
+
+class ContainmentHierarchyTranslatorTest {
+        private final PartialRelation c1 = new PartialRelation("C1", 1);
+        private final PartialRelation c2 = new PartialRelation("C2", 1);
+        private final PartialRelation entry = new PartialRelation("entry", 2);
+
+        private ModelStore store;
+
+        @BeforeEach
+        void beforeEach() {
+
+                var typeHierarchy = TypeHierarchy.builder()
+                                .type(CONTAINED_SYMBOL, true)
+                                .type(c1)
+                                .type(c2, c1, CONTAINED_SYMBOL)
+                                .build();
+
+                var containmentHierarchy = Map.of(
+                                entry,
+                                new ContainmentInfo(c1, UnconstrainedMultiplicity.INSTANCE, c2)
+                );
+
+                store = ModelStore.builder()
+                                .with(ViatraModelQueryAdapter.builder())
+                                .with(ReasoningAdapter.builder())
+                                .with(new MultiObjectTranslator())
+                                .with(new TypeHierarchyTranslator(typeHierarchy))
+                                .with(new ContainmentHierarchyTranslator(containmentHierarchy))
+                                .build();
+        }
+
+        @Test
+        void treeTest() {
+                var modelSeed = ModelSeed.builder(3)
+                                .seed(COUNT_SYMBOL, builder -> builder.reducedValue(CardinalityIntervals.ONE))
+                                .seed(CONTAINED_SYMBOL, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .seed(CONTAINS_SYMBOL, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .seed(c1, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0), TruthValue.TRUE))
+                                .seed(c2, builder -> builder
+                                                .put(Tuple.of(1), TruthValue.TRUE)
+                                                .put(Tuple.of(2), TruthValue.TRUE))
+                                .seed(entry, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 2), TruthValue.TRUE))
+                                .build();
+
+                var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(modelSeed);
+                var interpretation = model.getAdapter(ReasoningAdapter.class).getPartialInterpretation(Concreteness.PARTIAL,
+                                entry);
+
+                assertThat(interpretation.get(Tuple.of(0, 0)), is(TruthValue.FALSE));
+                assertThat(interpretation.get(Tuple.of(0, 1)), is(TruthValue.TRUE));
+                assertThat(interpretation.get(Tuple.of(0, 2)), is(TruthValue.TRUE));
+                assertThat(interpretation.get(Tuple.of(1, 0)), is(TruthValue.FALSE));
+                assertThat(interpretation.get(Tuple.of(1, 1)), is(TruthValue.FALSE));
+                assertThat(interpretation.get(Tuple.of(1, 2)), is(TruthValue.FALSE));
+                assertThat(interpretation.get(Tuple.of(2, 0)), is(TruthValue.FALSE));
+                assertThat(interpretation.get(Tuple.of(2, 1)), is(TruthValue.FALSE));
+                assertThat(interpretation.get(Tuple.of(2, 2)), is(TruthValue.FALSE));
+        }
+
+        @Test
+        void loopTest() {
+                var modelSeed = ModelSeed.builder(3)
+                                .seed(COUNT_SYMBOL, builder -> builder.reducedValue(CardinalityIntervals.ONE))
+                                .seed(CONTAINED_SYMBOL, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .seed(CONTAINS_SYMBOL, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .seed(c1, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .seed(c2, builder -> builder
+                                                .put(Tuple.of(0), TruthValue.TRUE)
+                                                .put(Tuple.of(1), TruthValue.TRUE)
+                                                .put(Tuple.of(2), TruthValue.TRUE))
+                                .seed(entry, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 0), TruthValue.TRUE))
+                                .build();
+
+                var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(modelSeed);
+                var interpretation = model.getAdapter(ReasoningAdapter.class).getPartialInterpretation(Concreteness.PARTIAL,
+                                entry);
+
+                assertThat(interpretation.get(Tuple.of(0, 0)), is(TruthValue.FALSE));
+                assertThat(interpretation.get(Tuple.of(0, 1)), is(TruthValue.ERROR));
+                assertThat(interpretation.get(Tuple.of(0, 2)), is(TruthValue.FALSE));
+                assertThat(interpretation.get(Tuple.of(1, 0)), is(TruthValue.FALSE));
+                assertThat(interpretation.get(Tuple.of(1, 1)), is(TruthValue.FALSE));
+                assertThat(interpretation.get(Tuple.of(1, 2)), is(TruthValue.ERROR));
+                assertThat(interpretation.get(Tuple.of(2, 0)), is(TruthValue.ERROR));
+                assertThat(interpretation.get(Tuple.of(2, 1)), is(TruthValue.FALSE));
+                assertThat(interpretation.get(Tuple.of(2, 2)), is(TruthValue.FALSE));
+        }
+}
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelBuilderTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelBuilderTest.java
new file mode 100644
index 00000000..0f1a1006
--- /dev/null
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelBuilderTest.java
@@ -0,0 +1,58 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.metamodel;
+
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.TranslationException;
+import tools.refinery.store.reasoning.translator.multiplicity.ConstrainedMultiplicity;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class MetamodelBuilderTest {
+        private final PartialRelation university = new PartialRelation("University", 1);
+        private final PartialRelation course = new PartialRelation("Course", 1);
+        private final PartialRelation courses = new PartialRelation("courses", 2);
+        private final PartialRelation location = new PartialRelation("location", 2);
+
+        @Test
+        void missingOppositeTest() {
+                var builder = Metamodel.builder()
+                                .type(university)
+                                .type(course)
+                                .reference(courses, university, course, location)
+                                .reference(location, course, university);
+
+                assertThrows(TranslationException.class, builder::build);
+        }
+
+        @Test
+        void invalidOppositeTypeTest() {
+                var builder = Metamodel.builder()
+                                .type(university)
+                                .type(course)
+                                .reference(courses, university, course, location)
+                                .reference(location, course, course, courses);
+
+                assertThrows(TranslationException.class, builder::build);
+        }
+
+        @Test
+        void invalidOppositeMultiplicityTest() {
+                var invalidMultiplicity = new PartialRelation("invalidMultiplicity", 1);
+
+                var builder = Metamodel.builder()
+                                .type(university)
+                                .type(course)
+                                .reference(courses, university, true, course, location)
+                                .reference(location, course,
+                                                ConstrainedMultiplicity.of(CardinalityIntervals.atLeast(2), invalidMultiplicity),
+                                                university,     courses);
+
+                assertThrows(TranslationException.class, builder::build);
+        }
+}
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java
new file mode 100644
index 00000000..eabbdffe
--- /dev/null
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java
@@ -0,0 +1,152 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.metamodel;
+
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.ReasoningStoreAdapter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+import tools.refinery.store.reasoning.translator.containment.ContainmentHierarchyTranslator;
+import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
+import tools.refinery.store.reasoning.translator.multiplicity.ConstrainedMultiplicity;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.tuple.Tuple;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+class MetamodelTest {
+        private final PartialRelation person = new PartialRelation("Person", 1);
+        private final PartialRelation student = new PartialRelation("Student", 1);
+        private final PartialRelation teacher = new PartialRelation("Teacher", 1);
+        private final PartialRelation university = new PartialRelation("University", 1);
+        private final PartialRelation course = new PartialRelation("Course", 1);
+        private final PartialRelation courses = new PartialRelation("courses", 2);
+        private final PartialRelation location = new PartialRelation("location", 2);
+        private final PartialRelation lecturer = new PartialRelation("lecturer", 2);
+        private final PartialRelation invalidLecturerCount = new PartialRelation("invalidLecturerCount", 1);
+        private final PartialRelation enrolledStudents = new PartialRelation("enrolledStudents", 2);
+        private final PartialRelation invalidStudentCount = new PartialRelation("invalidStudentCount", 1);
+
+        @Test
+        void metamodelTest() {
+                var metamodel = Metamodel.builder()
+                                .type(person, true)
+                                .type(student, person)
+                                .type(teacher, person)
+                                .type(university)
+                                .type(course)
+                                .reference(courses, university, true, course, location)
+                                .reference(location, course, university, courses)
+                                .reference(lecturer, course,
+                                                ConstrainedMultiplicity.of(CardinalityIntervals.ONE, invalidLecturerCount), teacher)
+                                .reference(enrolledStudents, course,
+                                                ConstrainedMultiplicity.of(CardinalityIntervals.SOME, invalidStudentCount), student)
+                                .build();
+
+                var seed = ModelSeed.builder(5)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(1), CardinalityIntervals.SET)
+                                                .put(Tuple.of(4), CardinalityIntervals.SET))
+                                .seed(ContainmentHierarchyTranslator.CONTAINED_SYMBOL, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN))
+                                .seed(ContainmentHierarchyTranslator.CONTAINS_SYMBOL, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .seed(student, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .seed(teacher, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .seed(university, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0), TruthValue.TRUE))
+                                .seed(course, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(2), TruthValue.TRUE))
+                                .seed(courses, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .seed(location, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 0), TruthValue.TRUE))
+                                .seed(lecturer, builder -> builder
+                                                .reducedValue(TruthValue.FALSE)
+                                                .put(Tuple.of(1, 3), TruthValue.TRUE))
+                                .seed(enrolledStudents, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .build();
+
+                var model = createModel(metamodel, seed);
+                var reasoningAdapter = model.getAdapter(ReasoningAdapter.class);
+
+                var coursesInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, courses);
+                assertThat(coursesInterpretation.get(Tuple.of(0, 1)), is(TruthValue.TRUE));
+                assertThat(coursesInterpretation.get(Tuple.of(0, 2)), is(TruthValue.UNKNOWN));
+                assertThat(coursesInterpretation.get(Tuple.of(0, 3)), is(TruthValue.FALSE));
+
+                var invalidLecturerCountInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL,
+                                invalidLecturerCount);
+                assertThat(invalidLecturerCountInterpretation.get(Tuple.of(1)), is(TruthValue.FALSE));
+                assertThat(invalidLecturerCountInterpretation.get(Tuple.of(2)), is(TruthValue.ERROR));
+
+                var enrolledStudentsInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL,
+                                enrolledStudents);
+                assertThat(enrolledStudentsInterpretation.get(Tuple.of(1, 3)), is(TruthValue.FALSE));
+                assertThat(enrolledStudentsInterpretation.get(Tuple.of(1, 4)), is(TruthValue.UNKNOWN));
+        }
+
+        @Test
+        void simpleContainmentTest() {
+                var metamodel = Metamodel.builder()
+                                .type(university)
+                                .type(course)
+                                .reference(courses, university, true, course)
+                                .build();
+
+
+                var seed = ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.SET)
+                                                .put(Tuple.of(1), CardinalityIntervals.SET))
+                                .seed(ContainmentHierarchyTranslator.CONTAINED_SYMBOL, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN))
+                                .seed(ContainmentHierarchyTranslator.CONTAINS_SYMBOL, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN))
+                                .seed(university, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0), TruthValue.TRUE))
+                                .seed(course, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1), TruthValue.TRUE))
+                                .seed(courses, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(2, 3), TruthValue.TRUE))
+                                .build();
+
+                var model = createModel(metamodel, seed);
+                var coursesInterpretation = model.getAdapter(ReasoningAdapter.class)
+                                .getPartialInterpretation(Concreteness.PARTIAL, courses);
+
+                assertThat(coursesInterpretation.get(Tuple.of(0, 1)), is(TruthValue.UNKNOWN));
+                assertThat(coursesInterpretation.get(Tuple.of(0, 3)), is(TruthValue.FALSE));
+                assertThat(coursesInterpretation.get(Tuple.of(2, 1)), is(TruthValue.UNKNOWN));
+                assertThat(coursesInterpretation.get(Tuple.of(2, 3)), is(TruthValue.TRUE));
+        }
+
+        private static Model createModel(Metamodel metamodel, ModelSeed seed) {
+                var store = ModelStore.builder()
+                                .with(ViatraModelQueryAdapter.builder())
+                                .with(ReasoningAdapter.builder())
+                                .with(new MultiObjectTranslator())
+                                .with(new MetamodelTranslator(metamodel))
+                                .build();
+
+                return store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(seed);
+        }
+}
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/CandidateCountTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/CandidateCountTest.java
new file mode 100644
index 00000000..28391ec7
--- /dev/null
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/CandidateCountTest.java
@@ -0,0 +1,321 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiobject;
+
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.ModelQueryAdapter;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.resultset.ResultSet;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.ReasoningStoreAdapter;
+import tools.refinery.store.reasoning.literal.CountCandidateLowerBoundLiteral;
+import tools.refinery.store.reasoning.literal.CountCandidateUpperBoundLiteral;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.must;
+
+class CandidateCountTest {
+        private static final PartialRelation person = new PartialRelation("Person", 1);
+        private static final PartialRelation friend = new PartialRelation("friend", 2);
+
+        @Test
+        void lowerBoundZeroTest() {
+                var query = Query.of("LowerBound", Integer.class, (builder, p1, p2, output) -> builder.clause(
+                                must(person.call(p1)),
+                                must(person.call(p2)),
+                                new CountCandidateLowerBoundLiteral(output, friend, List.of(p1, p2))
+                ));
+
+                var modelSeed = ModelSeed.builder(2)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .put(Tuple.of(0), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(1), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0, 0)), is(0));
+                assertThat(resultSet.get(Tuple.of(0, 1)), is(1));
+                assertThat(resultSet.get(Tuple.of(1, 0)), is(0));
+                assertThat(resultSet.get(Tuple.of(1, 1)), is(1));
+        }
+
+        @Test
+        void upperBoundZeroTest() {
+                var query = Query.of("UpperBound", Integer.class, (builder, p1, p2, output) -> builder.clause(
+                                must(person.call(p1)),
+                                must(person.call(p2)),
+                                new CountCandidateUpperBoundLiteral(output, friend, List.of(p1, p2))
+                ));
+
+                var modelSeed = ModelSeed.builder(2)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .put(Tuple.of(0), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(1), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0, 0)), is(0));
+                assertThat(resultSet.get(Tuple.of(0, 1)), is(1));
+                assertThat(resultSet.get(Tuple.of(1, 0)), is(0));
+                assertThat(resultSet.get(Tuple.of(1, 1)), is(1));
+        }
+
+        @Test
+        void lowerBoundOneTest() {
+                var query = Query.of("LowerBound", Integer.class, (builder, p1, output) -> builder.clause(
+                                must(person.call(p1)),
+                                new CountCandidateLowerBoundLiteral(output, friend, List.of(p1, Variable.of()))
+                ));
+
+                var modelSeed = ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(1), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(2), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 3), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 2), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 3), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(2, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0)), is(2));
+                assertThat(resultSet.get(Tuple.of(1)), is(1));
+                assertThat(resultSet.get(Tuple.of(2)), is(2));
+                assertThat(resultSet.get(Tuple.of(3)), is(0));
+        }
+
+        @Test
+        void upperBoundOneTest() {
+                var query = Query.of("UpperBound", Integer.class, (builder, p1, output) -> builder.clause(
+                                must(person.call(p1)),
+                                new CountCandidateUpperBoundLiteral(output, friend, List.of(p1, Variable.of()))
+                ));
+
+                var modelSeed = ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(1), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(2), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 3), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 2), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 3), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(2, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0)), is(2));
+                assertThat(resultSet.get(Tuple.of(1)), is(1));
+                assertThat(resultSet.get(Tuple.of(2)), is(2));
+                assertThat(resultSet.get(Tuple.of(3)), is(0));
+        }
+
+        @Test
+        void lowerBoundTwoTest() {
+                var subQuery = Query.of("SubQuery", (builder, p1, p2, p3) -> builder.clause(
+                                friend.call(p1, p2),
+                                friend.call(p1, p3),
+                                friend.call(p2, p3)
+                ));
+                var query = Query.of("LowerBound", Integer.class, (builder, p1, output) -> builder.clause(
+                                must(person.call(p1)),
+                                new CountCandidateLowerBoundLiteral(output, subQuery.getDnf(),
+                                                List.of(p1, Variable.of(), Variable.of()))
+                ));
+
+                var modelSeed = ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.between(5, 9))
+                                                .put(Tuple.of(1), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(2), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 3), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 3), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0)), is(1));
+                assertThat(resultSet.get(Tuple.of(1)), is(1));
+                assertThat(resultSet.get(Tuple.of(2)), is(2));
+                assertThat(resultSet.get(Tuple.of(3)), is(0));
+        }
+
+        @Test
+        void upperBoundTwoTest() {
+                var subQuery = Query.of("SubQuery", (builder, p1, p2, p3) -> builder.clause(
+                                friend.call(p1, p2),
+                                friend.call(p1, p3),
+                                friend.call(p2, p3)
+                ));
+                var query = Query.of("UpperBound", Integer.class, (builder, p1, output) -> builder.clause(
+                                must(person.call(p1)),
+                                new CountCandidateUpperBoundLiteral(output, subQuery.getDnf(),
+                                                List.of(p1, Variable.of(), Variable.of()))
+                ));
+
+                var modelSeed = ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.between(5, 9))
+                                                .put(Tuple.of(1), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(2), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 3), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 2), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 3), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(2, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0)), is(0));
+                assertThat(resultSet.get(Tuple.of(1)), is(0));
+                assertThat(resultSet.get(Tuple.of(2)), is(2));
+                assertThat(resultSet.get(Tuple.of(3)), is(0));
+        }
+
+        @Test
+        void lowerBoundDiagonalTest() {
+                var subQuery = Query.of("SubQuery", (builder, p1, p2, p3) -> builder.clause(
+                                friend.call(p1, p2),
+                                friend.call(p1, p3),
+                                not(friend.call(p2, p3))
+                ));
+                var query = Query.of("LowerBound", Integer.class, (builder, p1, output) -> builder.clause(v1 -> List.of(
+                                must(person.call(p1)),
+                                new CountCandidateLowerBoundLiteral(output, subQuery.getDnf(), List.of(p1, v1, v1))
+                )));
+
+                var modelSeed = ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.between(5, 9))
+                                                .put(Tuple.of(1), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(2), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 3), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 2), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 3), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(2, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0)), is(2));
+                assertThat(resultSet.get(Tuple.of(1)), is(1));
+                assertThat(resultSet.get(Tuple.of(2)), is(2));
+                assertThat(resultSet.get(Tuple.of(3)), is(0));
+        }
+
+        @Test
+        void upperBoundDiagonalTest() {
+                var subQuery = Query.of("SubQuery", (builder, p1, p2, p3) -> builder.clause(
+                                friend.call(p1, p2),
+                                friend.call(p1, p3),
+                                not(friend.call(p2, p3))
+                ));
+                var query = Query.of("UpperBound", Integer.class, (builder, p1, output) -> builder
+                                .clause(v1 -> List.of(
+                                                must(person.call(p1)),
+                                                new CountCandidateUpperBoundLiteral(output, subQuery.getDnf(), List.of(p1, v1, v1))
+                                )));
+
+                var modelSeed = ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.between(5, 9))
+                                                .put(Tuple.of(1), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(2), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 3), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 2), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 3), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(2, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0)), is(2));
+                assertThat(resultSet.get(Tuple.of(1)), is(1));
+                assertThat(resultSet.get(Tuple.of(2)), is(2));
+                assertThat(resultSet.get(Tuple.of(3)), is(0));
+        }
+
+        private static <T> ResultSet<T> getResultSet(Query<T> query, ModelSeed modelSeed) {
+                var personStorage = Symbol.of("Person", 1, TruthValue.class, TruthValue.FALSE);
+                var friendStorage = Symbol.of("friend", 2, TruthValue.class, TruthValue.FALSE);
+
+                var store = ModelStore.builder()
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .query(query))
+                                .with(ReasoningAdapter.builder())
+                                .with(new MultiObjectTranslator())
+                                .with(PartialRelationTranslator.of(person)
+                                                .symbol(personStorage))
+                                .with(PartialRelationTranslator.of(friend)
+                                                .symbol(friendStorage))
+                                .build();
+
+                var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(modelSeed);
+                return model.getAdapter(ModelQueryAdapter.class).getResultSet(query);
+        }
+}
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java
new file mode 100644
index 00000000..64230cf6
--- /dev/null
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java
@@ -0,0 +1,321 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.multiobject;
+
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.ModelQueryAdapter;
+import tools.refinery.store.query.dnf.Query;
+import tools.refinery.store.query.resultset.ResultSet;
+import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.ReasoningStoreAdapter;
+import tools.refinery.store.reasoning.literal.CountLowerBoundLiteral;
+import tools.refinery.store.reasoning.literal.CountUpperBoundLiteral;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.store.representation.cardinality.UpperCardinalities;
+import tools.refinery.store.representation.cardinality.UpperCardinality;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.store.reasoning.literal.PartialLiterals.must;
+
+class PartialCountTest {
+        private static final PartialRelation person = new PartialRelation("Person", 1);
+        private static final PartialRelation friend = new PartialRelation("friend", 2);
+
+        @Test
+        void lowerBoundZeroTest() {
+                var query = Query.of("LowerBound", Integer.class, (builder, p1, p2, output) -> builder.clause(
+                                must(person.call(p1)),
+                                must(person.call(p2)),
+                                new CountLowerBoundLiteral(output, friend, List.of(p1, p2))
+                ));
+
+                var modelSeed = ModelSeed.builder(2)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .put(Tuple.of(0), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(1), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0, 0)), is(0));
+                assertThat(resultSet.get(Tuple.of(0, 1)), is(1));
+                assertThat(resultSet.get(Tuple.of(1, 0)), is(0));
+                assertThat(resultSet.get(Tuple.of(1, 1)), is(1));
+        }
+
+        @Test
+        void upperBoundZeroTest() {
+                var query = Query.of("UpperBound", UpperCardinality.class, (builder, p1, p2, output) -> builder.clause(
+                                must(person.call(p1)),
+                                must(person.call(p2)),
+                                new CountUpperBoundLiteral(output, friend, List.of(p1, p2))
+                ));
+
+                var modelSeed = ModelSeed.builder(2)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .put(Tuple.of(0), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(1), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0, 0)), is(UpperCardinalities.ZERO));
+                assertThat(resultSet.get(Tuple.of(0, 1)), is(UpperCardinalities.ONE));
+                assertThat(resultSet.get(Tuple.of(1, 0)), is(UpperCardinalities.ONE));
+                assertThat(resultSet.get(Tuple.of(1, 1)), is(UpperCardinalities.ZERO));
+        }
+
+        @Test
+        void lowerBoundOneTest() {
+                var query = Query.of("LowerBound", Integer.class, (builder, p1, output) -> builder.clause(
+                                must(person.call(p1)),
+                                new CountLowerBoundLiteral(output, friend, List.of(p1, Variable.of()))
+                ));
+
+                var modelSeed = ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(1), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(2), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 3), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 2), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 3), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(2, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0)), is(4));
+                assertThat(resultSet.get(Tuple.of(1)), is(1));
+                assertThat(resultSet.get(Tuple.of(2)), is(4));
+                assertThat(resultSet.get(Tuple.of(3)), is(0));
+        }
+
+        @Test
+        void upperBoundOneTest() {
+                var query = Query.of("UpperBound", UpperCardinality.class, (builder, p1, output) -> builder.clause(
+                                must(person.call(p1)),
+                                new CountUpperBoundLiteral(output, friend, List.of(p1, Variable.of()))
+                ));
+
+                var modelSeed = ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(1), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(2), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 3), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 2), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 3), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(2, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0)), is(UpperCardinalities.UNBOUNDED));
+                assertThat(resultSet.get(Tuple.of(1)), is(UpperCardinalities.atMost(9)));
+                assertThat(resultSet.get(Tuple.of(2)), is(UpperCardinalities.ONE));
+                assertThat(resultSet.get(Tuple.of(3)), is(UpperCardinalities.ZERO));
+        }
+
+        @Test
+        void lowerBoundTwoTest() {
+                var subQuery = Query.of("SubQuery", (builder, p1, p2, p3) -> builder.clause(
+                                friend.call(p1, p2),
+                                friend.call(p1, p3),
+                                friend.call(p2, p3)
+                ));
+                var query = Query.of("LowerBound", Integer.class, (builder, p1, output) -> builder.clause(
+                                must(person.call(p1)),
+                                new CountLowerBoundLiteral(output, subQuery.getDnf(), List.of(p1, Variable.of(), Variable.of()))
+                ));
+
+                var modelSeed = ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.between(5, 9))
+                                                .put(Tuple.of(1), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(2), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 3), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 3), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0)), is(3));
+                assertThat(resultSet.get(Tuple.of(1)), is(5));
+                assertThat(resultSet.get(Tuple.of(2)), is(30));
+                assertThat(resultSet.get(Tuple.of(3)), is(0));
+        }
+
+        @Test
+        void upperBoundTwoTest() {
+                var subQuery = Query.of("SubQuery", (builder, p1, p2, p3) -> builder.clause(
+                                friend.call(p1, p2),
+                                friend.call(p1, p3),
+                                friend.call(p2, p3)
+                ));
+                var query = Query.of("UpperBound", UpperCardinality.class, (builder, p1, output) -> builder.clause(
+                                must(person.call(p1)),
+                                new CountUpperBoundLiteral(output, subQuery.getDnf(), List.of(p1, Variable.of(), Variable.of()))
+                ));
+
+                var modelSeed = ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.between(5, 9))
+                                                .put(Tuple.of(1), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(2), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 3), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 2), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 3), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(2, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0)), is(UpperCardinalities.UNBOUNDED));
+                assertThat(resultSet.get(Tuple.of(1)), is(UpperCardinalities.atMost(135)));
+                assertThat(resultSet.get(Tuple.of(2)), is(UpperCardinalities.ZERO));
+                assertThat(resultSet.get(Tuple.of(3)), is(UpperCardinalities.ZERO));
+        }
+
+        @Test
+        void lowerBoundDiagonalTest() {
+                var subQuery = Query.of("SubQuery", (builder, p1, p2, p3) -> builder.clause(
+                                friend.call(p1, p2),
+                                friend.call(p1, p3),
+                                not(friend.call(p2, p3))
+                ));
+                var query = Query.of("LowerBound", Integer.class, (builder, p1, output) -> builder.clause(v1 -> List.of(
+                                must(person.call(p1)),
+                                new CountLowerBoundLiteral(output, subQuery.getDnf(), List.of(p1, v1, v1))
+                )));
+
+                var modelSeed = ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.between(5, 9))
+                                                .put(Tuple.of(1), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(2), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 3), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 2), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 3), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(2, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0)), is(4));
+                assertThat(resultSet.get(Tuple.of(1)), is(5));
+                assertThat(resultSet.get(Tuple.of(2)), is(8));
+                assertThat(resultSet.get(Tuple.of(3)), is(0));
+        }
+
+        @Test
+        void upperBoundDiagonalTest() {
+                var subQuery = Query.of("SubQuery", (builder, p1, p2, p3) -> builder.clause(
+                                friend.call(p1, p2),
+                                friend.call(p1, p3),
+                                not(friend.call(p2, p3))
+                ));
+                var query = Query.of("UpperBound", UpperCardinality.class, (builder, p1, output) -> builder
+                                .clause(v1 -> List.of(
+                                                must(person.call(p1)),
+                                                new CountUpperBoundLiteral(output, subQuery.getDnf(), List.of(p1, v1, v1))
+                                )));
+
+                var modelSeed = ModelSeed.builder(4)
+                                .seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                                .reducedValue(CardinalityIntervals.ONE)
+                                                .put(Tuple.of(0), CardinalityIntervals.between(5, 9))
+                                                .put(Tuple.of(1), CardinalityIntervals.atLeast(3))
+                                                .put(Tuple.of(2), CardinalityIntervals.atMost(7)))
+                                .seed(person, builder -> builder.reducedValue(TruthValue.TRUE))
+                                .seed(friend, builder -> builder
+                                                .put(Tuple.of(0, 1), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 2), TruthValue.TRUE)
+                                                .put(Tuple.of(0, 3), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(1, 2), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1, 3), TruthValue.UNKNOWN)
+                                                .put(Tuple.of(2, 0), TruthValue.TRUE)
+                                                .put(Tuple.of(2, 1), TruthValue.ERROR))
+                                .build();
+
+                var resultSet = getResultSet(query, modelSeed);
+                assertThat(resultSet.get(Tuple.of(0)), is(UpperCardinalities.UNBOUNDED));
+                assertThat(resultSet.get(Tuple.of(1)), is(UpperCardinalities.atMost(17)));
+                assertThat(resultSet.get(Tuple.of(2)), is(UpperCardinalities.atMost(9)));
+                assertThat(resultSet.get(Tuple.of(3)), is(UpperCardinalities.ZERO));
+        }
+
+        private static <T> ResultSet<T> getResultSet(Query<T> query, ModelSeed modelSeed) {
+                var personStorage = Symbol.of("Person", 1, TruthValue.class, TruthValue.FALSE);
+                var friendStorage = Symbol.of("friend", 2, TruthValue.class, TruthValue.FALSE);
+
+                var store = ModelStore.builder()
+                                .with(ViatraModelQueryAdapter.builder()
+                                                .query(query))
+                                .with(ReasoningAdapter.builder())
+                                .with(new MultiObjectTranslator())
+                                .with(PartialRelationTranslator.of(person)
+                                                .symbol(personStorage))
+                                .with(PartialRelationTranslator.of(friend)
+                                                .symbol(friendStorage))
+                                .build();
+
+                var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(modelSeed);
+                return model.getAdapter(ModelQueryAdapter.class).getResultSet(query);
+        }
+}
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java
new file mode 100644
index 00000000..3658d603
--- /dev/null
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java
@@ -0,0 +1,145 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.typehierarchy;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.ReasoningStoreAdapter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.tuple.Tuple;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+class ConcreteSupertypeTest {
+        private final PartialRelation c1 = new PartialRelation("C1", 1);
+        private final PartialRelation c2 = new PartialRelation("C2", 1);
+
+        private ModelStore store;
+
+        @BeforeEach
+        void beforeEach() {
+                var typeHierarchy = TypeHierarchy.builder()
+                                .type(c1)
+                                .type(c2, c1)
+                                .build();
+
+                store = ModelStore.builder()
+                                .with(ViatraModelQueryAdapter.builder())
+                                .with(ReasoningAdapter.builder())
+                                .with(new TypeHierarchyTranslator(typeHierarchy))
+                                .build();
+        }
+
+        @Test
+        void inheritedTypeTrueTest() {
+                var seed = ModelSeed.builder(1)
+                                .seed(c1, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .seed(c2, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0), TruthValue.TRUE))
+                                .build();
+
+                var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(seed);
+                var adapter = model.getAdapter(ReasoningAdapter.class);
+
+                assertThat(adapter.getPartialInterpretation(Concreteness.PARTIAL, c1).get(Tuple.of(0)), is(TruthValue.TRUE));
+                assertThat(adapter.getPartialInterpretation(Concreteness.PARTIAL, c2).get(Tuple.of(0)), is(TruthValue.TRUE));
+        }
+
+        @Test
+        void inheritedTypeFalseTest() {
+                var seed = ModelSeed.builder(1)
+                                .seed(c1, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .seed(c2, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0), TruthValue.FALSE))
+                                .build();
+
+                var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(seed);
+                var adapter = model.getAdapter(ReasoningAdapter.class);
+
+                assertThat(adapter.getPartialInterpretation(Concreteness.PARTIAL, c1).get(Tuple.of(0)),
+                                is(TruthValue.UNKNOWN));
+                assertThat(adapter.getPartialInterpretation(Concreteness.PARTIAL, c2).get(Tuple.of(0)), is(TruthValue.FALSE));
+        }
+
+        @Test
+        void supertypeTrueTest() {
+                var seed = ModelSeed.builder(1)
+                                .seed(c1, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0), TruthValue.TRUE))
+                                .seed(c2, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .build();
+
+                var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(seed);
+                var adapter = model.getAdapter(ReasoningAdapter.class);
+
+                assertThat(adapter.getPartialInterpretation(Concreteness.PARTIAL, c1).get(Tuple.of(0)), is(TruthValue.TRUE));
+                assertThat(adapter.getPartialInterpretation(Concreteness.PARTIAL, c2).get(Tuple.of(0)),
+                                is(TruthValue.UNKNOWN));
+        }
+
+        @Test
+        void supertypeFalseTest() {
+                var seed = ModelSeed.builder(1)
+                                .seed(c1, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0), TruthValue.FALSE))
+                                .seed(c2, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .build();
+
+                var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(seed);
+                var adapter = model.getAdapter(ReasoningAdapter.class);
+
+                assertThat(adapter.getPartialInterpretation(Concreteness.PARTIAL, c1).get(Tuple.of(0)), is(TruthValue.FALSE));
+                assertThat(adapter.getPartialInterpretation(Concreteness.PARTIAL, c2).get(Tuple.of(0)), is(TruthValue.FALSE));
+        }
+
+        @Test
+        void supertypeOnlyTest() {
+                var seed = ModelSeed.builder(1)
+                                .seed(c1, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0), TruthValue.TRUE))
+                                .seed(c2, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0), TruthValue.FALSE))
+                                .build();
+
+                var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(seed);
+                var adapter = model.getAdapter(ReasoningAdapter.class);
+
+                assertThat(adapter.getPartialInterpretation(Concreteness.PARTIAL, c1).get(Tuple.of(0)), is(TruthValue.TRUE));
+                assertThat(adapter.getPartialInterpretation(Concreteness.PARTIAL, c2).get(Tuple.of(0)), is(TruthValue.FALSE));
+        }
+
+
+        @Test
+        void inheritedTypeErrorTest() {
+                var seed = ModelSeed.builder(1)
+                                .seed(c1, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0), TruthValue.FALSE))
+                                .seed(c2, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0), TruthValue.TRUE))
+                                .build();
+
+                var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(seed);
+                var adapter = model.getAdapter(ReasoningAdapter.class);
+
+                assertThat(adapter.getPartialInterpretation(Concreteness.PARTIAL, c1).get(Tuple.of(0)), is(TruthValue.ERROR));
+                assertThat(adapter.getPartialInterpretation(Concreteness.PARTIAL, c2).get(Tuple.of(0)), is(TruthValue.ERROR));
+        }
+}
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzerExampleHierarchyTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisExampleHierarchyTest.java
index 05a476c6..d9a5477e 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzerExampleHierarchyTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisExampleHierarchyTest.java
@@ -5,19 +5,19 @@
  */
 package tools.refinery.store.reasoning.translator.typehierarchy;
 
+import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.representation.TruthValue;
 
-import java.util.LinkedHashMap;
 import java.util.Set;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertAll;
 
-class TypeAnalyzerExampleHierarchyTest {
+class TypeAnalysisExampleHierarchyTest {
         private final PartialRelation a1 = new PartialRelation("A1", 1);
         private final PartialRelation a2 = new PartialRelation("A2", 1);
         private final PartialRelation a3 = new PartialRelation("A3", 1);
@@ -28,23 +28,23 @@ class TypeAnalyzerExampleHierarchyTest {
         private final PartialRelation c3 = new PartialRelation("C3", 1);
         private final PartialRelation c4 = new PartialRelation("C4", 1);
 
-        private TypeAnalyzer sut;
-        private TypeAnalyzerTester tester;
+        private TypeHierarchy sut;
+        private TypeHierarchyTester tester;
 
         @BeforeEach
         void beforeEach() {
-                var typeInfoMap = new LinkedHashMap<PartialRelation, TypeInfo>();
-                typeInfoMap.put(a1, TypeInfo.builder().abstractType().build());
-                typeInfoMap.put(a2, TypeInfo.builder().abstractType().build());
-                typeInfoMap.put(a3, TypeInfo.builder().abstractType().build());
-                typeInfoMap.put(a4, TypeInfo.builder().abstractType().build());
-                typeInfoMap.put(a5, TypeInfo.builder().abstractType().build());
-                typeInfoMap.put(c1, TypeInfo.builder().supertypes(a1, a4).build());
-                typeInfoMap.put(c2, TypeInfo.builder().supertypes(a1, a2, a3, a4).build());
-                typeInfoMap.put(c3, TypeInfo.builder().supertype(a3).build());
-                typeInfoMap.put(c4, TypeInfo.builder().supertype(a4).build());
-                sut = new TypeAnalyzer(typeInfoMap);
-                tester = new TypeAnalyzerTester(sut);
+                sut = TypeHierarchy.builder()
+                                .type(a1, true)
+                                .type(a2, true)
+                                .type(a3, true)
+                                .type(a4, true)
+                                .type(a5, true)
+                                .type(c1, a1, a4)
+                                .type(c2, a1, a2, a3, a4)
+                                .type(c3, a3)
+                                .type(c4, a4)
+                                .build();
+                tester = new TypeHierarchyTester(sut);
         }
 
         @Test
@@ -65,16 +65,16 @@ class TypeAnalyzerExampleHierarchyTest {
         @Test
         void inferredTypesTest() {
                 assertAll(
-                                () -> assertThat(sut.getUnknownType(), is(new InferredType(Set.of(), Set.of(c1, c2, c3, c4), null))),
-                                () -> assertThat(tester.getInferredType(a1), is(new InferredType(Set.of(a1, a4), Set.of(c1, c2), c1))),
-                                () -> assertThat(tester.getInferredType(a3), is(new InferredType(Set.of(a3), Set.of(c2, c3), c2))),
-                                () -> assertThat(tester.getInferredType(a4), is(new InferredType(Set.of(a4), Set.of(c1, c2, c4), c1))),
-                                () -> assertThat(tester.getInferredType(a5), is(new InferredType(Set.of(a5), Set.of(), null))),
-                                () -> assertThat(tester.getInferredType(c1), is(new InferredType(Set.of(a1, a4, c1), Set.of(c1), c1))),
+                                () -> assertThat(sut.getUnknownType(), Matchers.is(new InferredType(Set.of(), Set.of(c1, c2, c3, c4), null))),
+                                () -> assertThat(tester.getInferredType(a1), Matchers.is(new InferredType(Set.of(a1, a4), Set.of(c1, c2), c1))),
+                                () -> assertThat(tester.getInferredType(a3), Matchers.is(new InferredType(Set.of(a3), Set.of(c2, c3), c2))),
+                                () -> assertThat(tester.getInferredType(a4), Matchers.is(new InferredType(Set.of(a4), Set.of(c1, c2, c4), c1))),
+                                () -> assertThat(tester.getInferredType(a5), Matchers.is(new InferredType(Set.of(a5), Set.of(), null))),
+                                () -> assertThat(tester.getInferredType(c1), Matchers.is(new InferredType(Set.of(a1, a4, c1), Set.of(c1), c1))),
                                 () -> assertThat(tester.getInferredType(c2),
-                                                is(new InferredType(Set.of(a1, a3, a4, c2), Set.of(c2), c2))),
-                                () -> assertThat(tester.getInferredType(c3), is(new InferredType(Set.of(a3, c3), Set.of(c3), c3))),
-                                () -> assertThat(tester.getInferredType(c4), is(new InferredType(Set.of(a4, c4), Set.of(c4), c4)))
+                                                Matchers.is(new InferredType(Set.of(a1, a3, a4, c2), Set.of(c2), c2))),
+                                () -> assertThat(tester.getInferredType(c3), Matchers.is(new InferredType(Set.of(a3, c3), Set.of(c3), c3))),
+                                () -> assertThat(tester.getInferredType(c4), Matchers.is(new InferredType(Set.of(a4, c4), Set.of(c4), c4)))
                 );
         }
 
@@ -84,8 +84,8 @@ class TypeAnalyzerExampleHierarchyTest {
                 var a3Result = tester.getPreservedType(a3);
                 var expected = new InferredType(Set.of(a1, a3, a4, c2), Set.of(c2), c2);
                 assertAll(
-                                () -> assertThat(a1Result.merge(a3Result.asInferredType(), TruthValue.TRUE), is(expected)),
-                                () -> assertThat(a3Result.merge(a1Result.asInferredType(), TruthValue.TRUE), is(expected)),
+                                () -> assertThat(a1Result.merge(a3Result.asInferredType(), TruthValue.TRUE), Matchers.is(expected)),
+                                () -> assertThat(a3Result.merge(a1Result.asInferredType(), TruthValue.TRUE), Matchers.is(expected)),
                                 () -> assertThat(a1Result.merge(sut.getUnknownType(), TruthValue.TRUE), is(a1Result.asInferredType())),
                                 () -> assertThat(a3Result.merge(sut.getUnknownType(), TruthValue.TRUE), is(a3Result.asInferredType())),
                                 () -> assertThat(a1Result.merge(a1Result.asInferredType(), TruthValue.TRUE),
@@ -100,19 +100,19 @@ class TypeAnalyzerExampleHierarchyTest {
                 var a4Result = tester.getPreservedType(a4);
                 assertAll(
                                 () -> assertThat(a1Result.merge(a3Result.asInferredType(), TruthValue.FALSE),
-                                                is(new InferredType(Set.of(a3, c3), Set.of(c3), c3))),
+                                                Matchers.is(new InferredType(Set.of(a3, c3), Set.of(c3), c3))),
                                 () -> assertThat(a3Result.merge(a1Result.asInferredType(), TruthValue.FALSE),
-                                                is(new InferredType(Set.of(a1, a4, c1), Set.of(c1), c1))),
+                                                Matchers.is(new InferredType(Set.of(a1, a4, c1), Set.of(c1), c1))),
                                 () -> assertThat(a4Result.merge(a3Result.asInferredType(), TruthValue.FALSE),
-                                                is(new InferredType(Set.of(a3, c3), Set.of(c3), c3))),
+                                                Matchers.is(new InferredType(Set.of(a3, c3), Set.of(c3), c3))),
                                 () -> assertThat(a3Result.merge(a4Result.asInferredType(), TruthValue.FALSE),
-                                                is(new InferredType(Set.of(a4), Set.of(c1, c4), c1))),
+                                                Matchers.is(new InferredType(Set.of(a4), Set.of(c1, c4), c1))),
                                 () -> assertThat(a1Result.merge(sut.getUnknownType(), TruthValue.FALSE),
-                                                is(new InferredType(Set.of(), Set.of(c3, c4), null))),
+                                                Matchers.is(new InferredType(Set.of(), Set.of(c3, c4), null))),
                                 () -> assertThat(a3Result.merge(sut.getUnknownType(), TruthValue.FALSE),
-                                                is(new InferredType(Set.of(), Set.of(c1, c4), null))),
+                                                Matchers.is(new InferredType(Set.of(), Set.of(c1, c4), null))),
                                 () -> assertThat(a4Result.merge(sut.getUnknownType(), TruthValue.FALSE),
-                                                is(new InferredType(Set.of(), Set.of(c3), null)))
+                                                Matchers.is(new InferredType(Set.of(), Set.of(c3), null)))
                 );
         }
 
@@ -122,8 +122,8 @@ class TypeAnalyzerExampleHierarchyTest {
                 var a4Result = tester.getPreservedType(a4);
                 var expected = new InferredType(Set.of(c1, a1, a4), Set.of(), null);
                 assertAll(
-                                () -> assertThat(c1Result.merge(a4Result.asInferredType(), TruthValue.ERROR), is(expected)),
-                                () -> assertThat(a4Result.merge(c1Result.asInferredType(), TruthValue.ERROR), is(expected))
+                                () -> assertThat(c1Result.merge(a4Result.asInferredType(), TruthValue.ERROR), Matchers.is(expected)),
+                                () -> assertThat(a4Result.merge(c1Result.asInferredType(), TruthValue.ERROR), Matchers.is(expected))
                 );
         }
 
@@ -145,9 +145,9 @@ class TypeAnalyzerExampleHierarchyTest {
                 var c3Result = tester.getPreservedType(c3);
                 assertAll(
                                 () -> assertThat(a1Result.merge(c3Result.asInferredType(), TruthValue.TRUE),
-                                                is(new InferredType(Set.of(a1, a3, c3), Set.of(), null))),
+                                                Matchers.is(new InferredType(Set.of(a1, a3, c3), Set.of(), null))),
                                 () -> assertThat(c3Result.merge(a1Result.asInferredType(), TruthValue.TRUE),
-                                                is(new InferredType(Set.of(a1, a3, a4, c3), Set.of(), null)))
+                                                Matchers.is(new InferredType(Set.of(a1, a3, a4, c3), Set.of(), null)))
                 );
         }
 
@@ -158,13 +158,13 @@ class TypeAnalyzerExampleHierarchyTest {
                 var c1Result = tester.getPreservedType(c1);
                 assertAll(
                                 () -> assertThat(a4Result.merge(a1Result.asInferredType(), TruthValue.FALSE),
-                                                is(new InferredType(Set.of(a1, a4), Set.of(), null))),
+                                                Matchers.is(new InferredType(Set.of(a1, a4), Set.of(), null))),
                                 () -> assertThat(a1Result.merge(c1Result.asInferredType(), TruthValue.FALSE),
-                                                is(new InferredType(Set.of(a1, a4, c1), Set.of(), null))),
+                                                Matchers.is(new InferredType(Set.of(a1, a4, c1), Set.of(), null))),
                                 () -> assertThat(a4Result.merge(c1Result.asInferredType(), TruthValue.FALSE),
-                                                is(new InferredType(Set.of(a1, a4, c1), Set.of(), null))),
+                                                Matchers.is(new InferredType(Set.of(a1, a4, c1), Set.of(), null))),
                                 () -> assertThat(a1Result.merge(a1Result.asInferredType(), TruthValue.FALSE),
-                                                is(new InferredType(Set.of(a1, a4), Set.of(), null)))
+                                                Matchers.is(new InferredType(Set.of(a1, a4), Set.of(), null)))
                 );
         }
 
@@ -174,9 +174,9 @@ class TypeAnalyzerExampleHierarchyTest {
                 var a5Result = tester.getPreservedType(a5);
                 assertAll(
                                 () -> assertThat(c1Result.merge(a5Result.asInferredType(), TruthValue.TRUE),
-                                                is(new InferredType(Set.of(a1, a4, a5, c1), Set.of(), null))),
+                                                Matchers.is(new InferredType(Set.of(a1, a4, a5, c1), Set.of(), null))),
                                 () -> assertThat(a5Result.merge(c1Result.asInferredType(), TruthValue.TRUE),
-                                                is(new InferredType(Set.of(a1, a4, a5, c1), Set.of(), null)))
+                                                Matchers.is(new InferredType(Set.of(a1, a4, a5, c1), Set.of(), null)))
                 );
         }
 
@@ -198,9 +198,9 @@ class TypeAnalyzerExampleHierarchyTest {
                 var a5Result = tester.getPreservedType(a5);
                 assertAll(
                                 () -> assertThat(c1Result.merge(a5Result.asInferredType(), TruthValue.ERROR),
-                                                is(new InferredType(Set.of(a1, a4, a5, c1), Set.of(), null))),
+                                                Matchers.is(new InferredType(Set.of(a1, a4, a5, c1), Set.of(), null))),
                                 () -> assertThat(a5Result.merge(c1Result.asInferredType(), TruthValue.ERROR),
-                                                is(new InferredType(Set.of(a1, a4, a5, c1), Set.of(), null))),
+                                                Matchers.is(new InferredType(Set.of(a1, a4, a5, c1), Set.of(), null))),
                                 () -> assertThat(a5Result.merge(a5Result.asInferredType(), TruthValue.ERROR),
                                                 is(a5Result.asInferredType()))
                 );
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzerTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzerTest.java
deleted file mode 100644
index d0ef9d57..00000000
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzerTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.reasoning.translator.typehierarchy;
-
-import org.junit.jupiter.api.Test;
-import tools.refinery.store.reasoning.representation.PartialRelation;
-import tools.refinery.store.representation.TruthValue;
-
-import java.util.LinkedHashMap;
-import java.util.Set;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class TypeAnalyzerTest {
-        @Test
-        void directSupertypesTest() {
-                var c1 = new PartialRelation("C1", 1);
-                var c2 = new PartialRelation("C2", 1);
-                var c3 = new PartialRelation("C3", 1);
-                var typeInfoMap = new LinkedHashMap<PartialRelation, TypeInfo>();
-                typeInfoMap.put(c1, TypeInfo.builder().supertypes(c2, c3).build());
-                typeInfoMap.put(c2, TypeInfo.builder().supertype(c3).build());
-                typeInfoMap.put(c3, TypeInfo.builder().build());
-
-                var sut = new TypeAnalyzer(typeInfoMap);
-                var tester = new TypeAnalyzerTester(sut);
-
-                assertAll(
-                                () -> tester.assertConcreteType(c1),
-                                () -> tester.assertConcreteType(c2, c1),
-                                () -> tester.assertConcreteType(c3, c2)
-                );
-        }
-
-        @Test
-        void typeEliminationAbstractToConcreteTest() {
-                var c1 = new PartialRelation("C1", 1);
-                var c2 = new PartialRelation("C2", 1);
-                var a11 = new PartialRelation("A11", 1);
-                var a12 = new PartialRelation("A12", 1);
-                var a21 = new PartialRelation("A21", 1);
-                var a22 = new PartialRelation("A22", 1);
-                var a3 = new PartialRelation("A3", 1);
-                var typeInfoMap = new LinkedHashMap<PartialRelation, TypeInfo>();
-                typeInfoMap.put(a3, TypeInfo.builder().abstractType().build());
-                typeInfoMap.put(a21, TypeInfo.builder().abstractType().supertype(a3).build());
-                typeInfoMap.put(a22, TypeInfo.builder().abstractType().supertype(a3).build());
-                typeInfoMap.put(a11, TypeInfo.builder().abstractType().supertypes(a21, a22).build());
-                typeInfoMap.put(a12, TypeInfo.builder().abstractType().supertypes(a21, a22).build());
-                typeInfoMap.put(c1, TypeInfo.builder().supertypes(a11, a12).build());
-                typeInfoMap.put(c2, TypeInfo.builder().supertype(a3).build());
-
-                var sut = new TypeAnalyzer(typeInfoMap);
-                var tester = new TypeAnalyzerTester(sut);
-
-                assertAll(
-                                () -> tester.assertConcreteType(c1),
-                                () -> tester.assertConcreteType(c2),
-                                () -> tester.assertEliminatedType(a11, c1),
-                                () -> tester.assertEliminatedType(a12, c1),
-                                () -> tester.assertEliminatedType(a21, c1),
-                                () -> tester.assertEliminatedType(a22, c1),
-                                () -> tester.assertAbstractType(a3, c1, c2)
-                );
-        }
-
-        @Test
-        void typeEliminationConcreteToAbstractTest() {
-                var c1 = new PartialRelation("C1", 1);
-                var c2 = new PartialRelation("C2", 1);
-                var a11 = new PartialRelation("A11", 1);
-                var a12 = new PartialRelation("A12", 1);
-                var a21 = new PartialRelation("A21", 1);
-                var a22 = new PartialRelation("A22", 1);
-                var a3 = new PartialRelation("A3", 1);
-                var typeInfoMap = new LinkedHashMap<PartialRelation, TypeInfo>();
-                typeInfoMap.put(c1, TypeInfo.builder().supertypes(a11, a12).build());
-                typeInfoMap.put(c2, TypeInfo.builder().supertype(a3).build());
-                typeInfoMap.put(a11, TypeInfo.builder().abstractType().supertypes(a21, a22).build());
-                typeInfoMap.put(a12, TypeInfo.builder().abstractType().supertypes(a21, a22).build());
-                typeInfoMap.put(a21, TypeInfo.builder().abstractType().supertype(a3).build());
-                typeInfoMap.put(a22, TypeInfo.builder().abstractType().supertype(a3).build());
-                typeInfoMap.put(a3, TypeInfo.builder().abstractType().build());
-
-                var sut = new TypeAnalyzer(typeInfoMap);
-                var tester = new TypeAnalyzerTester(sut);
-
-                assertAll(
-                                () -> tester.assertConcreteType(c1),
-                                () -> tester.assertConcreteType(c2),
-                                () -> tester.assertEliminatedType(a11, c1),
-                                () -> tester.assertEliminatedType(a12, c1),
-                                () -> tester.assertEliminatedType(a21, c1),
-                                () -> tester.assertEliminatedType(a22, c1),
-                                () -> tester.assertAbstractType(a3, c1, c2)
-                );
-        }
-
-        @Test
-        void preserveConcreteTypeTest() {
-                var c1 = new PartialRelation("C1", 1);
-                var a1 = new PartialRelation("A1", 1);
-                var c2 = new PartialRelation("C2", 1);
-                var a2 = new PartialRelation("A2", 1);
-                var typeInfoMap = new LinkedHashMap<PartialRelation, TypeInfo>();
-                typeInfoMap.put(c1, TypeInfo.builder().supertype(a1).build());
-                typeInfoMap.put(a1, TypeInfo.builder().abstractType().supertype(c2).build());
-                typeInfoMap.put(c2, TypeInfo.builder().supertype(a2).build());
-                typeInfoMap.put(a2, TypeInfo.builder().abstractType().build());
-
-                var sut = new TypeAnalyzer(typeInfoMap);
-                var tester = new TypeAnalyzerTester(sut);
-
-                assertAll(
-                                () -> tester.assertConcreteType(c1),
-                                () -> tester.assertEliminatedType(a1, c1),
-                                () -> tester.assertConcreteType(c2, c1),
-                                () -> tester.assertEliminatedType(a2, c2)
-                );
-        }
-
-        @Test
-        void mostGeneralCurrentTypeTest() {
-                var c1 = new PartialRelation("C1", 1);
-                var c2 = new PartialRelation("C2", 1);
-                var c3 = new PartialRelation("C3", 1);
-                var typeInfoMap = new LinkedHashMap<PartialRelation, TypeInfo>();
-                typeInfoMap.put(c1, TypeInfo.builder().supertype(c3).build());
-                typeInfoMap.put(c2, TypeInfo.builder().supertype(c3).build());
-                typeInfoMap.put(c3, TypeInfo.builder().build());
-
-                var sut = new TypeAnalyzer(typeInfoMap);
-                var tester = new TypeAnalyzerTester(sut);
-                var c3Result = tester.getPreservedType(c3);
-
-                var expected = new InferredType(Set.of(c3), Set.of(c1, c2, c3), c3);
-                assertAll(
-                                () -> assertThat(tester.getInferredType(c3), is(expected)),
-                                () -> assertThat(c3Result.merge(sut.getUnknownType(), TruthValue.TRUE), is(expected))
-                );
-        }
-
-        @Test
-        void preferFirstConcreteTypeTest() {
-                var a1 = new PartialRelation("A1", 1);
-                var c1 = new PartialRelation("C1", 1);
-                var c2 = new PartialRelation("C2", 1);
-                var c3 = new PartialRelation("C3", 1);
-                var c4 = new PartialRelation("C4", 1);
-                var typeInfoMap = new LinkedHashMap<PartialRelation, TypeInfo>();
-                typeInfoMap.put(c1, TypeInfo.builder().supertype(a1).build());
-                typeInfoMap.put(c2, TypeInfo.builder().supertype(a1).build());
-                typeInfoMap.put(c3, TypeInfo.builder().supertype(a1).build());
-                typeInfoMap.put(c4, TypeInfo.builder().supertype(c3).build());
-                typeInfoMap.put(a1, TypeInfo.builder().abstractType().build());
-
-                var sut = new TypeAnalyzer(typeInfoMap);
-                var tester = new TypeAnalyzerTester(sut);
-                var c1Result = tester.getPreservedType(c1);
-                var a1Result = tester.getPreservedType(a1);
-
-                assertThat(c1Result.merge(a1Result.asInferredType(), TruthValue.FALSE),
-                                is(new InferredType(Set.of(a1), Set.of(c2, c3, c4), c2)));
-        }
-
-        @Test
-        void preferFirstMostGeneralConcreteTypeTest() {
-                var a1 = new PartialRelation("A1", 1);
-                var c1 = new PartialRelation("C1", 1);
-                var c2 = new PartialRelation("C2", 1);
-                var c3 = new PartialRelation("C3", 1);
-                var c4 = new PartialRelation("C4", 1);
-                var typeInfoMap = new LinkedHashMap<PartialRelation, TypeInfo>();
-                typeInfoMap.put(c4, TypeInfo.builder().supertype(c3).build());
-                typeInfoMap.put(c3, TypeInfo.builder().supertype(a1).build());
-                typeInfoMap.put(c2, TypeInfo.builder().supertype(a1).build());
-                typeInfoMap.put(c1, TypeInfo.builder().supertype(a1).build());
-                typeInfoMap.put(a1, TypeInfo.builder().abstractType().build());
-
-                var sut = new TypeAnalyzer(typeInfoMap);
-                var tester = new TypeAnalyzerTester(sut);
-                var c1Result = tester.getPreservedType(c1);
-                var a1Result = tester.getPreservedType(a1);
-
-                assertThat(c1Result.merge(a1Result.asInferredType(), TruthValue.FALSE),
-                                is(new InferredType(Set.of(a1), Set.of(c2, c3, c4), c3)));
-        }
-
-        @Test
-        void circularTypeHierarchyTest() {
-                var c1 = new PartialRelation("C1", 1);
-                var c2 = new PartialRelation("C2", 1);
-                var typeInfoMap = new LinkedHashMap<PartialRelation, TypeInfo>();
-                typeInfoMap.put(c1, TypeInfo.builder().supertype(c2).build());
-                typeInfoMap.put(c2, TypeInfo.builder().supertype(c1).build());
-
-                assertThrows(IllegalArgumentException.class, () -> new TypeAnalyzer(typeInfoMap));
-        }
-}
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java
new file mode 100644
index 00000000..cd9df19a
--- /dev/null
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java
@@ -0,0 +1,186 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.typehierarchy;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.ModelQueryAdapter;
+import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.ReasoningStoreAdapter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.seed.ModelSeed;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.tuple.Tuple;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+class TypeHierarchyPartialModelTest {
+        private final PartialRelation person = new PartialRelation("Person", 1);
+        private final PartialRelation member = new PartialRelation("Member", 1);
+        private final PartialRelation student = new PartialRelation("Student", 1);
+        private final PartialRelation teacher = new PartialRelation("Teacher", 1);
+        private final PartialRelation pet = new PartialRelation("Pet", 1);
+
+        private Model model;
+
+        @BeforeEach
+        void beforeEach() {
+                var typeHierarchy = TypeHierarchy.builder()
+                                .type(person, true)
+                                .type(member, true, person)
+                                .type(student, member)
+                                .type(teacher, member)
+                                .type(pet)
+                                .build();
+
+                var store = ModelStore.builder()
+                                .with(ViatraModelQueryAdapter.builder())
+                                .with(ReasoningAdapter.builder())
+                                .with(new TypeHierarchyTranslator(typeHierarchy))
+                                .build();
+
+                var seed = ModelSeed.builder(4)
+                                .seed(person, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(3), TruthValue.FALSE))
+                                .seed(member, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(1), TruthValue.TRUE)
+                                                .put(Tuple.of(2), TruthValue.TRUE))
+                                .seed(student, builder -> builder
+                                                .reducedValue(TruthValue.UNKNOWN)
+                                                .put(Tuple.of(0), TruthValue.TRUE)
+                                                .put(Tuple.of(2), TruthValue.FALSE))
+                                .seed(teacher, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .seed(pet, builder -> builder.reducedValue(TruthValue.UNKNOWN))
+                                .build();
+                model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(seed);
+        }
+
+        @Test
+        void initialModelTest() {
+                var reasoningAdapter = model.getAdapter(ReasoningAdapter.class);
+
+                var personInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, person);
+                assertThat(personInterpretation.get(Tuple.of(0)), is(TruthValue.TRUE));
+                assertThat(personInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));
+                assertThat(personInterpretation.get(Tuple.of(2)), is(TruthValue.TRUE));
+                assertThat(personInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+
+                var memberInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, member);
+                assertThat(memberInterpretation.get(Tuple.of(0)), is(TruthValue.TRUE));
+                assertThat(memberInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));
+                assertThat(memberInterpretation.get(Tuple.of(2)), is(TruthValue.TRUE));
+                assertThat(memberInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+
+                var studentInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, student);
+                assertThat(studentInterpretation.get(Tuple.of(0)), is(TruthValue.TRUE));
+                assertThat(studentInterpretation.get(Tuple.of(1)), is(TruthValue.UNKNOWN));
+                assertThat(studentInterpretation.get(Tuple.of(2)), is(TruthValue.FALSE));
+                assertThat(studentInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+
+                var teacherInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, teacher);
+                assertThat(teacherInterpretation.get(Tuple.of(0)), is(TruthValue.FALSE));
+                assertThat(teacherInterpretation.get(Tuple.of(1)), is(TruthValue.UNKNOWN));
+                assertThat(teacherInterpretation.get(Tuple.of(2)), is(TruthValue.TRUE));
+                assertThat(teacherInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+
+                var petInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, pet);
+                assertThat(petInterpretation.get(Tuple.of(0)), is(TruthValue.FALSE));
+                assertThat(petInterpretation.get(Tuple.of(1)), is(TruthValue.FALSE));
+                assertThat(petInterpretation.get(Tuple.of(2)), is(TruthValue.FALSE));
+                assertThat(petInterpretation.get(Tuple.of(3)), is(TruthValue.UNKNOWN));
+        }
+
+        @Test
+        void initialModelCandidateTest() {
+                var reasoningAdapter = model.getAdapter(ReasoningAdapter.class);
+
+                var personCandidateInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.CANDIDATE, person);
+                assertThat(personCandidateInterpretation.get(Tuple.of(0)), is(TruthValue.TRUE));
+                assertThat(personCandidateInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));
+                assertThat(personCandidateInterpretation.get(Tuple.of(2)), is(TruthValue.TRUE));
+                assertThat(personCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+
+                var memberCandidateInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.CANDIDATE, member);
+                assertThat(memberCandidateInterpretation.get(Tuple.of(0)), is(TruthValue.TRUE));
+                assertThat(memberCandidateInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));
+                assertThat(memberCandidateInterpretation.get(Tuple.of(2)), is(TruthValue.TRUE));
+                assertThat(memberCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+
+                var studentCandidateInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.CANDIDATE, student);
+                assertThat(studentCandidateInterpretation.get(Tuple.of(0)), is(TruthValue.TRUE));
+                assertThat(studentCandidateInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));
+                assertThat(studentCandidateInterpretation.get(Tuple.of(2)), is(TruthValue.FALSE));
+                assertThat(studentCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+
+                var teacherCandidateInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.CANDIDATE, teacher);
+                assertThat(teacherCandidateInterpretation.get(Tuple.of(0)), is(TruthValue.FALSE));
+                assertThat(teacherCandidateInterpretation.get(Tuple.of(1)), is(TruthValue.FALSE));
+                assertThat(teacherCandidateInterpretation.get(Tuple.of(2)), is(TruthValue.TRUE));
+                assertThat(teacherCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+
+                var petCandidateInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.CANDIDATE, pet);
+                assertThat(petCandidateInterpretation.get(Tuple.of(0)), is(TruthValue.FALSE));
+                assertThat(petCandidateInterpretation.get(Tuple.of(1)), is(TruthValue.FALSE));
+                assertThat(petCandidateInterpretation.get(Tuple.of(2)), is(TruthValue.FALSE));
+                assertThat(petCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+        }
+
+        @Test
+        void refinedModelTest() {
+                var reasoningAdapter = model.getAdapter(ReasoningAdapter.class);
+                var studentRefiner = reasoningAdapter.getRefiner(student);
+                studentRefiner.merge(Tuple.of(1), TruthValue.FALSE);
+                studentRefiner.merge(Tuple.of(3), TruthValue.TRUE);
+                model.getAdapter(ModelQueryAdapter.class).flushChanges();
+
+                var personInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, person);
+                assertThat(personInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));
+                assertThat(personInterpretation.get(Tuple.of(3)), is(TruthValue.ERROR));
+
+                var personCandidateInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.CANDIDATE, person);
+                assertThat(personCandidateInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));
+                assertThat(personCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+
+                var memberInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, member);
+                assertThat(memberInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));
+                assertThat(memberInterpretation.get(Tuple.of(3)), is(TruthValue.ERROR));
+
+                var memberCandidateInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.CANDIDATE, member);
+                assertThat(memberCandidateInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));
+                assertThat(memberCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+
+                var studentInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, student);
+                assertThat(studentInterpretation.get(Tuple.of(1)), is(TruthValue.FALSE));
+                assertThat(studentInterpretation.get(Tuple.of(3)), is(TruthValue.ERROR));
+
+                var studentCandidateInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.CANDIDATE, student);
+                assertThat(studentCandidateInterpretation.get(Tuple.of(1)), is(TruthValue.FALSE));
+                assertThat(studentCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+
+                var teacherInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, teacher);
+                assertThat(teacherInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));
+                assertThat(teacherInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+
+                var teacherCandidateInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.CANDIDATE, teacher);
+                assertThat(teacherCandidateInterpretation.get(Tuple.of(1)), is(TruthValue.TRUE));
+                assertThat(teacherCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+
+                var petInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.PARTIAL, pet);
+                assertThat(petInterpretation.get(Tuple.of(1)), is(TruthValue.FALSE));
+                assertThat(petInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+
+                var petCandidateInterpretation = reasoningAdapter.getPartialInterpretation(Concreteness.CANDIDATE, pet);
+                assertThat(petCandidateInterpretation.get(Tuple.of(1)), is(TruthValue.FALSE));
+                assertThat(petCandidateInterpretation.get(Tuple.of(3)), is(TruthValue.FALSE));
+        }
+}
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTest.java
new file mode 100644
index 00000000..931c62dd
--- /dev/null
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTest.java
@@ -0,0 +1,224 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.reasoning.translator.typehierarchy;
+
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.TranslationException;
+import tools.refinery.store.representation.TruthValue;
+
+import java.util.Set;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class TypeHierarchyTest {
+        @Test
+        void directSupertypesTest() {
+                var c1 = new PartialRelation("C1", 1);
+                var c2 = new PartialRelation("C2", 1);
+                var c3 = new PartialRelation("C3", 1);
+
+                var sut = TypeHierarchy.builder()
+                                .type(c1, c2, c3)
+                                .type(c2, c3)
+                                .type(c3)
+                                .build();
+                var tester = new TypeHierarchyTester(sut);
+
+                assertAll(
+                                () -> tester.assertConcreteType(c1),
+                                () -> tester.assertConcreteType(c2, c1),
+                                () -> tester.assertConcreteType(c3, c2)
+                );
+        }
+
+        @Test
+        void typeEliminationAbstractToConcreteTest() {
+                var c1 = new PartialRelation("C1", 1);
+                var c2 = new PartialRelation("C2", 1);
+                var a11 = new PartialRelation("A11", 1);
+                var a12 = new PartialRelation("A12", 1);
+                var a21 = new PartialRelation("A21", 1);
+                var a22 = new PartialRelation("A22", 1);
+                var a3 = new PartialRelation("A3", 1);
+
+                var sut = TypeHierarchy.builder()
+                                .type(a3, true)
+                                .type(a21, true, a3)
+                                .type(a22, true, a3)
+                                .type(a11, true, a21, a22)
+                                .type(a12, true, a21, a22)
+                                .type(c1, a11, a12)
+                                .type(c2, a3)
+                                .build();
+                var tester = new TypeHierarchyTester(sut);
+
+                assertAll(
+                                () -> tester.assertConcreteType(c1),
+                                () -> tester.assertConcreteType(c2),
+                                () -> tester.assertEliminatedType(a11, c1),
+                                () -> tester.assertEliminatedType(a12, c1),
+                                () -> tester.assertEliminatedType(a21, c1),
+                                () -> tester.assertEliminatedType(a22, c1),
+                                () -> tester.assertAbstractType(a3, c1, c2)
+                );
+        }
+
+        @Test
+        void typeEliminationConcreteToAbstractTest() {
+                var c1 = new PartialRelation("C1", 1);
+                var c2 = new PartialRelation("C2", 1);
+                var a11 = new PartialRelation("A11", 1);
+                var a12 = new PartialRelation("A12", 1);
+                var a21 = new PartialRelation("A21", 1);
+                var a22 = new PartialRelation("A22", 1);
+                var a3 = new PartialRelation("A3", 1);
+
+                var sut = TypeHierarchy.builder()
+                                .type(c1, a11, a12)
+                                .type(c2, a3)
+                                .type(a11, true, a21, a22)
+                                .type(a12, true, a21, a22)
+                                .type(a21, true, a3)
+                                .type(a22, true, a3)
+                                .type(a3, true)
+                                .build();
+                var tester = new TypeHierarchyTester(sut);
+
+                assertAll(
+                                () -> tester.assertConcreteType(c1),
+                                () -> tester.assertConcreteType(c2),
+                                () -> tester.assertEliminatedType(a11, c1),
+                                () -> tester.assertEliminatedType(a12, c1),
+                                () -> tester.assertEliminatedType(a21, c1),
+                                () -> tester.assertEliminatedType(a22, c1),
+                                () -> tester.assertAbstractType(a3, c1, c2)
+                );
+        }
+
+        @Test
+        void preserveConcreteTypeTest() {
+                var c1 = new PartialRelation("C1", 1);
+                var a1 = new PartialRelation("A1", 1);
+                var c2 = new PartialRelation("C2", 1);
+                var a2 = new PartialRelation("A2", 1);
+
+                var sut = TypeHierarchy.builder()
+                                .type(c1, a1)
+                                .type(a1, true, c2)
+                                .type(c2, a2)
+                                .type(a2, true)
+                                .build();
+                var tester = new TypeHierarchyTester(sut);
+
+                assertAll(
+                                () -> tester.assertConcreteType(c1),
+                                () -> tester.assertEliminatedType(a1, c1),
+                                () -> tester.assertConcreteType(c2, c1),
+                                () -> tester.assertEliminatedType(a2, c2)
+                );
+        }
+
+        @Test
+        void mostGeneralCurrentTypeTest() {
+                var c1 = new PartialRelation("C1", 1);
+                var c2 = new PartialRelation("C2", 1);
+                var c3 = new PartialRelation("C3", 1);
+
+                var sut = TypeHierarchy.builder()
+                                .type(c1, c3)
+                                .type(c2, c3)
+                                .type(c3)
+                                .build();
+                var tester = new TypeHierarchyTester(sut);
+                var c3Result = tester.getPreservedType(c3);
+
+                var expected = new InferredType(Set.of(c3), Set.of(c1, c2, c3), c3);
+                assertAll(
+                                () -> assertThat(tester.getInferredType(c3), Matchers.is(expected)),
+                                () -> assertThat(c3Result.merge(sut.getUnknownType(), TruthValue.TRUE), Matchers.is(expected))
+                );
+        }
+
+        @Test
+        void preferFirstConcreteTypeTest() {
+                var a1 = new PartialRelation("A1", 1);
+                var c1 = new PartialRelation("C1", 1);
+                var c2 = new PartialRelation("C2", 1);
+                var c3 = new PartialRelation("C3", 1);
+                var c4 = new PartialRelation("C4", 1);
+
+                var sut = TypeHierarchy.builder()
+                                .type(c1, a1)
+                                .type(c2, a1)
+                                .type(c3, a1)
+                                .type(c4, c3)
+                                .type(a1, true)
+                                .build();
+                var tester = new TypeHierarchyTester(sut);
+                var c1Result = tester.getPreservedType(c1);
+                var a1Result = tester.getPreservedType(a1);
+
+                assertThat(c1Result.merge(a1Result.asInferredType(), TruthValue.FALSE),
+                                Matchers.is(new InferredType(Set.of(a1), Set.of(c2, c3, c4), c2)));
+        }
+
+        @Test
+        void preferFirstMostGeneralConcreteTypeTest() {
+                var a1 = new PartialRelation("A1", 1);
+                var c1 = new PartialRelation("C1", 1);
+                var c2 = new PartialRelation("C2", 1);
+                var c3 = new PartialRelation("C3", 1);
+                var c4 = new PartialRelation("C4", 1);
+
+                var sut = TypeHierarchy.builder()
+                                .type(c4, c3)
+                                .type(c3, a1)
+                                .type(c2, a1)
+                                .type(c1, a1)
+                                .type(a1, true)
+                                .build();
+                var tester = new TypeHierarchyTester(sut);
+                var c1Result = tester.getPreservedType(c1);
+                var a1Result = tester.getPreservedType(a1);
+
+                assertThat(c1Result.merge(a1Result.asInferredType(), TruthValue.FALSE),
+                                Matchers.is(new InferredType(Set.of(a1), Set.of(c2, c3, c4), c3)));
+        }
+
+        @Test
+        void circularTypeHierarchyTest() {
+                var c1 = new PartialRelation("C1", 1);
+                var c2 = new PartialRelation("C2", 1);
+                var builder = TypeHierarchy.builder()
+                                .type(c1, c2)
+                                .type(c2, c1);
+
+                assertThrows(TranslationException.class, builder::build);
+        }
+
+        @Test
+        void chainedEliminationTest() {
+                var a1 = new PartialRelation("A1", 1);
+                var a2 = new PartialRelation("A2", 1);
+                var c1 = new PartialRelation("C1", 1);
+
+                var sut = TypeHierarchy.builder()
+                                .type(a1, true)
+                                .type(a2, true, a1)
+                                .type(c1, a2)
+                                .build();
+
+                assertAll(
+                                () -> assertThat(sut.getEliminatedTypes(), hasEntry(a1, c1)),
+                                () -> assertThat(sut.getEliminatedTypes(), hasEntry(a2, c1))
+                );
+        }
+}
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzerTester.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTester.java
index 2924816e..647bd782 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzerTester.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTester.java
@@ -11,10 +11,10 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.hamcrest.Matchers.is;
 
-class TypeAnalyzerTester {
-        private final TypeAnalyzer sut;
+class TypeHierarchyTester {
+        private final TypeHierarchy sut;
 
-        public TypeAnalyzerTester(TypeAnalyzer sut) {
+        public TypeHierarchyTester(TypeHierarchy sut) {
                 this.sut = sut;
         }
 
@@ -32,22 +32,21 @@ class TypeAnalyzerTester {
 
         private void assertPreservedType(PartialRelation partialRelation, boolean isAbstract, boolean isVacuous,
                                                                          PartialRelation... directSubtypes) {
-                var result = sut.getAnalysisResults().get(partialRelation);
-                assertThat(result, is(instanceOf(PreservedType.class)));
-                var preservedResult = (PreservedType) result;
-                assertThat(preservedResult.isAbstractType(), is(isAbstract));
-                assertThat(preservedResult.isVacuous(), is(isVacuous));
-                assertThat(preservedResult.getDirectSubtypes(), hasItems(directSubtypes));
+                var result = sut.getPreservedTypes().get(partialRelation);
+                assertThat(result, not(nullValue()));
+                assertThat(result.isAbstractType(), is(isAbstract));
+                assertThat(result.isVacuous(), is(isVacuous));
+                assertThat(result.getDirectSubtypes(), hasItems(directSubtypes));
         }
 
         public void assertEliminatedType(PartialRelation partialRelation, PartialRelation replacement) {
-                var result = sut.getAnalysisResults().get(partialRelation);
-                assertThat(result, is(instanceOf(EliminatedType.class)));
-                assertThat(((EliminatedType) result).replacement(), is(replacement));
+                var result = sut.getEliminatedTypes().get(partialRelation);
+                assertThat(result, not(nullValue()));
+                assertThat(result, is(replacement));
         }
 
-        public PreservedType getPreservedType(PartialRelation partialRelation) {
-                return (PreservedType) sut.getAnalysisResults().get(partialRelation);
+        public TypeAnalysisResult getPreservedType(PartialRelation partialRelation) {
+                return sut.getPreservedTypes().get(partialRelation);
         }
 
         public InferredType getInferredType(PartialRelation partialRelation) {
diff --git a/subprojects/store/build.gradle.kts b/subprojects/store/build.gradle.kts
index d653f01d..f96922a9 100644
--- a/subprojects/store/build.gradle.kts
+++ b/subprojects/store/build.gradle.kts
@@ -10,6 +10,6 @@ plugins {
 }
 
 dependencies {
-        implementation(libs.eclipseCollections)
         implementation(libs.eclipseCollections.api)
+        runtimeOnly(libs.eclipseCollections)
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/Cursors.java b/subprojects/store/src/main/java/tools/refinery/store/map/Cursors.java
index 0a94d449..5e69e7af 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/Cursors.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/Cursors.java
@@ -5,6 +5,9 @@
  */
 package tools.refinery.store.map;
 
+import java.util.Iterator;
+import java.util.Map;
+
 public final class Cursors {
     private Cursors() {
         throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
@@ -14,6 +17,18 @@ public final class Cursors {
         return new Empty<>();
     }
 
+        public static <K, V> Cursor<K, V> singleton(K key, V value) {
+                return new Singleton<>(key, value);
+        }
+
+        public static <K, V> Cursor<K, V> of(Iterator<Map.Entry<K, V>> iterator) {
+                return new IteratorBasedCursor<>(iterator);
+        }
+
+        public static <K, V> Cursor<K, V> of(Map<K, V> map) {
+                return of(map.entrySet().iterator());
+        }
+
     private static class Empty<K, V> implements Cursor<K, V> {
         private boolean terminated = false;
 
@@ -38,4 +53,53 @@ public final class Cursors {
             return false;
         }
     }
+
+        private static class Singleton<K, V> implements Cursor<K, V> {
+                private State state = State.INITIAL;
+                private final K key;
+                private final V value;
+
+                public Singleton(K key, V value) {
+                        this.key = key;
+                        this.value = value;
+                }
+
+                @Override
+                public K getKey() {
+                        if (state == State.STARTED) {
+                                return key;
+                        }
+                        return null;
+                }
+
+                @Override
+                public V getValue() {
+                        if (state == State.STARTED) {
+                                return value;
+                        }
+                        return null;
+                }
+
+                @Override
+                public boolean isTerminated() {
+                        return state == State.TERMINATED;
+                }
+
+                @Override
+                public boolean move() {
+                        if (state == State.INITIAL) {
+                                state = State.STARTED;
+                                return true;
+                        }
+                        state = State.TERMINATED;
+                        return false;
+                }
+
+
+                private enum State {
+                        INITIAL,
+                        STARTED,
+                        TERMINATED
+                }
+        }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/IteratorBasedCursor.java b/subprojects/store/src/main/java/tools/refinery/store/map/IteratorBasedCursor.java
new file mode 100644
index 00000000..0ed9b730
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/IteratorBasedCursor.java
@@ -0,0 +1,44 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.map;
+
+import java.util.Iterator;
+import java.util.Map;
+
+public class IteratorBasedCursor<K, V> implements Cursor<K, V> {
+        private final Iterator<Map.Entry<K, V>> iterator;
+        private Map.Entry<K, V> entry;
+        private boolean terminated;
+
+        public IteratorBasedCursor(Iterator<Map.Entry<K, V>> iterator) {
+                this.iterator = iterator;
+        }
+
+        @Override
+        public K getKey() {
+                return entry.getKey();
+        }
+
+        @Override
+        public V getValue() {
+                return entry.getValue();
+        }
+
+        @Override
+        public boolean isTerminated() {
+                return terminated;
+        }
+
+        @Override
+        public boolean move() {
+                if (!terminated && iterator.hasNext()) {
+                        entry = iterator.next();
+                        return true;
+                }
+                terminated = true;
+                return false;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/VersionedMapDeltaImpl.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/VersionedMapDeltaImpl.java
index c19cc817..d530ae87 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/VersionedMapDeltaImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/VersionedMapDeltaImpl.java
@@ -5,10 +5,9 @@
  */
 package tools.refinery.store.map.internal.delta;
 
-import java.util.*;
-
 import tools.refinery.store.map.*;
-import tools.refinery.store.map.IteratorAsCursor;
+
+import java.util.*;
 
 public class VersionedMapDeltaImpl<K, V> implements VersionedMap<K, V> {
         protected final VersionedMapStoreDeltaImpl<K, V> store;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/AnyInterpretation.java b/subprojects/store/src/main/java/tools/refinery/store/model/AnyInterpretation.java
index f906b48a..d650bd06 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/AnyInterpretation.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/AnyInterpretation.java
@@ -13,4 +13,6 @@ public sealed interface AnyInterpretation permits Interpretation {
         AnySymbol getSymbol();
 
         long getSize();
+
+        int getAdjacentSize(int slot, int node);
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/Interpretation.java b/subprojects/store/src/main/java/tools/refinery/store/model/Interpretation.java
index 72f188d3..1b15e4cf 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/Interpretation.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/Interpretation.java
@@ -19,6 +19,8 @@ public non-sealed interface Interpretation<T> extends AnyInterpretation {
 
         Cursor<Tuple, T> getAll();
 
+        Cursor<Tuple, T> getAdjacent(int slot, int node);
+
         T put(Tuple key, T value);
 
         void putAll(Cursor<Tuple, T> cursor);
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/ModelStoreBuilder.java b/subprojects/store/src/main/java/tools/refinery/store/model/ModelStoreBuilder.java
index 3a4024b5..8f652762 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/ModelStoreBuilder.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/ModelStoreBuilder.java
@@ -29,7 +29,9 @@ public interface ModelStoreBuilder {
 
         <T> ModelStoreBuilder symbol(Symbol<T> symbol);
 
-        <T extends ModelAdapterBuilder> ModelStoreBuilder with(T adapterBuilder);
+        ModelStoreBuilder with(ModelAdapterBuilder adapterBuilder);
+
+        ModelStoreBuilder with(ModelStoreConfiguration configuration);
 
         <T extends ModelAdapterBuilder> Optional<T> tryGetAdapter(Class<? extends T> adapterType);
 
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/ModelStoreConfiguration.java b/subprojects/store/src/main/java/tools/refinery/store/model/ModelStoreConfiguration.java
new file mode 100644
index 00000000..e94af5f8
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/ModelStoreConfiguration.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.model;
+
+@FunctionalInterface
+public interface ModelStoreConfiguration {
+        void apply(ModelStoreBuilder storeBuilder);
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/internal/BaseIndexer.java b/subprojects/store/src/main/java/tools/refinery/store/model/internal/BaseIndexer.java
new file mode 100644
index 00000000..3d7f59d7
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/internal/BaseIndexer.java
@@ -0,0 +1,102 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.model.internal;
+
+import org.eclipse.collections.api.factory.Maps;
+import org.eclipse.collections.api.factory.primitive.IntObjectMaps;
+import org.eclipse.collections.api.map.MutableMap;
+import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
+import tools.refinery.store.map.*;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.Set;
+
+class BaseIndexer<T> {
+        private final MutableIntObjectMap<MutableMap<Tuple, T>>[] maps;
+        private final VersionedMap<Tuple, T> versionedMap;
+
+        public BaseIndexer(int arity, VersionedMap<Tuple, T> map) {
+                if (arity < 2) {
+                        throw new IllegalArgumentException("Only arity >= 2 symbols need to be indexed");
+                }
+                // There is no way in Java to create a generic array in a checked way.
+                @SuppressWarnings({"unchecked", "squid:S1905"})
+                var uncheckedMaps = (MutableIntObjectMap<MutableMap<Tuple, T>>[]) new MutableIntObjectMap[arity];
+                maps = uncheckedMaps;
+                for (int i = 0; i < arity; i++) {
+                        maps[i] = IntObjectMaps.mutable.empty();
+                }
+                this.versionedMap = map;
+                if (map != null) {
+                        var cursor = map.getAll();
+                        while (cursor.move()) {
+                                put(cursor.getKey(), cursor.getValue());
+                        }
+                }
+        }
+
+        public void put(Tuple key, T value) {
+                for (int i = 0; i < maps.length; i++) {
+                        var map = maps[i];
+                        int element = key.get(i);
+                        var adjacentTuples = map.getIfAbsentPut(element, Maps.mutable::empty);
+                        adjacentTuples.put(key, value);
+                }
+        }
+
+        public void remove(Tuple key) {
+                for (int i = 0; i < maps.length; i++) {
+                        var map = maps[i];
+                        int element = key.get(i);
+                        var adjacentTuples = map.get(element);
+                        if (adjacentTuples == null) {
+                                continue;
+                        }
+                        adjacentTuples.remove(key);
+                        if (adjacentTuples.isEmpty()) {
+                                map.remove(element);
+                        }
+                }
+        }
+
+        private MutableMap<Tuple, T> getAdjacentMap(int slot, int node) {
+                if (slot < 0 || slot >= maps.length) {
+                        throw new IllegalArgumentException("Invalid index: " + slot);
+                }
+                var map = maps[slot];
+                return map.get(node);
+        }
+
+        public int getAdjacentSize(int slot, int node) {
+                var adjacentTuples = getAdjacentMap(slot, node);
+                if (adjacentTuples == null) {
+                        return 0;
+                }
+                return adjacentTuples.size();
+        }
+
+        public Cursor<Tuple, T> getAdjacent(int slot, int node) {
+                var adjacentTuples = getAdjacentMap(slot, node);
+                if (adjacentTuples == null) {
+                        return Cursors.empty();
+                }
+                return new IndexCursor<>(adjacentTuples, versionedMap);
+        }
+
+        private static class IndexCursor<T> extends IteratorBasedCursor<Tuple, T> {
+                private final Set<AnyVersionedMap> dependingMaps;
+
+                public IndexCursor(MutableMap<Tuple, T> map, VersionedMap<Tuple, T> versionedMap) {
+                        super(map.entrySet().iterator());
+                        dependingMaps = versionedMap == null ? Set.of() : Set.of(versionedMap);
+                }
+
+                @Override
+                public Set<AnyVersionedMap> getDependingMaps() {
+                        return dependingMaps;
+                }
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/internal/IndexedVersionedInterpretation.java b/subprojects/store/src/main/java/tools/refinery/store/model/internal/IndexedVersionedInterpretation.java
new file mode 100644
index 00000000..0be16f77
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/internal/IndexedVersionedInterpretation.java
@@ -0,0 +1,48 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.model.internal;
+
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.VersionedMap;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.Objects;
+
+class IndexedVersionedInterpretation<T> extends VersionedInterpretation<T> {
+        private final BaseIndexer<T> indexer;
+
+        public IndexedVersionedInterpretation(ModelImpl model, Symbol<T> symbol, VersionedMap<Tuple, T> map) {
+                super(model, symbol, map);
+                indexer = new BaseIndexer<>(symbol.arity(), map);
+        }
+
+        @Override
+        public Cursor<Tuple, T> getAdjacent(int slot, int node) {
+                return indexer.getAdjacent(slot, node);
+        }
+
+        @Override
+        public int getAdjacentSize(int slot, int node) {
+                return indexer.getAdjacentSize(slot, node);
+        }
+
+        @Override
+        protected boolean shouldNotifyRestoreListeners() {
+                // Always call the {@code valueChanged} method to update the index.
+                return true;
+        }
+
+        @Override
+        protected void valueChanged(Tuple key, T fromValue, T toValue, boolean restoring) {
+                if (Objects.equals(toValue, getSymbol().defaultValue())) {
+                        indexer.remove(key);
+                } else {
+                        indexer.put(key, toValue);
+                }
+                super.valueChanged(key, fromValue, toValue, restoring);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelStoreBuilderImpl.java b/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelStoreBuilderImpl.java
index 2bd187a8..2dde7a4c 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelStoreBuilderImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelStoreBuilderImpl.java
@@ -12,6 +12,7 @@ import tools.refinery.store.map.VersionedMapStoreFactory;
 import tools.refinery.store.map.VersionedMapStoreFactoryBuilder;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.model.ModelStoreConfiguration;
 import tools.refinery.store.representation.AnySymbol;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple;
@@ -26,7 +27,8 @@ public class ModelStoreBuilderImpl implements ModelStoreBuilder {
         @Override
         public <T> ModelStoreBuilder symbol(Symbol<T> symbol) {
                 if (!allSymbols.add(symbol)) {
-                        throw new IllegalArgumentException("Symbol %s already added".formatted(symbol));
+                        // No need to add symbol twice.
+                        return this;
                 }
                 var equivalenceClass = new SymbolEquivalenceClass<>(symbol);
                 var symbolsInEquivalenceClass = equivalenceClasses.computeIfAbsent(equivalenceClass,
@@ -36,7 +38,7 @@ public class ModelStoreBuilderImpl implements ModelStoreBuilder {
         }
 
         @Override
-        public <T extends ModelAdapterBuilder> ModelStoreBuilder with(T adapterBuilder) {
+        public ModelStoreBuilder with(ModelAdapterBuilder adapterBuilder) {
                 for (var existingAdapter : adapters) {
                         if (existingAdapter.getClass().equals(adapterBuilder.getClass())) {
                                 throw new IllegalArgumentException("%s adapter was already configured for store builder"
@@ -48,6 +50,12 @@ public class ModelStoreBuilderImpl implements ModelStoreBuilder {
         }
 
         @Override
+        public ModelStoreBuilder with(ModelStoreConfiguration configuration) {
+                configuration.apply(this);
+                return this;
+        }
+
+        @Override
         public <T extends ModelAdapterBuilder> Optional<T> tryGetAdapter(Class<? extends T> adapterType) {
                 return AdapterUtils.tryGetAdapter(adapters, adapterType);
         }
@@ -59,6 +67,7 @@ public class ModelStoreBuilderImpl implements ModelStoreBuilder {
 
         @Override
         public ModelStore build() {
+                // First configure adapters and let them register any symbols we don't know about yet.
                 for (int i = adapters.size() - 1; i >= 0; i--) {
                         adapters.get(i).configure(this);
                 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/internal/NullaryVersionedInterpretation.java b/subprojects/store/src/main/java/tools/refinery/store/model/internal/NullaryVersionedInterpretation.java
new file mode 100644
index 00000000..4a8e6752
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/internal/NullaryVersionedInterpretation.java
@@ -0,0 +1,27 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.model.internal;
+
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.VersionedMap;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+class NullaryVersionedInterpretation<T> extends VersionedInterpretation<T> {
+        public NullaryVersionedInterpretation(ModelImpl model, Symbol<T> symbol, VersionedMap<Tuple, T> map) {
+                super(model, symbol, map);
+        }
+
+        @Override
+        public Cursor<Tuple, T> getAdjacent(int slot, int node) {
+                throw new IllegalArgumentException("Invalid index: " + slot);
+        }
+
+        @Override
+        public int getAdjacentSize(int slot, int node) {
+                throw new IllegalArgumentException("Invalid index: " + slot);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/internal/UnaryVersionedInterpretation.java b/subprojects/store/src/main/java/tools/refinery/store/model/internal/UnaryVersionedInterpretation.java
new file mode 100644
index 00000000..75946680
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/internal/UnaryVersionedInterpretation.java
@@ -0,0 +1,48 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.model.internal;
+
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.Cursors;
+import tools.refinery.store.map.VersionedMap;
+import tools.refinery.store.representation.Symbol;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.Objects;
+
+class UnaryVersionedInterpretation<T> extends VersionedInterpretation<T> {
+        public UnaryVersionedInterpretation(ModelImpl model, Symbol<T> symbol, VersionedMap<Tuple, T> map) {
+                super(model, symbol, map);
+        }
+
+        private void validateSlot(int slot) {
+                if (slot != 0) {
+                        throw new IllegalArgumentException("Invalid index: " + slot);
+                }
+        }
+
+        @Override
+        public Cursor<Tuple, T> getAdjacent(int slot, int node) {
+                validateSlot(slot);
+                var key = Tuple.of(node);
+                var value = get(key);
+                if (Objects.equals(value, getSymbol().defaultValue())) {
+                        return Cursors.empty();
+                }
+                return Cursors.singleton(key, value);
+        }
+
+        @Override
+        public int getAdjacentSize(int slot, int node) {
+                validateSlot(slot);
+                var key = Tuple.of(node);
+                var value = get(key);
+                if (Objects.equals(value, getSymbol().defaultValue())) {
+                        return 0;
+                }
+                return 1;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/internal/VersionedInterpretation.java b/subprojects/store/src/main/java/tools/refinery/store/model/internal/VersionedInterpretation.java
index 76e3baea..71df3962 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/internal/VersionedInterpretation.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/internal/VersionedInterpretation.java
@@ -16,14 +16,14 @@ import tools.refinery.store.tuple.Tuple;
 import java.util.ArrayList;
 import java.util.List;
 
-public class VersionedInterpretation<T> implements Interpretation<T> {
+public abstract class VersionedInterpretation<T> implements Interpretation<T> {
         private final ModelImpl model;
         private final Symbol<T> symbol;
         private final VersionedMap<Tuple, T> map;
         private final List<InterpretationListener<T>> listeners = new ArrayList<>();
         private final List<InterpretationListener<T>> restoreListeners = new ArrayList<>();
 
-        private VersionedInterpretation(ModelImpl model, Symbol<T> symbol, VersionedMap<Tuple, T> map) {
+        protected VersionedInterpretation(ModelImpl model, Symbol<T> symbol, VersionedMap<Tuple, T> map) {
                 this.model = model;
                 this.symbol = symbol;
                 this.map = map;
@@ -50,6 +50,7 @@ public class VersionedInterpretation<T> implements Interpretation<T> {
                                         .formatted(symbol, symbol.arity()));
                 }
         }
+
         @Override
         public T get(Tuple key) {
                 checkKey(key);
@@ -61,7 +62,7 @@ public class VersionedInterpretation<T> implements Interpretation<T> {
                 return map.getAll();
         }
 
-        private void notifyListeners(Tuple key, T fromValue, T toValue, boolean restoring) {
+        protected void valueChanged(Tuple key, T fromValue, T toValue, boolean restoring) {
                 var listenerList = restoring ? restoreListeners : listeners;
                 int listenerCount = listenerList.size();
                 // Use a for loop instead of a for-each loop to avoid <code>Iterator</code> allocation overhead.
@@ -76,7 +77,7 @@ public class VersionedInterpretation<T> implements Interpretation<T> {
                 checkKey(key);
                 model.markAsChanged();
                 var oldValue = map.put(key, value);
-                notifyListeners(key, oldValue, value, false);
+                valueChanged(key, oldValue, value, false);
                 return oldValue;
         }
 
@@ -114,11 +115,16 @@ public class VersionedInterpretation<T> implements Interpretation<T> {
         Version commit() {
                 return map.commit();
         }
-        void restore(Version state) {
-                if (!restoreListeners.isEmpty()) {
+
+        protected boolean shouldNotifyRestoreListeners() {
+                return !restoreListeners.isEmpty();
+        }
+
+        public void restore(Version state) {
+                if (shouldNotifyRestoreListeners()) {
                         var diffCursor = getDiffCursor(state);
                         while (diffCursor.move()) {
-                                notifyListeners(diffCursor.getKey(), diffCursor.getFromValue(), diffCursor.getToValue(), true);
+                                valueChanged(diffCursor.getKey(), diffCursor.getFromValue(), diffCursor.getToValue(), true);
                         }
                 }
                 map.restore(state);
@@ -142,7 +148,7 @@ public class VersionedInterpretation<T> implements Interpretation<T> {
                 @SuppressWarnings("unchecked")
                 var typedSymbol = (Symbol<T>) symbol;
                 var map = store.createMap();
-                return new VersionedInterpretation<>(model, typedSymbol, map);
+                return of(model, typedSymbol, map);
         }
 
         static <T> VersionedInterpretation<T> of(ModelImpl model, AnySymbol symbol, VersionedMapStore<Tuple, T> store,
@@ -150,6 +156,15 @@ public class VersionedInterpretation<T> implements Interpretation<T> {
                 @SuppressWarnings("unchecked")
                 var typedSymbol = (Symbol<T>) symbol;
                 var map = store.createMap(state);
-                return new VersionedInterpretation<>(model, typedSymbol, map);
+                return of(model, typedSymbol, map);
+        }
+
+        private static <T> VersionedInterpretation<T> of(ModelImpl model, Symbol<T> typedSymbol,
+                                                                                                         VersionedMap<Tuple, T> map) {
+                return switch (typedSymbol.arity()) {
+                        case 0 -> new NullaryVersionedInterpretation<>(model, typedSymbol, map);
+                        case 1 -> new UnaryVersionedInterpretation<>(model, typedSymbol, map);
+                        default -> new IndexedVersionedInterpretation<>(model, typedSymbol, map);
+                };
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/AbstractDomain.java b/subprojects/store/src/main/java/tools/refinery/store/representation/AbstractDomain.java
index 52c740e8..dfdb43bd 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/AbstractDomain.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/AbstractDomain.java
@@ -5,6 +5,7 @@
  */
 package tools.refinery.store.representation;
 
+import java.util.Objects;
 import java.util.Optional;
 
 public non-sealed interface AbstractDomain<A, C> extends AnyAbstractDomain {
@@ -22,7 +23,9 @@ public non-sealed interface AbstractDomain<A, C> extends AnyAbstractDomain {
                 return toConcrete(abstractValue).isPresent();
         }
 
-        boolean isRefinement(A originalValue, A refinedValue);
+        default boolean isRefinement(A originalValue, A refinedValue) {
+                return Objects.equals(commonRefinement(originalValue, refinedValue), refinedValue);
+        }
 
         A commonRefinement(A leftValue, A rightValue);
 
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/TruthValue.java b/subprojects/store/src/main/java/tools/refinery/store/representation/TruthValue.java
index 40baf9a5..f81ee9a4 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/TruthValue.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/TruthValue.java
@@ -36,6 +36,10 @@ public enum TruthValue {
                 return this != UNKNOWN;
         }
 
+        public boolean isConcrete() {
+                return this == TRUE || this == FALSE;
+        }
+
         public boolean must() {
                 return this == TRUE || this == ERROR;
         }
@@ -55,9 +59,18 @@ public enum TruthValue {
         public TruthValue merge(TruthValue other) {
                 return switch (this) {
                         case TRUE -> other == UNKNOWN || other == TRUE ? TRUE : ERROR;
-                        case FALSE -> other == TruthValue.UNKNOWN || other == TruthValue.FALSE ? FALSE : ERROR;
+                        case FALSE -> other == UNKNOWN || other == FALSE ? FALSE : ERROR;
                         case UNKNOWN -> other;
-                        default -> ERROR;
+                        case ERROR -> ERROR;
+                };
+        }
+
+        public TruthValue join(TruthValue other) {
+                return switch (this) {
+                        case TRUE -> other == ERROR || other == TRUE ? TRUE : UNKNOWN;
+                        case FALSE -> other == ERROR || other == FALSE ? FALSE : UNKNOWN;
+                        case UNKNOWN -> UNKNOWN;
+                        case ERROR -> other;
                 };
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/TruthValueDomain.java b/subprojects/store/src/main/java/tools/refinery/store/representation/TruthValueDomain.java
index 89f8dd19..61696dca 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/TruthValueDomain.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/TruthValueDomain.java
@@ -7,6 +7,8 @@ package tools.refinery.store.representation;
 
 import java.util.Optional;
 
+// Singleton pattern, because there is only one domain for truth values.
+@SuppressWarnings("squid:S6548")
 public final class TruthValueDomain implements AbstractDomain<TruthValue, Boolean> {
         public static final TruthValueDomain INSTANCE = new TruthValueDomain();
 
@@ -15,51 +17,50 @@ public final class TruthValueDomain implements AbstractDomain<TruthValue, Boolea
 
         @Override
         public Class<TruthValue> abstractType() {
-                return null;
+                return TruthValue.class;
         }
 
         @Override
         public Class<Boolean> concreteType() {
-                return null;
+                return Boolean.class;
         }
 
         @Override
         public TruthValue toAbstract(Boolean concreteValue) {
-                return null;
+                return TruthValue.toTruthValue(concreteValue);
         }
 
         @Override
         public Optional<Boolean> toConcrete(TruthValue abstractValue) {
-                return Optional.empty();
+                return switch (abstractValue) {
+                        case TRUE -> Optional.of(true);
+                        case FALSE -> Optional.of(false);
+                        default -> Optional.empty();
+                };
         }
 
         @Override
         public boolean isConcrete(TruthValue abstractValue) {
-                return AbstractDomain.super.isConcrete(abstractValue);
-        }
-
-        @Override
-        public boolean isRefinement(TruthValue originalValue, TruthValue refinedValue) {
-                return false;
+                return abstractValue.isConcrete();
         }
 
         @Override
         public TruthValue commonRefinement(TruthValue leftValue, TruthValue rightValue) {
-                return null;
+                return leftValue.merge(rightValue);
         }
 
         @Override
         public TruthValue commonAncestor(TruthValue leftValue, TruthValue rightValue) {
-                return null;
+                return leftValue.join(rightValue);
         }
 
         @Override
         public TruthValue unknown() {
-                return null;
+                return TruthValue.UNKNOWN;
         }
 
         @Override
         public boolean isError(TruthValue abstractValue) {
-                return false;
+                return !abstractValue.isConsistent();
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityDomain.java b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityDomain.java
new file mode 100644
index 00000000..7ae2d935
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityDomain.java
@@ -0,0 +1,68 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.representation.cardinality;
+
+import tools.refinery.store.representation.AbstractDomain;
+
+import java.util.Optional;
+
+// Singleton pattern, because there is only one domain for truth values.
+@SuppressWarnings("squid:S6548")
+public class CardinalityDomain implements AbstractDomain<CardinalityInterval, Integer> {
+        public static final CardinalityDomain INSTANCE = new CardinalityDomain();
+
+        private CardinalityDomain() {
+        }
+
+        @Override
+        public Class<CardinalityInterval> abstractType() {
+                return CardinalityInterval.class;
+        }
+
+        @Override
+        public Class<Integer> concreteType() {
+                return Integer.class;
+        }
+
+        @Override
+        public CardinalityInterval toAbstract(Integer concreteValue) {
+                return CardinalityIntervals.exactly(concreteValue);
+        }
+
+        @Override
+        public Optional<Integer> toConcrete(CardinalityInterval abstractValue) {
+                return isConcrete(abstractValue) ? Optional.of(abstractValue.lowerBound()) : Optional.empty();
+        }
+
+        @Override
+        public boolean isConcrete(CardinalityInterval abstractValue) {
+                if (!(abstractValue instanceof NonEmptyCardinalityInterval nonEmptyValue) ||
+                                !((nonEmptyValue.upperBound()) instanceof FiniteUpperCardinality finiteUpperCardinality)) {
+                        return false;
+                }
+                return nonEmptyValue.lowerBound() == finiteUpperCardinality.finiteUpperBound();
+        }
+
+        @Override
+        public CardinalityInterval commonRefinement(CardinalityInterval leftValue, CardinalityInterval rightValue) {
+                return leftValue.meet(rightValue);
+        }
+
+        @Override
+        public CardinalityInterval commonAncestor(CardinalityInterval leftValue, CardinalityInterval rightValue) {
+                return leftValue.join(rightValue);
+        }
+
+        @Override
+        public CardinalityInterval unknown() {
+                return CardinalityIntervals.SET;
+        }
+
+        @Override
+        public boolean isError(CardinalityInterval abstractValue) {
+                return abstractValue.isEmpty();
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityInterval.java b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityInterval.java
index 704ca2fc..b20c685a 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityInterval.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityInterval.java
@@ -18,6 +18,8 @@ public sealed interface CardinalityInterval permits NonEmptyCardinalityInterval,
 
         CardinalityInterval add(CardinalityInterval other);
 
+        CardinalityInterval take(int count);
+
         CardinalityInterval multiply(CardinalityInterval other);
 
         CardinalityInterval meet(CardinalityInterval other);
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityIntervals.java b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityIntervals.java
index ad16a3e8..855fd248 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityIntervals.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityIntervals.java
@@ -30,7 +30,7 @@ public final class CardinalityIntervals {
         }
 
         public static CardinalityInterval between(int lowerBound, int upperBound) {
-                return between(lowerBound, UpperCardinalities.valueOf(upperBound));
+                return between(lowerBound, UpperCardinalities.atMost(upperBound));
         }
 
         public static CardinalityInterval atMost(UpperCardinality upperBound) {
@@ -38,7 +38,7 @@ public final class CardinalityIntervals {
         }
 
         public static CardinalityInterval atMost(int upperBound) {
-                return atMost(UpperCardinalities.valueOf(upperBound));
+                return atMost(UpperCardinalities.atMost(upperBound));
         }
 
         public static CardinalityInterval atLeast(int lowerBound) {
@@ -46,6 +46,6 @@ public final class CardinalityIntervals {
         }
 
         public static CardinalityInterval exactly(int lowerBound) {
-                return new NonEmptyCardinalityInterval(lowerBound, UpperCardinalities.valueOf(lowerBound));
+                return new NonEmptyCardinalityInterval(lowerBound, UpperCardinalities.atMost(lowerBound));
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/EmptyCardinalityInterval.java b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/EmptyCardinalityInterval.java
index 49911c29..9e371e21 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/EmptyCardinalityInterval.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/EmptyCardinalityInterval.java
@@ -5,6 +5,8 @@
  */
 package tools.refinery.store.representation.cardinality;
 
+// Singleton implementation, because there is only a single empty interval.
+@SuppressWarnings("squid:S6548")
 public final class EmptyCardinalityInterval implements CardinalityInterval {
         static final EmptyCardinalityInterval INSTANCE = new EmptyCardinalityInterval();
 
@@ -43,6 +45,11 @@ public final class EmptyCardinalityInterval implements CardinalityInterval {
         }
 
         @Override
+        public CardinalityInterval take(int count) {
+                return this;
+        }
+
+        @Override
         public CardinalityInterval multiply(CardinalityInterval other) {
                 return this;
         }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinality.java b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinality.java
index 82afdbbc..088e3925 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinality.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinality.java
@@ -6,6 +6,7 @@
 package tools.refinery.store.representation.cardinality;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.function.IntBinaryOperator;
 
@@ -22,6 +23,15 @@ public record FiniteUpperCardinality(int finiteUpperBound) implements UpperCardi
         }
 
         @Override
+        @Nullable
+        public UpperCardinality take(int count) {
+                if (finiteUpperBound < count) {
+                        return null;
+                }
+                return new FiniteUpperCardinality(finiteUpperBound - count);
+        }
+
+        @Override
         public UpperCardinality multiply(UpperCardinality other) {
                 return lift(other, (a, b) -> a * b);
         }
@@ -49,7 +59,7 @@ public record FiniteUpperCardinality(int finiteUpperBound) implements UpperCardi
 
         private UpperCardinality lift(@NotNull UpperCardinality other, IntBinaryOperator operator) {
                 if (other instanceof FiniteUpperCardinality finiteUpperCardinality) {
-                        return UpperCardinalities.valueOf(operator.applyAsInt(finiteUpperBound,
+                        return UpperCardinalities.atMost(operator.applyAsInt(finiteUpperBound,
                                         finiteUpperCardinality.finiteUpperBound));
                 }
                 if (other instanceof UnboundedUpperCardinality) {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/NonEmptyCardinalityInterval.java b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/NonEmptyCardinalityInterval.java
index 38bd53bf..bfaeea25 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/NonEmptyCardinalityInterval.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/NonEmptyCardinalityInterval.java
@@ -53,6 +53,16 @@ public record NonEmptyCardinalityInterval(int lowerBound, UpperCardinality upper
                 return lift(other, Math::min, UpperCardinality::max, this);
         }
 
+        @Override
+        public CardinalityInterval take(int count) {
+                int newLowerBound = Math.max(lowerBound - count, 0);
+                var newUpperBound = upperBound.take(count);
+                if (newUpperBound == null) {
+                        return CardinalityIntervals.ERROR;
+                }
+                return CardinalityIntervals.between(newLowerBound, newUpperBound);
+        }
+
         private CardinalityInterval lift(CardinalityInterval other, IntBinaryOperator lowerOperator,
                                                                          BinaryOperator<UpperCardinality> upperOperator,
                                                                          CardinalityInterval whenEmpty) {
@@ -73,7 +83,10 @@ public record NonEmptyCardinalityInterval(int lowerBound, UpperCardinality upper
 
         @Override
         public String toString() {
-                var closeBracket = upperBound instanceof UnboundedUpperCardinality ? ")" : "]";
-                return "[%d..%s%s".formatted(lowerBound, upperBound, closeBracket);
+                if (upperBound instanceof FiniteUpperCardinality finiteUpperCardinality &&
+                                finiteUpperCardinality.finiteUpperBound() == lowerBound) {
+                        return "[%d]".formatted(lowerBound);
+                }
+                return "[%d..%s]".formatted(lowerBound, upperBound);
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UnboundedUpperCardinality.java b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UnboundedUpperCardinality.java
index a5634020..e3a334cd 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UnboundedUpperCardinality.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UnboundedUpperCardinality.java
@@ -7,6 +7,8 @@ package tools.refinery.store.representation.cardinality;
 
 import org.jetbrains.annotations.NotNull;
 
+// Singleton implementation, because there is only a single countable infinity.
+@SuppressWarnings("squid:S6548")
 public final class UnboundedUpperCardinality implements UpperCardinality {
         static final UnboundedUpperCardinality INSTANCE = new UnboundedUpperCardinality();
 
@@ -20,10 +22,17 @@ public final class UnboundedUpperCardinality implements UpperCardinality {
         }
 
         @Override
+        public UpperCardinality take(int count) {
+                return this;
+        }
+
+        @Override
         public UpperCardinality multiply(UpperCardinality other) {
                 return this;
         }
 
+        // This should always be greater than any finite cardinality.
+        @SuppressWarnings("ComparatorMethodParameterNotUsed")
         @Override
         public int compareTo(@NotNull UpperCardinality upperCardinality) {
                 if (upperCardinality instanceof FiniteUpperCardinality) {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinalities.java b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinalities.java
index 1e18dde0..17d1b292 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinalities.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinalities.java
@@ -26,7 +26,7 @@ public final class UpperCardinalities {
                 throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
         }
 
-        public static UpperCardinality valueOf(int upperBound) {
+        public static UpperCardinality atMost(int upperBound) {
                 if (upperBound < 0) {
                         return UNBOUNDED;
                 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinality.java b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinality.java
index 5dbaa922..3f0db028 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinality.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinality.java
@@ -5,6 +5,8 @@
  */
 package tools.refinery.store.representation.cardinality;
 
+import org.jetbrains.annotations.Nullable;
+
 public sealed interface UpperCardinality extends Comparable<UpperCardinality> permits FiniteUpperCardinality,
                 UnboundedUpperCardinality {
         default UpperCardinality min(UpperCardinality other) {
@@ -17,11 +19,14 @@ public sealed interface UpperCardinality extends Comparable<UpperCardinality> pe
 
         UpperCardinality add(UpperCardinality other);
 
+        @Nullable
+        UpperCardinality take(int count);
+
         UpperCardinality multiply(UpperCardinality other);
 
         int compareToInt(int value);
 
         static UpperCardinality of(int upperBound) {
-                return UpperCardinalities.valueOf(upperBound);
+                return UpperCardinalities.atMost(upperBound);
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/StateCoderAdapter.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/StateCoderAdapter.java
index 8cfd24d5..cb73d27e 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/StateCoderAdapter.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/StateCoderAdapter.java
@@ -17,7 +17,7 @@ public interface StateCoderAdapter extends ModelAdapter {
                 return calculateStateCode().objectCode();
         }
 
-        static StateCoderBuilderImpl builder() {
+        static StateCoderBuilder builder() {
                 return new StateCoderBuilderImpl();
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/StateEquivalenceChecker.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/StateEquivalenceChecker.java
index 3fd8c8d8..0f0023ed 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/StateEquivalenceChecker.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/StateEquivalenceChecker.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.statecoding;
 
 import org.eclipse.collections.api.set.primitive.IntSet;
-import tools.refinery.store.model.Interpretation;
+import tools.refinery.store.model.AnyInterpretation;
 
 import java.util.List;
 
@@ -16,9 +16,6 @@ public interface StateEquivalenceChecker {
         }
 
         EquivalenceResult constructMorphism(
-                        IntSet individuals,
-                        List<? extends Interpretation<?>> interpretations1,
-                        ObjectCode code1, List<?
-                        extends Interpretation<?>> interpretations2,
-                        ObjectCode code2);
+                        IntSet individuals, List<? extends AnyInterpretation> interpretations1, ObjectCode code1,
+                        List<? extends AnyInterpretation> interpretations2, ObjectCode code2);
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/internal/StateCoderBuilderImpl.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/internal/StateCoderBuilderImpl.java
index 05b47c52..eed591e7 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/internal/StateCoderBuilderImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/internal/StateCoderBuilderImpl.java
@@ -5,61 +5,61 @@
  */
 package tools.refinery.store.statecoding.internal;
 
-import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet;
+import org.eclipse.collections.api.factory.primitive.IntSets;
+import org.eclipse.collections.api.set.primitive.MutableIntSet;
+import tools.refinery.store.adapter.AbstractModelAdapterBuilder;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.representation.AnySymbol;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.statecoding.*;
+import tools.refinery.store.statecoding.StateCodeCalculatorFactory;
+import tools.refinery.store.statecoding.StateCoderBuilder;
+import tools.refinery.store.statecoding.StateCoderStoreAdapter;
+import tools.refinery.store.statecoding.StateEquivalenceChecker;
 import tools.refinery.store.statecoding.neighbourhood.NeighbourhoodCalculator;
 import tools.refinery.store.statecoding.stateequivalence.StateEquivalenceCheckerImpl;
 import tools.refinery.store.tuple.Tuple1;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
-public class StateCoderBuilderImpl implements StateCoderBuilder {
-        Set<AnySymbol> excluded = new HashSet<>();
-        IntHashSet individuals = new IntHashSet();
-
-        StateCodeCalculatorFactory calculator = NeighbourhoodCalculator::new;
-        StateEquivalenceChecker checker = new StateEquivalenceCheckerImpl();
+public class StateCoderBuilderImpl extends AbstractModelAdapterBuilder<StateCoderStoreAdapter>
+                implements StateCoderBuilder {
+        private final Set<AnySymbol> excluded = new HashSet<>();
+        private final MutableIntSet individuals = IntSets.mutable.empty();
+        private StateCodeCalculatorFactory calculator = NeighbourhoodCalculator::new;
+        private StateEquivalenceChecker checker = new StateEquivalenceCheckerImpl();
 
         @Override
         public StateCoderBuilder exclude(AnySymbol symbol) {
+                checkNotConfigured();
                 excluded.add(symbol);
                 return this;
         }
 
         @Override
         public StateCoderBuilder individual(Tuple1 tuple) {
+                checkNotConfigured();
                 individuals.add(tuple.get(0));
                 return this;
         }
 
         @Override
         public StateCoderBuilder stateEquivalenceChecker(StateEquivalenceChecker stateEquivalenceChecker) {
+                checkNotConfigured();
                 this.checker = stateEquivalenceChecker;
                 return this;
         }
 
         @Override
         public StateCoderBuilder stateCodeCalculatorFactory(StateCodeCalculatorFactory codeCalculatorFactory) {
+                checkNotConfigured();
                 this.calculator = codeCalculatorFactory;
                 return this;
         }
 
         @Override
-        public boolean isConfigured() {
-                return true;
-        }
-
-        @Override
-        public void configure(ModelStoreBuilder storeBuilder) {
-                // It does not modify the build process
-        }
-
-        @Override
-        public StateCoderStoreAdapter build(ModelStore store) {
+        protected StateCoderStoreAdapter doBuild(ModelStore store) {
                 Set<Symbol<?>> symbols = new LinkedHashSet<>();
                 for (AnySymbol symbol : store.getSymbols()) {
                         if (!excluded.contains(symbol) && (symbol instanceof Symbol<?> typed)) {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/AbstractNeighbourhoodCalculator.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/AbstractNeighbourhoodCalculator.java
index 0a40a19d..5d390da2 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/AbstractNeighbourhoodCalculator.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/AbstractNeighbourhoodCalculator.java
@@ -5,8 +5,10 @@
  */
 package tools.refinery.store.statecoding.neighbourhood;
 
+import org.eclipse.collections.api.factory.primitive.IntLongMaps;
+import org.eclipse.collections.api.map.primitive.MutableIntLongMap;
 import org.eclipse.collections.api.set.primitive.IntSet;
-import org.eclipse.collections.impl.map.mutable.primitive.IntLongHashMap;
+import tools.refinery.store.model.AnyInterpretation;
 import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.statecoding.ObjectCode;
 import tools.refinery.store.tuple.Tuple;
@@ -15,25 +17,25 @@ import tools.refinery.store.tuple.Tuple0;
 import java.util.*;
 
 public abstract class AbstractNeighbourhoodCalculator {
-        protected final List<Interpretation<?>> nullImpactValues;
-        protected final LinkedHashMap<Interpretation<?>, long[]> impactValues;
-        protected final IntLongHashMap individualHashValues;
+        protected final List<AnyInterpretation> nullImpactValues;
+        protected final LinkedHashMap<AnyInterpretation, long[]> impactValues;
+        protected final MutableIntLongMap individualHashValues = IntLongMaps.mutable.empty();
 
         protected static final long PRIME = 31;
 
-        protected AbstractNeighbourhoodCalculator(List<? extends Interpretation<?>> interpretations, IntSet individuals) {
+        protected AbstractNeighbourhoodCalculator(List<? extends AnyInterpretation> interpretations, IntSet individuals) {
                 this.nullImpactValues = new ArrayList<>();
                 this.impactValues = new LinkedHashMap<>();
+                // Random isn't used for cryptographical purposes but just to assign distinguishable identifiers to symbols.
                 @SuppressWarnings("squid:S2245")
                 Random random = new Random(1);
 
-                individualHashValues = new IntLongHashMap();
                 var individualsInOrder = individuals.toSortedList(Integer::compare);
                 for(int i = 0; i<individualsInOrder.size(); i++) {
                         individualHashValues.put(individualsInOrder.get(i), random.nextLong());
                 }
 
-                for (Interpretation<?> interpretation : interpretations) {
+                for (AnyInterpretation interpretation : interpretations) {
                         int arity = interpretation.getSymbol().arity();
                         if (arity == 0) {
                                 nullImpactValues.add(interpretation);
@@ -86,7 +88,7 @@ public abstract class AbstractNeighbourhoodCalculator {
         protected long calculateModelCode(long lastSum) {
                 long result = 0;
                 for (var nullImpactValue : nullImpactValues) {
-                        result = result * PRIME + Objects.hashCode(nullImpactValue.get(Tuple0.INSTANCE));
+                        result = result * PRIME + Objects.hashCode(((Interpretation<?>) nullImpactValue).get(Tuple0.INSTANCE));
                 }
                 result += lastSum;
                 return result;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/LazyNeighbourhoodCalculator.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/LazyNeighbourhoodCalculator.java
index 2ffbef5e..c188a839 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/LazyNeighbourhoodCalculator.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/LazyNeighbourhoodCalculator.java
@@ -5,10 +5,12 @@
  */
 package tools.refinery.store.statecoding.neighbourhood;
 
+import org.eclipse.collections.api.factory.primitive.LongIntMaps;
 import org.eclipse.collections.api.map.primitive.LongIntMap;
+import org.eclipse.collections.api.map.primitive.MutableLongIntMap;
 import org.eclipse.collections.api.set.primitive.IntSet;
-import org.eclipse.collections.impl.map.mutable.primitive.LongIntHashMap;
 import tools.refinery.store.map.Cursor;
+import tools.refinery.store.model.AnyInterpretation;
 import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.statecoding.StateCodeCalculator;
 import tools.refinery.store.statecoding.StateCoderResult;
@@ -17,13 +19,13 @@ import tools.refinery.store.tuple.Tuple;
 import java.util.List;
 
 public class LazyNeighbourhoodCalculator extends AbstractNeighbourhoodCalculator implements StateCodeCalculator {
-        public LazyNeighbourhoodCalculator(List<? extends Interpretation<?>> interpretations, IntSet individuals) {
+        public LazyNeighbourhoodCalculator(List<? extends AnyInterpretation> interpretations, IntSet individuals) {
                 super(interpretations, individuals);
         }
 
         public StateCoderResult calculateCodes() {
                 ObjectCodeImpl previousObjectCode = new ObjectCodeImpl();
-                LongIntHashMap prevHash2Amount = new LongIntHashMap();
+                MutableLongIntMap prevHash2Amount = LongIntMaps.mutable.empty();
 
                 long lastSum;
                 // All hash code is 0, except to the individuals.
@@ -42,7 +44,7 @@ public class LazyNeighbourhoodCalculator extends AbstractNeighbourhoodCalculator
                         }
                         constructNextObjectCodes(previousObjectCode, nextObjectCode, prevHash2Amount);
 
-                        LongIntHashMap nextHash2Amount = new LongIntHashMap();
+                        MutableLongIntMap nextHash2Amount = LongIntMaps.mutable.empty();
                         lastSum = calculateLastSum(previousObjectCode, nextObjectCode, prevHash2Amount, nextHash2Amount);
 
                         int nextSize = nextHash2Amount.size();
@@ -60,7 +62,7 @@ public class LazyNeighbourhoodCalculator extends AbstractNeighbourhoodCalculator
         }
 
         private long calculateLastSum(ObjectCodeImpl previous, ObjectCodeImpl next, LongIntMap hash2Amount,
-                                                                  LongIntHashMap nextHash2Amount) {
+                                                                  MutableLongIntMap nextHash2Amount) {
                 long lastSum = 0;
                 for (int i = 0; i < next.getSize(); i++) {
                         final long hash;
@@ -84,7 +86,7 @@ public class LazyNeighbourhoodCalculator extends AbstractNeighbourhoodCalculator
 
         private void constructNextObjectCodes(ObjectCodeImpl previous, ObjectCodeImpl next, LongIntMap hash2Amount) {
                 for (var impactValueEntry : this.impactValues.entrySet()) {
-                        Interpretation<?> interpretation = impactValueEntry.getKey();
+                        Interpretation<?> interpretation = (Interpretation<?>) impactValueEntry.getKey();
                         var cursor = interpretation.getAll();
                         int arity = interpretation.getSymbol().arity();
                         long[] impactValue = impactValueEntry.getValue();
@@ -114,7 +116,8 @@ public class LazyNeighbourhoodCalculator extends AbstractNeighbourhoodCalculator
                 return amount == 1;
         }
 
-        private void lazyImpactCalculation1(LongIntMap hash2Amount, ObjectCodeImpl previous, ObjectCodeImpl next, long[] impactValues, Cursor<Tuple, ?> cursor) {
+        private void lazyImpactCalculation1(LongIntMap hash2Amount, ObjectCodeImpl previous, ObjectCodeImpl next,
+                                                                                long[] impactValues, Cursor<Tuple, ?> cursor) {
 
                 Tuple tuple = cursor.getKey();
                 int o = tuple.get(0);
@@ -129,7 +132,8 @@ public class LazyNeighbourhoodCalculator extends AbstractNeighbourhoodCalculator
                 }
         }
 
-        private void lazyImpactCalculation2(LongIntMap hash2Amount, ObjectCodeImpl previous, ObjectCodeImpl next, long[] impactValues, Cursor<Tuple, ?> cursor) {
+        private void lazyImpactCalculation2(LongIntMap hash2Amount, ObjectCodeImpl previous, ObjectCodeImpl next,
+                                                                                long[] impactValues, Cursor<Tuple, ?> cursor) {
                 final Tuple tuple = cursor.getKey();
                 final int o1 = tuple.get(0);
                 final int o2 = tuple.get(1);
@@ -155,7 +159,8 @@ public class LazyNeighbourhoodCalculator extends AbstractNeighbourhoodCalculator
                 }
         }
 
-        private void lazyImpactCalculationN(LongIntMap hash2Amount, ObjectCodeImpl previous, ObjectCodeImpl next, long[] impactValues, Cursor<Tuple, ?> cursor) {
+        private void lazyImpactCalculationN(LongIntMap hash2Amount, ObjectCodeImpl previous, ObjectCodeImpl next,
+                                                                                long[] impactValues, Cursor<Tuple, ?> cursor) {
                 final Tuple tuple = cursor.getKey();
 
                 final boolean[] uniques = new boolean[tuple.getSize()];
diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/NeighbourhoodCalculator.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/NeighbourhoodCalculator.java
index 5b3e5ea3..785fda7a 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/NeighbourhoodCalculator.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/NeighbourhoodCalculator.java
@@ -43,7 +43,7 @@ public class NeighbourhoodCalculator extends AbstractNeighbourhoodCalculator imp
         private long calculateLastSum(ObjectCode codes) {
                 long result = 0;
                 for (var nullImpactValue : nullImpactValues) {
-                        result = result * 31 + Objects.hashCode(nullImpactValue.get(Tuple0.INSTANCE));
+                        result = result * 31 + Objects.hashCode(((Interpretation<?>) nullImpactValue).get(Tuple0.INSTANCE));
                 }
 
                 for (int i = 0; i < codes.getSize(); i++) {
@@ -56,7 +56,7 @@ public class NeighbourhoodCalculator extends AbstractNeighbourhoodCalculator imp
 
         private void constructNextObjectCodes(ObjectCodeImpl previous, ObjectCodeImpl next) {
                 for (var impactValueEntry : this.impactValues.entrySet()) {
-                        Interpretation<?> interpretation = impactValueEntry.getKey();
+                        Interpretation<?> interpretation = (Interpretation<?>) impactValueEntry.getKey();
                         var cursor = interpretation.getAll();
                         int arity = interpretation.getSymbol().arity();
                         long[] impactValue = impactValueEntry.getValue();
@@ -78,7 +78,8 @@ public class NeighbourhoodCalculator extends AbstractNeighbourhoodCalculator imp
         }
 
 
-        private void impactCalculation1(ObjectCodeImpl previous, ObjectCodeImpl next, long[] impactValues, Cursor<Tuple, ?> cursor) {
+        private void impactCalculation1(ObjectCodeImpl previous, ObjectCodeImpl next, long[] impactValues,
+                                                                        Cursor<Tuple, ?> cursor) {
 
                 Tuple tuple = cursor.getKey();
                 int o = tuple.get(0);
@@ -87,7 +88,8 @@ public class NeighbourhoodCalculator extends AbstractNeighbourhoodCalculator imp
                 addHash(next, o, impactValues[0], tupleHash);
         }
 
-        private void impactCalculation2(ObjectCodeImpl previous, ObjectCodeImpl next, long[] impactValues, Cursor<Tuple, ?> cursor) {
+        private void impactCalculation2(ObjectCodeImpl previous, ObjectCodeImpl next, long[] impactValues,
+                                                                        Cursor<Tuple, ?> cursor) {
                 final Tuple tuple = cursor.getKey();
                 final int o1 = tuple.get(0);
                 final int o2 = tuple.get(1);
@@ -99,7 +101,8 @@ public class NeighbourhoodCalculator extends AbstractNeighbourhoodCalculator imp
                 addHash(next, o2, impactValues[1], tupleHash);
         }
 
-        private void impactCalculationN(ObjectCodeImpl previous, ObjectCodeImpl next, long[] impactValues, Cursor<Tuple, ?> cursor) {
+        private void impactCalculationN(ObjectCodeImpl previous, ObjectCodeImpl next, long[] impactValues,
+                                                                        Cursor<Tuple, ?> cursor) {
                 final Tuple tuple = cursor.getKey();
 
                 Object value = cursor.getValue();
diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/CombinationNodePairing.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/CombinationNodePairing.java
index decff1d5..0682e1a4 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/CombinationNodePairing.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/CombinationNodePairing.java
@@ -8,18 +8,14 @@ package tools.refinery.store.statecoding.stateequivalence;
 import org.eclipse.collections.api.factory.primitive.IntIntMaps;
 import org.eclipse.collections.api.map.primitive.IntIntMap;
 import org.eclipse.collections.api.set.primitive.IntSet;
-import org.eclipse.collections.impl.list.Interval;
-import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 public class CombinationNodePairing implements NodePairing {
         private final int[] left;
         private final int[] right;
 
-        CombinationNodePairing(IntSet left, IntHashSet right) {
+        CombinationNodePairing(IntSet left, IntSet right) {
                 this.left = left.toArray();
                 this.right = right.toArray();
 
@@ -32,59 +28,33 @@ public class CombinationNodePairing implements NodePairing {
                 return left.length;
         }
 
-        static final int LIMIT = 5;
-        static final List<List<int[]>> permutations = new ArrayList<>();
-
-        /**
-         * Generates and stores permutations up to a given size. If the number would be more than a limit, it provides a
-         * single permutation only.
-         *
-         * @param max The max number in the permutation
-         * @return A complete list of permutations of numbers 0...max, or a single permutation.
-         */
-        public static List<int[]> getPermutations(int max) {
-                if (max < permutations.size()) {
-                        return permutations.get(max);
-                }
-                if (max == 0) {
-                        List<int[]> result = new ArrayList<>();
-                        result.add(new int[1]);
-                        permutations.add(result);
-                        return result;
-                }
-                List<int[]> result = new ArrayList<>();
-                List<int[]> previousPermutations = getPermutations(max - 1);
-                for (var permutation : previousPermutations) {
-                        for (int pos = 0; pos <= max; pos++) {
-                                int[] newPermutation = new int[max + 1];
-                                System.arraycopy(permutation, 0, newPermutation, 0, pos);
-                                newPermutation[pos] = max;
-                                if (max - (pos + 1) >= 0)
-                                        System.arraycopy(permutation, pos + 1, newPermutation, pos + 1 + 1, max - (pos + 1));
-                                result.add(newPermutation);
-                        }
-                }
-                permutations.add(result);
-                return result;
+        private static final int LIMIT = 5;
+        // Enum-based singleton used to delay generating all permutations until they are first needed.
+        @SuppressWarnings("squid:S6548")
+        private enum PermutationsHolder {
+                INSTANCE;
+
+                final CombinationNodePairingPermutations permutations = new CombinationNodePairingPermutations(LIMIT);
         }
 
         @Override
         public List<IntIntMap> permutations() {
-                final var interval = Interval.zeroTo(this.size() - 1);
+                int limit = this.size();
+                Iterable<Integer> interval = () -> new IntervalIterator(limit);
 
                 if (isComplete()) {
-                        final List<int[]> p = getPermutations(this.size() - 1);
+                        final List<int[]> p = PermutationsHolder.INSTANCE.permutations.getPermutations(this.size() - 1);
                         return p.stream().map(x -> constructPermutationMap(interval, x)).toList();
                 } else {
                         return List.of(constructTrivialMap(interval));
                 }
         }
 
-        private IntIntMap constructTrivialMap(Interval interval) {
+        private IntIntMap constructTrivialMap(Iterable<Integer> interval) {
                 return IntIntMaps.immutable.from(interval, l -> left[l], r -> right[r]);
         }
 
-        private IntIntMap constructPermutationMap(Interval interval, int[] permutation) {
+        private IntIntMap constructPermutationMap(Iterable<Integer> interval, int[] permutation) {
                 return IntIntMaps.immutable.from(interval, l -> left[l], r -> right[permutation[r]]);
         }
 
@@ -92,4 +62,28 @@ public class CombinationNodePairing implements NodePairing {
         public boolean isComplete() {
                 return this.size() <= LIMIT;
         }
+
+        private static class IntervalIterator implements Iterator<Integer> {
+                private final int limit;
+                private int value = 0;
+
+                private IntervalIterator(int max) {
+                        this.limit = max;
+                }
+
+                @Override
+                public boolean hasNext() {
+                        return value < limit;
+                }
+
+                @Override
+                public Integer next() {
+                        if (value >= limit) {
+                                throw new NoSuchElementException("End of interval");
+                        }
+                        int next = value;
+                        value++;
+                        return next;
+                }
+        }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/CombinationNodePairingPermutations.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/CombinationNodePairingPermutations.java
new file mode 100644
index 00000000..eacd3a2a
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/CombinationNodePairingPermutations.java
@@ -0,0 +1,57 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.statecoding.stateequivalence;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class CombinationNodePairingPermutations {
+        private final List<List<int[]>> permutations = new ArrayList<>();
+
+        public CombinationNodePairingPermutations(int max) {
+                initializePermutations(max);
+        }
+
+        public List<int[]> getPermutations(int max) {
+                if (max >= permutations.size()) {
+                        throw new IllegalArgumentException("Only permutations up to %d elements are supported".formatted(max));
+                }
+                return permutations.get(max);
+        }
+
+        /**
+         * Generates and stores permutations up to a given size. If the number would be more than a limit, it provides a
+         * single permutation only.
+         *
+         * @param max The max number in the permutation
+         * @return A complete list of permutations of numbers 0...max, or a single permutation.
+         */
+        private List<int[]> initializePermutations(int max) {
+                if (max < permutations.size()) {
+                        return permutations.get(max);
+                }
+                if (max == 0) {
+                        List<int[]> result = new ArrayList<>();
+                        result.add(new int[1]);
+                        permutations.add(result);
+                        return result;
+                }
+                List<int[]> result = new ArrayList<>();
+                List<int[]> previousPermutations = initializePermutations(max - 1);
+                for (var permutation : previousPermutations) {
+                        for (int pos = 0; pos <= max; pos++) {
+                                int[] newPermutation = new int[max + 1];
+                                System.arraycopy(permutation, 0, newPermutation, 0, pos);
+                                newPermutation[pos] = max;
+                                if (max - (pos + 1) >= 0)
+                                        System.arraycopy(permutation, pos + 1, newPermutation, pos + 1 + 1, max - (pos + 1));
+                                result.add(newPermutation);
+                        }
+                }
+                permutations.add(result);
+                return result;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/NodePairing.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/NodePairing.java
index 7e5db7a3..f45f0d2e 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/NodePairing.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/NodePairing.java
@@ -6,18 +6,18 @@
 package tools.refinery.store.statecoding.stateequivalence;
 
 import org.eclipse.collections.api.map.primitive.IntIntMap;
-import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet;
+import org.eclipse.collections.api.set.primitive.IntSet;
 
 import java.util.List;
 
 public interface NodePairing {
-
         int size();
+
         List<IntIntMap> permutations();
 
         boolean isComplete();
 
-        static NodePairing constructNodePairing(IntHashSet left, IntHashSet right){
+        static NodePairing constructNodePairing(IntSet left, IntSet right){
                 if(left.size() !=  right.size()) {
                         return null;
                 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/PermutationMorphism.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/PermutationMorphism.java
index 6be0f3e7..bc4d723a 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/PermutationMorphism.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/PermutationMorphism.java
@@ -12,12 +12,12 @@ import java.util.List;
 
 public class PermutationMorphism implements Morphism {
         private final IntIntMap object2PermutationGroup;
-        private final List<List<IntIntMap>> permutationsGroups;
+        private final List<? extends List<? extends IntIntMap>> permutationsGroups;
         private final int[] selection;
         private boolean hasNext;
 
         PermutationMorphism(IntIntMap object2PermutationGroup,
-                                                List<List<IntIntMap>> permutationsGroups) {
+                                                List<? extends List<? extends IntIntMap>> permutationsGroups) {
                 this.object2PermutationGroup = object2PermutationGroup;
                 this.permutationsGroups = permutationsGroups;
 
diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/StateEquivalenceCheckerImpl.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/StateEquivalenceCheckerImpl.java
index ef0d76a7..5a62d8a0 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/StateEquivalenceCheckerImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/StateEquivalenceCheckerImpl.java
@@ -6,11 +6,14 @@
 package tools.refinery.store.statecoding.stateequivalence;
 
 import org.eclipse.collections.api.factory.primitive.IntIntMaps;
+import org.eclipse.collections.api.factory.primitive.IntSets;
+import org.eclipse.collections.api.factory.primitive.LongObjectMaps;
 import org.eclipse.collections.api.map.primitive.IntIntMap;
+import org.eclipse.collections.api.map.primitive.MutableIntIntMap;
+import org.eclipse.collections.api.map.primitive.MutableLongObjectMap;
 import org.eclipse.collections.api.set.primitive.IntSet;
-import org.eclipse.collections.impl.map.mutable.primitive.IntIntHashMap;
-import org.eclipse.collections.impl.map.mutable.primitive.LongObjectHashMap;
-import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet;
+import org.eclipse.collections.api.set.primitive.MutableIntSet;
+import tools.refinery.store.model.AnyInterpretation;
 import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.statecoding.Morphism;
 import tools.refinery.store.statecoding.ObjectCode;
@@ -26,12 +29,11 @@ public class StateEquivalenceCheckerImpl implements StateEquivalenceChecker {
 
         @Override
         public EquivalenceResult constructMorphism(IntSet individuals,
-                                                                                                List<? extends Interpretation<?>> interpretations1,
-                                                                                                ObjectCode code1,
-                                                                                                List<? extends Interpretation<?>> interpretations2,
-                                                                                                ObjectCode code2)
-        {
-                IntIntHashMap object2PermutationGroup = new IntIntHashMap();
+                                                                                           List<? extends AnyInterpretation> interpretations1,
+                                                                                           ObjectCode code1,
+                                                                                           List<? extends AnyInterpretation> interpretations2,
+                                                                                           ObjectCode code2) {
+                MutableIntIntMap object2PermutationGroup = IntIntMaps.mutable.empty();
                 List<List<IntIntMap>> permutationsGroups = new ArrayList<>();
 
                 final EquivalenceResult permutations = constructPermutationNavigation(individuals,
@@ -50,7 +52,7 @@ public class StateEquivalenceCheckerImpl implements StateEquivalenceChecker {
                                 return permutations;
                         }
 
-                        if(tried >= LIMIT) {
+                        if (tried >= LIMIT) {
                                 return EquivalenceResult.UNKNOWN;
                         }
 
@@ -58,22 +60,22 @@ public class StateEquivalenceCheckerImpl implements StateEquivalenceChecker {
                         tried++;
                 } while (hasNext);
 
-                if(permutations == EquivalenceResult.UNKNOWN) {
+                if (permutations == EquivalenceResult.UNKNOWN) {
                         return EquivalenceResult.UNKNOWN;
                 } else {
                         return EquivalenceResult.DIFFERENT;
                 }
         }
 
-        private LongObjectHashMap<IntHashSet> indexByHash(ObjectCode code, IntSet individuals) {
-                LongObjectHashMap<IntHashSet> result = new LongObjectHashMap<>();
+        private MutableLongObjectMap<MutableIntSet> indexByHash(ObjectCode code, IntSet individuals) {
+                MutableLongObjectMap<MutableIntSet> result = LongObjectMaps.mutable.empty();
                 for (int o = 0; o < code.getSize(); o++) {
-                        if(! individuals.contains(o)){
+                        if (!individuals.contains(o)) {
                                 long hash = code.get(o);
-                                if(hash != 0) {
+                                if (hash != 0) {
                                         var equivalenceClass = result.get(hash);
                                         if (equivalenceClass == null) {
-                                                equivalenceClass = new IntHashSet();
+                                                equivalenceClass = IntSets.mutable.empty();
                                                 result.put(hash, equivalenceClass);
                                         }
                                         equivalenceClass.add(o);
@@ -83,11 +85,9 @@ public class StateEquivalenceCheckerImpl implements StateEquivalenceChecker {
                 return result;
         }
 
-        private EquivalenceResult constructPermutationNavigation(IntSet individuals,
-                                                                                                                         LongObjectHashMap<IntHashSet> map1,
-                                                                                                                         LongObjectHashMap<IntHashSet> map2,
-                                                                                                                         IntIntHashMap object2OptionIndex,
-                                                                                                                         List<List<IntIntMap>> listOfOptions) {
+        private EquivalenceResult constructPermutationNavigation(
+                        IntSet individuals, MutableLongObjectMap<MutableIntSet> map1, MutableLongObjectMap<MutableIntSet> map2,
+                        MutableIntIntMap object2OptionIndex, List<List<IntIntMap>> listOfOptions) {
                 if (map1.size() != map2.size()) {
                         return EquivalenceResult.DIFFERENT;
                 }
@@ -116,27 +116,28 @@ public class StateEquivalenceCheckerImpl implements StateEquivalenceChecker {
                         listOfOptions.add(pairing.permutations());
                 }
 
-                individuals.forEach(o -> listOfOptions.add(o,List.of(IntIntMaps.immutable.of(o,o))));
+                individuals.forEach(o -> listOfOptions.add(o, List.of(IntIntMaps.immutable.of(o, o))));
 
-                if(allComplete) {
+                if (allComplete) {
                         return EquivalenceResult.ISOMORPHIC;
                 } else {
                         return EquivalenceResult.UNKNOWN;
                 }
         }
 
-        private boolean testMorphism(List<? extends Interpretation<?>> s, List<? extends Interpretation<?>> t, Morphism m) {
+        private boolean testMorphism(List<? extends AnyInterpretation> s, List<? extends AnyInterpretation> t,
+                                                                 Morphism m) {
                 for (int interpretationIndex = 0; interpretationIndex < s.size(); interpretationIndex++) {
                         var sI = s.get(interpretationIndex);
                         var tI = t.get(interpretationIndex);
 
-                        var cursor = sI.getAll();
+                        var cursor = ((Interpretation<?>) sI).getAll();
                         while (cursor.move()) {
                                 final Tuple sTuple = cursor.getKey();
                                 final Object sValue = cursor.getValue();
 
                                 final Tuple tTuple = apply(sTuple, m);
-                                final Object tValue = tI.get(tTuple);
+                                final Object tValue = ((Interpretation<?>) tI).get(tTuple);
 
                                 if (!Objects.equals(sValue, tValue)) {
                                         return false;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple.java b/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple.java
index aae7b344..e9761763 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple.java
@@ -12,6 +12,8 @@ public sealed interface Tuple extends Comparable<Tuple> permits Tuple0, Tuple1,
 
         int get(int element);
 
+        Tuple set(int element, int value);
+
         @Override
         default int compareTo(@NotNull Tuple other) {
                 int size = getSize();
diff --git a/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple0.java b/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple0.java
index a9aa9bf2..5f525798 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple0.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple0.java
@@ -29,6 +29,11 @@ public final class Tuple0 implements Tuple {
         }
 
         @Override
+        public Tuple set(int element, int value) {
+                throw new IndexOutOfBoundsException(element);
+        }
+
+        @Override
         public String toString() {
                 return TUPLE_BEGIN + TUPLE_END;
         }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple1.java b/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple1.java
index 388ee3a9..fb9497d2 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple1.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple1.java
@@ -38,6 +38,14 @@ public final class Tuple1 implements Tuple {
         }
 
         @Override
+        public Tuple set(int element, int value) {
+                if (element == 0) {
+                        return Tuple.of(value);
+                }
+                throw new IndexOutOfBoundsException(element);
+        }
+
+        @Override
         public String toString() {
                 return TUPLE_BEGIN + value0 + TUPLE_END;
         }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple2.java b/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple2.java
index 6d886fd3..2213df97 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple2.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple2.java
@@ -25,6 +25,15 @@ public record Tuple2(int value0, int value1) implements Tuple {
         }
 
         @Override
+        public Tuple set(int element, int value) {
+                return switch (element) {
+                        case 0 -> Tuple.of(value, value1);
+                        case 1 -> Tuple.of(value0, value);
+                        default -> throw new ArrayIndexOutOfBoundsException(element);
+                };
+        }
+
+        @Override
         public String toString() {
                 return TUPLE_BEGIN + value0 + TUPLE_SEPARATOR + value1 + TUPLE_END;
         }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple3.java b/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple3.java
index 734e45c2..417770e8 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple3.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple3.java
@@ -26,6 +26,16 @@ public record Tuple3(int value0, int value1, int value2) implements Tuple {
         }
 
         @Override
+        public Tuple set(int element, int value) {
+                return switch (element) {
+                        case 0 -> Tuple.of(value, value1, value2);
+                        case 1 -> Tuple.of(value0, value, value2);
+                        case 2 -> Tuple.of(value0, value1, value);
+                        default -> throw new ArrayIndexOutOfBoundsException(element);
+                };
+        }
+
+        @Override
         public String toString() {
                 return TUPLE_BEGIN + value0 + TUPLE_SEPARATOR + value1 + TUPLE_SEPARATOR + value2 + TUPLE_END;
         }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple4.java b/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple4.java
index e1b93e7b..c4915198 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple4.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple4.java
@@ -27,6 +27,17 @@ public record Tuple4(int value0, int value1, int value2, int value3) implements
         }
 
         @Override
+        public Tuple set(int element, int value) {
+                return switch (element) {
+                        case 0 -> Tuple.of(value, value1, value2, value3);
+                        case 1 -> Tuple.of(value0, value, value2, value3);
+                        case 2 -> Tuple.of(value0, value1, value, value3);
+                        case 3 -> Tuple.of(value0, value1, value2, value);
+                        default -> throw new ArrayIndexOutOfBoundsException(element);
+                };
+        }
+
+        @Override
         public String toString() {
                 return TUPLE_BEGIN + value0 + TUPLE_SEPARATOR + value1 + TUPLE_SEPARATOR + value2 + TUPLE_SEPARATOR + value3 +
                                 TUPLE_END;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/tuple/TupleN.java b/subprojects/store/src/main/java/tools/refinery/store/tuple/TupleN.java
index b66af491..b42b4b6a 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/tuple/TupleN.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/tuple/TupleN.java
@@ -32,6 +32,16 @@ public final class TupleN implements Tuple {
         }
 
         @Override
+        public Tuple set(int element, int value) {
+                int size = getSize();
+                var newValues = new int[size];
+                for (int i = 0; i < size; i++) {
+                        newValues[i] = element == i ? value : values[i];
+                }
+                return Tuple.of(newValues);
+        }
+
+        @Override
         public String toString() {
                 var valuesString = Arrays.stream(values)
                                 .mapToObj(Integer::toString)
diff --git a/subprojects/store/src/main/java/tools/refinery/store/util/CycleDetectingMapper.java b/subprojects/store/src/main/java/tools/refinery/store/util/CycleDetectingMapper.java
index 78ad2ad7..2e302663 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/util/CycleDetectingMapper.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/util/CycleDetectingMapper.java
@@ -20,6 +20,10 @@ public class CycleDetectingMapper<T, R> {
 
         private final Map<T, R> results = new HashMap<>();
 
+        public CycleDetectingMapper(Function<T, R> doMap) {
+                this(Objects::toString, doMap);
+        }
+
         public CycleDetectingMapper(Function<T, String> getName, Function<T, R> doMap) {
                 this.getName = getName;
                 this.doMap = doMap;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java
index e61f7b36..e403eec2 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java
@@ -8,9 +8,6 @@ package tools.refinery.store.representation.cardinality;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
-import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
-import tools.refinery.store.representation.cardinality.UnboundedUpperCardinality;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
@@ -20,14 +17,14 @@ class UpperCardinalitiesTest {
         @ParameterizedTest
         @ValueSource(ints = {0, 1, 255, 256, 1000, Integer.MAX_VALUE})
         void valueOfBoundedTest(int value) {
-                var upperCardinality = UpperCardinalities.valueOf(value);
+                var upperCardinality = UpperCardinalities.atMost(value);
                 assertThat(upperCardinality, instanceOf(FiniteUpperCardinality.class));
                 assertThat(((FiniteUpperCardinality) upperCardinality).finiteUpperBound(), equalTo(value));
         }
 
         @Test
         void valueOfUnboundedTest() {
-                var upperCardinality = UpperCardinalities.valueOf(-1);
+                var upperCardinality = UpperCardinalities.atMost(-1);
                 assertThat(upperCardinality, instanceOf(UnboundedUpperCardinality.class));
         }
 }
diff --git a/subprojects/store/src/test/java/tools/refinery/store/statecoding/ExperimentalSetupTest.java b/subprojects/store/src/test/java/tools/refinery/store/statecoding/ExperimentalSetupTest.java
index 25b5dca1..f5ffc18d 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/statecoding/ExperimentalSetupTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/statecoding/ExperimentalSetupTest.java
@@ -5,7 +5,8 @@
  */
 package tools.refinery.store.statecoding;
 
-import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;
+import org.eclipse.collections.api.factory.primitive.IntObjectMaps;
+import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -24,7 +25,6 @@ import java.util.Set;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-
 class ExperimentalSetupTest {
         static class ExperimentalSetupResult {
                 int versions = 0;
@@ -61,7 +61,7 @@ class ExperimentalSetupTest {
                                 .build();
 
                 Set<Version> versions = new HashSet<>();
-                IntObjectHashMap<List<Version>> codes = new IntObjectHashMap<>();
+                MutableIntObjectMap<List<Version>> codes = IntObjectMaps.mutable.empty();
 
                 var empty = store.createEmptyModel();
                 if (!permuteTypes) {
@@ -123,8 +123,9 @@ class ExperimentalSetupTest {
                 return result;
         }
 
-        private static void saveAsNewVersion(Set<Version> versions, IntObjectHashMap<List<Version>> codes,
-                                                                                 StateCoderStoreAdapter storeAdapter, ExperimentalSetupResult result, Model model) {
+        private static void saveAsNewVersion(Set<Version> versions, MutableIntObjectMap<List<Version>> codes,
+                                                                                 StateCoderStoreAdapter storeAdapter, ExperimentalSetupResult result,
+                                                                                 Model model) {
                 Version version1 = model.commit();
 
                 var stateCode = model.getAdapter(StateCoderAdapter.class).calculateStateCode();
diff --git a/subprojects/viatra-runtime-localsearch/about.html b/subprojects/viatra-runtime-localsearch/about.html
new file mode 100644
index 00000000..d1d5593a
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/about.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<!--
+  Copyright (c) 2017, Eclipse.org Foundation, Inc.
+
+  SPDX-License-Identifier: LicenseRef-EPL-Steward
+-->
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>March 18, 2019</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v20.php">http://www.eclipse.org/legal/epl-v20.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+</body>
+</html>
diff --git a/subprojects/viatra-runtime-localsearch/build.gradle.kts b/subprojects/viatra-runtime-localsearch/build.gradle.kts
new file mode 100644
index 00000000..31c0c634
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/build.gradle.kts
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+plugins {
+        id("tools.refinery.gradle.java-library")
+}
+
+dependencies {
+        implementation(project(":refinery-viatra-runtime"))
+        implementation(libs.slf4j.log4j)
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/ExecutionLoggerAdapter.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/ExecutionLoggerAdapter.java
new file mode 100644
index 00000000..bfb76d9a
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/ExecutionLoggerAdapter.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch;
+
+import tools.refinery.viatra.runtime.localsearch.matcher.ILocalSearchAdapter;
+import tools.refinery.viatra.runtime.localsearch.matcher.LocalSearchMatcher;
+import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.plan.SearchPlan;
+
+import java.util.Optional;
+import java.util.function.Consumer;
+
+/**
+ * @since 2.0
+ */
+public final class ExecutionLoggerAdapter implements ILocalSearchAdapter {
+
+    volatile String indentation = "";
+    private final Consumer<String> outputConsumer;
+
+    public ExecutionLoggerAdapter(Consumer<String> outputConsumer) {
+        this.outputConsumer = outputConsumer;
+    }
+
+    private void logMessage(String message) {
+        outputConsumer.accept(message);
+    }
+
+    private void logMessage(String message, Object...args) {
+        outputConsumer.accept(String.format(message, args));
+    }
+
+    @Override
+    public void patternMatchingStarted(LocalSearchMatcher lsMatcher) {
+        logMessage(indentation + "[ START] " + lsMatcher.getQuerySpecification().getFullyQualifiedName());
+    }
+
+    @Override
+    public void noMoreMatchesAvailable(LocalSearchMatcher lsMatcher) {
+        logMessage(indentation + "[FINISH] " + lsMatcher.getQuerySpecification().getFullyQualifiedName());
+    }
+
+    @Override
+    public void planChanged(Optional<SearchPlan> oldPlan, Optional<SearchPlan> newPlan) {
+        logMessage(indentation + "[  PLAN] " + newPlan.map(p -> p.getSourceBody().getPattern().getFullyQualifiedName()).orElse(""));
+        logMessage(indentation + newPlan.map(SearchPlan::toString).map(s -> s.replace("\n", "\n" + indentation)).orElse(""));
+    }
+
+    @Override
+    public void operationSelected(SearchPlan plan, ISearchOperation operation, MatchingFrame frame, boolean isBacktrack) {
+        String category = isBacktrack ? "[  BACK] "  : "[SELECT] ";
+       logMessage(indentation + category + operation.toString());
+        if (operation instanceof IPatternMatcherOperation) {
+            indentation = indentation + "\t";
+        }
+    }
+
+    @Override
+    public void operationExecuted(SearchPlan plan, ISearchOperation operation, MatchingFrame frame,
+            boolean isSuccessful) {
+        if (operation instanceof IPatternMatcherOperation && indentation.length() > 0) {
+            indentation = indentation.substring(1);
+        }
+        logMessage(indentation + "[    %s] %s %s", isSuccessful ? "OK" : "NO", operation.toString(), frame.toString());
+    }
+
+    @Override
+    public void matchFound(SearchPlan plan, MatchingFrame frame) {
+        logMessage(indentation + "[ MATCH] " + plan.getSourceBody().getPattern().getFullyQualifiedName() + " " + frame.toString());
+    }
+
+    @Override
+    public void duplicateMatchFound(MatchingFrame frame) {
+        logMessage(indentation + "[ DUPL.] " + frame.toString());
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/MatchingFrame.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/MatchingFrame.java
new file mode 100644
index 00000000..bdbc663c
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/MatchingFrame.java
@@ -0,0 +1,114 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Akos Horvath, Gergely Varro Zoltan Ujhelyi and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.localsearch;
+
+import tools.refinery.viatra.runtime.matchers.tuple.IModifiableTuple;
+import tools.refinery.viatra.runtime.matchers.tuple.VolatileTuple;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+/**
+ * A MatchingFrame is a Volatile Tuple implementation used by the local search engine internally.
+ */
+public class MatchingFrame extends VolatileTuple implements IModifiableTuple {
+
+    /**
+     * The array that physically holds the values.
+     */
+    private Object[] frame;
+
+    /**
+     * @since 1.7
+     */
+    public MatchingFrame(int frameSize) {
+        this.frame = new Object[frameSize];
+    }
+
+    /**
+     * Creates a copy of another matching frame; the two frames can be updated separately
+     * @param other
+     * @since 1.7
+     */
+    public MatchingFrame(MatchingFrame other) {
+        this.frame = Arrays.copyOf(other.frame, other.frame.length);
+    }
+
+
+
+    /**
+     * Returns the value stored inside the matching frame.
+     *
+     * @param position
+     * @return the element stored in the selected position in the frame, or null if it is not yet set
+     * @throws IndexOutOfBoundsException
+     *             if position is negative
+     * @throws IllegalArgumentException
+     *             if the position is larger then the length of the frame
+     */
+    public Object getValue(int position) {
+        Preconditions.checkElementIndex(position, frame.length);
+        return frame[position];
+    }
+
+    /**
+     * Sets the value of the variable at the given position. For internal use in LS matching only.
+     *
+     * @param position the position of the variable within the frame
+     * @param value the value to be set for the variable
+     */
+    public void setValue(int position, Object value) {
+        Preconditions.checkElementIndex(position, frame.length);
+        frame[position] = value;
+    }
+
+    public boolean testAndSetValue(Integer position, Object value) {
+        Preconditions.checkElementIndex(position, frame.length);
+        if (frame[position] == null) {
+            frame[position] = value;
+            return true;
+        } else {
+            return frame[position].equals(value);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return Arrays.stream(frame).map(this::stringRepresentation).collect(Collectors.joining(", ", "[", "]"));
+    }
+
+    private String stringRepresentation(Object obj) {
+        if (obj == null) {
+            return "_";
+        }
+        return obj.toString();
+    }
+
+    @Override
+    public int getSize() {
+        return frame.length;
+    }
+
+    @Override
+    public Object get(int index) {
+        return getValue(index);
+    }
+
+    @Override
+    public Object[] getElements() {
+        return Arrays.copyOf(frame, frame.length);
+    }
+
+    @Override
+    public void set(int index, Object value) {
+        frame[index] = value;
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/exceptions/LocalSearchException.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/exceptions/LocalSearchException.java
new file mode 100644
index 00000000..c239e766
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/exceptions/LocalSearchException.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Akos Horvath, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.exceptions;
+
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+
+/**
+ * @author Zoltan Ujhelyi, Akos Horvath
+ * 
+ */
+public class LocalSearchException extends ViatraQueryRuntimeException {
+
+    private static final long serialVersionUID = -2585896573351435974L;
+
+    public static final String PLAN_EXECUTION_ERROR = "Error while executing search plan";
+    public static final String TYPE_ERROR = "Invalid type of variable";
+
+    public LocalSearchException(String description, Throwable rootException) {
+        super(description, rootException);
+    }
+
+    public LocalSearchException(String description) {
+        super(description);
+    }
+
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/CallWithAdornment.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/CallWithAdornment.java
new file mode 100644
index 00000000..0cabeb97
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/CallWithAdornment.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * Immutable data that represents the role of a pattern call within an LS query plan.
+ *  
+ * <p> The call is expressed as the {@link PConstraint} {@link #call} (implementing {@link IQueryReference}), 
+ * while the stored {@link #adornment} records the way it will be used within a search plan (specifically, 
+ * pattern parameters within the adornment will have their values known at the point of evaluating the constraint).
+ * 
+ * 
+ * @author Gabor Bergmann
+ * @since 2.1
+ */
+public class CallWithAdornment {
+    private final IQueryReference call;
+    private final Set<PParameter> adornment;
+
+    public CallWithAdornment(IQueryReference call, Set<PParameter> adornment) {
+        this.call = call;
+        this.adornment = new HashSet<>(adornment);
+    }
+
+    public IQueryReference getCall() {
+        return call;
+    }
+
+    public Set<PParameter> getAdornment() {
+        return adornment;
+    }
+    
+    
+    public PQuery getReferredQuery() {
+        return call.getReferredQuery();
+    }
+    
+    public MatcherReference getMatcherReference() {
+        return new MatcherReference(getReferredQuery(), adornment);
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ILocalSearchAdaptable.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ILocalSearchAdaptable.java
new file mode 100644
index 00000000..f4b28ed0
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ILocalSearchAdaptable.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Peter Lunk, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher;
+
+import java.util.List;
+
+/**
+ * @author Zoltan Ujhelyi
+ *
+ */
+public interface ILocalSearchAdaptable {
+
+    List<ILocalSearchAdapter> getAdapters();
+
+    void addAdapter(ILocalSearchAdapter adapter);
+
+    void removeAdapter(ILocalSearchAdapter adapter);
+
+    void removeAdapters(List<ILocalSearchAdapter> adapter);
+
+    void addAdapters(List<ILocalSearchAdapter> adapter);
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ILocalSearchAdapter.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ILocalSearchAdapter.java
new file mode 100644
index 00000000..df64b5f1
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ILocalSearchAdapter.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Marton Bur, Akos Horvath, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher;
+
+import java.util.Optional;
+
+import tools.refinery.viatra.runtime.localsearch.ExecutionLoggerAdapter;
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.plan.SearchPlan;
+import tools.refinery.viatra.runtime.localsearch.profiler.LocalSearchProfilerAdapter;
+
+
+/**
+ * A local search adapter allows external code to follow the internal executions of the local search matcher. Possible
+ * implementations of the interface include profilers and debuggers.
+ * <p>
+ * <strong>EXPERIMENTAL</strong>. A few shortcomings have been found for this interface late during the development
+ * lifecycle of version 2.0 whose solution might need breaking possible future implementors. Because of this, right now
+ * it is not recommended to provide implementations outside of VIATRA. If necessary, have a look at the built-in
+ * adapters that should fulfill most cases in the meantime. See bugs https://bugs.eclipse.org/bugs/show_bug.cgi?id=535101
+ * and https://bugs.eclipse.org/bugs/show_bug.cgi?id=535102 for details.
+ * 
+ * @author Marton Bur
+ * @see ExecutionLoggerAdapter
+ * @see LocalSearchProfilerAdapter
+ *
+ */
+public interface ILocalSearchAdapter {
+
+    /**
+     * 
+     * @since 1.2
+     */
+    default void adapterRegistered(ILocalSearchAdaptable adaptable) {};
+    /**
+     * 
+     * @since 1.2
+     */
+    default void adapterUnregistered(ILocalSearchAdaptable adaptable) {};
+    
+    /**
+     * Callback method to indicate the start of a matching process
+     *
+     * @param lsMatcher the local search matcher that starts the matching
+     */
+    default void patternMatchingStarted(LocalSearchMatcher lsMatcher) {};
+
+    /**
+     * Callback method to indicate the end of a matching process
+     * </p>
+     * <strong>WARNING</strong>: It is not guaranteed that this method will be called;
+     * it is possible that a match process will end after a match is found and no other matches are accessed.
+     * 
+     * @param lsMatcher the local search matcher that finished
+     * @since 2.0
+     */
+    default void noMoreMatchesAvailable(LocalSearchMatcher lsMatcher) {};
+
+    /**
+     * Callback method to indicate switching to a new plan during the execution of a pattern matching
+     * 
+     * @param oldPlan the plan that is finished. Value is null when the first plan is starting.
+     * @param newPlan the plan that will begin execution
+     * @since 2.0
+     */
+    default void planChanged(Optional<SearchPlan> oldPlan, Optional<SearchPlan> newPlan) {};
+    
+    /**
+     * Callback method to indicate the selection of an operation to execute
+     * 
+     * @param plan the current plan executor
+     * @param frame the current matching frame
+     * @param isBacktrack if true, the selected operation was reached via backtracking
+     * @since 2.0
+     */
+    default void operationSelected(SearchPlan plan, ISearchOperation operation, MatchingFrame frame, boolean isBacktrack) {};
+
+    /**
+     * Callback method to indicate that an operation is executed
+     * 
+     * @param plan the current plan
+     * @param frame the current matching frame
+     * @param isSuccessful if true, the operation executed successfully, or false if the execution failed and backtracking will happen
+     * @since 2.0
+     */
+    default void operationExecuted(SearchPlan plan, ISearchOperation operation, MatchingFrame frame, boolean isSuccessful) {};
+
+    /**
+     * Callback that is used to indicate that a match has been found
+     * 
+     * @param plan the search plan executor that found the match
+     * @param frame the frame that holds the substitutions of the variables that match 
+     * @since 2.0
+     */
+    default void matchFound(SearchPlan plan, MatchingFrame frame) {};
+    /**
+     * Callback that is used to indicate that the previously reported match has been found as a duplicate, thus will be ignored from the match results.
+     * 
+     * @param plan the search plan executor that found the match
+     * @param frame the frame that holds the substitutions of the variables that match 
+     * @since 2.0
+     */
+    default void duplicateMatchFound(MatchingFrame frame) {};
+
+    /**
+     * Callback method to indicate that a search plan is initialized in an executor with the given frame and starting operation
+     * 
+     * @param searchPlan
+     * @param frame
+     * @since 2.0
+     */
+    default void executorInitializing(SearchPlan searchPlan, MatchingFrame frame) {};
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ISearchContext.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ISearchContext.java
new file mode 100644
index 00000000..71aa4aac
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/ISearchContext.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.localsearch.matcher.integration.IAdornmentProvider;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.util.ICache;
+import tools.refinery.viatra.runtime.matchers.util.IProvider;
+
+import java.util.Collections;
+
+/**
+ * The {@link ISearchContext} interface allows search operations to reuse platform services such as the indexer.
+ *
+ * @author Zoltan Ujhelyi
+ * @noreference This interface is not intended to be referenced by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @noextend This interface is not intended to be extended by clients.
+ *
+ */
+public interface ISearchContext {
+
+    /**
+     * Provides access to the generic query runtime context of the current engine
+     * @since 1.7
+     */
+    IQueryRuntimeContext getRuntimeContext();
+
+    /**
+     * Returns a matcher for a selected query specification.
+     *
+     * @throws ViatraQueryRuntimeException
+     * @since 1.5
+     */
+    IQueryResultProvider getMatcher(CallWithAdornment dependency);
+
+    /**
+     * Allows search operations to cache values through the entire lifecycle of the local search backend. The values are
+     * calculated if not cached before using the given provider, or returned from the cache accordingly.
+     *
+     * @since 1.7
+     */
+    <T> T accessBackendLevelCache(Object key, Class<? extends T> clazz, IProvider<T> valueProvider);
+
+    /**
+     * Returns the engine-specific logger
+     *
+     * @since 2.0
+     */
+    Logger getLogger();
+
+    /**
+     * @noreference This class is not intended to be referenced by clients.
+     * @noimplement This interface is not intended to be implemented by clients.
+     * @noextend This interface is not intended to be extended by clients.
+     */
+    public class SearchContext implements ISearchContext {
+
+        private final IQueryRuntimeContext runtimeContext;
+
+        private final ICache backendLevelCache;
+        private final Logger logger;
+        private final ResultProviderRequestor resultProviderRequestor;
+
+        /**
+         * Initializes a search context using an arbitrary backend context
+         */
+        public SearchContext(IQueryBackendContext backendContext, ICache backendLevelCache,
+                ResultProviderRequestor resultProviderRequestor) {
+            this.resultProviderRequestor = resultProviderRequestor;
+            this.runtimeContext = backendContext.getRuntimeContext();
+            this.logger = backendContext.getLogger();
+
+            this.backendLevelCache = backendLevelCache;
+        }
+
+        /**
+         * @throws ViatraQueryRuntimeException
+         * @since 2.1
+         */
+        @Override
+        public IQueryResultProvider getMatcher(CallWithAdornment dependency) {
+            // Inject adornment for referenced pattern
+            IAdornmentProvider adornmentProvider = query -> {
+                if (query.equals(dependency.getReferredQuery())){
+                    return Collections.singleton(dependency.getAdornment());
+                }
+                return Collections.emptySet();
+            };
+            return resultProviderRequestor.requestResultProvider(dependency.getCall(),
+                    IAdornmentProvider.toHint(adornmentProvider));
+        }
+
+        @Override
+        public <T> T accessBackendLevelCache(Object key, Class<? extends T> clazz, IProvider<T> valueProvider) {
+            return backendLevelCache.getValue(key, clazz, valueProvider);
+        }
+
+        public IQueryRuntimeContext getRuntimeContext() {
+            return runtimeContext;
+        }
+
+        @Override
+        public Logger getLogger() {
+            return logger;
+        }
+
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/LocalSearchMatcher.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/LocalSearchMatcher.java
new file mode 100644
index 00000000..e31d7b5c
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/LocalSearchMatcher.java
@@ -0,0 +1,301 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Marton Bur, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.plan.IPlanDescriptor;
+import tools.refinery.viatra.runtime.localsearch.plan.SearchPlan;
+import tools.refinery.viatra.runtime.localsearch.plan.SearchPlanExecutor;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public final class LocalSearchMatcher implements ILocalSearchAdaptable {
+
+    private final List<SearchPlanExecutor> plan;
+    private final IPlanDescriptor planDescriptor;
+    private final List<ILocalSearchAdapter> adapters;
+
+    /**
+     * @since 2.0
+     */
+    public List<SearchPlanExecutor> getPlan() {
+        return plan;
+    }
+    
+    @Override
+    public List<ILocalSearchAdapter> getAdapters() {
+        return new ArrayList<>(adapters);
+    }
+    
+    private abstract class PlanExecutionIterator implements Iterator<Tuple> {
+
+        protected final Iterator<SearchPlanExecutor> planIterator;
+        
+        protected SearchPlanExecutor currentPlan;
+        protected MatchingFrame frame;
+        protected final Set<ITuple> matchSet;
+        protected VolatileModifiableMaskedTuple parametersOfFrameView; 
+        private boolean isNextMatchCalculated;
+        
+        public PlanExecutionIterator(final Iterator<SearchPlanExecutor> planIterator) {
+            this.planIterator = planIterator;
+            isNextMatchCalculated = false;
+            matchSet = new HashSet<>();
+        }
+
+        protected boolean selectNextPlan() {
+            if(currentPlan != null) {
+                currentPlan.removeAdapters(adapters);
+            }
+            boolean validPlanSelected = false;
+            
+            SearchPlanExecutor nextPlan = null;
+            
+            while (!validPlanSelected && planIterator.hasNext()) {
+                nextPlan = planIterator.next();
+                nextPlan.addAdapters(adapters);
+                nextPlan.resetPlan();
+                
+                validPlanSelected = initializeMatchingFrame(nextPlan);
+            }
+            
+            if (validPlanSelected) {
+                for (ILocalSearchAdapter adapter : adapters) {
+                    adapter.planChanged(Optional.ofNullable(currentPlan).map(SearchPlanExecutor::getSearchPlan),
+                            Optional.ofNullable(nextPlan).map(SearchPlanExecutor::getSearchPlan));
+                }
+                currentPlan = nextPlan;
+                return true;
+            } else {
+                currentPlan = null;
+                return false;
+            }
+        }
+
+        protected abstract boolean initializeMatchingFrame(SearchPlanExecutor nextPlan);
+
+        private boolean findNextNewMatchInCurrentPlan() {
+            boolean foundMatch = currentPlan.execute(frame);
+            while (foundMatch && matchSet.contains(parametersOfFrameView)) {
+                for (ILocalSearchAdapter adapter : adapters) {
+                    adapter.duplicateMatchFound(frame);
+                }
+                foundMatch = currentPlan.execute(frame);
+            }
+            return foundMatch;
+        }
+        
+        @Override
+        public boolean hasNext() {
+            if (isNextMatchCalculated) {
+                return true;
+            }
+            if (currentPlan == null) {
+                return false;
+            }
+            boolean foundMatch = findNextNewMatchInCurrentPlan();
+            
+            while (!foundMatch && planIterator.hasNext()) {
+                foundMatch = selectNextPlan() && findNextNewMatchInCurrentPlan();
+            }
+            if (!foundMatch) {
+                for (ILocalSearchAdapter adapter : adapters) {
+                    adapter.noMoreMatchesAvailable(LocalSearchMatcher.this);
+                }
+            }
+            isNextMatchCalculated = foundMatch;
+            return foundMatch;
+        }
+
+        @Override
+        public Tuple next() {
+            if (!hasNext()) {
+                throw new NoSuchElementException("No more matches available.");
+            }
+            isNextMatchCalculated = false;
+            final Tuple match = parametersOfFrameView.toImmutable();
+            matchSet.add(match);
+            return match;
+        }
+    }
+
+    private class PlanExecutionIteratorWithArrayParameters extends PlanExecutionIterator {
+        
+        private final Object[] parameterValues;
+        
+        public PlanExecutionIteratorWithArrayParameters(Iterator<SearchPlanExecutor> planIterator, final Object[] parameterValues) {
+            super(planIterator);
+            this.parameterValues = parameterValues;
+            selectNextPlan();
+        }
+        
+        protected boolean initializeMatchingFrame(SearchPlanExecutor nextPlan) {
+            frame = new MatchingFrame(nextPlan.getVariableMapping().size());
+            parametersOfFrameView = new VolatileModifiableMaskedTuple(frame, nextPlan.getParameterMask());
+            for (int i = 0; i < parameterValues.length; i++) {
+                Object valueToSet = parameterValues[i];
+                if (valueToSet != null) {
+                    Object oldValue = parametersOfFrameView.get(i);
+                    if (oldValue == null) {
+                        parametersOfFrameView.set(i, valueToSet);
+                    } else if (!Objects.equals(valueToSet, oldValue)) {
+                        // Initial value setting resulted in contradictory values. This can happen because two parameter
+                        // variables have been unified but the call provides different values for the parameters.
+                        return false;
+                    }
+                    // If oldValue is not null but equal to newValue, the setting can be ignored
+                }
+            }
+            
+            return true;
+        }
+    }
+    private class PlanExecutionIteratorWithTupleParameters extends PlanExecutionIterator {
+        
+        private final ITuple parameterValues;
+        private final TupleMask parameterSeedMask;
+        
+        public PlanExecutionIteratorWithTupleParameters(Iterator<SearchPlanExecutor> planIterator, final TupleMask parameterSeedMask, final ITuple parameterValues) {
+            super(planIterator);
+            this.parameterSeedMask = parameterSeedMask;
+            this.parameterValues = parameterValues;
+            selectNextPlan();
+        }
+        
+        protected boolean initializeMatchingFrame(SearchPlanExecutor nextPlan) {
+            frame = new MatchingFrame(nextPlan.getVariableMapping().size());
+            parametersOfFrameView = new VolatileModifiableMaskedTuple(frame, nextPlan.getParameterMask());
+            for (int i = 0; i < parameterSeedMask.getSize(); i++) {
+                int index = parameterSeedMask.indices[i];
+                Object valueToSet = parameterValues.get(i);
+                if (valueToSet != null) {
+                    Object oldValue = parametersOfFrameView.get(index);
+                    if (oldValue == null) {
+                        parametersOfFrameView.set(index, valueToSet);
+                    } else if (!Objects.equals(valueToSet, oldValue)) {
+                        // Initial value setting resulted in contradictory values. This can happen because two parameter
+                        // variables have been unified but the call provides different values for the parameters.
+                        return false;
+                    }
+                    // If oldValue is not null but equal to newValue, the setting can be ignored
+                }
+            }
+            
+            return true;
+        }
+    }
+
+    /**
+     * @since 2.0
+     */
+    public LocalSearchMatcher(ISearchContext searchContext, IPlanDescriptor planDescriptor, List<SearchPlan> plan) {
+        Preconditions.checkArgument(planDescriptor != null, "Cannot initialize matcher with null query.");
+        this.planDescriptor = planDescriptor;
+        this.plan = plan.stream().map(p -> new SearchPlanExecutor(p, searchContext)).collect(Collectors.toList());
+        this.adapters = new LinkedList<>();
+    }
+    
+    @Override
+    public void addAdapter(ILocalSearchAdapter adapter) {
+        this.adapters.add(adapter);
+        adapter.adapterRegistered(this);
+    }
+
+    @Override
+    public void removeAdapter(ILocalSearchAdapter adapter) {
+        this.adapters.remove(adapter);
+        adapter.adapterUnregistered(this);
+    }
+    
+    @Override
+    public void addAdapters(List<ILocalSearchAdapter> adapters) {
+        this.adapters.addAll(adapters);
+        for (ILocalSearchAdapter adapter : adapters) {
+            adapter.adapterRegistered(this);
+        }
+    }
+
+    @Override
+    public void removeAdapters(List<ILocalSearchAdapter> adapters) {
+        this.adapters.removeAll(adapters);
+        for (ILocalSearchAdapter adapter : adapters) {
+            adapter.adapterUnregistered(this);
+        }
+    }
+    
+    public int getParameterCount() {
+        return planDescriptor.getQuery().getParameters().size();
+    }
+
+    private void matchingStarted() {
+        for (ILocalSearchAdapter adapter : adapters) {
+            adapter.patternMatchingStarted(this);
+        }
+    }
+
+    /**
+     * @since 2.0
+     */
+    public Stream<Tuple> streamMatches(final Object[] parameterValues) {
+        matchingStarted();
+        PlanExecutionIterator it = new PlanExecutionIteratorWithArrayParameters(plan.iterator(), parameterValues);
+        return StreamSupport.stream(Spliterators.spliteratorUnknownSize(it,
+                Spliterator.IMMUTABLE | Spliterator.NONNULL | Spliterator.DISTINCT), false);
+    }
+    
+    /**
+     * @since 2.0
+     */
+    public Stream<Tuple> streamMatches(TupleMask parameterSeedMask, final ITuple parameterValues) {
+        matchingStarted();
+        PlanExecutionIterator it = new PlanExecutionIteratorWithTupleParameters(
+                plan.iterator(), parameterSeedMask, parameterValues);
+        return StreamSupport.stream(Spliterators.spliteratorUnknownSize(it,
+                Spliterator.IMMUTABLE | Spliterator.NONNULL | Spliterator.DISTINCT), false);
+    }
+    
+    /**
+     * Returns the query specification this matcher used as source for the implementation
+     * @return never null
+     */
+    public PQuery getQuerySpecification() {
+        return planDescriptor.getQuery();
+    }
+    
+    
+    /**
+     * @since 1.5
+     */
+    public IPlanDescriptor getPlanDescriptor() {
+        return planDescriptor;
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/MatcherReference.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/MatcherReference.java
new file mode 100644
index 00000000..6bf25192
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/MatcherReference.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Zoltan Ujhelyi, Marton Bur, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher;
+
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+public class MatcherReference {
+    final PQuery query;
+    final Set<PParameter> adornment;
+    
+    /**
+     * Hints that can override the callee's own hints. This field is intentionally left out from hashCode and equals
+     */
+    final QueryEvaluationHint hints;
+        
+    /**
+     * @since 1.4
+     */
+    public MatcherReference(PQuery query, Set<PParameter> adornment, QueryEvaluationHint hints) {
+        super();
+        this.query = query;
+        this.adornment = adornment;
+        this.hints = hints;
+    }
+    
+    public MatcherReference(PQuery query, Set<PParameter> adornment){
+        this(query, adornment, null);
+    }
+    
+    public PQuery getQuery() {
+        return query;
+    }
+    public Set<PParameter> getAdornment() {
+        return adornment;
+    }
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        
+        result = prime * result + ((adornment == null) ? 0 : adornment.hashCode());
+        result = prime * result + ((query == null) ? 0 : query.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;
+        MatcherReference other = (MatcherReference) obj;
+        if (adornment == null) {
+            if (other.adornment != null)
+                return false;
+        } else if (!adornment.equals(other.adornment))
+            return false;
+        if (query == null) {
+            if (other.query != null)
+                return false;
+        } else if (!query.equals(other.query))
+            return false;
+        return true;
+    }
+    
+    /**
+     * @return the hints to override the called reference's own hints with. Can be null.
+     * @since 1.4
+     */
+    public QueryEvaluationHint getHints() {
+        return hints;
+    }
+    
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(query.getFullyQualifiedName());
+        sb.append("(");
+        for(PParameter p : query.getParameters()){
+            sb.append(adornment.contains(p) ? "b" : "f");
+        }
+        sb.append(")");
+        return sb.toString();
+    }
+    
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/AbstractLocalSearchResultProvider.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/AbstractLocalSearchResultProvider.java
new file mode 100644
index 00000000..1ae24d2d
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/AbstractLocalSearchResultProvider.java
@@ -0,0 +1,532 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.localsearch.exceptions.LocalSearchException;
+import tools.refinery.viatra.runtime.localsearch.matcher.CallWithAdornment;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.matcher.LocalSearchMatcher;
+import tools.refinery.viatra.runtime.localsearch.matcher.MatcherReference;
+import tools.refinery.viatra.runtime.localsearch.plan.IPlanDescriptor;
+import tools.refinery.viatra.runtime.localsearch.plan.IPlanProvider;
+import tools.refinery.viatra.runtime.localsearch.plan.SearchPlan;
+import tools.refinery.viatra.runtime.localsearch.plan.SearchPlanForBody;
+import tools.refinery.viatra.runtime.localsearch.planner.compiler.IOperationCompiler;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.backend.IUpdateable;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.backend.QueryHintOption;
+import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.context.IndexingService;
+import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+import tools.refinery.viatra.runtime.matchers.planning.helpers.FunctionalDependencyHelper;
+import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQueries;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IFlattenCallPredicate;
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Accuracy;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ *
+ */
+public abstract class AbstractLocalSearchResultProvider implements IQueryResultProvider {
+    
+    protected final LocalSearchBackend backend;
+    protected final IQueryBackendContext backendContext;
+    protected final IQueryRuntimeContext runtimeContext;
+    protected final PQuery query;
+    protected final QueryEvaluationHint userHints;
+    protected final Map<PQuery, LocalSearchHints> hintCache = new HashMap<>();
+    protected final IPlanProvider planProvider;
+    private static final String PLAN_CACHE_KEY = AbstractLocalSearchResultProvider.class.getName() + "#planCache"; 
+    private final Map<MatcherReference, IPlanDescriptor> planCache;
+    protected final ISearchContext searchContext;
+    /**
+     * @since 2.1
+     */
+    protected ResultProviderRequestor resultProviderRequestor;
+
+    /**
+     * @since 1.5
+     */
+    @SuppressWarnings({ "unchecked"})
+    public AbstractLocalSearchResultProvider(LocalSearchBackend backend, IQueryBackendContext context, PQuery query,
+            IPlanProvider planProvider, QueryEvaluationHint userHints) {
+        this.backend = backend;
+        this.backendContext = context;
+        this.query = query;
+
+        this.planProvider = planProvider;
+        this.userHints = userHints;
+        this.runtimeContext = context.getRuntimeContext();
+        this.resultProviderRequestor = backend.getResultProviderRequestor(query, userHints);
+        this.searchContext = new ISearchContext.SearchContext(backendContext, backend.getCache(), resultProviderRequestor);
+        this.planCache = backend.getCache().getValue(PLAN_CACHE_KEY, Map.class, HashMap::new);
+    }
+    
+    protected abstract IOperationCompiler getOperationCompiler(IQueryBackendContext backendContext, LocalSearchHints configuration);
+    
+    private IQueryRuntimeContext getRuntimeContext() {
+        return backend.getRuntimeContext();
+    }
+
+    private LocalSearchMatcher createMatcher(IPlanDescriptor plan, final ISearchContext searchContext) {
+        List<SearchPlan> executors = plan.getPlan().stream()
+                .map(input -> new SearchPlan(input.getBody(), input.getCompiledOperations(), input.calculateParameterMask(),
+                        input.getVariableKeys()))
+                .collect(Collectors.toList());
+        return new LocalSearchMatcher(searchContext, plan, executors);
+    }
+
+    private IPlanDescriptor getOrCreatePlan(MatcherReference key, IQueryBackendContext backendContext, IOperationCompiler compiler, LocalSearchHints configuration, IPlanProvider planProvider) {
+        if (planCache.containsKey(key)){
+            return planCache.get(key);
+        } else {
+            IPlanDescriptor plan = planProvider.getPlan(backendContext, compiler, 
+                    resultProviderRequestor, configuration, key);
+            planCache.put(key, plan);
+            return plan;
+        }
+    }
+    
+    private IPlanDescriptor getOrCreatePlan(MatcherReference key, IPlanProvider planProvider) {
+        if (planCache.containsKey(key)){
+            return planCache.get(key);
+        } else {
+            LocalSearchHints configuration = overrideDefaultHints(key.getQuery());
+            IOperationCompiler compiler = getOperationCompiler(backendContext, configuration);
+            IPlanDescriptor plan = planProvider.getPlan(backendContext, compiler, 
+                    resultProviderRequestor, configuration, key);
+            planCache.put(key, plan);
+            return plan;
+        }
+    }
+    
+    private LocalSearchHints overrideDefaultHints(PQuery pQuery) {
+        if (hintCache.containsKey(pQuery)) {
+            return hintCache.get(pQuery);
+        } else {
+            LocalSearchHints hint = LocalSearchHints.getDefaultOverriddenBy(
+                    computeOverridingHints(pQuery));
+            hintCache.put(pQuery, hint);
+            return hint;
+        }
+    }
+
+    /** 
+     * Combine with {@link QueryHintOption#getValueOrDefault(QueryEvaluationHint)} to access 
+     * hint settings not covered by {@link LocalSearchHints} 
+     */
+    private QueryEvaluationHint computeOverridingHints(PQuery pQuery) {
+        return backendContext.getHintProvider().getQueryEvaluationHint(pQuery).overrideBy(userHints);
+    }
+
+    /**
+     * Prepare this result provider. This phase is separated from the constructor to allow the backend to cache its instance before
+     * requesting preparation for its dependencies.
+     * @since 1.5
+     */
+    public void prepare() {
+        try {
+            runtimeContext.coalesceTraversals(() -> {
+                LocalSearchHints configuration = overrideDefaultHints(query);
+                if (configuration.isUseBase()) {
+                    indexInitializationBeforePlanning();
+                }
+                prepareDirectDependencies();
+                runtimeContext.executeAfterTraversal(AbstractLocalSearchResultProvider.this::preparePlansForExpectedAdornments);
+                return null;
+            });
+        } catch (InvocationTargetException e) {
+            throw new QueryProcessingException("Error while building required indexes: {1}", new String[]{e.getTargetException().getMessage()}, "Error while building required indexes.", query, e);
+        }
+    }
+
+    protected void preparePlansForExpectedAdornments() {
+        // Plan for possible adornments
+        for (Set<PParameter> adornment : overrideDefaultHints(query).getAdornmentProvider().getAdornments(query)) {
+            MatcherReference reference = new MatcherReference(query, adornment, userHints);
+            LocalSearchHints configuration = overrideDefaultHints(query);
+            IOperationCompiler compiler = getOperationCompiler(backendContext, configuration);
+            IPlanDescriptor plan = getOrCreatePlan(reference, backendContext, compiler, configuration, planProvider);
+            // Index keys
+            try {
+                if (configuration.isUseBase()) {
+                    indexKeys(plan.getIteratedKeys());
+                }
+            } catch (InvocationTargetException e) {
+                throw new QueryProcessingException(e.getMessage(), null, e.getMessage(), query, e);
+            }
+            //Prepare dependencies
+            for(SearchPlanForBody body: plan.getPlan()){
+                for(CallWithAdornment dependency : body.getDependencies()){
+                    searchContext.getMatcher(dependency);
+                }
+            }
+        }
+    }
+
+    protected void prepareDirectDependencies() {
+        // Do not prepare for any adornment at this point
+        IAdornmentProvider adornmentProvider = input -> Collections.emptySet();
+        QueryEvaluationHint adornmentHint = IAdornmentProvider.toHint(adornmentProvider);
+
+        for(IQueryReference call : getDirectDependencies()){
+            resultProviderRequestor.requestResultProvider(call, adornmentHint);
+        }
+    }
+
+    /**
+     * This method is called before planning start to allow indexing. It is important to note that this method is called
+     * inside a coalesceTraversals block, meaning (1) it is safe to add multiple registration requests as necessary, but
+     * (2) no value or statistics is available from the index.
+     * 
+     * @throws ViatraQueryRuntimeException
+     */
+    protected void indexInitializationBeforePlanning() {
+        // By default, no indexing is necessary
+    }
+    
+    /**
+     * Collects and indexes all types _directly_ referred by the PQuery {@link #query}. Types indirect
+     * @param requiredIndexingServices
+     */
+    protected void indexReferredTypesOfQuery(PQuery query, IndexingService requiredIndexingServices) {
+        PQueries.directlyRequiredTypesOfQuery(query, true /*only enumerables are considered for indexing */).forEach(
+                inputKey -> runtimeContext.ensureIndexed(inputKey, requiredIndexingServices)
+        );
+    }
+    
+    private Set<IQueryReference> getDirectDependencies() {
+        IFlattenCallPredicate flattenPredicate = overrideDefaultHints(query).getFlattenCallPredicate();
+        Queue<PQuery> queue = new LinkedList<>();
+        Set<PQuery> visited = new HashSet<>();
+        Set<IQueryReference> result = new HashSet<>();
+        queue.add(query);
+        
+        while(!queue.isEmpty()){
+            PQuery next = queue.poll();
+            visited.add(next);
+            for(PBody body : next.getDisjunctBodies().getBodies()){
+                for (IQueryReference call : body.getConstraintsOfType(IQueryReference.class)) {
+                    if (call instanceof PositivePatternCall && 
+                            flattenPredicate.shouldFlatten((PositivePatternCall) call)) 
+                    {
+                        PQuery dep = ((PositivePatternCall) call).getReferredQuery();
+                        if (!visited.contains(dep)){
+                            queue.add(dep);
+                        }
+                    } else {
+                        result.add(call);
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    private LocalSearchMatcher initializeMatcher(Object[] parameters) {
+        return newLocalSearchMatcher(parameters);
+    }
+    
+    private LocalSearchMatcher initializeMatcher(TupleMask parameterSeedMask) {
+        return newLocalSearchMatcher(parameterSeedMask.transformUnique(query.getParameters()));
+
+    }
+
+    
+    /**
+     * @throws ViatraQueryRuntimeException
+     */
+    public LocalSearchMatcher newLocalSearchMatcher(ITuple parameters) {
+        final Set<PParameter> adornment = new HashSet<>();
+        for (int i = 0; i < parameters.getSize(); i++) {
+            if (parameters.get(i) != null) {
+                adornment.add(query.getParameters().get(i));
+            }
+        }
+        
+        return newLocalSearchMatcher(adornment);
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException
+     */
+    public LocalSearchMatcher newLocalSearchMatcher(Object[] parameters) {
+        final Set<PParameter> adornment = new HashSet<>();
+        for (int i = 0; i < parameters.length; i++) {
+            if (parameters[i] != null) {
+                adornment.add(query.getParameters().get(i));
+            }
+        }
+    
+        return newLocalSearchMatcher(adornment);
+    }
+
+    private LocalSearchMatcher newLocalSearchMatcher(final Set<PParameter> adornment) {
+        final MatcherReference reference = new MatcherReference(query, adornment, userHints);
+        
+        IPlanDescriptor plan = getOrCreatePlan(reference, planProvider);
+        if (overrideDefaultHints(reference.getQuery()).isUseBase()){
+            try {
+                indexKeys(plan.getIteratedKeys());
+            } catch (InvocationTargetException e) {
+                throw new LocalSearchException("Could not index keys", e);
+            }
+        }
+        
+        LocalSearchMatcher matcher = createMatcher(plan, searchContext);
+        matcher.addAdapters(backend.getAdapters());
+        return matcher;
+    }
+
+    private void indexKeys(final Iterable<IInputKey> keys) throws InvocationTargetException {
+        final IQueryRuntimeContext qrc = getRuntimeContext();
+        qrc.coalesceTraversals(new Callable<Void>() {
+    
+            @Override
+            public Void call() throws Exception {
+                for(IInputKey key : keys){
+                    if (key.isEnumerable()) {
+                        qrc.ensureIndexed(key, IndexingService.INSTANCES);
+                    }
+                }
+                return null;
+            }
+        });
+    }
+
+    @Override
+    public boolean hasMatch(Object[] parameters) {
+        final LocalSearchMatcher matcher = initializeMatcher(parameters);
+        return matcher.streamMatches(parameters).findAny().isPresent();
+    }
+
+    @Override
+    public boolean hasMatch(TupleMask parameterSeedMask, ITuple parameters) {
+        final LocalSearchMatcher matcher = initializeMatcher(parameterSeedMask);
+        return matcher.streamMatches(parameterSeedMask, parameters).findAny().isPresent();
+    }
+
+    @Override
+    public Optional<Tuple> getOneArbitraryMatch(Object[] parameters) {
+        final LocalSearchMatcher matcher = initializeMatcher(parameters);
+        return matcher.streamMatches(parameters).findAny();
+    }
+
+    @Override
+    public Optional<Tuple> getOneArbitraryMatch(TupleMask parameterSeedMask, ITuple parameters) {
+        final LocalSearchMatcher matcher = initializeMatcher(parameterSeedMask);
+        return matcher.streamMatches(parameterSeedMask, parameters).findAny();
+    }
+
+    @Override
+    public int countMatches(Object[] parameters) {
+        final LocalSearchMatcher matcher = initializeMatcher(parameters);
+        // Count returns long; casting to int - in case of integer overflow casting will throw the exception
+        return (int) matcher.streamMatches(parameters).count();
+    }
+    
+    @Override
+    public int countMatches(TupleMask parameterSeedMask, ITuple parameters) {
+        final LocalSearchMatcher matcher = initializeMatcher(parameterSeedMask);
+        // Count returns long; casting to int - in case of integer overflow casting will throw the exception
+        return (int) matcher.streamMatches(parameterSeedMask, parameters).count();
+    }
+        
+    private static final double ESTIMATE_CEILING = Long.MAX_VALUE / 16.0;
+    
+    @Override
+    public Optional<Long> estimateCardinality(TupleMask groupMask, Accuracy requiredAccuracy) {
+        if (Accuracy.BEST_UPPER_BOUND.atLeastAsPreciseAs(requiredAccuracy)) { // approximate using parameter types
+            final List<PParameter> parameters = query.getParameters();
+            final Map<Set<Integer>, Set<Integer>> dependencies = backendContext.getQueryAnalyzer()
+                    .getProjectedFunctionalDependencies(query, false);
+            
+            List<Integer> projectionIndices = groupMask.getIndicesAsList();
+            
+            return estimateParameterCombinations(requiredAccuracy, parameters, dependencies, 
+                    projectionIndices,
+                    Collections.emptySet() /* No parameters with fixed value */).map(Double::longValue);
+        }        
+        else return Optional.empty();
+    }
+    
+    @Override
+    public Optional<Double> estimateAverageBucketSize(TupleMask groupMask, Accuracy requiredAccuracy) {
+        if (Accuracy.BEST_UPPER_BOUND.atLeastAsPreciseAs(requiredAccuracy)) { // approximate using parameter types            
+            final List<PParameter> parameters = query.getParameters();
+            final Map<Set<Integer>, Set<Integer>> dependencies = backendContext.getQueryAnalyzer()
+                    .getProjectedFunctionalDependencies(query, false);
+            
+            // all parameters used for the estimation - determinized order
+            final List<Integer> allParameterIndices = 
+                    IntStream.range(0, parameters.size()).boxed().collect(Collectors.toList());
+            
+            // some free parameters are functionally determined by bound parameters
+            final Set<Integer> boundOrImplied = FunctionalDependencyHelper.closureOf(groupMask.getIndicesAsList(),
+                    dependencies);
+            
+            return estimateParameterCombinations(requiredAccuracy, parameters, dependencies, 
+                    allParameterIndices,
+                    boundOrImplied);
+        }
+        else return Optional.empty();
+    }
+    
+    /**
+     * @since 2.1
+     * @noreference This method is not intended to be referenced by clients.
+     */
+    public double estimateCost(TupleMask inputBindingMask) {
+        // TODO this is currently an abstract cost, not really a branching factor
+        
+        HashSet<PParameter> adornment = new HashSet<>(inputBindingMask.transform(query.getParameters()));
+        final MatcherReference reference = new MatcherReference(query, adornment, userHints);
+        IPlanDescriptor plan = getOrCreatePlan(reference, planProvider);
+
+        return plan.getPlan().stream().mapToDouble(SearchPlanForBody::getCost).sum();
+    }
+
+    /**
+     * Approximates using parameter types
+     */
+    private Optional<Double> estimateParameterCombinations(
+            Accuracy requiredAccuracy, 
+            final List<PParameter> parameters,
+            final Map<Set<Integer>, Set<Integer>> functionalDependencies,
+            final Collection<Integer> parameterIndicesToEstimate, 
+            final Set<Integer> otherDeterminingIndices) 
+    {
+        // keep order deterministic
+        LinkedHashSet<Integer> freeParameterIndices = new LinkedHashSet<>(parameterIndicesToEstimate);
+        
+        // determining indices are bound
+        freeParameterIndices.removeAll(otherDeterminingIndices);
+        
+        // some free parameters are functionally determined by other free parameters
+        for (Integer candidateForRemoval : new ArrayList<>(freeParameterIndices)) {
+            List<Integer> others = Stream.concat(
+                    otherDeterminingIndices.stream(), 
+                    freeParameterIndices.stream().filter(index -> !Objects.equals(index, candidateForRemoval))
+            ).collect(Collectors.toList());
+            Set<Integer> othersClosure = FunctionalDependencyHelper.closureOf(others, functionalDependencies);
+            if (othersClosure.contains(candidateForRemoval)) { 
+                // other parameters functionally determine this mone, does not count towards estimate
+                freeParameterIndices.remove(candidateForRemoval);
+            }
+        }
+        
+        
+        Optional<Double> result = Optional.of(1.0);
+        // TODO this is currently works with declared types only. For better results, information from
+        // the Type inferrer should be included in the PSystem
+        for (int i = 0; (i < parameters.size()); i++) {
+            final IInputKey type = parameters.get(i).getDeclaredUnaryType();
+            if (freeParameterIndices.contains(i) && type != null) {
+                result = result.flatMap(accumulator ->
+                runtimeContext.estimateCardinality(type, TupleMask.identity(1), requiredAccuracy).map(multiplier ->
+                    Math.min(accumulator * multiplier, ESTIMATE_CEILING /* avoid overflow */)
+                ));                    
+            }
+        }
+        // TODO better approximate cardinality based on plan, branching factors, etc.
+        return result;
+    }
+    
+
+    @Override
+    public Stream<Tuple> getAllMatches(Object[] parameters) {
+        final LocalSearchMatcher matcher = initializeMatcher(parameters);
+        return matcher.streamMatches(parameters);
+    }
+    
+    @Override
+    public Stream<Tuple> getAllMatches(TupleMask parameterSeedMask, ITuple parameters) {
+        final LocalSearchMatcher matcher = initializeMatcher(parameterSeedMask);
+        return matcher.streamMatches(parameterSeedMask, parameters);
+    }
+
+    @Override
+    public IQueryBackend getQueryBackend() {
+        return backend;
+    }
+
+    @Override
+    public void addUpdateListener(IUpdateable listener, Object listenerTag, boolean fireNow) {
+        // throw new UnsupportedOperationException(UPDATE_LISTENER_NOT_SUPPORTED);
+    }
+
+    @Override
+    public void removeUpdateListener(Object listenerTag) {
+        // throw new UnsupportedOperationException(UPDATE_LISTENER_NOT_SUPPORTED);
+    }
+
+    /**
+     * @since 1.4
+     */
+    public IMatcherCapability getCapabilites() {
+        LocalSearchHints configuration = overrideDefaultHints(query);
+        return configuration;
+    }
+    
+    /**
+     * Forgets all stored plans in this result provider. If no plans are stored, nothing happens.
+     * 
+     * @since 2.0
+     * @noreference This method is not intended to be referenced by clients; it should only used by {@link LocalSearchBackend}.
+     */
+    public void forgetAllPlans() {
+        planCache.clear();
+    }
+    
+    /**
+     * Returns a search plan for a given adornment if exists
+     * 
+     * @return a search plan for the pattern with the given adornment, or null if none exists
+     * @since 2.0
+     * @noreference This method is not intended to be referenced by clients; it should only used by {@link LocalSearchBackend}.
+     */
+    public IPlanDescriptor getSearchPlan(Set<PParameter> adornment) {
+        return planCache.get(new MatcherReference(query, adornment));
+    }
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/AllValidAdornments.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/AllValidAdornments.java
new file mode 100644
index 00000000..f801163e
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/AllValidAdornments.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameterDirection;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQueries;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.util.Sets;
+
+
+/**
+ * This implementation calculates all valid adornments for the given query, respecting the parameter direction constraints.
+ * 
+ * @author Grill Balázs
+ * @since 1.5
+ */
+public class AllValidAdornments implements IAdornmentProvider {
+
+    @Override
+    public Iterable<Set<PParameter>> getAdornments(PQuery query) {
+        final Set<PParameter> ins = query.getParameters().stream().filter(PQueries.parameterDirectionPredicate(PParameterDirection.IN)).collect(Collectors.toSet()); 
+        Set<PParameter> inouts = query.getParameters().stream().filter(PQueries.parameterDirectionPredicate(PParameterDirection.INOUT)).collect(Collectors.toSet()); 
+        Set<? extends Set<PParameter>> possibleInouts = Sets.powerSet(inouts);
+        return possibleInouts.stream().map(input -> Sets.union(ins, input)).collect(Collectors.toSet());
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/DontFlattenDisjunctive.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/DontFlattenDisjunctive.java
new file mode 100644
index 00000000..bf1b61b5
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/DontFlattenDisjunctive.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IFlattenCallPredicate;
+
+/**
+ * Forbids flattening of patterns that have more than one body.
+ * 
+ * @since 2.1
+
+ * @author Gabor Bergmann
+ *
+ */
+public class DontFlattenDisjunctive implements IFlattenCallPredicate {
+
+    @Override
+    public boolean shouldFlatten(PositivePatternCall positivePatternCall) {
+        return 1 >= positivePatternCall.getReferredQuery().getDisjunctBodies().getBodies().size();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/DontFlattenIncrementalPredicate.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/DontFlattenIncrementalPredicate.java
new file mode 100644
index 00000000..1b918528
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/DontFlattenIncrementalPredicate.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint.BackendRequirement;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IFlattenCallPredicate;
+
+/**
+ * This implementation forbids flattening of patterns marked to be executed with a caching / incremental backend. 
+ * This makes is possible for the user to configure hybrid matching via using 
+ * the 'search' and 'incremental keywords in the pattern definition file.
+ * 
+ * @since 1.5
+ *
+ */
+public class DontFlattenIncrementalPredicate implements IFlattenCallPredicate {
+
+    @Override
+    public boolean shouldFlatten(PositivePatternCall positivePatternCall) {
+        QueryEvaluationHint evaluationHints = positivePatternCall.getReferredQuery().getEvaluationHints();
+        if (evaluationHints == null) return true;
+        
+        BackendRequirement backendRequirementType = evaluationHints.getQueryBackendRequirementType();
+        switch(backendRequirementType) {
+        case DEFAULT_CACHING:
+            return false;
+        case SPECIFIC:
+            return !evaluationHints.getQueryBackendFactory().isCaching();
+        case UNSPECIFIED:
+        case DEFAULT_SEARCH:
+        default:
+            return true;
+        }
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/GenericLocalSearchResultProvider.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/GenericLocalSearchResultProvider.java
new file mode 100644
index 00000000..ed6c1e5f
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/GenericLocalSearchResultProvider.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Marton Bur, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+
+import tools.refinery.viatra.runtime.localsearch.plan.IPlanProvider;
+import tools.refinery.viatra.runtime.localsearch.planner.compiler.GenericOperationCompiler;
+import tools.refinery.viatra.runtime.localsearch.planner.compiler.IOperationCompiler;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.context.IndexingService;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ *
+ */
+public class GenericLocalSearchResultProvider extends AbstractLocalSearchResultProvider {
+
+    /**
+     * @throws ViatraQueryRuntimeException
+     */
+    public GenericLocalSearchResultProvider(LocalSearchBackend backend, IQueryBackendContext context, PQuery query,
+            IPlanProvider planProvider, QueryEvaluationHint userHints) {
+        super(backend, context, query, planProvider, userHints);
+    }
+
+    @Override
+    protected void indexInitializationBeforePlanning() {
+        super.indexInitializationBeforePlanning();
+        
+        indexReferredTypesOfQuery(query, IndexingService.INSTANCES);
+        indexReferredTypesOfQuery(query, IndexingService.STATISTICS);
+    }
+
+    @Override
+    protected IOperationCompiler getOperationCompiler(IQueryBackendContext backendContext,
+            LocalSearchHints configuration) {
+        return new GenericOperationCompiler(runtimeContext);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/IAdornmentProvider.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/IAdornmentProvider.java
new file mode 100644
index 00000000..86058be0
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/IAdornmentProvider.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+
+import java.util.Collections;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint.BackendRequirement;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * An adornment provider is used to define the adornments the pattern matcher should prepare for.
+ *  
+ * <p>A default implementation is available in {@link AllValidAdornments} that describes all 
+ * adornments fulfilling the parameter direction declarations; 
+ * another default option (with better performance but restricted applicability) is {@link LazyPlanningAdornments}.
+ * 
+ * <br><br>
+ * 
+ * Users may implement this interface to limit the number of prepared plans based on some runtime information:
+ * 
+ * <pre>
+ * class SomeAdornments{
+ * 
+ *     public Iterable&lt;Set&lt;{@link PParameter}>> getAdornments({@link PQuery} query){
+ *         if (SomeGeneratedQuerySpecification.instance().getInternalQueryRepresentation().equals(query)){
+ *             return Collections.singleton(Sets.filter(Sets.newHashSet(query.getParameters()), new Predicate<PParameter>() {
+ *
+ *                  &#64;Override
+ *                  public boolean apply(PParameter input) {
+ *                      // Decide whether this particular parameter will be bound
+ *                      return false;
+ *                  }
+ *              }));
+ *         }
+ *         // Returning an empty iterable is safe for unknown queries
+ *         return Collections.emptySet();
+ *     }
+ * 
+ * }
+ * </pre>
+ * 
+ * @author Grill Balázs
+ * @since 1.5
+ *
+ */
+public interface IAdornmentProvider {
+
+    /**
+     * The bound parameter sets
+     */
+    public Iterable<Set<PParameter>> getAdornments(PQuery query);
+    
+    /**
+     * @return a simple hint that only overrides the adornment provider
+     * @since 2.1
+     */
+    public static QueryEvaluationHint toHint(IAdornmentProvider adornmentProvider) {
+        return new QueryEvaluationHint(
+                Collections.singletonMap(LocalSearchHintOptions.ADORNMENT_PROVIDER, adornmentProvider), 
+                BackendRequirement.UNSPECIFIED);
+    }
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LazyPlanningAdornments.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LazyPlanningAdornments.java
new file mode 100644
index 00000000..30b3689f
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LazyPlanningAdornments.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+
+import java.util.Collections;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * This adornment provider does not trigger the preparation of any plans. 
+ * Actual query plans will be computed on demand, when the first actual match request is made with a given adornment.
+ * 
+ * <p> Caution: this is a safe default adornment provider for {@link GenericLocalSearchResultProvider} only; 
+ * do not use for the EMF-specific LS backend. 
+ * 
+ * <p> The benefits is in execution time: query planning costs for adornments are postponed until first usage 
+ * or even entirely avoided (when adornment is never used in practice).  
+ * However, query evaluation time may become less predictable, as the first matcher call (with a given adornment) 
+ * will include the planning cost. 
+ * For benchmarking or other purposes where this is not desirable, use an adornment provider that demands plan precomputation for all necessary adornments. 
+ * 
+ * @author Gabor Bergmann
+ * @since 2.1
+ *
+ */
+public class LazyPlanningAdornments implements IAdornmentProvider {
+
+    @Override
+    public Iterable<Set<PParameter>> getAdornments(PQuery query) {
+        return Collections.emptySet();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchBackend.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchBackend.java
new file mode 100644
index 00000000..ae51e2b0
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchBackend.java
@@ -0,0 +1,259 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Marton Bur, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.localsearch.exceptions.LocalSearchException;
+import tools.refinery.viatra.runtime.localsearch.matcher.ILocalSearchAdapter;
+import tools.refinery.viatra.runtime.localsearch.plan.IPlanDescriptor;
+import tools.refinery.viatra.runtime.localsearch.plan.IPlanProvider;
+import tools.refinery.viatra.runtime.localsearch.plan.SimplePlanProvider;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.ICache;
+import tools.refinery.viatra.runtime.matchers.util.PurgableCache;
+
+/**
+ * @author Marton Bur, Zoltan Ujhelyi
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public abstract class LocalSearchBackend implements IQueryBackend {
+
+    IQueryBackendContext context;
+    IPlanProvider planProvider;
+    private final Set<ILocalSearchAdapter> adapters = new HashSet<>();
+    
+    private final PurgableCache generalCache;
+    
+    private final Map<PQuery, List<AbstractLocalSearchResultProvider>> resultProviderCache = CollectionsFactory.createMap();
+    
+    
+    /**
+     * @since 1.5
+     */
+    public LocalSearchBackend(IQueryBackendContext context) {
+        super();
+        this.context = context;
+        this.generalCache = new PurgableCache();
+        this.planProvider = new SimplePlanProvider(context.getLogger());
+    }
+
+    @Override
+    public void flushUpdates() {
+        
+    }
+    
+    @Override
+    public IQueryResultProvider getResultProvider(PQuery query) {
+        return getResultProvider(query, null);
+    }
+    
+    /**
+     * @since 1.4
+     */
+    @Override
+    public IQueryResultProvider getResultProvider(PQuery query, QueryEvaluationHint hints) {
+        
+        final QueryEvaluationHint callHints = getHintProvider().getQueryEvaluationHint(query).overrideBy(hints);
+        IMatcherCapability requestedCapability = context.getRequiredMatcherCapability(query, callHints);
+        for(AbstractLocalSearchResultProvider existingResultProvider : resultProviderCache.getOrDefault(query, Collections.emptyList())){
+            if (requestedCapability.canBeSubstitute(existingResultProvider.getCapabilites())){
+                return existingResultProvider;
+            }
+        }
+        
+        AbstractLocalSearchResultProvider resultProvider = initializeResultProvider(query, hints);
+        resultProviderCache.computeIfAbsent(query, k->new ArrayList<>()).add(resultProvider);
+        resultProvider.prepare();
+        return resultProvider;
+    }
+    
+    /**
+     * Returns a requestor that this backend uses while processing pattern calls <i>from</i> this query.
+     * @noreference This method is not intended to be referenced by clients.
+     * @since 2.1
+     */
+    public ResultProviderRequestor getResultProviderRequestor(PQuery query, QueryEvaluationHint userHints) {
+        QueryEvaluationHint hintOnQuery = 
+                context.getHintProvider().getQueryEvaluationHint(query).overrideBy(userHints);
+        LocalSearchHints defaultsApplied = LocalSearchHints.getDefaultOverriddenBy(hintOnQuery);
+
+        return new ResultProviderRequestor(this, 
+                context.getResultProviderAccess(), 
+                context.getHintProvider(), 
+                defaultsApplied.getCallDelegationStrategy(), 
+                userHints, 
+                /* no global overrides */ null);
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException 
+     * @since 1.7
+     */
+    protected abstract AbstractLocalSearchResultProvider initializeResultProvider(PQuery query, QueryEvaluationHint hints);
+    
+    @Override
+    public void dispose() {  
+        resultProviderCache.clear();
+        generalCache.purge();
+    }
+
+    @Override
+    public boolean isCaching() {
+        return false;
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public AbstractLocalSearchResultProvider peekExistingResultProvider(PQuery query) {
+        return resultProviderCache.getOrDefault(query, Collections.emptyList()).stream().findAny().orElse(null);
+    }
+
+    /**
+     * @since 1.4
+     */
+    public IQueryRuntimeContext getRuntimeContext() {
+        return context.getRuntimeContext();
+    }
+    
+    
+    /**
+     * @since 1.5
+     */
+    public QueryAnalyzer getQueryAnalyzer() {
+        return context.getQueryAnalyzer();
+    }
+
+
+    /**
+     * @since 1.4
+     */
+    public IQueryBackendHintProvider getHintProvider() {
+        return context.getHintProvider();
+    }
+    
+    /**
+     * @since 1.5
+     */
+    public void addAdapter(ILocalSearchAdapter adapter){
+        adapters.add(adapter);
+    }
+    
+    /**
+     * @since 1.5
+     */
+    public void removeAdapter(ILocalSearchAdapter adapter){
+        adapters.remove(adapter);
+    }
+    
+    /**
+     * Return a copy of the current adapters
+     * @since 1.7
+     */
+    public List<ILocalSearchAdapter> getAdapters() {
+        return new ArrayList<>(adapters);
+    }
+    
+    /**
+     * @since 1.5
+     */
+    public IQueryBackendContext getBackendContext() {
+        return context;
+    }
+    
+    /**
+     * Returns the internal cache of the backend
+     * @since 1.7
+     * @noreference This method is not intended to be referenced by clients.
+     */
+    public ICache getCache() {
+        return generalCache;
+    }
+    
+    /**
+     * Updates the previously stored search plans for one or more given queries, computing a new set of plans if
+     * necessary. The new plans created are the same that would be created by executing prepare on the given query
+     * definitions.
+     * 
+     * @since 2.0
+     */
+    public void recomputePlans(PQuery... queries) {
+        recomputePlans(Arrays.stream(queries).flatMap(query -> resultProviderCache.getOrDefault(query, Collections.emptyList()).stream()));
+    }
+    
+    /**
+     * Updates the previously stored search plans for one or more given queries, computing a new set of plans if
+     * necessary The new plans created are the same that would be created by executing prepare on the given query
+     * definitions.
+     * 
+     * @since 2.0
+     */
+    public void recomputePlans(Collection<PQuery> queries) {
+        recomputePlans(queries.stream().flatMap(query -> resultProviderCache.getOrDefault(query, Collections.emptyList()).stream()));
+    }
+    
+    /**
+     * Updates the previously stored search plans for one or more given queries, computing a new set of plans if
+     * necessary The new plans created are the same that would be created by executing prepare on the given query
+     * definitions.
+     * 
+     * @since 2.0
+     */
+    public void recomputePlans() {
+        recomputePlans(resultProviderCache.values().stream().flatMap(List::stream));
+    }
+    
+    private void recomputePlans(Stream<AbstractLocalSearchResultProvider> resultProviders) {
+        try {
+            context.getRuntimeContext().coalesceTraversals(() -> {
+                resultProviders.forEach(resultProvider -> {
+                    resultProvider.forgetAllPlans();
+                    resultProvider.prepare();
+                });
+                return null;
+            });
+        } catch (InvocationTargetException e) {
+            throw new LocalSearchException("Error while rebuilding plans: " + e.getMessage(), e);
+        }
+    }
+    
+    /**
+     * Returns a search plan for a given query and adornment if such plan is already calculated.
+     * 
+     * @return a previously calculated search plan for the given query and adornment, or null if no such plan exists
+     * @since 2.0
+     */
+    public IPlanDescriptor getSearchPlan(PQuery query, Set<PParameter> adornment) {
+        final AbstractLocalSearchResultProvider resultProvider = peekExistingResultProvider(query);
+        return (resultProvider == null) ? null : resultProvider.getSearchPlan(adornment);
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchGenericBackendFactory.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchGenericBackendFactory.java
new file mode 100644
index 00000000..1dd08f98
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchGenericBackendFactory.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Marton Bur, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+
+import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * @author Marton Bur, Zoltan Ujhelyi
+ * @since 1.7
+ *
+ */
+public enum LocalSearchGenericBackendFactory implements IQueryBackendFactory {
+    
+    INSTANCE;
+    
+    /**
+     * @since 1.5
+     */
+    @Override
+    public IQueryBackend create(IQueryBackendContext context) {
+        return new LocalSearchBackend(context) {
+            
+            @Override
+            protected AbstractLocalSearchResultProvider initializeResultProvider(PQuery query, QueryEvaluationHint hints) {
+                return new GenericLocalSearchResultProvider(this, context, query, planProvider, hints);
+            }
+            
+            @Override
+            public IQueryBackendFactory getFactory() {
+                return INSTANCE;
+            }
+            
+        };
+    }
+    
+    @Override
+    public Class<? extends IQueryBackend> getBackendClass() {
+        return LocalSearchBackend.class;
+    }
+
+    /**
+     * @since 1.4
+     */
+    @Override
+    public IMatcherCapability calculateRequiredCapability(PQuery query, QueryEvaluationHint hint) {
+        return LocalSearchHints.parse(hint);
+    }
+
+    @Override
+    public boolean isCaching() {
+        return false;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchGenericBackendFactoryProvider.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchGenericBackendFactoryProvider.java
new file mode 100644
index 00000000..ea422d91
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchGenericBackendFactoryProvider.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactoryProvider;
+
+/**
+ * @since 2.0
+ */
+public class LocalSearchGenericBackendFactoryProvider implements IQueryBackendFactoryProvider {
+    
+    @Override
+    public IQueryBackendFactory getFactory() {
+        return LocalSearchGenericBackendFactory.INSTANCE;
+    }
+    
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchHintOptions.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchHintOptions.java
new file mode 100644
index 00000000..43462204
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchHintOptions.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+
+import tools.refinery.viatra.runtime.localsearch.planner.cost.ICostFunction;
+import tools.refinery.viatra.runtime.localsearch.planner.cost.impl.IndexerBasedConstraintCostFunction;
+import tools.refinery.viatra.runtime.matchers.backend.ICallDelegationStrategy;
+import tools.refinery.viatra.runtime.matchers.backend.QueryHintOption;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IFlattenCallPredicate;
+
+/**
+ * 
+ * @author Gabor Bergmann
+ * @since 1.5
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public final class LocalSearchHintOptions {
+    
+    private LocalSearchHintOptions() {
+        // Private constructor for utility class
+    }
+    
+    public static final QueryHintOption<Boolean> USE_BASE_INDEX = 
+            hintOption("USE_BASE_INDEX", true);
+    
+    // This key can be used to influence the core planner algorithm
+    public static final QueryHintOption<Integer> PLANNER_TABLE_ROW_COUNT = 
+            hintOption("PLANNER_TABLE_ROW_COUNT", 4);
+    /**
+     * Cost function to be used by the planner. Must implement {@link ICostFunction}
+     * @since 1.4
+     */
+    public static final QueryHintOption<ICostFunction> PLANNER_COST_FUNCTION = 
+            hintOption("PLANNER_COST_FUNCTION", new IndexerBasedConstraintCostFunction());
+    /**
+     * Predicate to decide whether to flatten specific positive pattern calls {@link IFlattenCallPredicate}
+     * @since 1.4
+     */
+    public static final QueryHintOption<IFlattenCallPredicate> FLATTEN_CALL_PREDICATE = 
+            hintOption("FLATTEN_CALL_PREDICATE", new DontFlattenDisjunctive());
+    /**
+     * Strategy to decide how hints (most importantly, backend selection) propagate across pattern calls. 
+     * Must implement {@link ICallDelegationStrategy}.
+     * @since 2.1
+     */
+    public static final QueryHintOption<ICallDelegationStrategy> CALL_DELEGATION_STRATEGY = 
+            hintOption("CALL_DELEGATION_STRATEGY", ICallDelegationStrategy.FULL_BACKEND_ADHESION);
+    
+    /**
+     * A provider of expected adornments {@link IAdornmentProvider}. 
+     * 
+     * The safe default is {@link AllValidAdornments}; 
+     * however, the generic backend variant may safely use {@link LazyPlanningAdornments} instead. 
+     * 
+     * @since 1.5
+     */
+    public static final QueryHintOption<IAdornmentProvider> ADORNMENT_PROVIDER = 
+            hintOption("ADORNMENT_PROVIDER", new AllValidAdornments());
+    
+    // internal helper for conciseness
+    private static <T, V extends T> QueryHintOption<T> hintOption(String hintKeyLocalName, V defaultValue) {
+        return new QueryHintOption<>(LocalSearchHintOptions.class, hintKeyLocalName, defaultValue);
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchHints.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchHints.java
new file mode 100644
index 00000000..5f3895be
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchHints.java
@@ -0,0 +1,306 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.matcher.integration;
+
+import tools.refinery.viatra.runtime.localsearch.planner.cost.ICostFunction;
+import tools.refinery.viatra.runtime.localsearch.planner.cost.impl.IndexerBasedConstraintCostFunction;
+import tools.refinery.viatra.runtime.localsearch.planner.cost.impl.StatisticsBasedConstraintCostFunction;
+import tools.refinery.viatra.runtime.matchers.backend.*;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IFlattenCallPredicate;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IRewriterTraceCollector;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.NopTraceCollector;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import static tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHintOptions.*;
+import static tools.refinery.viatra.runtime.matchers.backend.CommonQueryHintOptions.normalizationTraceCollector;
+
+/**
+ * Type safe builder and extractor for Local search specific hints
+ *
+ * @author Grill Balázs
+ * @since 1.4
+ *
+ */
+public final class LocalSearchHints implements IMatcherCapability {
+
+    private Boolean useBase = null;
+
+    private Integer rowCount = null;
+
+    private ICostFunction costFunction = null;
+
+    private IFlattenCallPredicate flattenCallPredicate = null;
+
+    private ICallDelegationStrategy callDelegationStrategy = null;
+
+    private IAdornmentProvider adornmentProvider = null;
+
+    private IRewriterTraceCollector traceCollector = NopTraceCollector.INSTANCE;
+
+    private IQueryBackendFactory backendFactory = null;
+
+    private LocalSearchHints() {}
+
+    /**
+     * Return the default settings overridden by the given hints
+     */
+    public static LocalSearchHints getDefaultOverriddenBy(QueryEvaluationHint overridingHint){
+        return parse(getDefault().build(overridingHint));
+    }
+
+    /**
+     * Default settings which are considered the most safe, providing a reasonable performance for most of the cases. Assumes the availability of the base indexer.
+     */
+    public static LocalSearchHints getDefault(){
+        return getDefaultGeneric();
+    }
+
+    /**
+     * Initializes the generic (not EMF specific) search backend with the default settings
+     * @since 1.7
+     */
+    public static LocalSearchHints getDefaultGeneric(){
+        LocalSearchHints result = new LocalSearchHints();
+        result.useBase = true; // Should be unused; but a false value might cause surprises as an engine-default hint
+        result.rowCount = 4;
+        result.costFunction = new IndexerBasedConstraintCostFunction(StatisticsBasedConstraintCostFunction.INVERSE_NAVIGATION_PENALTY_GENERIC);
+        result.flattenCallPredicate = FLATTEN_CALL_PREDICATE.getDefaultValue();
+        result.callDelegationStrategy = ICallDelegationStrategy.FULL_BACKEND_ADHESION;
+        result.adornmentProvider = new LazyPlanningAdornments();
+        result.backendFactory = LocalSearchGenericBackendFactory.INSTANCE;
+        return result;
+    }
+
+    /**
+     * Initializes the default search backend with hybrid-enabled settings
+     * @since 2.1
+     */
+    public static LocalSearchHints getDefaultHybrid(){
+        LocalSearchHints result = getDefault();
+        result.callDelegationStrategy = ICallDelegationStrategy.PARTIAL_BACKEND_ADHESION;
+        result.flattenCallPredicate = new IFlattenCallPredicate.And(
+                new DontFlattenIncrementalPredicate(), new DontFlattenDisjunctive());
+        return result;
+    }
+
+    /**
+     * Initializes the generic (not EMF specific) search backend with hybrid-enabled settings
+     * @since 2.1
+     */
+    public static LocalSearchHints getDefaultGenericHybrid(){
+        LocalSearchHints result = getDefaultGeneric();
+        result.callDelegationStrategy = ICallDelegationStrategy.PARTIAL_BACKEND_ADHESION;
+        result.flattenCallPredicate = new IFlattenCallPredicate.And(
+                new DontFlattenIncrementalPredicate(), new DontFlattenDisjunctive());
+        return result;
+    }
+
+    public static LocalSearchHints parse(QueryEvaluationHint hint){
+        LocalSearchHints result = new LocalSearchHints();
+
+        result.useBase = USE_BASE_INDEX.getValueOrNull(hint);
+        result.rowCount = PLANNER_TABLE_ROW_COUNT.getValueOrNull(hint);
+        result.flattenCallPredicate = FLATTEN_CALL_PREDICATE.getValueOrNull(hint);
+        result.callDelegationStrategy = CALL_DELEGATION_STRATEGY.getValueOrNull(hint);
+        result.costFunction = PLANNER_COST_FUNCTION.getValueOrNull(hint);
+        result.adornmentProvider = ADORNMENT_PROVIDER.getValueOrNull(hint);
+        result.traceCollector = normalizationTraceCollector.getValueOrDefault(hint);
+
+        return result;
+    }
+
+
+    private Map<QueryHintOption<?>, Object> calculateHintMap() {
+        Map<QueryHintOption<?>, Object> map = new HashMap<>();
+        if (useBase != null){
+            USE_BASE_INDEX.insertOverridingValue(map, useBase);
+        }
+        if (rowCount != null){
+            PLANNER_TABLE_ROW_COUNT.insertOverridingValue(map, rowCount);
+        }
+        if (costFunction != null){
+            PLANNER_COST_FUNCTION.insertOverridingValue(map, costFunction);
+        }
+        if (flattenCallPredicate != null){
+            FLATTEN_CALL_PREDICATE.insertOverridingValue(map, flattenCallPredicate);
+        }
+        if (callDelegationStrategy != null){
+            CALL_DELEGATION_STRATEGY.insertOverridingValue(map, callDelegationStrategy);
+        }
+        if (adornmentProvider != null){
+            ADORNMENT_PROVIDER.insertOverridingValue(map, adornmentProvider);
+        }
+        if (traceCollector != null){
+            normalizationTraceCollector.insertOverridingValue(map, traceCollector);
+        }
+        return map;
+    }
+
+    public QueryEvaluationHint build(){
+        Map<QueryHintOption<?>, Object> map = calculateHintMap();
+        return new QueryEvaluationHint(map, backendFactory);
+    }
+
+    /**
+     * @since 1.7
+     */
+    public QueryEvaluationHint build(QueryEvaluationHint overridingHint) {
+        if (overridingHint == null)
+            return build();
+
+        IQueryBackendFactory factory = (overridingHint.getQueryBackendFactory() == null)
+                ? this.backendFactory
+                : overridingHint.getQueryBackendFactory();
+
+        Map<QueryHintOption<?>, Object> hints = calculateHintMap();
+        if (overridingHint.getBackendHintSettings() != null) {
+            hints.putAll(overridingHint.getBackendHintSettings());
+        }
+
+        return new QueryEvaluationHint(hints, factory);
+    }
+
+    public boolean isUseBase() {
+        return useBase;
+    }
+
+    public ICostFunction getCostFunction() {
+        return costFunction;
+    }
+
+    public IFlattenCallPredicate getFlattenCallPredicate() {
+        return flattenCallPredicate;
+    }
+
+    /**
+     * @since 2.1
+     */
+    public ICallDelegationStrategy getCallDelegationStrategy() {
+        return callDelegationStrategy;
+    }
+
+    public Integer getRowCount() {
+        return rowCount;
+    }
+
+    /**
+     * @since 1.5
+     */
+    public IAdornmentProvider getAdornmentProvider() {
+        return adornmentProvider;
+    }
+
+    /**
+     * @since 1.6
+     */
+    public IRewriterTraceCollector getTraceCollector() {
+        return traceCollector == null ? normalizationTraceCollector.getDefaultValue() : traceCollector;
+    }
+
+    public LocalSearchHints setUseBase(boolean useBase) {
+        this.useBase = useBase;
+        return this;
+    }
+
+    public LocalSearchHints setRowCount(int rowCount) {
+        this.rowCount = rowCount;
+        return this;
+    }
+
+    public LocalSearchHints setCostFunction(ICostFunction costFunction) {
+        this.costFunction = costFunction;
+        return this;
+    }
+
+    public LocalSearchHints setFlattenCallPredicate(IFlattenCallPredicate flattenCallPredicate) {
+        this.flattenCallPredicate = flattenCallPredicate;
+        return this;
+    }
+
+
+    /**
+     * @since 2.1
+     */
+    public LocalSearchHints setCallDelegationStrategy(ICallDelegationStrategy callDelegationStrategy) {
+        this.callDelegationStrategy = callDelegationStrategy;
+        return this;
+    }
+
+    /**
+     * @since 1.6
+     */
+    public LocalSearchHints setTraceCollector(IRewriterTraceCollector traceCollector) {
+        this.traceCollector = traceCollector;
+        return this;
+    }
+
+    /**
+     * @since 1.5
+     */
+    public LocalSearchHints setAdornmentProvider(IAdornmentProvider adornmentProvider) {
+        this.adornmentProvider = adornmentProvider;
+        return this;
+    }
+
+    public static LocalSearchHints customizeUseBase(boolean useBase){
+        return new LocalSearchHints().setUseBase(useBase);
+    }
+
+    public static LocalSearchHints customizeRowCount(int rowCount){
+        return new LocalSearchHints().setRowCount(rowCount);
+    }
+
+    public static LocalSearchHints customizeCostFunction(ICostFunction costFunction){
+        return new LocalSearchHints().setCostFunction(costFunction);
+    }
+
+    public static LocalSearchHints customizeFlattenCallPredicate(IFlattenCallPredicate predicate){
+        return new LocalSearchHints().setFlattenCallPredicate(predicate);
+    }
+
+    /**
+     * @since 2.1
+     */
+    public static LocalSearchHints customizeCallDelegationStrategy(ICallDelegationStrategy strategy){
+        return new LocalSearchHints().setCallDelegationStrategy(strategy);
+    }
+
+    /**
+     * @since 1.5
+     */
+    public static LocalSearchHints customizeAdornmentProvider(IAdornmentProvider adornmentProvider){
+        return new LocalSearchHints().setAdornmentProvider(adornmentProvider);
+    }
+
+    /**
+     * @since 1.6
+     */
+    public static LocalSearchHints customizeTraceCollector(IRewriterTraceCollector traceCollector){
+        return new LocalSearchHints().setTraceCollector(traceCollector);
+    }
+
+    @Override
+    public boolean canBeSubstitute(IMatcherCapability capability) {
+        if (capability instanceof LocalSearchHints){
+            LocalSearchHints other = (LocalSearchHints)capability;
+            /*
+             * We allow substitution of matchers if their functionally relevant settings are equal.
+             */
+            return Objects.equals(other.useBase, useBase);
+        }
+        /*
+         * For any other cases (e.g. for Rete), we cannot assume
+         * that matchers created by LS are functionally equivalent.
+         */
+        return false;
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/CheckOperationExecutor.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/CheckOperationExecutor.java
new file mode 100644
index 00000000..295ac110
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/CheckOperationExecutor.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation.ISearchOperationExecutor;
+
+/**
+ * Abstract base class for search operations that check only the already set variables.
+ * 
+ * @noextend This class is not intended to be subclassed by clients.
+ * @since 2.0
+ */
+public abstract class CheckOperationExecutor implements ISearchOperationExecutor {
+
+    /**
+     * The executed field ensures that the second call of the check always returns false, resulting in a quick
+     * backtracking.
+     */
+    private boolean executed;
+
+    @Override
+    public void onInitialize(MatchingFrame frame, ISearchContext context) {
+        executed = false;
+    }
+
+    @Override
+    public void onBacktrack(MatchingFrame frame, ISearchContext context) {
+    }
+
+    @Override
+    public boolean execute(MatchingFrame frame, ISearchContext context) {
+        executed = executed ? false : check(frame, context);
+        return executed;
+    }
+
+    /**
+     * Executes the checking operation
+     * @since 1.7
+     */
+    protected abstract boolean check(MatchingFrame frame, ISearchContext context) ;
+
+}
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/ExtendOperationExecutor.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/ExtendOperationExecutor.java
index 37177cbf..a72c30dd 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/ExtendOperationExecutor.java
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/ExtendOperationExecutor.java
@@ -4,22 +4,24 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
+ *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.store.query.viatra.internal.localsearch;
+package tools.refinery.viatra.runtime.localsearch.operations;
 
-import org.eclipse.viatra.query.runtime.localsearch.MatchingFrame;
-import org.eclipse.viatra.query.runtime.localsearch.matcher.ISearchContext;
-import org.eclipse.viatra.query.runtime.localsearch.operations.ISearchOperation.ISearchOperationExecutor;
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation.ISearchOperationExecutor;
 
 import java.util.Iterator;
 
 /**
  * An operation that can be used to enumerate all possible values for a single position based on a constraint
  * @author Zoltan Ujhelyi, Akos Horvath
+ * @noextend This class is not intended to be subclassed by clients.
  * @since 2.0
  */
-abstract class ExtendOperationExecutor<T> implements ISearchOperationExecutor {
+public abstract class ExtendOperationExecutor<T> implements ISearchOperationExecutor {
 
     private Iterator<? extends T> it;
 
@@ -27,7 +29,6 @@ abstract class ExtendOperationExecutor<T> implements ISearchOperationExecutor {
      * Returns an iterator with the possible options from the current state
      * @since 2.0
      */
-        @SuppressWarnings("squid:S1452")
     protected abstract Iterator<? extends T> getIterator(MatchingFrame frame, ISearchContext context);
     /**
      * Updates the frame with the next element of the iterator. Called during {@link #execute(MatchingFrame, ISearchContext)}.
@@ -57,14 +58,13 @@ abstract class ExtendOperationExecutor<T> implements ISearchOperationExecutor {
     }
 
         /**
-         * Fixed version of {@link org.eclipse.viatra.query.runtime.localsearch.operations.ExtendOperationExecutor#execute}
-         * that handles failed unification of variables correctly.
+         * Fixed version that handles failed unification of variables correctly.
          * @param frame The matching frame to extend.
          * @param context The search context.
          * @return {@code true} if an extension was found, {@code false} otherwise.
          */
-    @Override
-    public boolean execute(MatchingFrame frame, ISearchContext context) {
+        @Override
+        public boolean execute(MatchingFrame frame, ISearchContext context) {
                 while (it.hasNext()) {
                         var newValue = it.next();
                         if (fillInValue(newValue, frame, context)) {
@@ -72,5 +72,6 @@ abstract class ExtendOperationExecutor<T> implements ISearchOperationExecutor {
                         }
                 }
                 return false;
-    }
+        }
+
 }
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/IIteratingSearchOperation.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/IIteratingSearchOperation.java
new file mode 100644
index 00000000..6fee0097
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/IIteratingSearchOperation.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQueryLabs
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+
+/**
+ * Denotes a {@link ISearchOperation} which involves iterating over an instances of an {@link IInputKey}
+ * 
+ * @author Grill Balázs
+ * @since 1.4
+ *
+ */
+public interface IIteratingSearchOperation extends ISearchOperation{
+
+    /**
+     * Get the {@link IInputKey} which instances this operation iterates upon.
+     */
+    public IInputKey getIteratedInputKey();
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/IPatternMatcherOperation.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/IPatternMatcherOperation.java
new file mode 100644
index 00000000..d8106329
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/IPatternMatcherOperation.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations;
+
+import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
+
+/**
+ * Marker interface for pattern matcher call operations, such as positive and negative pattern calls or match aggregators.
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ */
+public interface IPatternMatcherOperation {
+
+    /**
+     * Returns the precomputed call information associated with the current operation
+     * @since 2.0
+     */
+    CallInformation getCallInformation();
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/ISearchOperation.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/ISearchOperation.java
new file mode 100644
index 00000000..eb6243ed
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/ISearchOperation.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Akos Horvath, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations;
+
+import java.util.List;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+
+/**
+ * Represents a search operation executable by the LS engine. It is expected that an operation can be shared among
+ * multiple LS matchers, but the created executors are not.
+ * 
+ * @author Zoltan Ujhelyi
+ * 
+ */
+public interface ISearchOperation {
+
+    /**
+     * Initializes a new operation executor for the given operation. Repeated calls must return different executor
+     * instances.
+     * 
+     * @since 2.0
+     */
+    public ISearchOperationExecutor createExecutor();
+    
+    /**
+     * 
+     * @since 2.0
+     *
+     */
+    public interface ISearchOperationExecutor {
+        
+        /**
+         * Returns the stateless operation this executor was initialized from
+         */
+        ISearchOperation getOperation();
+        
+        /**
+         * During the execution of the corresponding plan, the onInitialize callback is evaluated before the execution of
+         * the operation may begin. Operations may use this method to initialize its internal data structures.
+         * 
+         * @throws ViatraQueryRuntimeException
+         */
+        void onInitialize(MatchingFrame frame, ISearchContext context);
+    
+        /**
+         * After the execution of the operation failed and {@link #execute(MatchingFrame, ISearchContext)} returns false, the onBacktrack
+         * callback is evaluated. Operations may use this method to clean up any temporary structures, and make the
+         * operation ready for a new execution.
+         * 
+         * @throws ViatraQueryRuntimeException
+         */
+        void onBacktrack(MatchingFrame frame, ISearchContext context);
+    
+        /**
+         * 
+         * @param frame
+         * @param context
+         * @return true if successful, or false if backtracking needed
+         * @throws ViatraQueryRuntimeException
+         */
+        boolean execute(MatchingFrame frame, ISearchContext context);
+    }
+    /**
+     * 
+     * @return the ordered list of the variable numbers that are affected by the search operation
+     */
+    List<Integer> getVariablePositions();
+
+    /**
+     * Creates a string representation of the search operation by replacing the variable numbers according to the
+     * parameter function. It is expected that the provided function does return a non-null value for each variable
+     * index that is returned by {@link #getVariablePositions()}; otherwise a {@link NullPointerException} will be
+     * thrown during the calculation of the string.
+     * 
+     * @since 2.0
+     */
+    String toString(Function<Integer, String> variableMapping);
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/MatchingFrameValueProvider.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/MatchingFrameValueProvider.java
new file mode 100644
index 00000000..38f62129
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/MatchingFrameValueProvider.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations;
+
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.matchers.psystem.IValueProvider;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * 
+ * 
+ * @author Zoltan Ujhelyi
+ *
+ */
+public class MatchingFrameValueProvider implements IValueProvider {
+    
+    final Map<String, Integer> nameMap;
+    final MatchingFrame frame;
+    
+    public MatchingFrameValueProvider(MatchingFrame frame, Map<String, Integer> nameMap) {
+        super();
+        this.frame = frame;
+        this.nameMap = nameMap;
+    }
+
+    @Override
+    public Object getValue(String variableName) {
+        Integer index = nameMap.get(variableName);
+        Preconditions.checkArgument(index != null, "Unknown parameter variable name");
+        return frame.get(index);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/AggregatorCheck.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/AggregatorCheck.java
new file mode 100644
index 00000000..4d631635
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/AggregatorCheck.java
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.check;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
+import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+
+/**
+ * Calculates the aggregated value of a column based on the given {@link AggregatorConstraint}
+ * 
+ * @author Balázs Grill
+ * @since 1.4
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class AggregatorCheck implements ISearchOperation, IPatternMatcherOperation {
+
+    private class Executor extends CheckOperationExecutor {
+        
+        private final VolatileModifiableMaskedTuple maskedTuple;
+        private IQueryResultProvider matcher;
+        
+        public Executor() {
+            super();
+            this.maskedTuple = new VolatileModifiableMaskedTuple(information.getThinFrameMask());
+        }
+        
+        @Override
+        public void onInitialize(MatchingFrame frame, ISearchContext context) {
+            super.onInitialize(frame, context);
+            maskedTuple.updateTuple(frame);
+            matcher = context.getMatcher(information.getCallWithAdornment());
+        }
+
+        @Override
+        protected boolean check(MatchingFrame frame, ISearchContext context) {
+            IMultisetAggregationOperator<?, ?, ?> operator = aggregator.getAggregator().getOperator();
+            Object result = aggregate(operator, aggregator.getAggregatedColumn(), frame);
+            return result == null ? false : Objects.equals(frame.getValue(position), result);
+        }
+
+        @SuppressWarnings("unchecked")
+        private <Domain, Accumulator, AggregateResult> AggregateResult aggregate(
+                IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator, int aggregatedColumn,
+                MatchingFrame initialFrame) {
+            maskedTuple.updateTuple(initialFrame);
+            final Stream<Domain> valueStream = matcher.getAllMatches(information.getParameterMask(), maskedTuple)
+                    .map(match -> (Domain) match.get(aggregatedColumn));
+            return operator.aggregateStream(valueStream);
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return AggregatorCheck.this;
+        }
+    }
+    
+    private final int position;
+    private final AggregatorConstraint aggregator;
+    private final CallInformation information;
+    
+    /**
+     * @since 1.7
+     */
+    public AggregatorCheck(CallInformation information, AggregatorConstraint aggregator, int position) {
+        super();
+        this.information = information;
+        this.position = position;
+        this.aggregator = aggregator;
+    }
+
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor();
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        return Collections.singletonList(position);
+    }
+    
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        return "check     "+variableMapping.apply(position)+" = " + aggregator.getAggregator().getOperator().getName() + " find " + information.toString(variableMapping);
+    }
+
+    @Override
+    public CallInformation getCallInformation() {
+        return information;
+    }
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/BinaryTransitiveClosureCheck.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/BinaryTransitiveClosureCheck.java
new file mode 100644
index 00000000..8f818542
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/BinaryTransitiveClosureCheck.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.check;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.Set;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * Checking for a transitive closure expressed as a local search pattern matcher. The matched pattern must have two
+ * parameters of the same model type.
+ * 
+ * @author Zoltan Ujhelyi
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ * 
+ */
+public class BinaryTransitiveClosureCheck implements ISearchOperation, IPatternMatcherOperation {
+
+    private class Executor extends CheckOperationExecutor {
+        
+        @Override
+        public void onInitialize(MatchingFrame frame, ISearchContext context) {
+            super.onInitialize(frame, context);
+            matcher = context.getMatcher(information.getCallWithAdornment());
+            // Note: second parameter is NOT bound during execution, but the first is
+        }
+
+        @Override
+        protected boolean check(MatchingFrame frame, ISearchContext context) {
+            if (checkReflexive(frame)) {
+                return true;
+            }
+            
+            Object targetValue = frame.get(targetPosition);
+            Queue<Object> sourcesToEvaluate = new LinkedList<>();
+            sourcesToEvaluate.add(frame.get(sourcePosition));
+            Set<Object> sourceEvaluated = new HashSet<>();
+            final Object[] mappedFrame = new Object[] {null, null};
+            while (!sourcesToEvaluate.isEmpty()) {
+                Object currentValue = sourcesToEvaluate.poll();
+                sourceEvaluated.add(currentValue);
+                mappedFrame[0] = currentValue;
+                for (Tuple match : (Iterable<Tuple>) () -> matcher.getAllMatches(mappedFrame).iterator()) {
+                    Object foundTarget = match.get(1);
+                    if (targetValue.equals(foundTarget)) {
+                        return true;
+                    } else if (!sourceEvaluated.contains(foundTarget)) {
+                        sourcesToEvaluate.add(foundTarget);
+                    }
+                }
+            }
+            return false;
+        }
+        
+        protected boolean checkReflexive(MatchingFrame frame) {
+            return reflexive && Objects.equals(frame.get(sourcePosition), frame.get(targetPosition));
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return BinaryTransitiveClosureCheck.this;
+        }
+    }
+    
+    private final CallInformation information; 
+    private IQueryResultProvider matcher;
+    private final int sourcePosition;
+    private final int targetPosition;
+    private final boolean reflexive;
+    
+    /**
+     * The source position will be matched in the called pattern to the first parameter; while target to the second.
+     * </p>
+     * <strong>NOTE</strong>: the reflexive check call does not include the parameter type checks; appropriate type checks should be
+     * added as necessary by the operation compiler.
+     * 
+     * @since 2.0
+     */
+    public BinaryTransitiveClosureCheck(CallInformation information, int sourcePosition, int targetPosition, boolean reflexive) {
+        super();
+        this.sourcePosition = sourcePosition;
+        this.targetPosition = targetPosition;
+        this.information = information;
+        this.reflexive = reflexive;
+    }
+    
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor();
+    }
+
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        String c = information.toString(variableMapping);
+        int p = c.indexOf('(');
+        String modifier = reflexive ? "*" : "+";
+        return "check     find "+c.substring(0, p)+ modifier +c.substring(p);
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        return Arrays.asList(sourcePosition, targetPosition);
+    }
+
+    @Override
+    public CallInformation getCallInformation() {
+        return information;
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CheckConstant.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CheckConstant.java
new file mode 100644
index 00000000..4ce48af0
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CheckConstant.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Marton Bur, Akos Horvath, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.check;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+
+/**
+ * This operation handles constants in search plans by checking if a variable is bound to a certain constant value. Such
+ * operations should be executed as early as possible during plan execution.
+ * 
+ * @author Marton Bur
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class CheckConstant implements ISearchOperation {
+
+    private class Executor extends CheckOperationExecutor {
+        
+        @Override
+        protected boolean check(MatchingFrame frame, ISearchContext context) {
+            return frame.get(position).equals(value);
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return CheckConstant.this;
+        }
+    }
+    
+    private int position;
+    private Object value;
+
+    public CheckConstant(int position, Object value) {
+        this.position = position;
+        this.value = value;
+    }
+
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor();
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        return Collections.singletonList(position);
+    }
+    
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        return "check     constant "+variableMapping.apply(position)+"='"+value+"'";
+    }
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CheckPositivePatternCall.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CheckPositivePatternCall.java
new file mode 100644
index 00000000..5f9b688a
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CheckPositivePatternCall.java
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQueryLabs
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.check;
+
+import java.util.List;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+
+/**
+ * @author Grill Balázs
+ * @since 1.4
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class CheckPositivePatternCall implements ISearchOperation, IPatternMatcherOperation {
+
+    private class Executor extends CheckOperationExecutor {
+        
+        private final VolatileModifiableMaskedTuple maskedTuple;
+        private IQueryResultProvider matcher;
+        
+        public Executor() {
+            super();
+            this.maskedTuple = new VolatileModifiableMaskedTuple(information.getThinFrameMask());
+        }
+
+        @Override
+        public void onInitialize(MatchingFrame frame, ISearchContext context) {
+            super.onInitialize(frame, context);
+            maskedTuple.updateTuple(frame);
+            matcher = context.getMatcher(information.getCallWithAdornment());
+        }
+        
+        /**
+         * @since 1.5
+         */
+        protected boolean check(MatchingFrame frame, ISearchContext context) {
+            return matcher.hasMatch(information.getParameterMask(), maskedTuple);
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return CheckPositivePatternCall.this;
+        }
+    }
+    
+    private final CallInformation information; 
+
+
+    /**
+     * @since 1.7
+     */
+    public CheckPositivePatternCall(CallInformation information) {
+        super();
+        this.information = information;
+        
+    }
+
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor();
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        return information.getVariablePositions();
+    }
+    
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        return "check     find "+information.toString(variableMapping);
+    }
+
+    @Override
+    public CallInformation getCallInformation() {
+        return information;
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CountCheck.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CountCheck.java
new file mode 100644
index 00000000..d74c1c6f
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/CountCheck.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.check;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+
+/**
+ * Calculates the count of matches for a called matcher
+ * 
+ * @author Zoltan Ujhelyi
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class CountCheck implements ISearchOperation, IPatternMatcherOperation {
+
+    private class Executor extends CheckOperationExecutor {
+        
+        private final VolatileModifiableMaskedTuple maskedTuple;
+        private IQueryResultProvider matcher;
+        
+        public Executor() {
+            maskedTuple = new VolatileModifiableMaskedTuple(information.getThinFrameMask());
+        }
+        
+        @Override
+        public void onInitialize(MatchingFrame frame, ISearchContext context) {
+            super.onInitialize(frame, context);
+            maskedTuple.updateTuple(frame);
+            matcher = context.getMatcher(information.getCallWithAdornment());
+        }
+        
+        @Override
+        protected boolean check(MatchingFrame frame, ISearchContext context) {
+            int count = matcher.countMatches(information.getParameterMask(), maskedTuple);
+            return ((Integer)frame.getValue(position)) == count;
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return CountCheck.this;
+        }
+    }
+    
+    private final int position;
+    private final CallInformation information;
+    
+    /**
+     * @since 1.7
+     */
+    public CountCheck(CallInformation information, int position) {
+        super();
+        this.information = information;
+        this.position = position;
+    }
+
+
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor();
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        return Collections.singletonList(position);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        return "check     "+variableMapping.apply(position)+" = count find "+ information.toString(variableMapping);
+    }
+    
+    @Override
+    public CallInformation getCallInformation() {
+        return information;
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/ExpressionCheck.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/ExpressionCheck.java
new file mode 100644
index 00000000..fc9efdca
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/ExpressionCheck.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.check;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.MatchingFrameValueProvider;
+import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ExpressionCheck implements ISearchOperation {
+
+    private class Executor extends CheckOperationExecutor {
+        
+        @Override
+        protected boolean check(MatchingFrame frame, ISearchContext context) {
+            try {
+                boolean result = (Boolean) evaluator.evaluateExpression(new MatchingFrameValueProvider(frame, nameMap));
+                return result;
+            } catch (Exception e) {
+                context.getLogger().warn("Error while evaluating expression", e);
+                return false;
+            }
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return ExpressionCheck.this;
+        }
+    }
+    
+    IExpressionEvaluator evaluator;
+    Map<String, Integer> nameMap;
+
+    public ExpressionCheck(IExpressionEvaluator evaluator, Map<String, Integer> nameMap) {
+        super();
+        this.evaluator = evaluator;
+        this.nameMap = nameMap;
+    }
+
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor();
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        // XXX not sure if this is the correct implementation to get the affected variable indicies
+        return new ArrayList<>(nameMap.values());
+    }
+    
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        return "check     expression "+evaluator.getShortDescription();
+    }
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/ExpressionEvalCheck.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/ExpressionEvalCheck.java
new file mode 100644
index 00000000..5b1bca10
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/ExpressionEvalCheck.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQueryLabs
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.check;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.MatchingFrameValueProvider;
+import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
+
+/**
+ * @author Grill Balázs
+ * @since 1.3
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ExpressionEvalCheck implements ISearchOperation {
+
+    private class Executor extends CheckOperationExecutor {
+        
+        @Override
+        protected boolean check(MatchingFrame frame, ISearchContext context) {
+            try {
+                Object result = evaluator.evaluateExpression(new MatchingFrameValueProvider(frame, nameMap));
+                if (!unwind && result != null) {
+                    Object currentValue = frame.get(outputPosition);
+                    return result.equals(currentValue);
+                } else if (unwind && result instanceof Set<?>) {
+                    Object currentValue = frame.get(outputPosition);
+                    return ((Set<?>)result).contains(currentValue);
+                }
+            } catch (Exception e) {
+                context.getLogger().warn("Error while evaluating expression", e);
+            }
+            return false;
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return ExpressionEvalCheck.this;
+        }
+    }
+    
+    private final int outputPosition;
+    private final IExpressionEvaluator evaluator;
+    private final Map<String, Integer> nameMap;
+    private final boolean unwind;
+    
+    public ExpressionEvalCheck(IExpressionEvaluator evaluator, Map<String, Integer> nameMap, int position) {
+        this(evaluator, nameMap, false, position);
+    }
+    
+    /**
+     * @since 2.7
+     */
+    public ExpressionEvalCheck(IExpressionEvaluator evaluator, Map<String, Integer> nameMap, boolean unwind, int position) {
+        this.evaluator = evaluator;
+        this.nameMap = nameMap;
+        this.unwind = unwind;
+        this.outputPosition = position;
+    }
+
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor();
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        // XXX not sure if this is the correct implementation to get the affected variable indicies
+        return new ArrayList<>(nameMap.values());
+    }
+
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        return "check     "+variableMapping.apply(outputPosition)+" = expression "+evaluator.getShortDescription();
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/InequalityCheck.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/InequalityCheck.java
new file mode 100644
index 00000000..3f30c3c4
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/InequalityCheck.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.check;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.exceptions.LocalSearchException;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class InequalityCheck implements ISearchOperation {
+
+    private class Executor extends CheckOperationExecutor {
+        
+        @Override
+        protected boolean check(MatchingFrame frame, ISearchContext context) {
+            Object source = frame.getValue(sourceLocation);
+            Object target = frame.getValue(targetLocation);
+            if (source == null) {
+                throw new LocalSearchException("Source not bound.");
+            }
+            if (target == null) {
+                throw new LocalSearchException("Target not bound");
+            }
+            return !source.equals(target);
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return InequalityCheck.this;
+        }
+    }
+    
+    int sourceLocation;
+    int targetLocation;
+
+    public InequalityCheck(int sourceLocation, int targetLocation) {
+        super();
+        this.sourceLocation = sourceLocation;
+        this.targetLocation = targetLocation;
+    }
+    
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor();
+    }
+    
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        return "check     "+variableMapping.apply(sourceLocation)+" != "+variableMapping.apply(targetLocation);
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        return Arrays.asList(sourceLocation, targetLocation);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/NACOperation.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/NACOperation.java
new file mode 100644
index 00000000..3759e1d1
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/check/NACOperation.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.check;
+
+import java.util.List;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class NACOperation implements ISearchOperation, IPatternMatcherOperation {
+
+    private class Executor extends CheckOperationExecutor {
+        private final VolatileModifiableMaskedTuple maskedTuple;
+        private IQueryResultProvider matcher;
+        
+        private Executor() {
+            this.maskedTuple = new VolatileModifiableMaskedTuple(information.getThinFrameMask());
+        }
+        
+        @Override
+        public void onInitialize(MatchingFrame frame, ISearchContext context) {
+            super.onInitialize(frame, context);
+            maskedTuple.updateTuple(frame);
+            matcher = context.getMatcher(information.getCallWithAdornment());
+        }
+        
+        @Override
+        protected boolean check(MatchingFrame frame, ISearchContext context) {
+            return !matcher.hasMatch(information.getParameterMask(), maskedTuple);
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return NACOperation.this;
+        }
+    }
+    
+    private final CallInformation information;
+
+    /**
+     * @since 1.7
+     */
+    public NACOperation(CallInformation information) {
+        super();
+        this.information = information;
+    }
+    
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor();
+    }
+    
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        return "check     neg find "+information.toString(variableMapping);
+    }
+    
+    @Override
+    public List<Integer> getVariablePositions() {
+        return information.getVariablePositions();
+    }
+
+    @Override
+    public CallInformation getCallInformation() {
+        return information;
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/AggregatorExtend.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/AggregatorExtend.java
new file mode 100644
index 00000000..c2e75b7a
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/AggregatorExtend.java
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.extend;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
+import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+
+/**
+ * Calculates the aggregated value of a column based on the given {@link AggregatorConstraint}
+ * 
+ * @author Balázs Grill
+ * @since 1.4
+ */
+public class AggregatorExtend  implements ISearchOperation, IPatternMatcherOperation{
+
+    private class Executor extends SingleValueExtendOperationExecutor<Object> {
+
+        private final VolatileModifiableMaskedTuple maskedTuple;
+        private IQueryResultProvider matcher;
+        
+        public Executor(int position) {
+            super(position);
+            this.maskedTuple = new VolatileModifiableMaskedTuple(information.getThinFrameMask());
+        }
+        
+        @Override
+        public Iterator<?> getIterator(MatchingFrame frame, ISearchContext context) {
+            maskedTuple.updateTuple(frame);
+            matcher = context.getMatcher(information.getCallWithAdornment());
+            Object aggregate = aggregate(aggregator.getAggregator().getOperator(), aggregator.getAggregatedColumn());
+            return aggregate == null ? Collections.emptyIterator() : Collections.singletonList(aggregate).iterator();
+            
+        }
+        
+        @SuppressWarnings("unchecked")
+        private <Domain, Accumulator, AggregateResult> AggregateResult aggregate(
+                IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator, int aggregatedColumn) {
+            final Stream<Domain> valueStream = matcher.getAllMatches(information.getParameterMask(), maskedTuple)
+                    .map(match -> (Domain) match.get(aggregatedColumn));
+            return operator.aggregateStream(valueStream);
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return AggregatorExtend.this;
+        }
+    }
+    
+    private final AggregatorConstraint aggregator;
+    private final CallInformation information; 
+    private final int position;
+    
+    /**
+     * @since 1.7
+     */
+    public AggregatorExtend(CallInformation information, AggregatorConstraint aggregator, int position) {
+        this.aggregator = aggregator;
+        this.information = information;
+        this.position = position;
+    }
+    
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor(position);
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        return Arrays.asList(position);
+    }
+    
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        return "extend    -"+variableMapping.apply(position)+" = " + aggregator.getAggregator().getOperator().getName()+" find " + information.toString(variableMapping);
+    }
+    
+    @Override
+    public CallInformation getCallInformation() {
+        return information;
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/CountOperation.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/CountOperation.java
new file mode 100644
index 00000000..08ecc8d6
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/CountOperation.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.extend;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+
+/**
+ * Calculates the count of matches for a called matcher
+ * 
+ * @author Zoltan Ujhelyi
+ */
+public class CountOperation implements ISearchOperation, IPatternMatcherOperation{
+
+    private class Executor extends SingleValueExtendOperationExecutor<Integer>  {
+        private final VolatileModifiableMaskedTuple maskedTuple;
+        private IQueryResultProvider matcher;
+        
+        public Executor(int position) {
+            super(position);
+            maskedTuple = new VolatileModifiableMaskedTuple(information.getThinFrameMask());
+        }
+        
+        @Override
+        public Iterator<Integer> getIterator(MatchingFrame frame, ISearchContext context) {
+            matcher = context.getMatcher(information.getCallWithAdornment());
+            maskedTuple.updateTuple(frame);
+            return Collections.singletonList(matcher.countMatches(information.getParameterMask(), maskedTuple)).iterator();
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return CountOperation.this;
+        }
+    }
+    
+    private final CallInformation information;
+    private final int position; 
+    
+    /**
+     * @since 1.7
+     */
+    public CountOperation(CallInformation information, int position) {
+        this.information = information;
+        this.position = position;
+    }
+
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor(position);
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        return information.getVariablePositions();
+    }
+
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        return "extend    -"+variableMapping.apply(position)+" = count find " + information.toString(variableMapping);
+    }
+    
+    @Override
+    public CallInformation getCallInformation() {
+        return information;
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExpressionEval.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExpressionEval.java
new file mode 100644
index 00000000..7186f4ac
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExpressionEval.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.extend;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.MatchingFrameValueProvider;
+import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
+
+/**
+ * Calculates the result of an expression and stores it inside a variable for future reference.
+ * 
+ * @author Zoltan Ujhelyi
+ * 
+ */
+public class ExpressionEval implements ISearchOperation {
+
+    private class Executor extends SingleValueExtendOperationExecutor<Object> {
+
+        public Executor(int position) {
+            super(position);
+        }
+        
+        @Override
+        public Iterator<?> getIterator(MatchingFrame frame, ISearchContext context) {
+            try {
+                Object result = evaluator.evaluateExpression(new MatchingFrameValueProvider(frame, nameMap));
+                if (!unwind && result != null){
+                    return Collections.singletonList(result).iterator();
+                } else if (unwind && result instanceof Set<?>) {
+                    return ((Set<?>)result).iterator();
+                } else {
+                    return Collections.emptyIterator();
+                }
+            } catch (Exception e) {
+                context.getLogger().warn("Error while evaluating expression", e);
+                return Collections.emptyIterator();
+            }
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return ExpressionEval.this;
+        }
+    }
+    
+    private final IExpressionEvaluator evaluator;
+    private final boolean unwind;
+    private final Map<String, Integer> nameMap;
+    private final int position;
+
+    public ExpressionEval(IExpressionEvaluator evaluator, Map<String, Integer> nameMap, int position) {
+        this(evaluator, nameMap, false, position);
+    }
+    
+    /**
+     * @since 2.7
+     */
+    public ExpressionEval(IExpressionEvaluator evaluator, Map<String, Integer> nameMap, boolean unwind, int position) {
+        this.evaluator = evaluator;
+        this.nameMap = nameMap;
+        this.unwind = unwind;
+        this.position = position;
+    }
+    
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        return "extend    -"+variableMapping.apply(position)+" = expression "+evaluator.getShortDescription();
+    }
+    
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor(position);
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        // XXX not sure if this is the correct implementation to get the affected variable indicies
+        List<Integer> variables = new ArrayList<>();
+        variables.addAll(nameMap.values());
+        return variables;
+    }
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExtendBinaryTransitiveClosure.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExtendBinaryTransitiveClosure.java
new file mode 100644
index 00000000..1250e84e
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExtendBinaryTransitiveClosure.java
@@ -0,0 +1,185 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.extend;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.Set;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * Checking for a transitive closure expressed as a local search pattern matcher. The matched pattern must have two
+ * parameters of the same model type.
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ * 
+ */
+public abstract class ExtendBinaryTransitiveClosure implements ISearchOperation, IPatternMatcherOperation {
+
+    private class Executor extends SingleValueExtendOperationExecutor<Object> {
+
+        public Executor(int position) {
+            super(position);
+        }
+        
+        @Override
+        public Iterator<?> getIterator(MatchingFrame frame, ISearchContext context) {
+            // Note: second parameter is NOT bound during execution, but the first is
+            IQueryResultProvider matcher = context.getMatcher(information.getCallWithAdornment());
+
+            Queue<Object> seedsToEvaluate = new LinkedList<>();
+            final Object seedValue = frame.get(seedPosition);
+            seedsToEvaluate.add(seedValue);
+            Set<Object> seedsEvaluated = new HashSet<>();
+            Set<Object> targetsFound = new HashSet<>();
+            if (reflexive) {
+                targetsFound.add(seedValue);
+            }
+
+            while(!seedsToEvaluate.isEmpty()) {
+                Object currentValue = seedsToEvaluate.poll();
+                seedsEvaluated.add(currentValue);
+                final Object[] mappedFrame = calculateCallFrame(currentValue);
+                matcher.getAllMatches(mappedFrame).forEach(match -> {
+                    Object foundTarget = getTarget(match);
+                    targetsFound.add(foundTarget);
+                    if (!seedsEvaluated.contains(foundTarget)) {
+                        seedsToEvaluate.add(foundTarget);
+                    }
+                });
+            }
+
+            return targetsFound.iterator();
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return ExtendBinaryTransitiveClosure.this;
+        }
+    }
+    
+    /**
+     * Calculates the transitive closure of a pattern match in a forward direction (first parameter bound, second
+     * unbound).
+     * </p>
+     * <strong>Note</strong>: In case the call is reflexive, it is expected that the bound parameter already matches the universe type of the call. 
+     * 
+     * @since 1.7
+     */
+    public static class Forward extends ExtendBinaryTransitiveClosure {
+
+        private Object[] seedFrame = new Object[2];
+        
+        /**
+         * @since 2.0
+         */
+        public Forward(CallInformation information, int sourcePosition, int targetPosition, boolean reflexive) {
+            super(information, sourcePosition, targetPosition, reflexive);
+        }
+
+        protected Object[] calculateCallFrame(Object seed) {
+            seedFrame[0] = seed;
+            seedFrame[1] = null;
+            return seedFrame;
+        }
+
+        protected Object getTarget(Tuple frame) {
+            return frame.get(1);
+        }
+    }
+
+    /**
+     * Calculates the transitive closure of a pattern match in a backward direction (first parameter unbound, second
+     * bound)
+     * </p>
+     * <strong>Note</strong>: In case the call is reflexive, it is expected that the bound parameter already matches the universe type of the call.
+     * 
+     * @since 2.0
+     */
+    public static class Backward extends ExtendBinaryTransitiveClosure {
+        private Object[] seedFrame = new Object[2];
+
+        /**
+         * @since 2.0
+         */
+        public Backward(CallInformation information, int sourcePosition, int targetPosition, boolean reflexive) {
+            super(information, targetPosition, sourcePosition, reflexive);
+        }
+
+        protected Object[] calculateCallFrame(Object seed) {
+            seedFrame[0] = null;
+            seedFrame[1] = seed;
+            return seedFrame;
+        }
+
+        protected Object getTarget(Tuple frame) {
+            return frame.get(0);
+        }
+    }
+
+    private final int seedPosition;
+    private final int targetPosition;
+    private final CallInformation information;
+    private final boolean reflexive;
+
+    /**
+     * The source position will be matched in the called pattern to the first parameter; while target to the second.
+     * @since 2.0
+     */
+    protected ExtendBinaryTransitiveClosure(CallInformation information, int seedPosition, int targetPosition, boolean reflexive) {
+        this.information = information;
+        this.seedPosition = seedPosition;
+        this.targetPosition = targetPosition;
+        this.reflexive = reflexive;
+    }
+
+    protected abstract Object[] calculateCallFrame(Object seed);
+
+    protected abstract Object getTarget(Tuple frame);
+
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor(targetPosition);
+    }
+    
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        String c = information.toString(variableMapping);
+        int p = c.indexOf('(');
+        return "extend    find " + c.substring(0, p) + "+" + c.substring(p);
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        return Arrays.asList(seedPosition, targetPosition);
+    }
+
+    @Override
+    public CallInformation getCallInformation() {
+        return information;
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExtendConstant.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExtendConstant.java
new file mode 100644
index 00000000..455236f3
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExtendConstant.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Marton Bur, Akos Horvath, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.extend;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+
+/**
+ * This operation handles constants in search plans by binding a variable to a constant value. Such operations should be
+ * executed as early as possible during plan execution.
+ * 
+ * @author Marton Bur
+ *
+ */
+public class ExtendConstant implements ISearchOperation {
+
+    private class Executor extends SingleValueExtendOperationExecutor<Object> {
+
+        public Executor(int position) {
+            super(position);
+        }
+
+        @Override
+        public Iterator<?> getIterator(MatchingFrame frame, ISearchContext context) {
+            return Collections.singletonList(value).iterator();
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return ExtendConstant.this;
+        }
+    }
+    
+    private final Object value;
+    private final int position;
+
+    public ExtendConstant(int position, Object value) {
+        this.position = position;
+        this.value = value;
+    }
+
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor(position);
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        return Arrays.asList(position);
+    }
+    
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        return "extend    constant -"+variableMapping.apply(position)+"='"+value+"'";
+    }
+    
+}
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/ExtendPositivePatternCall.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExtendPositivePatternCall.java
index 9d48c785..690a3241 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/ExtendPositivePatternCall.java
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/ExtendPositivePatternCall.java
@@ -1,27 +1,28 @@
 /*******************************************************************************
  * Copyright (c) 2010-2016, Grill Balázs, IncQueryLabs
- * Copyright (c) 2023 The Refinery Authors <https://refinery.tools/>
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
+ * 
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.store.query.viatra.internal.localsearch;
-
-import org.eclipse.viatra.query.runtime.localsearch.MatchingFrame;
-import org.eclipse.viatra.query.runtime.localsearch.matcher.ISearchContext;
-import org.eclipse.viatra.query.runtime.localsearch.operations.IPatternMatcherOperation;
-import org.eclipse.viatra.query.runtime.localsearch.operations.ISearchOperation;
-import org.eclipse.viatra.query.runtime.localsearch.operations.util.CallInformation;
-import org.eclipse.viatra.query.runtime.matchers.backend.IQueryResultProvider;
-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.VolatileModifiableMaskedTuple;
+package tools.refinery.viatra.runtime.localsearch.operations.extend;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.Function;
 
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.ExtendOperationExecutor;
+import tools.refinery.viatra.runtime.localsearch.operations.IPatternMatcherOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.VolatileModifiableMaskedTuple;
+
 /**
  * @author Grill Balázs
  * @since 1.4
@@ -31,25 +32,25 @@ public class ExtendPositivePatternCall implements ISearchOperation, IPatternMatc
 
     private class Executor extends ExtendOperationExecutor<Tuple> {
         private final VolatileModifiableMaskedTuple maskedTuple;
-
+        
         public Executor() {
             maskedTuple = new VolatileModifiableMaskedTuple(information.getThinFrameMask());
         }
-
+        
         @Override
         protected Iterator<? extends Tuple> getIterator(MatchingFrame frame, ISearchContext context) {
             maskedTuple.updateTuple(frame);
             IQueryResultProvider matcher = context.getMatcher(information.getCallWithAdornment());
             return matcher.getAllMatches(information.getParameterMask(), maskedTuple).iterator();
         }
-
+        
         /**
          * @since 2.0
          */
         @Override
         protected boolean fillInValue(Tuple result, MatchingFrame frame, ISearchContext context) {
             TupleMask mask = information.getFullFrameMask();
-            // The first loop clears out the elements from a possible previous iteration
+            // The first loop clears out the elements from a possible previous iteration 
             for(int i : information.getFreeParameterIndices()) {
                 mask.set(frame, i, null);
             }
@@ -57,7 +58,7 @@ public class ExtendPositivePatternCall implements ISearchOperation, IPatternMatc
                 Object oldValue = mask.getValue(frame, i);
                 Object valueToFill = result.get(i);
                 if (oldValue != null && !oldValue.equals(valueToFill)){
-                    // If the inverse map contains more than one values for the same key, it means that these arguments are unified by the caller.
+                    // If the inverse map contains more than one values for the same key, it means that these arguments are unified by the caller. 
                     // In this case if the callee assigns different values the frame shall be dropped
                     return false;
                 }
@@ -65,31 +66,31 @@ public class ExtendPositivePatternCall implements ISearchOperation, IPatternMatc
             }
             return true;
         }
-
+        
         @Override
         protected void cleanup(MatchingFrame frame, ISearchContext context) {
             TupleMask mask = information.getFullFrameMask();
             for(int i : information.getFreeParameterIndices()){
                 mask.set(frame, i, null);
             }
-
+            
         }
-
+        
         @Override
         public ISearchOperation getOperation() {
             return ExtendPositivePatternCall.this;
         }
     }
-
-    private final CallInformation information;
-
+    
+    private final CallInformation information; 
+    
     /**
      * @since 1.7
      */
     public ExtendPositivePatternCall(CallInformation information) {
        this.information = information;
     }
-
+    
     @Override
     public ISearchOperationExecutor createExecutor() {
         return new Executor();
@@ -99,17 +100,17 @@ public class ExtendPositivePatternCall implements ISearchOperation, IPatternMatc
     public List<Integer> getVariablePositions() {
         return information.getVariablePositions();
     }
-
+    
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-
+    
     @Override
-    public String toString(@SuppressWarnings("squid:S4276") Function<Integer, String> variableMapping) {
+    public String toString(Function<Integer, String> variableMapping) {
         return "extend find " + information.toString(variableMapping);
     }
-
+    
     @Override
     public CallInformation getCallInformation() {
         return information;
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/SingleValueExtendOperationExecutor.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/SingleValueExtendOperationExecutor.java
new file mode 100644
index 00000000..a04ffcca
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/extend/SingleValueExtendOperationExecutor.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.extend;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.ExtendOperationExecutor;
+
+/**
+ * @since 2.0
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public abstract class SingleValueExtendOperationExecutor<T> extends ExtendOperationExecutor<T> {
+    protected int position;
+    
+    /**
+     * @param position the frame position all values are to be added
+     */
+    public SingleValueExtendOperationExecutor(int position) {
+        super();
+        this.position = position;
+    }
+
+    @Override
+    protected final boolean fillInValue(T newValue, MatchingFrame frame, ISearchContext context) {
+        frame.setValue(position, newValue);
+        return true;
+    }
+
+    @Override
+    protected final void cleanup(MatchingFrame frame, ISearchContext context) {
+        frame.setValue(position, null);
+    }
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/generic/GenericTypeCheck.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/generic/GenericTypeCheck.java
new file mode 100644
index 00000000..2b189c57
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/generic/GenericTypeCheck.java
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.generic;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.CheckOperationExecutor;
+import tools.refinery.viatra.runtime.localsearch.operations.IIteratingSearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.VolatileMaskedTuple;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class GenericTypeCheck implements ISearchOperation, IIteratingSearchOperation {
+    
+    private class Executor extends CheckOperationExecutor {
+        private VolatileMaskedTuple maskedTuple;
+        
+        private Executor() {
+            this.maskedTuple = new VolatileMaskedTuple(callMask);
+        }
+        
+        @Override
+        protected boolean check(MatchingFrame frame, ISearchContext context) {
+            maskedTuple.updateTuple(frame);
+            return context.getRuntimeContext().containsTuple(type, maskedTuple);
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return GenericTypeCheck.this;
+        }
+    }
+
+    private final IInputKey type;
+    private final List<Integer> positionList;
+    private final TupleMask callMask;
+
+    public GenericTypeCheck(IInputKey type, int[] positions, TupleMask callMask) {
+        this.callMask = callMask;
+        Preconditions.checkArgument(positions.length == type.getArity(),
+                "The type %s requires %d parameters, but %d positions are provided", type.getPrettyPrintableName(),
+                type.getArity(), positions.length);
+        List<Integer> modifiablePositionList = new ArrayList<>();
+        for (int position : positions) {
+            modifiablePositionList.add(position);
+        }
+        this.positionList = Collections.unmodifiableList(modifiablePositionList);
+        this.type = type;
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        return positionList;
+    }
+
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor();
+    }
+
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        return "check     " + type.getPrettyPrintableName() + "("
+                + positionList.stream().map(input -> String.format("+%s", variableMapping.apply(input))).collect(Collectors.joining(", "))
+                + ")";
+    }
+
+    @Override
+    public IInputKey getIteratedInputKey() {
+        return type;
+    }
+}
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/GenericTypeExtend.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/generic/GenericTypeExtend.java
index 96ac4a72..dfc3e9ad 100644
--- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/localsearch/GenericTypeExtend.java
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/generic/GenericTypeExtend.java
@@ -1,39 +1,47 @@
 /*******************************************************************************
  * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
- * Copyright (c) 2023 The Refinery Authors <https://refinery.tools/>
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-v20.html.
+ * 
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package tools.refinery.store.query.viatra.internal.localsearch;
-
-import org.eclipse.viatra.query.runtime.localsearch.MatchingFrame;
-import org.eclipse.viatra.query.runtime.localsearch.matcher.ISearchContext;
-import org.eclipse.viatra.query.runtime.localsearch.operations.IIteratingSearchOperation;
-import org.eclipse.viatra.query.runtime.localsearch.operations.ISearchOperation;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-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.VolatileMaskedTuple;
-import org.eclipse.viatra.query.runtime.matchers.util.Preconditions;
-
-import java.util.*;
+package tools.refinery.viatra.runtime.localsearch.operations.generic;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.ExtendOperationExecutor;
+import tools.refinery.viatra.runtime.localsearch.operations.IIteratingSearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.VolatileMaskedTuple;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
 /**
  * @author Zoltan Ujhelyi
  * @since 1.7
+ * @noextend This class is not intended to be subclassed by clients.
  */
 public class GenericTypeExtend implements IIteratingSearchOperation {
+
     private class Executor extends ExtendOperationExecutor<Tuple> {
         private final VolatileMaskedTuple maskedTuple;
-
+        
         public Executor() {
             this.maskedTuple = new VolatileMaskedTuple(callMask);
         }
-
+        
         @Override
         protected Iterator<? extends Tuple> getIterator(MatchingFrame frame, ISearchContext context) {
             maskedTuple.updateTuple(frame);
@@ -65,13 +73,13 @@ public class GenericTypeExtend implements IIteratingSearchOperation {
                 frame.setValue(position, null);
             }
         }
-
-                @Override
+        
+        @Override
         public ISearchOperation getOperation() {
             return GenericTypeExtend.this;
         }
     }
-
+    
     private final IInputKey type;
     private final int[] positions;
     private final List<Integer> positionList;
@@ -80,7 +88,7 @@ public class GenericTypeExtend implements IIteratingSearchOperation {
     private final TupleMask callMask;
 
     /**
-     *
+     * 
      * @param type
      *            the type to execute the extend operation on
      * @param positions
@@ -119,14 +127,14 @@ public class GenericTypeExtend implements IIteratingSearchOperation {
     public List<Integer> getVariablePositions() {
         return positionList;
     }
-
+    
     @Override
     public String toString() {
         return toString(Object::toString);
     }
-
+    
     @Override
-    public String toString(@SuppressWarnings("squid:S4276") Function<Integer, String> variableMapping) {
+    public String toString(Function<Integer, String> variableMapping) {
         return "extend    " + type.getPrettyPrintableName() + "("
                 + positionList.stream()
                         .map(input -> String.format("%s%s", unboundVariableIndices.contains(input) ? "-" : "+", variableMapping.apply(input)))
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/generic/GenericTypeExtendSingleValue.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/generic/GenericTypeExtendSingleValue.java
new file mode 100644
index 00000000..45e4fd0e
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/generic/GenericTypeExtendSingleValue.java
@@ -0,0 +1,114 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.generic;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.IIteratingSearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.extend.SingleValueExtendOperationExecutor;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.VolatileMaskedTuple;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class GenericTypeExtendSingleValue implements IIteratingSearchOperation {
+
+    private class Executor extends  SingleValueExtendOperationExecutor<Object> {
+        
+        private final VolatileMaskedTuple maskedTuple;
+        
+        public Executor(int position) {
+            super(position);
+            this.maskedTuple = new VolatileMaskedTuple(callMask);
+        }
+
+        @Override
+        protected Iterator<? extends Object> getIterator(MatchingFrame frame, ISearchContext context) {
+            maskedTuple.updateTuple(frame);
+            return context.getRuntimeContext().enumerateValues(type, indexerMask, maskedTuple).iterator();
+        }
+        
+        @Override
+        public ISearchOperation getOperation() {
+            return GenericTypeExtendSingleValue.this;
+        }
+    }
+    
+    private final IInputKey type;
+    private final List<Integer> positionList;
+    private final TupleMask indexerMask;
+    private final TupleMask callMask;
+    private final int unboundVariableIndex;
+
+    /**
+     * 
+     * @param type
+     *            the type to execute the extend operation on
+     * @param positions
+     *            the parameter positions that represent the variables of the input key
+     */
+    public GenericTypeExtendSingleValue(IInputKey type, int[] positions, TupleMask callMask, TupleMask indexerMask, int unboundVariableIndex) {
+        Preconditions.checkArgument(positions.length == type.getArity(),
+                "The type %s requires %d parameters, but %d positions are provided", type.getPrettyPrintableName(),
+                type.getArity(), positions.length);
+        List<Integer> modifiablePositionList = new ArrayList<>();
+        for (int position : positions) {
+            modifiablePositionList.add(position);
+        }
+        this.unboundVariableIndex = unboundVariableIndex;
+        this.positionList = Collections.unmodifiableList(modifiablePositionList);
+        this.type = type;
+
+        this.callMask = callMask;
+        this.indexerMask = indexerMask;
+    }
+
+    @Override
+    public IInputKey getIteratedInputKey() {
+        return type;
+    }
+
+    @Override
+    public ISearchOperationExecutor createExecutor() {
+        return new Executor(unboundVariableIndex);
+    }
+
+    @Override
+    public List<Integer> getVariablePositions() {
+        return positionList;
+    }
+
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    @Override
+    public String toString(Function<Integer, String> variableMapping) {
+        return "extend    " + type.getPrettyPrintableName() + "("
+                + positionList.stream().map(
+                        input -> String.format("%s%s", Objects.equals(input, unboundVariableIndex) ? "-" : "+", variableMapping.apply(input)))
+                        .collect(Collectors.joining(", "))
+                + ")";
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/util/CallInformation.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/util/CallInformation.java
new file mode 100644
index 00000000..b141a7b0
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/operations/util/CallInformation.java
@@ -0,0 +1,186 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.operations.util;
+
+import java.util.ArrayList;
+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 java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.localsearch.matcher.CallWithAdornment;
+import tools.refinery.viatra.runtime.localsearch.matcher.MatcherReference;
+import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.PatternCallBasedDeferred;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.BinaryReflexiveTransitiveClosure;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+
+/**
+ * This class stores a precompiled version of call-related metadata and masks for local search operations
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ */
+public final class CallInformation {
+
+    private final TupleMask fullFrameMask;   
+    private final TupleMask thinFrameMask;   
+    private final TupleMask parameterMask;
+    private final int[] freeParameterIndices;
+    
+    private final Map<PParameter, Integer> mapping = new HashMap<>();
+    private final Set<PParameter> adornment = new HashSet<>();
+    private final PQuery referredQuery;
+    private final MatcherReference matcherReference;
+    private final IQueryReference call;
+    private CallWithAdornment callWithAdornment;
+    
+    public static CallInformation create(PatternCallBasedDeferred constraint, Map<PVariable, Integer> variableMapping, Set<Integer> bindings) {
+        return new CallInformation(constraint.getActualParametersTuple(), constraint, bindings, variableMapping);
+    }
+    
+    public static CallInformation create(PositivePatternCall pCall, Map<PVariable, Integer> variableMapping, Set<Integer> bindings) {
+        return new CallInformation(pCall.getVariablesTuple(), pCall, bindings, variableMapping);
+    }
+    
+    public static CallInformation create(BinaryTransitiveClosure constraint, Map<PVariable, Integer> variableMapping, Set<Integer> bindings) {
+        return new CallInformation(constraint.getVariablesTuple(), constraint, bindings, variableMapping);
+    }
+    
+    /**
+     * @since 2.0
+     */
+    public static CallInformation create(BinaryReflexiveTransitiveClosure constraint, Map<PVariable, Integer> variableMapping, Set<Integer> bindings) {
+        return new CallInformation(constraint.getVariablesTuple(), constraint, bindings, variableMapping);
+    }
+    
+    private CallInformation(Tuple actualParameters, IQueryReference call, final Set<Integer> bindings,
+            Map<PVariable, Integer> variableMapping) {
+        this.call = call;
+        this.referredQuery = call.getReferredQuery();
+        int keySize = actualParameters.getSize();
+        List<Integer> parameterMaskIndices = new ArrayList<>();
+        int[] fullParameterMaskIndices = new int[keySize];
+        for (int i = 0; i < keySize; i++) {
+            PParameter symbolicParameter = referredQuery.getParameters().get(i);
+            PVariable parameter = (PVariable) actualParameters.get(i);
+            Integer originalFrameIndex = variableMapping.get(parameter);
+            mapping.put(symbolicParameter, originalFrameIndex);
+            fullParameterMaskIndices[i] = originalFrameIndex;
+            if (bindings.contains(originalFrameIndex)) {
+                parameterMaskIndices.add(originalFrameIndex);
+                adornment.add(symbolicParameter);
+            }
+        }
+        
+        thinFrameMask = TupleMask.fromSelectedIndices(variableMapping.size(), parameterMaskIndices);
+        fullFrameMask = TupleMask.fromSelectedIndices(variableMapping.size(), fullParameterMaskIndices);
+        
+        // This second iteration is necessary as we don't know beforehand the number of bound parameters
+        int[] boundParameterIndices = new int[adornment.size()];
+        int boundIndex = 0;
+        freeParameterIndices = new int[keySize - adornment.size()];
+        int freeIndex = 0;
+        for (int i = 0; i < keySize; i++) {
+            if (bindings.contains(variableMapping.get(actualParameters.get(i)))) {
+                boundParameterIndices[boundIndex] = i;
+                boundIndex++;
+            } else {
+                freeParameterIndices[freeIndex] = i;
+                freeIndex++;
+            }
+        }
+        parameterMask = TupleMask.fromSelectedIndices(keySize, boundParameterIndices);
+        callWithAdornment = new CallWithAdornment(call, adornment);
+        matcherReference = callWithAdornment.getMatcherReference();
+    }
+
+    /** 
+     * Returns a mask describing how the bound variables of a Matching Frame are mapped to parameter indexes
+     */
+    public TupleMask getThinFrameMask() {
+        return thinFrameMask;
+    }
+    
+    /** 
+     * Returns a mask describing how all variables of a Matching Frame are mapped to parameter indexes
+     */
+    public TupleMask getFullFrameMask() {
+        return fullFrameMask;
+    }
+    
+    /**
+     * Returns a mask describing the adornment the called pattern uses
+     */
+    public TupleMask getParameterMask() {
+        return parameterMask;
+    }
+    
+    public MatcherReference getReference() {
+        return matcherReference;
+    }
+    
+    /**
+     * @since 2.1
+     */
+    public IQueryReference getCall() {
+        return call;
+    }
+    
+    /**
+     * @since 2.1
+     */
+    public CallWithAdornment getCallWithAdornment() {
+        return callWithAdornment;
+    }
+
+    /**
+     * Returns the parameter indices that are unbound before the call
+     */
+    public int[] getFreeParameterIndices() {
+        return freeParameterIndices;
+    }
+    
+    public List<Integer> getVariablePositions() {
+        List<Integer> variables = new ArrayList<>(mapping.size());
+        for(PParameter p : referredQuery.getParameters()){
+            variables.add(mapping.get(p));
+        }
+        return variables;
+    }
+    
+    
+    
+    @Override
+    public String toString() {
+        return toString(Object::toString);
+    }
+    
+    /**
+     * @since 2.0
+     */
+    public String toString(Function<Integer, String> variableMapping) {
+        return referredQuery.getFullyQualifiedName() + "("
+                + referredQuery.getParameters().stream().map(
+                        input -> (adornment.contains(input) ? "+" : "-") + variableMapping.apply(mapping.get(input)))
+                        .collect(Collectors.joining(","))
+                + ")";
+    }
+    
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/IPlanDescriptor.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/IPlanDescriptor.java
new file mode 100644
index 00000000..987996c9
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/IPlanDescriptor.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.plan;
+
+import java.util.Collection;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * Denotes an executable plan
+ * 
+ * @author Grill Balázs
+ * @since 1.4
+ *
+ */
+public interface IPlanDescriptor {
+
+    /**
+     * The query which this plan implements
+     */
+    public PQuery getQuery();
+    
+    /**
+     * The executable search plans for each body in the query
+     * @since 2.0
+     */
+    public Collection<SearchPlanForBody> getPlan();
+    
+    /**
+     * The set of parameters this plan assumes to be bound
+     */
+    public Set<PParameter> getAdornment();
+    
+    /**
+     * The collection of {@link IInputKey}s which needs to be iterated during the execution of this plan. For optimal
+     * performance, instances of these keys might be indexed.
+     */
+    public Set<IInputKey> getIteratedKeys();
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/IPlanProvider.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/IPlanProvider.java
new file mode 100644
index 00000000..b74282ca
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/IPlanProvider.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.plan;
+
+import tools.refinery.viatra.runtime.localsearch.matcher.MatcherReference;
+import tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHints;
+import tools.refinery.viatra.runtime.localsearch.planner.compiler.IOperationCompiler;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+
+/**
+ * @author Grill Balázs
+ * @since 1.4
+ * @noreference This interface is not intended to be referenced by clients.
+ */
+public interface IPlanProvider {
+
+    /**
+     * @throws ViatraQueryRuntimeException
+     * @since 2.1
+     */
+    public IPlanDescriptor getPlan(IQueryBackendContext backend, IOperationCompiler compiler, 
+            ResultProviderRequestor resultProviderRequestor,
+            LocalSearchHints configuration, MatcherReference key);
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/PlanDescriptor.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/PlanDescriptor.java
new file mode 100644
index 00000000..a5565546
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/PlanDescriptor.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.plan;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.localsearch.operations.IIteratingSearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * @author Grill Balázs
+ * @since 1.4
+ *
+ */
+public class PlanDescriptor implements IPlanDescriptor {
+
+    private final PQuery pquery;
+    private final List<SearchPlanForBody> plan;
+    private final Set<PParameter> adornment;
+    private Set<IInputKey> iteratedKeys = null;
+    
+    public PlanDescriptor(PQuery pquery, Collection<SearchPlanForBody> plan, Set<PParameter> adornment) {
+        this.pquery = pquery;
+        this.plan = new ArrayList<>(plan);
+        this.adornment = adornment;
+    }
+
+    @Override
+    public PQuery getQuery() {
+        return pquery;
+    }
+
+    @Override
+    public Collection<SearchPlanForBody> getPlan() {
+        return plan;
+    }
+
+    @Override
+    public Set<PParameter> getAdornment() {
+        return adornment;
+    }
+
+    @Override
+    public Set<IInputKey> getIteratedKeys() {
+        if (iteratedKeys == null){
+            Set<IInputKey> keys = new HashSet<>();
+            for(SearchPlanForBody bodyPlan : plan){
+                for(ISearchOperation operation : bodyPlan.getCompiledOperations()){
+                    if (operation instanceof IIteratingSearchOperation){
+                        keys.add(((IIteratingSearchOperation) operation).getIteratedInputKey());
+                    }
+                }
+            }
+            iteratedKeys = Collections.unmodifiableSet(keys);
+        }
+        return iteratedKeys;
+    }
+    
+    @Override
+    public String toString() {
+        return new StringBuilder().append("Plan for ").append(pquery.getFullyQualifiedName()).append("(")
+        .append(adornment.stream().map(PParameter::getName).collect(Collectors.joining(",")))
+        .append("{")
+        .append(plan.stream().map(Object::toString).collect(Collectors.joining("}\n{")))
+        .append("}")
+        .toString();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlan.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlan.java
new file mode 100644
index 00000000..3159f707
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlan.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.plan;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+
+/**
+ * A SearchPlan stores a collection of SearchPlanOperations for a fixed order of variables.
+ * 
+ * @author Zoltan Ujhelyi
+ * 
+ */
+public class SearchPlan {
+
+    private final List<ISearchOperation> operations;
+    private final Map<Integer, PVariable> variableMapping;
+    private final TupleMask parameterMask;
+    private final PBody body;
+    
+    /**
+     * @since 2.0
+     */
+    public SearchPlan(PBody body, List<ISearchOperation> operations, TupleMask parameterMask, Map<PVariable, Integer> variableMapping) {
+        this.body = body;
+        this.operations = Collections.unmodifiableList(new ArrayList<>(operations));
+        this.parameterMask = parameterMask;
+        this.variableMapping = Collections.unmodifiableMap(variableMapping.entrySet().stream()
+                .collect(Collectors.toMap(Entry::getValue, Entry::getKey)));
+    }
+
+
+    /**
+     * Returns an immutable list of operations stored in the plan.
+     * @return the operations
+     */
+    public List<ISearchOperation> getOperations() {
+        return operations;
+    }
+
+    /**
+     * Returns an immutable map of variable mappings for the plan
+     * @since 2.0
+     */
+    public Map<Integer, PVariable> getVariableMapping() {
+        return variableMapping;
+    }
+
+    /**
+     * Returns the index of a given operation in the plan
+     * @since 2.0
+     */
+    public int getOperationIndex(ISearchOperation operation) {
+        return operations.indexOf(operation);
+    }
+
+    /**
+     * @since 2.0
+     */
+    public TupleMask getParameterMask() {
+        return parameterMask;
+    }
+    
+    /**
+     * @since 2.0
+     */
+    public PBody getSourceBody() {
+        return body;
+    }
+    
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+            
+        sb.append("{\n");
+        for(ISearchOperation operation : this.getOperations()){
+            sb.append("\t");
+            sb.append(operation);
+            sb.append("\n");
+        }
+        sb.append("}");
+        return sb.toString();
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlanExecutor.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlanExecutor.java
new file mode 100644
index 00000000..4a4e2450
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlanExecutor.java
@@ -0,0 +1,210 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Akos Horvath, Gergely Varro Zoltan Ujhelyi and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+ package tools.refinery.viatra.runtime.localsearch.plan;
+
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Collectors;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.exceptions.LocalSearchException;
+import tools.refinery.viatra.runtime.localsearch.matcher.ILocalSearchAdaptable;
+import tools.refinery.viatra.runtime.localsearch.matcher.ILocalSearchAdapter;
+import tools.refinery.viatra.runtime.localsearch.matcher.ISearchContext;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation.ISearchOperationExecutor;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * A search plan executor is used to execute {@link SearchPlan} instances.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class SearchPlanExecutor implements ILocalSearchAdaptable {
+
+    private int currentOperation;
+    private final List<ISearchOperationExecutor> operations;
+    private final SearchPlan plan;
+    private final ISearchContext context;
+    private final List<ILocalSearchAdapter> adapters = new CopyOnWriteArrayList<>();
+
+    /**
+     * @since 2.0
+     */
+    public Map<Integer, PVariable> getVariableMapping() {
+        return plan.getVariableMapping();
+    }
+
+    public int getCurrentOperation() {
+        return currentOperation;
+    }
+    
+    public SearchPlan getSearchPlan() {
+        return plan;
+    }
+    
+    /**
+     * @since 1.7
+     */
+    public TupleMask getParameterMask() {
+        return plan.getParameterMask();
+    }
+
+    @Override
+    public void addAdapters(List<ILocalSearchAdapter> adapters) {
+        for(ILocalSearchAdapter adapter : adapters){
+            if (!this.adapters.contains(adapter)){
+                this.adapters.add(adapter);
+                adapter.adapterRegistered(this);
+            }
+        }
+    }
+
+    @Override
+    public void removeAdapters(List<ILocalSearchAdapter> adapters) {
+        for (ILocalSearchAdapter adapter : adapters) {
+            if (this.adapters.remove(adapter)){
+                adapter.adapterUnregistered(this);
+            }
+        }
+    }
+
+    /**
+     * @since 2.0
+     */
+    public SearchPlanExecutor(SearchPlan plan, ISearchContext context) {
+        Preconditions.checkArgument(context != null, "Context cannot be null");
+        this.plan = plan;
+        this.context = context;
+        operations = plan.getOperations().stream().map(ISearchOperation::createExecutor).collect(Collectors.toList());
+        this.currentOperation = -1;
+    }
+   
+
+    private void init(MatchingFrame frame) {
+        if (currentOperation == -1) {
+            currentOperation++;
+            ISearchOperationExecutor operation = operations.get(currentOperation);
+            if (!adapters.isEmpty()){
+                for (ILocalSearchAdapter adapter : adapters) {
+                    adapter.executorInitializing(plan, frame);
+                }
+            }
+            operation.onInitialize(frame, context);
+        } else if (currentOperation == operations.size()) {
+            currentOperation--;
+        } else {
+            throw new LocalSearchException(LocalSearchException.PLAN_EXECUTION_ERROR);
+        }
+    }
+
+
+    /**
+     * Calculates the cost of the search plan.
+     */
+    public double cost() {
+        /* default generated stub */
+        return 0.0;
+    }
+
+    /**
+     * @throws ViatraQueryRuntimeException
+     */
+    public boolean execute(MatchingFrame frame) {
+        int upperBound = operations.size() - 1;
+        init(frame);
+        operationSelected(frame, currentOperation, false);
+        while (currentOperation >= 0 && currentOperation <= upperBound) {
+            if (operations.get(currentOperation).execute(frame, context)) {
+                operationExecuted(frame, currentOperation, true);
+                currentOperation++;
+                operationSelected(frame, currentOperation, false);
+                if (currentOperation <= upperBound) {
+                    ISearchOperationExecutor operation = operations.get(currentOperation);
+                    operation.onInitialize(frame, context);
+                }
+            } else {
+                operationExecuted(frame, currentOperation, false);
+                ISearchOperationExecutor operation = operations.get(currentOperation);
+                operation.onBacktrack(frame, context);
+                currentOperation--;
+                operationSelected(frame, currentOperation, true);
+            }
+        }
+        boolean matchFound = currentOperation > upperBound;
+        if (matchFound && !adapters.isEmpty()) {
+            for (ILocalSearchAdapter adapter : adapters) {
+                adapter.matchFound(plan, frame);
+            }
+        }
+        return matchFound;
+    }
+    
+    public void resetPlan() {
+        currentOperation = -1;
+    }
+    
+    public void printDebugInformation() {
+        for (int i = 0; i < operations.size(); i++) {
+            Logger.getRootLogger().debug("[" + i + "]\t" + operations.get(i).toString());
+        }
+    }
+    
+    private void operationExecuted(MatchingFrame frame, int operationIndex, boolean isSuccessful) {
+        if (!adapters.isEmpty()){
+            for (ILocalSearchAdapter adapter : adapters) {
+                adapter.operationExecuted(plan, operations.get(operationIndex).getOperation(), frame, isSuccessful);
+            }
+        }
+    }
+    
+    private void operationSelected(MatchingFrame frame, int operationIndex, boolean isBacktrack) {
+        if (!adapters.isEmpty() && operationIndex >= 0 && operationIndex < operations.size()){
+            for (ILocalSearchAdapter adapter : adapters) {
+                adapter.operationSelected(plan, operations.get(operationIndex).getOperation(), frame, isBacktrack);
+            }
+        }
+    }
+
+    public ISearchContext getContext() {
+        return context;
+    }
+
+    @Override
+    public List<ILocalSearchAdapter> getAdapters() {
+        return Collections.<ILocalSearchAdapter>unmodifiableList(this.adapters);
+    }
+
+    @Override
+    public void addAdapter(ILocalSearchAdapter adapter) {
+        addAdapters(Collections.singletonList(adapter));
+    }
+
+    @Override
+    public void removeAdapter(ILocalSearchAdapter adapter) {
+        removeAdapters(Collections.singletonList(adapter));
+    }
+
+    @Override
+    public String toString() {
+        if (operations == null) {
+            return "Unspecified plan";
+        } else {
+            return operations.stream().map(Object::toString).collect(Collectors.joining("\n"));
+        }
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlanForBody.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlanForBody.java
new file mode 100644
index 00000000..e0300da4
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SearchPlanForBody.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.plan;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.localsearch.matcher.CallWithAdornment;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+
+/**
+ * This class is responsible for storing the results of the planner and operation compiler for a selected body.
+ * @since 2.0
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class SearchPlanForBody {
+
+    private final PBody body;
+    private final Map<PVariable, Integer> variableKeys;
+    private final int[] parameterKeys;
+    private final SubPlan plan;
+    private final List<ISearchOperation> compiledOperations;
+    private final Collection<CallWithAdornment> dependencies;
+    private final double cost;
+    private final Object internalRepresentation;
+    
+    /**
+     * @since 2.1
+     */
+    public SearchPlanForBody(PBody body, Map<PVariable, Integer> variableKeys,
+            SubPlan plan, List<ISearchOperation> compiledOperations, Collection<CallWithAdornment> dependencies,
+            Object internalRepresentation, double cost) {
+        super();
+        this.body = body;
+        this.variableKeys = variableKeys;
+        this.plan = plan;
+        this.internalRepresentation = internalRepresentation;
+        this.cost = cost;
+        List<PVariable> parameters = body.getSymbolicParameterVariables();
+        parameterKeys = new int[parameters.size()];
+        for (int i=0; i<parameters.size(); i++) {
+            parameterKeys[i] = variableKeys.get(parameters.get(i));
+        }
+        this.compiledOperations = new ArrayList<>(compiledOperations.size()+1);
+        this.compiledOperations.addAll(compiledOperations);
+        
+        this.dependencies = new ArrayList<>(dependencies);
+    }
+
+    public PBody getBody() {
+        return body;
+    }
+
+    public Map<PVariable, Integer> getVariableKeys() {
+        return variableKeys;
+    }
+
+    public int[] getParameterKeys() {
+        return Arrays.copyOf(parameterKeys, parameterKeys.length);
+    }
+
+    public List<ISearchOperation> getCompiledOperations() {
+        return compiledOperations;
+    }
+
+    public SubPlan getPlan() {
+        return plan;
+    }
+    
+    public Collection<CallWithAdornment> getDependencies() {
+        return dependencies;
+    }
+    
+    public TupleMask calculateParameterMask() {
+        return TupleMask.fromSelectedIndices(variableKeys.size(), parameterKeys);
+    }
+    
+    @Override
+    public String toString() {
+        return compiledOperations.stream().map(Object::toString).collect(Collectors.joining("\n"));
+    }
+
+    /**
+     * @since 2.1
+     */
+    public double getCost() {
+        return cost;
+    }
+
+    /**
+     * @return The internal representation of the search plan, if any, for traceability
+     * @since 2.1
+     */
+    public Object getInternalRepresentation() {
+        return internalRepresentation;
+    }
+    
+    
+    
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SimplePlanProvider.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SimplePlanProvider.java
new file mode 100644
index 00000000..ed31bcb0
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/plan/SimplePlanProvider.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.plan;
+
+import java.util.Collection;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.localsearch.matcher.MatcherReference;
+import tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHints;
+import tools.refinery.viatra.runtime.localsearch.planner.LocalSearchPlanner;
+import tools.refinery.viatra.runtime.localsearch.planner.compiler.IOperationCompiler;
+import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+
+/**
+ * A plan provider implementation which caches previously calculated plans to avoid re-planning for the same adornment
+ * 
+ * @author Grill Balázs
+ * @since 1.7
+ *
+ */
+public class SimplePlanProvider implements IPlanProvider {
+
+    private final Logger logger;
+    
+    public SimplePlanProvider(Logger logger) {
+        this.logger = logger;
+    }
+    
+    @Override
+    public IPlanDescriptor getPlan(IQueryBackendContext backend, IOperationCompiler compiler, 
+            final ResultProviderRequestor resultRequestor,
+            final LocalSearchHints configuration, MatcherReference key) {
+        
+        LocalSearchPlanner planner = new LocalSearchPlanner(backend, compiler, logger, configuration, resultRequestor);
+        
+        Collection<SearchPlanForBody> plansForBodies = planner.plan(key.getQuery(), key.getAdornment());
+      
+        IPlanDescriptor plan = new PlanDescriptor(key.getQuery(), plansForBodies, key.getAdornment());
+        return plan;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/ILocalSearchPlanner.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/ILocalSearchPlanner.java
new file mode 100644
index 00000000..dfd9a3c8
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/ILocalSearchPlanner.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner;
+
+import java.util.Collection;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.localsearch.plan.SearchPlanForBody;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ */
+public interface ILocalSearchPlanner {
+
+    /**
+     * Creates executable plans for the provided query. It is required to call one of the
+     * <code>initializePlanner()</code> methods before calling this method.
+     * 
+     * @param querySpec
+     * @param boundParameters
+     *            a set of bound parameters
+     * @return a mapping between ISearchOperation list and a mapping, that holds a PVariable-Integer mapping for the
+     *         list of ISearchOperations
+     * @throws ViatraQueryRuntimeException
+     */
+    Collection<SearchPlanForBody> plan(PQuery querySpec, Set<PParameter> boundParameters);
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/ISearchPlanCodeGenerator.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/ISearchPlanCodeGenerator.java
new file mode 100644
index 00000000..72218337
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/ISearchPlanCodeGenerator.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Marton Bur, Akos Horvath, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner;
+
+import java.util.List;
+
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+
+/**
+ * @author Marton Bur
+ *
+ */
+public interface ISearchPlanCodeGenerator {
+
+    void compile(List<List<ISearchOperation>> plans);
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/LocalSearchPlanner.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/LocalSearchPlanner.java
new file mode 100644
index 00000000..f44be655
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/LocalSearchPlanner.java
@@ -0,0 +1,140 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Marton Bur, Akos Horvath, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner;
+
+import java.util.ArrayList;
+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 org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHints;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.plan.SearchPlanForBody;
+import tools.refinery.viatra.runtime.localsearch.planner.compiler.IOperationCompiler;
+import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.PBodyNormalizer;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.PDisjunctionRewriter;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.PDisjunctionRewriterCacher;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.PQueryFlattener;
+
+/**
+ * 
+ * @author Marton Bur
+ * @noreference This class is not intended to be referenced by clients.
+ */
+public class LocalSearchPlanner implements ILocalSearchPlanner {
+
+    // Externally set tools for planning
+    private final PDisjunctionRewriter preprocessor;
+    private final LocalSearchRuntimeBasedStrategy plannerStrategy;
+    private final IQueryRuntimeContext runtimeContext;
+    private final LocalSearchHints configuration;
+    private final IOperationCompiler operationCompiler;
+    private final IQueryBackendContext context;
+    private final ResultProviderRequestor resultRequestor;
+    
+    /**
+     * @param resultRequestor 
+     * @since 1.7
+     */
+    public LocalSearchPlanner(IQueryBackendContext backendContext, IOperationCompiler compiler, Logger logger, 
+            final LocalSearchHints configuration, ResultProviderRequestor resultRequestor) 
+    {
+
+        this.runtimeContext = backendContext.getRuntimeContext();
+        this.configuration = configuration;
+        this.operationCompiler = compiler;
+        this.resultRequestor = resultRequestor;
+        PQueryFlattener flattener = new PQueryFlattener(configuration.getFlattenCallPredicate());
+        /*
+         * TODO https://bugs.eclipse.org/bugs/show_bug.cgi?id=439358: The normalizer is initialized with the false
+         * parameter to turn off unary constraint elimination to work around an issue related to plan ordering: the
+         * current implementation of the feature target checking operations expect that the source types were checked
+         * before. However, this causes duplicate constraint checks in the search plan that might affect performance
+         * negatively.
+         */
+        PBodyNormalizer normalizer = new PBodyNormalizer(runtimeContext.getMetaContext()) {
+            
+            @Override
+            protected boolean shouldCalculateImpliedTypes(PQuery query) {
+                return false;
+            }
+        };
+        preprocessor = new PDisjunctionRewriterCacher(flattener, normalizer);
+
+        plannerStrategy = new LocalSearchRuntimeBasedStrategy();
+
+        context = backendContext;
+    }
+
+    /**
+     * Creates executable plans for the provided query. It is required to call one of the
+     * <code>initializePlanner()</code> methods before calling this method.
+     * 
+     * @param querySpec
+     * @param boundParameters
+     *            a set of bound parameters
+     * @return a mapping between ISearchOperation list and a mapping, that holds a PVariable-Integer mapping for the
+     *         list of ISearchOperations
+     */
+    @Override
+    public Collection<SearchPlanForBody> plan(PQuery querySpec, Set<PParameter> boundParameters) {
+        // 1. Preparation
+        preprocessor.setTraceCollector(configuration.getTraceCollector());
+        Set<PBody> normalizedBodies = preprocessor.rewrite(querySpec.getDisjunctBodies()).getBodies();
+
+        List<SearchPlanForBody> plansForBodies = new ArrayList<>(normalizedBodies.size());
+
+        for (PBody normalizedBody : normalizedBodies) {
+            // 2. Plan creation
+            // Context has matchers for the referred Queries (IQuerySpecifications)
+            Set<PVariable> boundVariables = calculatePatternAdornmentForPlanner(boundParameters, normalizedBody);
+            PlanState searchPlanInternal = plannerStrategy.plan(normalizedBody, boundVariables, context, resultRequestor, configuration);
+            SubPlan plan = plannerStrategy.convertPlan(boundVariables, searchPlanInternal);
+            // 3. PConstraint -> POperation compilation step
+            // * Pay extra caution to extend operations, when more than one variables are unbound
+            List<ISearchOperation> compiledOperations = operationCompiler.compile(plan, boundParameters);
+            // Store the variable mappings for the plans for debug purposes (traceability information)
+            SearchPlanForBody compiledPlan = new SearchPlanForBody(normalizedBody,
+                    operationCompiler.getVariableMappings(), plan, compiledOperations,
+                    operationCompiler.getDependencies(), 
+                    searchPlanInternal, searchPlanInternal.getCost());
+
+            plansForBodies.add(compiledPlan);
+        }
+
+        return plansForBodies;
+    }
+
+    private Set<PVariable> calculatePatternAdornmentForPlanner(Set<PParameter> boundParameters, PBody normalizedBody) {
+        Map<PParameter, PVariable> parameterMapping = new HashMap<>();
+        for (ExportedParameter constraint : normalizedBody.getSymbolicParameters()) {
+            parameterMapping.put(constraint.getPatternParameter(), constraint.getParameterVariable());
+        }
+        Set<PVariable> boundVariables = new HashSet<>();
+        for (PParameter parameter : boundParameters) {
+            PVariable mappedParameter = parameterMapping.get(parameter);
+            boundVariables.add(mappedParameter);
+        }
+        return boundVariables;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/LocalSearchRuntimeBasedStrategy.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/LocalSearchRuntimeBasedStrategy.java
new file mode 100644
index 00000000..1bebe37e
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/LocalSearchRuntimeBasedStrategy.java
@@ -0,0 +1,257 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Marton Bur, Akos Horvath, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHints;
+import tools.refinery.viatra.runtime.localsearch.planner.cost.ICostFunction;
+import tools.refinery.viatra.runtime.localsearch.planner.util.OperationCostComparator;
+import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlanFactory;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PApply;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PProject;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PStart;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.util.Sets;
+
+/**
+ * This class contains the logic for local search plan calculation based on costs of the operations.
+ * Its name refers to the fact that the strategy tries to use as much information as available about
+ * the model on which the matching is initiated. When no runtime info is available, it falls back to 
+ * the information available from the metamodel durint operation cost calculation.
+ * 
+ * The implementation is based on the paper "Gergely Varró, Frederik Deckwerth, Martin Wieber, and Andy Schürr: 
+ * An algorithm for generating model-sensitive search plans for pattern matching on EMF models" 
+ * (DOI: 10.1007/s10270-013-0372-2)
+ * 
+ * @author Marton Bur
+ * @noreference This class is not intended to be referenced by clients.
+ */
+public class LocalSearchRuntimeBasedStrategy {
+    
+    private final OperationCostComparator infoComparator = new OperationCostComparator();
+
+
+    /**
+     * Converts a plan to the standard format
+     */
+    protected SubPlan convertPlan(Set<PVariable> initialBoundVariables, PlanState searchPlan) {
+        PBody pBody;
+        pBody = searchPlan.getAssociatedPBody();
+        
+        // Create a starting plan
+        SubPlanFactory subPlanFactory = new SubPlanFactory(pBody);
+
+        // We assume that the adornment (now the bound variables) is previously set
+        SubPlan plan = subPlanFactory.createSubPlan(new PStart(initialBoundVariables));
+
+        List<PConstraintInfo> operations = searchPlan.getOperations();
+        for (PConstraintInfo pConstraintPlanInfo : operations) {
+            PConstraint pConstraint = pConstraintPlanInfo.getConstraint();
+            plan = subPlanFactory.createSubPlan(new PApply(pConstraint), plan);
+        }
+
+        return subPlanFactory.createSubPlan(new PProject(pBody.getSymbolicParameterVariables()), plan);
+    }
+
+    /**
+     * The implementation of a local search-based algorithm to create a search plan for a flattened (and normalized)
+     * PBody
+     * @param pBody for which the plan is to be created
+     * @param initialBoundVariables variables that are known to have already assigned values
+     * @param context the backend context
+     * @param resultProviderRequestor requestor for accessing result providers of called patterns
+     * @param configuration the planner configuration
+     * @return the complete search plan for the given {@link PBody}
+     * @since 2.1
+     */
+    protected PlanState plan(PBody pBody, Set<PVariable> initialBoundVariables,
+            IQueryBackendContext context, final ResultProviderRequestor resultProviderRequestor,
+            LocalSearchHints configuration) {
+        final ICostFunction costFunction = configuration.getCostFunction();
+        PConstraintInfoInferrer pConstraintInfoInferrer = new PConstraintInfoInferrer(
+                configuration.isUseBase(), context, resultProviderRequestor, costFunction::apply);
+        
+        // Create mask infos
+        Set<PConstraint> constraintSet = pBody.getConstraints();
+        List<PConstraintInfo> constraintInfos = 
+                pConstraintInfoInferrer.createPConstraintInfos(constraintSet);
+        
+        // Calculate the characteristic function
+        // The characteristic function tells whether a given adornment is backward reachable from the (B)* state, where
+        // each variable is bound.
+        // The characteristic function is represented as a set of set of variables
+        // TODO this calculation is not not implemented yet, thus the contents of the returned set is not considered later
+        List<Set<PVariable>> reachableBoundVariableSets = reachabilityAnalysis(pBody, constraintInfos);
+        int k = configuration.getRowCount();
+        PlanState searchPlan = calculateSearchPlan(pBody, initialBoundVariables, k, reachableBoundVariableSets, constraintInfos);
+        return searchPlan;
+    }
+
+    private PlanState calculateSearchPlan(PBody pBody, Set<PVariable> initialBoundVariables, int k,
+            List<Set<PVariable>> reachableBoundVariableSets, List<PConstraintInfo> allMaskInfos) {
+
+        List<PConstraintInfo> allPotentialExtendInfos = new ArrayList<>();
+        List<PConstraintInfo> allPotentialCheckInfos = new ArrayList<>();
+        Map<PVariable, List<PConstraintInfo>> checkOpsByVariables = new HashMap<>();
+        Map<PVariable, Collection<PConstraintInfo>> extendOpsByBoundVariables = new HashMap<>();
+        
+        for (PConstraintInfo op : allMaskInfos) {
+            if (op.getFreeVariables().isEmpty()) { // CHECK
+                allPotentialCheckInfos.add(op);
+            } else { // EXTEND
+                allPotentialExtendInfos.add(op);
+                for (PVariable variable : op.getBoundVariables()) {
+                    extendOpsByBoundVariables.computeIfAbsent(variable, v -> new ArrayList<>()).add(op);
+                }
+            }
+        }
+        // For CHECKs only, we must start from lists that are ordered by the cost of the constraint application
+        Collections.sort(allPotentialCheckInfos, infoComparator);  // costs are eagerly needed for check ops          
+        for (PConstraintInfo op : allPotentialCheckInfos) {
+            for (PVariable variable : op.getBoundVariables()) {
+                checkOpsByVariables.computeIfAbsent(variable, v -> new ArrayList<>()).add(op);
+            }
+        }
+        // costs are not needed for extend ops until they are first applied (TODO make cost computaiton on demand) 
+        
+        
+        // rename for better understanding
+        Set<PVariable> boundVariables = initialBoundVariables;
+        Set<PVariable> freeVariables = Sets.difference(pBody.getUniqueVariables(), initialBoundVariables);
+
+        int variableCount = pBody.getUniqueVariables().size();
+        int n = freeVariables.size();
+
+        List<List<PlanState>> stateTable = initializeStateTable(k, n);
+
+        // Set initial state: begin with an empty operation list
+        PlanState initialState = new PlanState(pBody, boundVariables);
+        
+        // Initial state creation, categorizes all operations; add present checks to operationsList
+        initialState.updateExtends(allPotentialExtendInfos);
+        initialState.applyChecks(allPotentialCheckInfos);
+        stateTable.get(n).add(0, initialState);
+        
+        // stateTable.get(0) will contain the states with adornment B*
+        for (int i = n; i > 0; i--) {
+            for (int j = 0; j < k && j < stateTable.get(i).size(); j++) {
+                PlanState currentState = stateTable.get(i).get(j);
+
+                for (PConstraintInfo constraintInfo : currentState.getPresentExtends()) {
+                    // for each present EXTEND operation
+                    PlanState newState = calculateNextState(currentState, constraintInfo);
+                    // also eagerly perform any CHECK operations that become applicable (extends still deferred)
+                    newState.applyChecksBasedOnDelta(checkOpsByVariables);
+                    
+                    if(currentState.getBoundVariables().size() == newState.getBoundVariables().size()){
+                        // This means no variable binding was done, go on with the next constraint info
+                        continue;
+                    }
+                    int i2 = variableCount - newState.getBoundVariables().size();
+                    
+                    List<Integer> newIndices = determineIndices(stateTable, i2, newState, k);
+                    int a = newIndices.get(0);
+                    int c = newIndices.get(1);
+
+                    if (checkInsertCondition(stateTable.get(i2), newState, reachableBoundVariableSets, a, c, k)) {
+                        updateExtends(newState, currentState, extendOpsByBoundVariables); // preprocess next steps 
+                        insert(stateTable,i2, newState, a, c, k);
+                    }
+                }
+            }
+        }
+
+        return stateTable.get(0).get(0);
+    }
+
+    private List<List<PlanState>> initializeStateTable(int k, int n) {
+        List<List<PlanState>> stateTable = new ArrayList<>();
+        // Initialize state table and fill it with null
+        for (int i = 0; i <= n ; i++) {
+            stateTable.add(new ArrayList<>());
+        }
+        return stateTable;
+    }
+
+    private void insert(List<List<PlanState>> stateTable, int idx, PlanState newState, int a, int c, int k) {
+        stateTable.get(idx).add(c, newState);
+        while(stateTable.get(idx).size() > k){
+            // Truncate back to size k when grows too big
+            stateTable.set(idx, stateTable.get(idx).subList(0, k));
+        }
+    }
+
+    private void updateExtends(PlanState newState, PlanState currentState,  
+            Map<PVariable, ? extends Collection<PConstraintInfo>> extendOpsByBoundVariables) 
+    {
+        List<PConstraintInfo> presentExtends = currentState.getPresentExtends();
+
+        // Recategorize operations
+        newState.updateExtendsBasedOnDelta(presentExtends, extendOpsByBoundVariables);
+        
+        return;
+    }
+
+    private boolean checkInsertCondition(List<PlanState> list, PlanState newState,
+            List<Set<PVariable>> reachableBoundVariableSets, int a, int c, int k) {
+//        boolean isAmongBestK = (a == (k + 1)) && c < a && reachableBoundVariableSets.contains(newState.getBoundVariables());
+        boolean isAmongBestK = a == k && c < a ;
+        boolean isBetterThanCurrent = a < k && c <= a;
+
+        return isAmongBestK || isBetterThanCurrent;
+    }
+
+    private List<Integer> determineIndices(List<List<PlanState>> stateTable, int i2, PlanState newState, int k) {
+        int a = k;
+        int c = 0;
+        List<Integer> acIndices = new ArrayList<>();
+        for (int j = 0; j < k; j++) {
+            if (j < stateTable.get(i2).size()) {
+                PlanState stateInTable = stateTable.get(i2).get(j);
+                if (newState.getBoundVariables().equals(stateInTable.getBoundVariables())) {
+                    // The new state has the same adornment as the stored one - they are not adornment disjoint
+                    a = j;
+                }
+                if (newState.getCost() >= stateInTable.getCost()) {
+                    c = j + 1;
+                }
+            } else {
+                break;
+            }
+        }
+
+        acIndices.add(a);
+        acIndices.add(c);
+        return acIndices;
+    }
+
+    private PlanState calculateNextState(PlanState currentState, PConstraintInfo constraintInfo) {
+        return currentState.cloneWithApplied(constraintInfo);
+    }
+
+    private List<Set<PVariable>> reachabilityAnalysis(PBody pBody, List<PConstraintInfo> constraintInfos) {
+        // TODO implement reachability analisys, also save/persist the results somewhere
+        List<Set<PVariable>> reachableBoundVariableSets = new ArrayList<>();
+        return reachableBoundVariableSets;
+    }
+
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintCategory.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintCategory.java
new file mode 100644
index 00000000..b98dd12e
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintCategory.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Marton Bur, Zoltan Ujhelyi, Akos Horvath, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner;
+
+
+/**
+ * Expresses the state of a PConstraint application 
+ * condition with respect to a given adornment.
+ * 
+ * @author Marton Bur
+ * @noreference This enum is not intended to be referenced by clients.
+ */
+public enum PConstraintCategory {
+    /*
+     * During plan creation an operation is considered a past 
+     * operation, if an already bound variable is free in the
+     * mask of the operation.
+     * (Mask of the operation: the required binding state of 
+     * the affected variables)
+     */
+    PAST, 
+    /*
+     * The binding states of the variables in the operation 
+     * mask correspond to the current binding states of the 
+     * variables in the search plan
+     */
+    PRESENT, 
+    /*
+     * There is at least one bound variable in the mask of 
+     * a future operation that is still free at the current 
+     * state of the plan. Also, a future operation can't be 
+     * PAST.
+     */
+    FUTURE;
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintInfo.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintInfo.java
new file mode 100644
index 00000000..c2c76ef2
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintInfo.java
@@ -0,0 +1,142 @@
+/** 
+ * Copyright (c) 2010-2015, Marton Bur, Zoltan Ujhelyi, Akos Horvath, Istvan Rath and Danil Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.viatra.runtime.localsearch.planner;
+
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
+import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryResultProviderAccess;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
+
+/** 
+ * Wraps a PConstraint together with information required for the planner. Currently contains information about the expected binding state of
+ * the affected variables also called application condition, and the cost of the enforcement, based on the meta and/or the runtime context.
+ *  
+ * @author Marton Bur
+ * @noreference This class is not intended to be referenced by clients.
+ */
+public class PConstraintInfo implements IConstraintEvaluationContext {
+
+    private PConstraint constraint;
+    private Set<PVariable> boundMaskVariables;
+    private Set<PVariable> freeMaskVariables;
+    private Set<PConstraintInfo> sameWithDifferentBindings;
+    private IQueryRuntimeContext runtimeContext;
+    private QueryAnalyzer queryAnalyzer;
+    private IQueryResultProviderAccess resultProviderAccess;
+    private ResultProviderRequestor resultRequestor;
+
+    private Double cost;
+    private Function<IConstraintEvaluationContext, Double> costFunction;
+    
+
+    /** 
+     * Instantiates the wrapper
+     * @param constraintfor which the information is added and stored
+     * @param boundMaskVariables the bound variables in the operation mask
+     * @param freeMaskVariables the free variables in the operation mask
+     * @param sameWithDifferentBindings during the planning process, multiple operation adornments are considered for a constraint, so that it
+     * is represented by multiple plan infos. This parameter contains all plan infos that are for the same
+     * constraint, but with different adornment
+     * @param context the query backend context
+     */
+    public PConstraintInfo(PConstraint constraint, Set<PVariable> boundMaskVariables, Set<PVariable> freeMaskVariables,
+        Set<PConstraintInfo> sameWithDifferentBindings, 
+        IQueryBackendContext context,
+        ResultProviderRequestor resultRequestor,
+        Function<IConstraintEvaluationContext, Double> costFunction) {
+        this.constraint = constraint;
+        this.costFunction = costFunction;
+        this.boundMaskVariables = new LinkedHashSet<>(boundMaskVariables);
+        this.freeMaskVariables = new LinkedHashSet<>(freeMaskVariables);
+        this.sameWithDifferentBindings = sameWithDifferentBindings;
+        this.resultRequestor = resultRequestor;
+        this.runtimeContext = context.getRuntimeContext();
+        this.queryAnalyzer = context.getQueryAnalyzer();
+        this.resultProviderAccess = context.getResultProviderAccess();
+
+        this.cost = null; // cost will be computed lazily (esp. important for pattern calls)
+    }
+    
+    @Override
+    public IQueryRuntimeContext getRuntimeContext() {
+        return runtimeContext;
+    }
+
+    @Override
+    public QueryAnalyzer getQueryAnalyzer() {
+        return queryAnalyzer;
+    }
+
+    @Override
+    public PConstraint getConstraint() {
+        return constraint;
+    }
+
+    @Override
+    public Set<PVariable> getFreeVariables() {
+        return freeMaskVariables;
+    }
+
+    @Override
+    public Set<PVariable> getBoundVariables() {
+        return boundMaskVariables;
+    }
+
+    public Set<PConstraintInfo> getSameWithDifferentBindings() {
+        return sameWithDifferentBindings;
+    }
+
+    public double getCost() {
+        if (cost == null) {
+            // Calculate cost of the constraint based on its type
+            cost = costFunction.apply(this);
+        }
+        return cost;
+    }
+
+    public PConstraintCategory getCategory(PBody pBody, Set<PVariable> boundVariables) {
+        if (!Collections.disjoint(boundVariables, this.freeMaskVariables)) {
+            return PConstraintCategory.PAST;
+        } else if (!boundVariables.containsAll(this.boundMaskVariables)) {
+            return PConstraintCategory.FUTURE;
+        } else {
+            return PConstraintCategory.PRESENT;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s, bound variables: %s, cost: \"%.2f\"", constraint.toString(), boundMaskVariables.toString(), cost);
+    }
+
+    /**
+     * @deprecated use {@link #resultProviderRequestor()}
+     */
+    @Override
+    @Deprecated
+    public IQueryResultProviderAccess resultProviderAccess() {
+        return resultProviderAccess;
+    }
+    
+    @Override
+    public ResultProviderRequestor resultProviderRequestor() {
+        return resultRequestor;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintInfoInferrer.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintInfoInferrer.java
new file mode 100644
index 00000000..eeac07ce
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PConstraintInfoInferrer.java
@@ -0,0 +1,278 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner;
+
+import tools.refinery.viatra.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
+import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.*;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.AbstractTransitiveClosure;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameterDirection;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Sets;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+
+/**
+ * @author Grill Balázs
+ * @noreference This class is not intended to be referenced by clients.
+ */
+class PConstraintInfoInferrer {
+
+    private static final Predicate<PVariable> SINGLE_USE_VARIABLE = input -> input != null && input.getReferringConstraints().size() == 1;
+
+    private final boolean useIndex;
+    private final Function<IConstraintEvaluationContext, Double> costFunction;
+    private final IQueryBackendContext context;
+    private final ResultProviderRequestor resultRequestor;
+
+
+    public PConstraintInfoInferrer(boolean useIndex,
+            IQueryBackendContext backendContext,
+            ResultProviderRequestor resultRequestor,
+            Function<IConstraintEvaluationContext, Double> costFunction) {
+        this.useIndex = useIndex;
+        this.context = backendContext;
+        this.resultRequestor = resultRequestor;
+        this.costFunction = costFunction;
+    }
+
+
+    /**
+     * Create all possible application condition for all constraint
+     *
+     * @param constraintSet the set of constraints
+     * @return a collection of the wrapper PConstraintInfo objects with all the allowed application conditions
+     */
+    public List<PConstraintInfo> createPConstraintInfos(Set<PConstraint> constraintSet) {
+        List<PConstraintInfo> constraintInfos = new ArrayList<>();
+
+        for (PConstraint pConstraint : constraintSet) {
+            createPConstraintInfoDispatch(constraintInfos, pConstraint);
+        }
+        return constraintInfos;
+    }
+
+    private void createPConstraintInfoDispatch(List<PConstraintInfo> resultList, PConstraint pConstraint){
+        if(pConstraint instanceof ExportedParameter){
+            createConstraintInfoExportedParameter(resultList, (ExportedParameter) pConstraint);
+        } else if(pConstraint instanceof TypeConstraint){
+            createConstraintInfoTypeConstraint(resultList, (TypeConstraint)pConstraint);
+        } else if(pConstraint instanceof TypeFilterConstraint){
+            createConstraintInfoTypeFilterConstraint(resultList, (TypeFilterConstraint)pConstraint);
+        } else if(pConstraint instanceof ConstantValue){
+            createConstraintInfoConstantValue(resultList, (ConstantValue)pConstraint);
+        } else if (pConstraint instanceof Inequality){
+            createConstraintInfoInequality(resultList, (Inequality) pConstraint);
+        } else if (pConstraint instanceof ExpressionEvaluation){
+            createConstraintInfoExpressionEvaluation(resultList, (ExpressionEvaluation)pConstraint);
+        } else if (pConstraint instanceof AggregatorConstraint){
+            createConstraintInfoAggregatorConstraint(resultList, pConstraint, ((AggregatorConstraint) pConstraint).getResultVariable());
+        } else if (pConstraint instanceof PatternMatchCounter){
+            createConstraintInfoAggregatorConstraint(resultList, pConstraint, ((PatternMatchCounter) pConstraint).getResultVariable());
+        } else if (pConstraint instanceof PositivePatternCall){
+            createConstraintInfoPositivePatternCall(resultList, (PositivePatternCall) pConstraint);
+        } else if (pConstraint instanceof AbstractTransitiveClosure) {
+            createConstraintInfoBinaryTransitiveClosure(resultList, (AbstractTransitiveClosure) pConstraint);
+        } else{
+            createConstraintInfoGeneric(resultList, pConstraint);
+        }
+    }
+
+    private void createConstraintInfoConstantValue(List<PConstraintInfo> resultList,
+            ConstantValue pConstraint) {
+        // A ConstantValue constraint has a single variable, which is allowed to be unbound
+        // (extending through ConstantValue is considered a cheap operation)
+        Set<PVariable> affectedVariables = pConstraint.getAffectedVariables();
+        Set<? extends Set<PVariable>> bindings = Sets.powerSet(affectedVariables);
+        doCreateConstraintInfos(resultList, pConstraint, affectedVariables, bindings);
+    }
+
+
+    private void createConstraintInfoPositivePatternCall(List<PConstraintInfo> resultList,
+            PositivePatternCall pCall) {
+        // A pattern call can have any of its variables unbound
+        Set<PVariable> affectedVariables = pCall.getAffectedVariables();
+        // IN parameters cannot be unbound and
+        // OUT parameters cannot be bound
+        Tuple variables = pCall.getVariablesTuple();
+        final Set<PVariable> inVariables = new HashSet<>();
+        Set<PVariable> inoutVariables = new HashSet<>();
+        List<PParameter> parameters = pCall.getReferredQuery().getParameters();
+        for(int i=0;i<parameters.size();i++){
+            switch(parameters.get(i).getDirection()){
+            case IN:
+                inVariables.add((PVariable) variables.get(i));
+                break;
+            case INOUT:
+                inoutVariables.add((PVariable) variables.get(i));
+                break;
+            case OUT:
+            default:
+                break;
+
+            }
+        }
+        Iterable<Set<PVariable>> bindings = Sets.powerSet(inoutVariables).stream()
+                .map(input -> Stream.concat(input.stream(), inVariables.stream()).collect(Collectors.toSet()))
+                .collect(Collectors.toSet());
+
+        doCreateConstraintInfos(resultList, pCall, affectedVariables, bindings);
+    }
+
+    private void createConstraintInfoBinaryTransitiveClosure(List<PConstraintInfo> resultList,
+            AbstractTransitiveClosure closure) {
+        // A pattern call can have any of its variables unbound
+
+        List<PParameter> parameters = closure.getReferredQuery().getParameters();
+        Tuple variables = closure.getVariablesTuple();
+
+        Set<Set<PVariable>> bindings = new HashSet<>();
+        PVariable firstVariable = (PVariable) variables.get(0);
+        PVariable secondVariable = (PVariable) variables.get(1);
+        // Check is always supported
+        bindings.add(new HashSet<>(Arrays.asList(firstVariable, secondVariable)));
+        // If first parameter is not bound mandatorily, it can be left out
+        if (parameters.get(0).getDirection() != PParameterDirection.IN) {
+            bindings.add(Collections.singleton(secondVariable));
+        }
+        // If second parameter is not bound mandatorily, it can be left out
+        if (parameters.get(1).getDirection() != PParameterDirection.IN) {
+            bindings.add(Collections.singleton(firstVariable));
+        }
+
+        doCreateConstraintInfos(resultList, closure, closure.getAffectedVariables(), bindings);
+    }
+
+
+
+    private void createConstraintInfoExportedParameter(List<PConstraintInfo> resultList,
+            ExportedParameter parameter) {
+        // In case of an exported parameter constraint, the parameter must be bound in order to execute
+        Set<PVariable> affectedVariables = parameter.getAffectedVariables();
+        doCreateConstraintInfos(resultList, parameter, affectedVariables, Collections.singleton(affectedVariables));
+    }
+
+    private void createConstraintInfoExpressionEvaluation(List<PConstraintInfo> resultList,
+            ExpressionEvaluation expressionEvaluation) {
+        // An expression evaluation can only have its output variable unbound. All other variables shall be bound
+        PVariable output = expressionEvaluation.getOutputVariable();
+        Set<Set<PVariable>> bindings = new HashSet<>();
+        Set<PVariable> affectedVariables = expressionEvaluation.getAffectedVariables();
+        // All variables bound -> check
+        bindings.add(affectedVariables);
+        // Output variable is not bound -> extend
+        bindings.add(affectedVariables.stream().filter(var -> !Objects.equals(var, output)).collect(Collectors.toSet()));
+        doCreateConstraintInfos(resultList, expressionEvaluation, affectedVariables, bindings);
+    }
+
+    private void createConstraintInfoTypeFilterConstraint(List<PConstraintInfo> resultList,
+            TypeFilterConstraint filter){
+        // In case of type filter, all affected variables must be bound in order to execute
+        Set<PVariable> affectedVariables = filter.getAffectedVariables();
+        doCreateConstraintInfos(resultList, filter, affectedVariables, Collections.singleton(affectedVariables));
+    }
+
+    private void createConstraintInfoInequality(List<PConstraintInfo> resultList,
+            Inequality inequality){
+        // In case of inequality, all affected variables must be bound in order to execute
+        Set<PVariable> affectedVariables = inequality.getAffectedVariables();
+        doCreateConstraintInfos(resultList, inequality, affectedVariables, Collections.singleton(affectedVariables));
+    }
+
+    private void createConstraintInfoAggregatorConstraint(List<PConstraintInfo> resultList,
+            PConstraint pConstraint, PVariable resultVariable){
+        Set<PVariable> affectedVariables = pConstraint.getAffectedVariables();
+
+        // The only variables which can be unbound are single-use
+        Set<PVariable> canBeUnboundVariables =
+                Stream.concat(Stream.of(resultVariable), affectedVariables.stream().filter(SINGLE_USE_VARIABLE)).collect(Collectors.toSet());
+
+        Set<Set<PVariable>> bindings = calculatePossibleBindings(canBeUnboundVariables, affectedVariables);
+
+        doCreateConstraintInfos(resultList, pConstraint, affectedVariables, bindings);
+    }
+
+    /**
+     *
+     * @param canBeUnboundVariables Variables which are allowed to be unbound
+     * @param affectedVariables All affected variables
+     * @return The set of possible bound variable sets
+     */
+    private Set<Set<PVariable>> calculatePossibleBindings(Set<PVariable> canBeUnboundVariables, Set<PVariable> affectedVariables){
+        final Set<PVariable> mustBindVariables = affectedVariables.stream().filter(input -> !canBeUnboundVariables.contains(input)).collect(Collectors.toSet());
+        return Sets.powerSet(canBeUnboundVariables).stream()
+                .map(input -> {
+                    //some variables have to be bound before executing this constraint
+                    Set<PVariable> result= new HashSet<>(input);
+                    result.addAll(mustBindVariables);
+                    return result;
+                })
+                .collect(Collectors.toSet());
+    }
+
+    private void createConstraintInfoGeneric(List<PConstraintInfo> resultList, PConstraint pConstraint){
+        Set<PVariable> affectedVariables = pConstraint.getAffectedVariables();
+
+        // The only variables which can be unbound are single use variables
+        Set<PVariable> canBeUnboundVariables = affectedVariables.stream().filter(SINGLE_USE_VARIABLE).collect(Collectors.toSet());
+
+        Set<Set<PVariable>> bindings = calculatePossibleBindings(canBeUnboundVariables, affectedVariables);
+
+        doCreateConstraintInfos(resultList, pConstraint, affectedVariables, bindings);
+    }
+
+    private void createConstraintInfoTypeConstraint(List<PConstraintInfo> resultList,
+            TypeConstraint typeConstraint) {
+        Set<PVariable> affectedVariables = typeConstraint.getAffectedVariables();
+        Set<? extends Set<PVariable>> bindings = null;
+
+        IInputKey inputKey = typeConstraint.getSupplierKey();
+        if(inputKey.isEnumerable()){
+            bindings = Sets.powerSet(affectedVariables);
+        }else{
+            // For not enumerable types, this constraint can only be a check
+            bindings = Collections.singleton(affectedVariables);
+        }
+
+        doCreateConstraintInfos(resultList, typeConstraint, affectedVariables, bindings);
+    }
+
+    private void doCreateConstraintInfos(List<PConstraintInfo> constraintInfos,
+            PConstraint pConstraint, Set<PVariable> affectedVariables, Iterable<? extends Set<PVariable>> bindings) {
+        Set<PConstraintInfo> sameWithDifferentBindings = new HashSet<>();
+        for (Set<PVariable> boundVariables : bindings) {
+
+            PConstraintInfo info = new PConstraintInfo(pConstraint, boundVariables,
+                    affectedVariables.stream().filter(input -> !boundVariables.contains(input)).collect(Collectors.toSet()),
+                    sameWithDifferentBindings, context, resultRequestor, costFunction);
+            constraintInfos.add(info);
+            sameWithDifferentBindings.add(info);
+        }
+    }
+
+    private Set<Set<PVariable>> excludeUnnavigableOperationMasks(TypeConstraint typeConstraint, Set<? extends Set<PVariable>> bindings) {
+        PVariable firstVariable = typeConstraint.getVariableInTuple(0);
+        return bindings.stream().filter(
+                boundVariablesSet -> (boundVariablesSet.isEmpty() || boundVariablesSet.contains(firstVariable)))
+                .collect(Collectors.toSet());
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PlanState.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PlanState.java
new file mode 100644
index 00000000..e93b07bc
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/PlanState.java
@@ -0,0 +1,283 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Marton Bur, Zoltan Ujhelyi, Akos Horvath, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.localsearch.planner.util.OperationCostComparator;
+import tools.refinery.viatra.runtime.matchers.algorithms.OrderedIterableMerge;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+
+/**
+ * This class represents the state of the plan during planning.
+ * 
+ * <p> A PlanState represents a sequence of operations (operationsList) and caches the computed cost 
+ * for this operation sequence. The list and the cost are initialized in the constructor. 
+ * However, #categorizeChecks() also updates the operations list (by suffixing checks)
+ * 
+ * @author Marton Bur
+ * @noreference This class is not intended to be referenced by clients.
+ */
+public class PlanState {
+
+    private final PBody pBody;
+    private final List<PConstraintInfo> operationsList;
+    private final Set<PVariable> boundVariables;
+    private final Collection<PVariable> deltaVariables; /* bound since ancestor plan */
+    private final Set<PConstraint> enforcedConstraints;
+    
+    private double cummulativeProduct;
+    private double cost;
+
+    private static Comparator<PConstraintInfo> infoComparator = new OperationCostComparator();
+
+    /*
+     * For a short explanation of past, present and future operations,
+     * see class 
+     */
+    private List<PConstraintInfo> presentExtends;
+
+    /**
+     * Creates an initial state
+     */
+    public PlanState(PBody pBody, Set<PVariable> boundVariables) {
+
+        this(pBody, new ArrayList<>(), boundVariables, boundVariables /* also the delta */, 
+                0.0 /* initial cost */, 1.0 /*initial branch count */);
+    }
+    
+    public PlanState cloneWithApplied(PConstraintInfo op) {
+        // Create operation list based on the current state
+        ArrayList<PConstraintInfo> newOperationsList =  
+                // pre-reserve excess capacity for later addition of CHECK ops
+                new ArrayList<>(pBody.getConstraints().size());
+        newOperationsList.addAll(this.getOperations());
+        newOperationsList.add(op);
+        
+        // Bind the variables of the op
+        Collection<PVariable> deltaVariables = op.getFreeVariables();
+        Set<PVariable> allBoundVariables =
+                // pre-reserve exact capacity as variables are known 
+                // (will not be affected by adding CHECK ops later)
+                new HashSet<>(this.getBoundVariables().size() + deltaVariables.size());
+        allBoundVariables.addAll(this.getBoundVariables());
+        allBoundVariables.addAll(deltaVariables);
+        
+        PlanState newState = new PlanState(getAssociatedPBody(), newOperationsList, allBoundVariables, deltaVariables,
+                cost, cummulativeProduct);
+        newState.accountNewOperation(op);
+        return newState;
+    }
+
+    private PlanState(PBody pBody, List<PConstraintInfo> operationsList, 
+            Set<PVariable> boundVariables, Collection<PVariable> deltaVariables, 
+            double cost, double cummulativeProduct) 
+    {
+        this.pBody = pBody;
+        this.operationsList = operationsList;
+        this.boundVariables = boundVariables;
+        this.enforcedConstraints = new HashSet<>();
+        this.deltaVariables = deltaVariables;
+        this.cost = cost;
+        this.cummulativeProduct = cummulativeProduct;
+    }
+
+    // NOT included for EXTEND: bind all variables of op
+    private void accountNewOperation(PConstraintInfo constraintInfo) {
+        this.enforcedConstraints.add(constraintInfo.getConstraint());
+        accountCost(constraintInfo);
+    }
+
+    private void accountCost(PConstraintInfo constraintInfo) {
+        double constraintCost = constraintInfo.getCost();
+        double branchFactor = constraintCost;
+        if (constraintCost > 0){
+            cost += cummulativeProduct * constraintCost;
+            cummulativeProduct *= branchFactor;
+        }
+    }
+
+
+    public Set<PConstraint> getEnforcedConstraints() {
+        return enforcedConstraints;
+    }
+
+    /**
+     * Re-categorizes given extend operations into already applied or no longer applicable ones (discarded), 
+     * immediately applicable ones (saved as presently viable extends), 
+     * and not yet applicable ones (discarded).
+     * 
+     * @param allPotentialExtendInfos all other extends that may be applicable 
+     * to this plan state now or in the future;
+     * MUST consist of "extend" constraint applications only (at least one free variable)
+     */
+    public void updateExtends(Iterable<PConstraintInfo> allPotentialExtendInfos) {
+        presentExtends = new ArrayList<>();
+        
+        
+        // categorize future/present extend constraint infos
+        for (PConstraintInfo op : allPotentialExtendInfos) {
+            updateExtendInternal(op);
+        }
+    }
+
+    /**
+     * Re-categorizes given extend operations into already applied or no longer applicable ones (discarded), 
+     * immediately applicable ones (saved as presently viable extends),
+     * and not yet applicable ones (discarded).
+     * 
+     * @param extendOpsByBoundVariables all EXTEND operations indexed by affected <i>bound</i> variables
+     * MUST consist of "extend" constraint applications only (at least one free variable)
+     */
+    public void updateExtendsBasedOnDelta(
+            Iterable<PConstraintInfo> previousPresentExtends, 
+            Map<PVariable, ? extends Collection<PConstraintInfo>> extendOpsByBoundVariables) 
+    {
+        presentExtends = new ArrayList<>();
+        if (operationsList.isEmpty())
+            throw new IllegalStateException("Not applicable as starting step");     
+        
+        for (PConstraintInfo extend: previousPresentExtends) {
+            updateExtendInternal(extend);
+        }
+        
+        Set<PConstraintInfo> affectedExtends = new HashSet<>();
+        for (PVariable variable : deltaVariables) {
+            // only those check ops may become applicable that have an affected variable in the delta
+            Collection<PConstraintInfo> extendsForVariable = extendOpsByBoundVariables.get(variable);
+            if (null != extendsForVariable) {
+                affectedExtends.addAll(extendsForVariable);
+            }
+        }
+        for (PConstraintInfo extend: affectedExtends) {
+            updateExtendInternal(extend);
+        }
+    }
+    
+    private void updateExtendInternal(PConstraintInfo op) {
+        if(!enforcedConstraints.contains(op.getConstraint())) {
+            categorizeExtend(op);                
+        }
+    }
+    
+    /**
+     * Check operations that newly became applicable (see {@link #getDeltaVariables()}) 
+     * are appended to operations lists.
+     * 
+     * <p> Will never discover degenerate checks (of PConstraints with zero variables),
+     * so must not use on initial state.
+     * 
+     * @param allPotentialCheckInfos all CHECK operations
+     * MUST consist of "check" constraint applications only (no free variables) 
+     * and must be iterable in decreasing order of cost
+     * 
+     * 
+     */
+    public void applyChecks(List<PConstraintInfo> allPotentialCheckInfos) {
+        applyChecksInternal(allPotentialCheckInfos);        
+    }
+ 
+    /**
+     * Immediately applicable checks are appended to operations lists.
+     * 
+     * @param checkOpsByVariables all CHECK operations indexed by affected variables
+     * MUST consist of "check" constraint applications only (no free variables) 
+     * and each bucket must be iterable in decreasing order of cost
+     */
+    public void applyChecksBasedOnDelta(Map<PVariable, List<PConstraintInfo>> checkOpsByVariables) {
+        if (operationsList.isEmpty())
+            throw new IllegalStateException("Not applicable as starting step");     
+        
+        Iterable<PConstraintInfo> affectedChecks = Collections.emptyList();
+        
+        for (PVariable variable : deltaVariables) {
+            // only those check ops may become applicable that have an affected variable in the delta
+            List<PConstraintInfo> checksForVariable = checkOpsByVariables.get(variable);
+            if (null != checksForVariable) {
+                affectedChecks = OrderedIterableMerge.mergeUniques(affectedChecks, checksForVariable, infoComparator);
+            }
+        }
+        
+        // checks retain their order, no re-sorting needed
+        applyChecksInternal(affectedChecks);
+    }
+
+    private void applyChecksInternal(Iterable<PConstraintInfo> checks) {
+        for (PConstraintInfo checkInfo : checks) {
+            if (this.boundVariables.containsAll(checkInfo.getBoundVariables()) &&
+                    !enforcedConstraints.contains(checkInfo.getConstraint())) 
+            {
+                operationsList.add(checkInfo);
+                accountNewOperation(checkInfo);                    
+            }
+        }
+    }
+
+
+    private void categorizeExtend(PConstraintInfo constraintInfo) {
+        PConstraintCategory category = constraintInfo.getCategory(pBody, boundVariables);
+        if (category == PConstraintCategory.PRESENT) {
+            presentExtends.add(constraintInfo);
+        } else {
+            // do not categorize past/future operations
+        }
+    }
+
+
+    public PBody getAssociatedPBody() {
+        return pBody;
+    }
+
+    public List<PConstraintInfo> getOperations() {
+        return operationsList;
+    }
+
+    public Set<PVariable> getBoundVariables() {
+        return boundVariables;
+    }
+
+    /**
+     * @return the derived cost of the plan contained in the state
+     */
+    public double getCost() {
+        return cost;
+    }
+
+    
+    /**
+     * @return cumulative branching factor
+     * @since 2.1
+     */
+    public double getCummulativeProduct() {
+        return cummulativeProduct;
+    }
+
+    public List<PConstraintInfo> getPresentExtends() {
+        return presentExtends;
+    }
+
+    /**
+     * Contains only those variables that are added by the newest extend 
+     * (or the initially bound ones if no extend yet)
+     */
+    public Collection<PVariable> getDeltaVariables() {
+        return deltaVariables;
+    }
+
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/AbstractOperationCompiler.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/AbstractOperationCompiler.java
new file mode 100644
index 00000000..73312dc9
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/AbstractOperationCompiler.java
@@ -0,0 +1,430 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner.compiler;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.localsearch.matcher.CallWithAdornment;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.check.AggregatorCheck;
+import tools.refinery.viatra.runtime.localsearch.operations.check.BinaryTransitiveClosureCheck;
+import tools.refinery.viatra.runtime.localsearch.operations.check.CheckConstant;
+import tools.refinery.viatra.runtime.localsearch.operations.check.CheckPositivePatternCall;
+import tools.refinery.viatra.runtime.localsearch.operations.check.CountCheck;
+import tools.refinery.viatra.runtime.localsearch.operations.check.ExpressionCheck;
+import tools.refinery.viatra.runtime.localsearch.operations.check.ExpressionEvalCheck;
+import tools.refinery.viatra.runtime.localsearch.operations.check.InequalityCheck;
+import tools.refinery.viatra.runtime.localsearch.operations.check.NACOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.extend.AggregatorExtend;
+import tools.refinery.viatra.runtime.localsearch.operations.extend.CountOperation;
+import tools.refinery.viatra.runtime.localsearch.operations.extend.ExpressionEval;
+import tools.refinery.viatra.runtime.localsearch.operations.extend.ExtendBinaryTransitiveClosure;
+import tools.refinery.viatra.runtime.localsearch.operations.extend.ExtendConstant;
+import tools.refinery.viatra.runtime.localsearch.operations.extend.ExtendPositivePatternCall;
+import tools.refinery.viatra.runtime.localsearch.operations.util.CallInformation;
+import tools.refinery.viatra.runtime.localsearch.planner.util.CompilerHelper;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PApply;
+import tools.refinery.viatra.runtime.matchers.planning.operations.POperation;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PProject;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PStart;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.Inequality;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.PatternMatchCounter;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.BinaryReflexiveTransitiveClosure;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ *
+ */
+public abstract class AbstractOperationCompiler implements IOperationCompiler {
+    
+    protected static final String UNSUPPORTED_TYPE_MESSAGE = "Unsupported type: ";
+
+    protected abstract void createExtend(TypeConstraint typeConstraint, Map<PVariable, Integer> variableMapping);
+
+    /**
+     * @throws ViatraQueryRuntimeException
+     */
+    protected abstract void createCheck(TypeConstraint typeConstraint, Map<PVariable, Integer> variableMapping);
+
+    /**
+     * @throws ViatraQueryRuntimeException
+     */
+    protected abstract void createCheck(TypeFilterConstraint typeConstraint, Map<PVariable, Integer> variableMapping);
+
+    /**
+     * @since 2.0
+     * @throws ViatraQueryRuntimeException
+     */
+    protected abstract void createUnaryTypeCheck(IInputKey type, int position);
+    
+    protected List<ISearchOperation> operations;
+    protected Set<CallWithAdornment> dependencies = new HashSet<>();
+    protected Map<PConstraint, Set<Integer>> variableBindings;
+    private Map<PVariable, Integer> variableMappings;
+    protected final IQueryRuntimeContext runtimeContext;
+
+    public AbstractOperationCompiler(IQueryRuntimeContext runtimeContext) {
+        this.runtimeContext = runtimeContext;
+    }
+
+    /**
+     * Compiles a plan of <code>POperation</code>s to a list of type <code>List&ltISearchOperation></code>
+     * 
+     * @param plan
+     * @param boundParameters
+     * @return an ordered list of POperations that make up the compiled search plan
+     * @throws ViatraQueryRuntimeException
+     */
+    @Override
+    public List<ISearchOperation> compile(SubPlan plan, Set<PParameter> boundParameters) {
+    
+        variableMappings = CompilerHelper.createVariableMapping(plan);
+        variableBindings = CompilerHelper.cacheVariableBindings(plan, variableMappings, boundParameters);
+    
+        operations = new ArrayList<>();
+    
+        List<POperation> operationList = CompilerHelper.createOperationsList(plan);
+        for (POperation pOperation : operationList) {
+            compile(pOperation, variableMappings);
+        }
+    
+        return operations;
+    }
+
+    private void compile(POperation pOperation, Map<PVariable, Integer> variableMapping) {
+    
+        if (pOperation instanceof PApply) {
+            PApply pApply = (PApply) pOperation;
+            PConstraint pConstraint = pApply.getPConstraint();
+           
+            if (isCheck(pConstraint, variableMapping)) {
+                // check
+                createCheckDispatcher(pConstraint, variableMapping);
+            } else {
+                // extend
+                createExtendDispatcher(pConstraint, variableMapping);
+            }
+    
+        } else if (pOperation instanceof PStart) {
+            // nop
+        } else if (pOperation instanceof PProject) {
+            // nop
+        } else {
+            throw new QueryProcessingException("PStart, PApply or PProject was expected, received: " + pOperation.getClass(), null,"Unexpected POperation type", null);
+        }
+    
+    }
+
+    private void createCheckDispatcher(PConstraint pConstraint, Map<PVariable, Integer> variableMapping) {
+        
+        
+        // DeferredPConstraint subclasses
+    
+        // Equalities are normalized
+    
+        if (pConstraint instanceof Inequality) {
+            createCheck((Inequality) pConstraint, variableMapping);
+        } else if (pConstraint instanceof PositivePatternCall){
+            createCheck((PositivePatternCall) pConstraint, variableMapping);
+        } else if (pConstraint instanceof NegativePatternCall) {
+            createCheck((NegativePatternCall) pConstraint,variableMapping);
+        } else if (pConstraint instanceof AggregatorConstraint) {
+            createCheck((AggregatorConstraint) pConstraint, variableMapping);
+        } else if (pConstraint instanceof PatternMatchCounter) {
+            createCheck((PatternMatchCounter) pConstraint, variableMapping);
+        } else if (pConstraint instanceof ExpressionEvaluation) {
+            createCheck((ExpressionEvaluation) pConstraint, variableMapping);
+        } else if (pConstraint instanceof TypeFilterConstraint) {
+            createCheck((TypeFilterConstraint) pConstraint,variableMapping);
+        } else if (pConstraint instanceof ExportedParameter) {
+            // Nothing to do here
+        } else
+        
+        // EnumerablePConstraint subclasses
+    
+        if (pConstraint instanceof BinaryTransitiveClosure) {
+            createCheck((BinaryTransitiveClosure) pConstraint, variableMapping);
+        } else if (pConstraint instanceof BinaryReflexiveTransitiveClosure) {
+            createCheck((BinaryReflexiveTransitiveClosure)pConstraint, variableMapping);
+        } else if (pConstraint instanceof ConstantValue) {
+            createCheck((ConstantValue) pConstraint, variableMapping);
+        } else if (pConstraint instanceof TypeConstraint) {
+            createCheck((TypeConstraint) pConstraint,variableMapping);
+        }  else {
+            String msg = "Unsupported Check constraint: "+pConstraint.toString();
+            throw new QueryProcessingException(msg, null, msg, null);
+        }
+    
+    }
+    
+    protected void createExtendDispatcher(PConstraint pConstraint, Map<PVariable, Integer> variableMapping) {
+    
+        // DeferredPConstraint subclasses
+        
+        // Equalities are normalized
+        if (pConstraint instanceof PositivePatternCall) {
+            createExtend((PositivePatternCall)pConstraint, variableMapping);
+        } else if (pConstraint instanceof AggregatorConstraint) {
+            createExtend((AggregatorConstraint) pConstraint, variableMapping);
+        } else if (pConstraint instanceof PatternMatchCounter) {
+            createExtend((PatternMatchCounter) pConstraint, variableMapping);
+        } else if (pConstraint instanceof ExpressionEvaluation) {
+            createExtend((ExpressionEvaluation) pConstraint, variableMapping);
+        } else if (pConstraint instanceof ExportedParameter) {
+            // ExportedParameters are compiled to NOP
+        } else
+        
+        // EnumerablePConstraint subclasses
+    
+        if (pConstraint instanceof ConstantValue) {
+            createExtend((ConstantValue) pConstraint, variableMapping);
+        } else if (pConstraint instanceof TypeConstraint) {
+            createExtend((TypeConstraint) pConstraint, variableMapping);
+        } else if (pConstraint instanceof BinaryTransitiveClosure) {
+            createExtend((BinaryTransitiveClosure)pConstraint, variableMapping);
+        } else if (pConstraint instanceof BinaryReflexiveTransitiveClosure) {
+            createExtend((BinaryReflexiveTransitiveClosure)pConstraint, variableMapping);
+        } else {
+            String msg = "Unsupported Extend constraint: "+pConstraint.toString();
+            throw new QueryProcessingException(msg, null, msg, null);
+        }
+    }
+    
+    private boolean isCheck(PConstraint pConstraint, final Map<PVariable, Integer> variableMapping) {
+        if (pConstraint instanceof NegativePatternCall){
+            return true;
+        }else if (pConstraint instanceof PositivePatternCall){
+            // Positive pattern call is check if all non-single used variables are bound
+            List<Integer> callVariables = pConstraint.getAffectedVariables().stream()
+                .filter(input -> input.getReferringConstraints().size() > 1)
+                .map(variableMapping::get)
+                .collect(Collectors.toList());
+            return variableBindings.get(pConstraint).containsAll(callVariables);
+        }else if (pConstraint instanceof AggregatorConstraint){
+            PVariable outputvar = ((AggregatorConstraint) pConstraint).getResultVariable();
+            return variableBindings.get(pConstraint).contains(variableMapping.get(outputvar));
+        }else if (pConstraint instanceof PatternMatchCounter){
+            PVariable outputvar = ((PatternMatchCounter) pConstraint).getResultVariable();
+            return variableBindings.get(pConstraint).contains(variableMapping.get(outputvar));
+        }else if (pConstraint instanceof ExpressionEvaluation){
+            PVariable outputvar = ((ExpressionEvaluation) pConstraint).getOutputVariable();
+            return outputvar == null || variableBindings.get(pConstraint).contains(variableMapping.get(outputvar));
+        } else {
+            // In other cases, all variables shall be bound to be a check
+            Set<PVariable> affectedVariables = pConstraint.getAffectedVariables();
+            Set<Integer> varIndices = new HashSet<>();
+            for (PVariable variable : affectedVariables) {
+                varIndices.add(variableMapping.get(variable));
+            }
+            return variableBindings.get(pConstraint).containsAll(varIndices);
+        }
+    }
+
+    @Override
+    public Set<CallWithAdornment> getDependencies() {
+        return dependencies;
+    }
+
+    /**
+     * @return the cached variable bindings for the previously created plan
+     */
+    @Override
+    public Map<PVariable, Integer> getVariableMappings() {
+        return variableMappings;
+    }
+
+    protected void createCheck(PatternMatchCounter counter, Map<PVariable, Integer> variableMapping) {
+        CallInformation information = CallInformation.create(counter, variableMapping, variableBindings.get(counter));
+        operations.add(new CountCheck(information, variableMapping.get(counter.getResultVariable())));
+        dependencies.add(information.getCallWithAdornment());
+    }
+
+    protected void createCheck(PositivePatternCall pCall, Map<PVariable, Integer> variableMapping) {
+        CallInformation information = CallInformation.create(pCall, variableMapping, variableBindings.get(pCall));
+        operations.add(new CheckPositivePatternCall(information));
+        dependencies.add(information.getCallWithAdornment());
+    }
+
+    protected void createCheck(ConstantValue constant, Map<PVariable, Integer> variableMapping) {
+        int position = variableMapping.get(constant.getVariablesTuple().get(0));
+        operations.add(new CheckConstant(position, constant.getSupplierKey()));
+    }
+
+    protected void createCheck(BinaryTransitiveClosure binaryTransitiveClosure, Map<PVariable, Integer> variableMapping) {
+        int sourcePosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(0));
+        int targetPosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(1));
+        
+        //The second parameter is NOT bound during execution!
+        CallInformation information = CallInformation.create(binaryTransitiveClosure, variableMapping, Stream.of(sourcePosition).collect(Collectors.toSet()));
+        operations.add(new BinaryTransitiveClosureCheck(information, sourcePosition, targetPosition, false));
+        dependencies.add(information.getCallWithAdornment());
+    }
+    
+    /**
+     * @since 2.0
+     */
+    protected void createCheck(BinaryReflexiveTransitiveClosure binaryTransitiveClosure, Map<PVariable, Integer> variableMapping) {
+        int sourcePosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(0));
+        int targetPosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(1));
+        
+        //The second parameter is NOT bound during execution!
+        CallInformation information = CallInformation.create(binaryTransitiveClosure, variableMapping, Stream.of(sourcePosition).collect(Collectors.toSet()));
+        createUnaryTypeCheck(binaryTransitiveClosure.getUniverseType(), sourcePosition);
+        operations.add(new BinaryTransitiveClosureCheck(information, sourcePosition, targetPosition, true));
+        dependencies.add(information.getCallWithAdornment());
+    }
+
+    protected void createCheck(ExpressionEvaluation expressionEvaluation, Map<PVariable, Integer> variableMapping) {
+        // Fill unbound variables with null; simply copy all variables. Unbound variables will be null anyway
+        Iterable<String> inputParameterNames = expressionEvaluation.getEvaluator().getInputParameterNames();
+        Map<String, Integer> nameMap = new HashMap<>();
+        
+        for (String pVariableName : inputParameterNames) {
+            PVariable pVariable = expressionEvaluation.getPSystem().getVariableByNameChecked(pVariableName);
+            nameMap.put(pVariableName, variableMapping.get(pVariable));
+        }
+        
+        // output variable can be null; if null it is an ExpressionCheck
+        if(expressionEvaluation.getOutputVariable() == null){
+            operations.add(new ExpressionCheck(expressionEvaluation.getEvaluator(), nameMap));
+        } else {
+            operations.add(new ExpressionEvalCheck(expressionEvaluation.getEvaluator(), nameMap, expressionEvaluation.isUnwinding(), variableMapping.get(expressionEvaluation.getOutputVariable())));
+        }
+    }
+
+    protected void createCheck(AggregatorConstraint aggregator, Map<PVariable, Integer> variableMapping) {
+        CallInformation information = CallInformation.create(aggregator, variableMapping, variableBindings.get(aggregator));
+        operations.add(new AggregatorCheck(information, aggregator, variableMapping.get(aggregator.getResultVariable())));
+        dependencies.add(information.getCallWithAdornment());
+    }
+
+    protected void createCheck(NegativePatternCall negativePatternCall, Map<PVariable, Integer> variableMapping) {
+        CallInformation information = CallInformation.create(negativePatternCall, variableMapping, variableBindings.get(negativePatternCall));
+        operations.add(new NACOperation(information));
+        dependencies.add(information.getCallWithAdornment());
+    }
+
+    protected void createCheck(Inequality inequality, Map<PVariable, Integer> variableMapping) {
+        operations.add(new InequalityCheck(variableMapping.get(inequality.getWho()), variableMapping.get(inequality.getWithWhom())));
+    }
+
+    protected void createExtend(PositivePatternCall pCall, Map<PVariable, Integer> variableMapping) {
+        CallInformation information = CallInformation.create(pCall, variableMapping, variableBindings.get(pCall));
+        operations.add(new ExtendPositivePatternCall(information));
+        dependencies.add(information.getCallWithAdornment());
+    }
+
+    protected void createExtend(BinaryTransitiveClosure binaryTransitiveClosure, Map<PVariable, Integer> variableMapping) {
+        int sourcePosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(0));
+        int targetPosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(1));
+        
+        boolean sourceBound = variableBindings.get(binaryTransitiveClosure).contains(sourcePosition);
+        boolean targetBound = variableBindings.get(binaryTransitiveClosure).contains(targetPosition);
+        
+        CallInformation information = CallInformation.create(binaryTransitiveClosure, variableMapping, variableBindings.get(binaryTransitiveClosure));
+        
+        if (sourceBound && !targetBound) {
+            operations.add(new ExtendBinaryTransitiveClosure.Forward(information, sourcePosition, targetPosition, false));
+            dependencies.add(information.getCallWithAdornment());            
+        } else if (!sourceBound && targetBound) {
+            operations.add(new ExtendBinaryTransitiveClosure.Backward(information, sourcePosition, targetPosition, false));
+            dependencies.add(information.getCallWithAdornment());                        
+        } else {
+            String msg = "Binary transitive closure not supported with two unbound parameters";
+            throw new QueryProcessingException(msg, null, msg, binaryTransitiveClosure.getPSystem().getPattern());
+        }
+    }
+    
+    /**
+     * @since 2.0
+     */
+    protected void createExtend(BinaryReflexiveTransitiveClosure binaryTransitiveClosure, Map<PVariable, Integer> variableMapping) {
+        int sourcePosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(0));
+        int targetPosition = variableMapping.get(binaryTransitiveClosure.getVariablesTuple().get(1));
+        
+        boolean sourceBound = variableBindings.get(binaryTransitiveClosure).contains(sourcePosition);
+        boolean targetBound = variableBindings.get(binaryTransitiveClosure).contains(targetPosition);
+        
+        CallInformation information = CallInformation.create(binaryTransitiveClosure, variableMapping, variableBindings.get(binaryTransitiveClosure));
+        
+        if (sourceBound && !targetBound) {
+            createUnaryTypeCheck(binaryTransitiveClosure.getUniverseType(), sourcePosition);
+            operations.add(new ExtendBinaryTransitiveClosure.Forward(information, sourcePosition, targetPosition, true));
+            dependencies.add(information.getCallWithAdornment());            
+        } else if (!sourceBound && targetBound) {
+            createUnaryTypeCheck(binaryTransitiveClosure.getUniverseType(), targetPosition);
+            operations.add(new ExtendBinaryTransitiveClosure.Backward(information, sourcePosition, targetPosition, true));
+            dependencies.add(information.getCallWithAdornment());                        
+        } else {
+            String msg = "Binary reflective transitive closure not supported with two unbound parameters";
+            throw new QueryProcessingException(msg, null, msg, binaryTransitiveClosure.getPSystem().getPattern());
+        }
+    }
+
+    protected void createExtend(ConstantValue constant, Map<PVariable, Integer> variableMapping) {
+        int position = variableMapping.get(constant.getVariablesTuple().get(0));
+        operations.add(new ExtendConstant(position, constant.getSupplierKey()));        
+    }
+
+    protected void createExtend(ExpressionEvaluation expressionEvaluation, Map<PVariable, Integer> variableMapping) {
+        // Fill unbound variables with null; simply copy all variables. Unbound variables will be null anyway
+        Iterable<String> inputParameterNames = expressionEvaluation.getEvaluator().getInputParameterNames();
+        Map<String, Integer> nameMap = new HashMap<>();
+        
+        for (String pVariableName : inputParameterNames) {
+            PVariable pVariable = expressionEvaluation.getPSystem().getVariableByNameChecked(pVariableName);
+            nameMap.put(pVariableName, variableMapping.get(pVariable));
+        }
+        
+        // output variable can be null; if null it is an ExpressionCheck
+        if(expressionEvaluation.getOutputVariable() == null){
+            operations.add(new ExpressionCheck(expressionEvaluation.getEvaluator(), nameMap));
+        } else {
+            operations.add(new ExpressionEval(expressionEvaluation.getEvaluator(), nameMap, expressionEvaluation.isUnwinding(), variableMapping.get(expressionEvaluation.getOutputVariable())));
+        }
+    }
+
+    protected void createExtend(AggregatorConstraint aggregator, Map<PVariable, Integer> variableMapping) {
+        CallInformation information = CallInformation.create(aggregator, variableMapping, variableBindings.get(aggregator));
+        operations.add(new AggregatorExtend(information, aggregator, variableMapping.get(aggregator.getResultVariable())));
+        dependencies.add(information.getCallWithAdornment());
+    }
+
+    protected void createExtend(PatternMatchCounter patternMatchCounter, Map<PVariable, Integer> variableMapping) {
+        CallInformation information = CallInformation.create(patternMatchCounter, variableMapping, variableBindings.get(patternMatchCounter));
+        operations.add(new CountOperation(information, variableMapping.get(patternMatchCounter.getResultVariable())));
+        dependencies.add(information.getCallWithAdornment());
+    }
+    
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/GenericOperationCompiler.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/GenericOperationCompiler.java
new file mode 100644
index 00000000..d86982e9
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/GenericOperationCompiler.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * Copyright (c) 2023 The Refinery Authors <https://refinery.tools/>
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner.compiler;
+
+import tools.refinery.viatra.runtime.localsearch.operations.generic.GenericTypeCheck;
+import tools.refinery.viatra.runtime.localsearch.operations.generic.GenericTypeExtend;
+import tools.refinery.viatra.runtime.localsearch.operations.generic.GenericTypeExtendSingleValue;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+
+import java.util.*;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ *
+ */
+public class GenericOperationCompiler extends AbstractOperationCompiler {
+
+    public GenericOperationCompiler(IQueryRuntimeContext runtimeContext) {
+        super(runtimeContext);
+    }
+
+    @Override
+    protected void createCheck(TypeFilterConstraint typeConstraint, Map<PVariable, Integer> variableMapping) {
+        IInputKey inputKey = typeConstraint.getInputKey();
+        Tuple tuple = typeConstraint.getVariablesTuple();
+        int[] positions = new int[tuple.getSize()];
+        for (int i = 0; i < tuple.getSize(); i++) {
+            PVariable variable = (PVariable) tuple.get(i);
+            positions[i] = variableMapping.get(variable);
+        }
+        operations.add(new GenericTypeCheck(inputKey, positions, TupleMask.fromSelectedIndices(variableMapping.size(), positions)));
+
+    }
+
+    @Override
+    protected void createCheck(TypeConstraint typeConstraint, Map<PVariable, Integer> variableMapping) {
+        IInputKey inputKey = typeConstraint.getSupplierKey();
+        Tuple tuple = typeConstraint.getVariablesTuple();
+        int[] positions = new int[tuple.getSize()];
+        for (int i = 0; i < tuple.getSize(); i++) {
+            PVariable variable = (PVariable) tuple.get(i);
+            positions[i] = variableMapping.get(variable);
+        }
+        operations.add(new GenericTypeCheck(inputKey, positions, TupleMask.fromSelectedIndices(variableMapping.size(), positions)));
+    }
+
+    @Override
+    protected void createUnaryTypeCheck(IInputKey inputKey, int position) {
+        int[] positions = new int[] {position};
+        operations.add(new GenericTypeCheck(inputKey, positions, TupleMask.fromSelectedIndices(1, positions)));
+    }
+
+    @Override
+    protected void createExtend(TypeConstraint typeConstraint, Map<PVariable, Integer> variableMapping) {
+        IInputKey inputKey = typeConstraint.getSupplierKey();
+        Tuple tuple = typeConstraint.getVariablesTuple();
+
+        int[] positions = new int[tuple.getSize()];
+        List<Integer> boundVariableIndices = new ArrayList<>();
+        List<Integer> boundVariables = new ArrayList<>();
+        Set<Integer> unboundVariables = new HashSet<>();
+        for (int i = 0; i < tuple.getSize(); i++) {
+            PVariable variable = (PVariable) tuple.get(i);
+            Integer position = variableMapping.get(variable);
+            positions[i] = position;
+            if (variableBindings.get(typeConstraint).contains(position)) {
+                boundVariableIndices.add(i);
+                boundVariables.add(position);
+            } else {
+                unboundVariables.add(position);
+            }
+        }
+        TupleMask indexerMask = TupleMask.fromSelectedIndices(inputKey.getArity(), boundVariableIndices);
+        TupleMask callMask = TupleMask.fromSelectedIndices(variableMapping.size(), boundVariables);
+                // If multiple tuple elements from the indexer should be bound to the same variable, we must use a
+                // {@link GenericTypeExtend} check whether the tuple elements have the same value.
+                if (unboundVariables.size() == 1 && indexerMask.getSize() + 1 == indexerMask.getSourceWidth()) {
+            operations.add(new GenericTypeExtendSingleValue(inputKey, positions, callMask, indexerMask, unboundVariables.iterator().next()));
+        } else {
+            operations.add(new GenericTypeExtend(inputKey, positions, callMask, indexerMask, unboundVariables));
+        }
+
+    }
+
+
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/IOperationCompiler.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/IOperationCompiler.java
new file mode 100644
index 00000000..625a7eb2
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/compiler/IOperationCompiler.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner.compiler;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.localsearch.matcher.CallWithAdornment;
+import tools.refinery.viatra.runtime.localsearch.matcher.MatcherReference;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+
+/**
+ * An operation compiler is responsible for creating executable search plans from the subplan structure.
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ *
+ */
+public interface IOperationCompiler {
+
+    /**
+     * Compiles a plan of <code>POperation</code>s to a list of type <code>List&ltISearchOperation></code>
+     * 
+     * @param plan
+     * @param boundParameters
+     * @return an ordered list of POperations that make up the compiled search plan
+     * @throws ViatraQueryRuntimeException 
+     */
+    List<ISearchOperation> compile(SubPlan plan, Set<PParameter> boundParameters);
+
+    /**
+     * Replaces previous method returning {@link MatcherReference}
+     * @since 2.1
+     */
+    Set<CallWithAdornment> getDependencies();
+
+    /**
+     * @return the cached variable bindings for the previously created plan
+     */
+    Map<PVariable, Integer> getVariableMappings();
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/IConstraintEvaluationContext.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/IConstraintEvaluationContext.java
new file mode 100644
index 00000000..9b44612b
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/IConstraintEvaluationContext.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner.cost;
+
+import tools.refinery.viatra.runtime.matchers.backend.ResultProviderRequestor;
+import tools.refinery.viatra.runtime.matchers.context.IQueryResultProviderAccess;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import java.util.Collection;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
+
+/**
+ * This interface denotes the evaluation context of a constraint, intended for cost estimation. Provides access to information
+ * on which the cost function can base its calculation.
+ * 
+ * @author Grill Balázs
+ * @since 1.4
+ * @noimplement
+ */
+public interface IConstraintEvaluationContext {
+
+    /**
+     * Get the constraint to be evaluated
+     */
+    public PConstraint getConstraint();
+
+    /**
+     * Unbound variables at the time of evaluating the constraint
+     */
+    public Collection<PVariable> getFreeVariables();
+
+    /**
+     * Bound variables at the time of evaluating the constraint
+     */
+    public Collection<PVariable> getBoundVariables();
+    
+    public IQueryRuntimeContext getRuntimeContext();
+    
+    /**
+     * @since 1.5
+     */
+    public QueryAnalyzer getQueryAnalyzer();
+    
+    /**
+     * @deprecated use {@link #resultProviderRequestor()}
+     * @since 1.5
+     */
+    @Deprecated
+    public IQueryResultProviderAccess resultProviderAccess();
+    
+    /**
+     * @since 2.1
+     */
+    public ResultProviderRequestor resultProviderRequestor();
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/ICostFunction.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/ICostFunction.java
new file mode 100644
index 00000000..4d9d0708
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/ICostFunction.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner.cost;
+
+/**
+ * Common interface for cost function implementation
+ * 
+ * @author Grill Balázs
+ * @since 1.4
+ *
+ */
+public interface ICostFunction{
+
+    public double apply(IConstraintEvaluationContext input);
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/HybridMatcherConstraintCostFunction.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/HybridMatcherConstraintCostFunction.java
new file mode 100644
index 00000000..df9292f0
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/HybridMatcherConstraintCostFunction.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner.cost.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+
+/**
+ * This cost function is intended to be used on hybrid configuration, with the strict restriction than any
+ * non-flattened positive pattern call is executed with Rete engine. This implementation provides the exact number
+ * of matches by invoking the result provider for the called pattern.
+ * 
+ * @deprecated {@link StatisticsBasedConstraintCostFunction} should use {@link IQueryResultProvider#estimateCardinality(tools.refinery.viatra.runtime.matchers.tuple.TupleMask, org.eclipse.viatra.query.runtime.matchers.util.Accuracy)} 
+ */
+@Deprecated
+public class HybridMatcherConstraintCostFunction extends IndexerBasedConstraintCostFunction {
+    
+    @Override
+    protected double _calculateCost(PositivePatternCall patternCall, IConstraintEvaluationContext context) {
+        // Determine local constant constraints which is used to filter results
+        Tuple variables = patternCall.getVariablesTuple();
+        Set<Object> variablesSet = variables.getDistinctElements();
+        final Map<PVariable, Object> constantMap = new HashMap<>();
+        for (PConstraint _constraint : patternCall.getPSystem().getConstraints()) {
+            if (_constraint instanceof ConstantValue){
+                ConstantValue constraint = (ConstantValue) _constraint;
+                PVariable variable = (PVariable) constraint.getVariablesTuple().get(0);
+                if (variablesSet.contains(variable) && context.getBoundVariables().contains(variable)) {
+                    constantMap.put(variable, constraint.getSupplierKey());
+                }
+            }
+        }
+        
+        // Determine filter
+        Object[] filter = new Object[variables.getSize()];
+        for(int i=0; i < variables.getSize(); i++){
+            filter[i] = constantMap.get(variables.get(i));
+        }
+
+        // aggregate keys are the bound and not filtered variables
+        // These will be fixed in runtime, but unknown at planning time
+        // This is represented by indices to ease working with result tuples
+        final Map<Object, Integer> variableIndices = variables.invertIndex();
+        List<Integer> aggregateKeys = context.getBoundVariables().stream()
+                .filter(input -> !constantMap.containsKey(input))
+                .map(variableIndices::get)
+                .collect(Collectors.toList());
+
+        IQueryResultProvider resultProvider = context.resultProviderRequestor().requestResultProvider(patternCall, null);
+        Map<Tuple, Integer> aggregatedCounts = new HashMap<>();
+        
+        // Iterate over all matches and count together matches that has equal values on
+        // aggregateKeys positions. The cost of the pattern call is considered to be the
+        // Maximum of these counted values
+        
+        int result = 0;
+        // NOTE: a stream is not an iterable (cannot be iterated more than once), so to use it in a for-loop
+        // it has to be wrapped; in the following line a lambda is used to implement Iterable#iterator()
+        for (Tuple match : (Iterable<Tuple>) () -> resultProvider.getAllMatches(filter).iterator()) {
+            Tuple extracted = Tuples.flatTupleOf(aggregateKeys.stream().map(match::get).toArray());
+            int count = (aggregatedCounts.containsKey(extracted)) 
+                ? aggregatedCounts.get(extracted) + 1
+                : 1;                
+            aggregatedCounts.put(extracted, count);
+            if (result < count) {
+                result = count;
+            }
+        }
+
+        return result;
+    }
+    
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/IndexerBasedConstraintCostFunction.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/IndexerBasedConstraintCostFunction.java
new file mode 100644
index 00000000..9e2c8680
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/IndexerBasedConstraintCostFunction.java
@@ -0,0 +1,49 @@
+/** 
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.viatra.runtime.localsearch.planner.cost.impl;
+
+import java.util.Optional;
+
+import tools.refinery.viatra.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Accuracy;
+
+/**
+ * Cost function which calculates cost based on the cardinality of items in the runtime model, provided by the base indexer
+ * 
+ * @author Grill Balázs
+ * @since 1.4
+ */
+public class IndexerBasedConstraintCostFunction extends StatisticsBasedConstraintCostFunction {
+    
+    
+    
+
+    /**
+     * 
+     */
+    public IndexerBasedConstraintCostFunction() {
+        super();
+    }
+
+    /**
+     * @param inverseNavigationPenalty
+     * @since 2.1
+     */
+    public IndexerBasedConstraintCostFunction(double inverseNavigationPenalty) {
+        super(inverseNavigationPenalty);
+    }
+
+    @Override
+    public Optional<Long> projectionSize(IConstraintEvaluationContext input, IInputKey supplierKey, TupleMask groupMask, Accuracy requiredAccuracy) {
+        return input.getRuntimeContext().estimateCardinality(supplierKey, groupMask, requiredAccuracy);
+    }
+    
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/StatisticsBasedConstraintCostFunction.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/StatisticsBasedConstraintCostFunction.java
new file mode 100644
index 00000000..873be31d
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/StatisticsBasedConstraintCostFunction.java
@@ -0,0 +1,413 @@
+/**
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.viatra.runtime.localsearch.planner.cost.impl;
+
+import static tools.refinery.viatra.runtime.matchers.planning.helpers.StatisticsHelper.min;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.localsearch.matcher.integration.AbstractLocalSearchResultProvider;
+import tools.refinery.viatra.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
+import tools.refinery.viatra.runtime.localsearch.planner.cost.ICostFunction;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.planning.helpers.FunctionalDependencyHelper;
+import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.Inequality;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.PatternMatchCounter;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.BinaryReflexiveTransitiveClosure;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Accuracy;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * Cost function which calculates cost based on the cardinality of items in the runtime model
+ * 
+ * <p> To provide custom statistics, override 
+ *  {@link #projectionSize(IConstraintEvaluationContext, IInputKey, TupleMask, Accuracy)} 
+ *  and {@link #bucketSize(IQueryReference, IConstraintEvaluationContext, TupleMask)}.
+ * 
+ * @author Grill Balázs
+ * @since 1.4
+ */
+public abstract class StatisticsBasedConstraintCostFunction implements ICostFunction {
+    protected static final double MAX_COST = 250.0;
+
+    protected static final double DEFAULT_COST = StatisticsBasedConstraintCostFunction.MAX_COST - 100.0;
+        
+    /**
+     * @since 2.1
+     */
+    public static final double INVERSE_NAVIGATION_PENALTY_DEFAULT = 0.10;
+    /**
+     * @since 2.1
+     */
+    public static final double INVERSE_NAVIGATION_PENALTY_GENERIC = 0.01;
+    /**
+     * @since 2.7
+     */
+    public static final double EVAL_UNWIND_EXTENSION_FACTOR = 3.0;
+    
+    private final double inverseNavigationPenalty;
+    
+    
+    /**
+     * @since 2.1
+     */
+    public StatisticsBasedConstraintCostFunction(double inverseNavigationPenalty) {
+        super();
+        this.inverseNavigationPenalty = inverseNavigationPenalty;
+    }
+    public StatisticsBasedConstraintCostFunction() {
+        this(INVERSE_NAVIGATION_PENALTY_DEFAULT);
+    }
+
+    /**
+     * @deprecated call and implement {@link #projectionSize(IConstraintEvaluationContext, IInputKey, TupleMask, Accuracy)} instead
+     */
+    @Deprecated
+    public long countTuples(final IConstraintEvaluationContext input, final IInputKey supplierKey) {
+        return projectionSize(input, supplierKey, TupleMask.identity(supplierKey.getArity()), Accuracy.EXACT_COUNT).orElse(-1L);
+    }
+    
+    /**
+     * Override this to provide custom statistics on edge/node counts.
+     * New implementors shall implement this instead of {@link #countTuples(IConstraintEvaluationContext, IInputKey)}
+     * @since 2.1
+     */
+    public Optional<Long> projectionSize(final IConstraintEvaluationContext input, final IInputKey supplierKey,
+            final TupleMask groupMask, Accuracy requiredAccuracy) {
+        long legacyCount = countTuples(input, supplierKey);
+        return legacyCount < 0 ? Optional.empty() : Optional.of(legacyCount);
+    }
+
+    /**
+     * Override this to provide custom estimates for match set sizes of called patterns.
+     * @since 2.1
+     */
+    public Optional<Double> bucketSize(final IQueryReference patternCall,
+            final IConstraintEvaluationContext input, TupleMask projMask) {
+        IQueryResultProvider resultProvider = input.resultProviderRequestor().requestResultProvider(patternCall, null);
+        // TODO hack: use LS cost instead of true bucket size estimate
+        if (resultProvider instanceof AbstractLocalSearchResultProvider) {
+            double estimatedCost = ((AbstractLocalSearchResultProvider) resultProvider).estimateCost(projMask);
+            return Optional.of(estimatedCost);
+        } else {            
+            return resultProvider.estimateAverageBucketSize(projMask, Accuracy.APPROXIMATION);
+        }
+    }
+   
+    
+
+    @Override
+    public double apply(final IConstraintEvaluationContext input) {
+        return this.calculateCost(input.getConstraint(), input);
+    }
+
+    protected double _calculateCost(final ConstantValue constant, final IConstraintEvaluationContext input) {
+        return 0.0f;
+    }
+
+    protected double _calculateCost(final TypeConstraint constraint, final IConstraintEvaluationContext input) {
+        final Collection<PVariable> freeMaskVariables = input.getFreeVariables();
+        final Collection<PVariable> boundMaskVariables = input.getBoundVariables();
+        IInputKey supplierKey = constraint.getSupplierKey();
+        long arity = supplierKey.getArity();
+
+        if ((arity == 1)) {
+            // unary constraint
+            return calculateUnaryConstraintCost(constraint, input);
+        } else if ((arity == 2)) {
+            // binary constraint
+            PVariable srcVariable = ((PVariable) constraint.getVariablesTuple().get(0));
+            PVariable dstVariable = ((PVariable) constraint.getVariablesTuple().get(1));
+            boolean isInverse = false;
+            // Check if inverse navigation is needed along the edge
+            if ((freeMaskVariables.contains(srcVariable) && boundMaskVariables.contains(dstVariable))) {
+                isInverse = true;
+            }
+            double binaryExtendCost = calculateBinaryCost(supplierKey, srcVariable, dstVariable, isInverse, input);
+            // Make inverse navigation slightly more expensive than forward navigation
+            // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=501078
+            return (isInverse) ? binaryExtendCost + inverseNavigationPenalty : binaryExtendCost;
+        } else {
+            // n-ary constraint
+            throw new UnsupportedOperationException("Cost calculation for arity " + arity + " is not implemented yet");
+        }
+    }
+
+    
+    /**
+     * @deprecated use/implement {@link #calculateBinaryCost(IInputKey, PVariable, PVariable, boolean, IConstraintEvaluationContext)} instead
+     */
+    @Deprecated
+    protected double calculateBinaryExtendCost(final IInputKey supplierKey, final PVariable srcVariable,
+            final PVariable dstVariable, final boolean isInverse, long edgeCount /* TODO remove */,
+            final IConstraintEvaluationContext input) {
+        throw new UnsupportedOperationException();
+    }
+    
+    /**
+     * @since 2.1
+     */
+    protected double calculateBinaryCost(final IInputKey supplierKey, final PVariable srcVariable,
+            final PVariable dstVariable, final boolean isInverse, 
+            final IConstraintEvaluationContext input) {
+        final Collection<PVariable> freeMaskVariables = input.getFreeVariables();
+        final PConstraint constraint = input.getConstraint();
+        
+//        IQueryMetaContext metaContext = input.getRuntimeContext().getMetaContext();
+//        Collection<InputKeyImplication> implications = metaContext.getImplications(supplierKey);
+
+        Optional<Long> edgeUpper = projectionSize(input,   supplierKey,    TupleMask.identity(2),          Accuracy.BEST_UPPER_BOUND);
+        Optional<Long> srcUpper  = projectionSize(input,   supplierKey,    TupleMask.selectSingle(0, 2),   Accuracy.BEST_UPPER_BOUND);
+        Optional<Long> dstUpper  = projectionSize(input,   supplierKey,    TupleMask.selectSingle(1, 2),   Accuracy.BEST_UPPER_BOUND);
+
+        if (freeMaskVariables.contains(srcVariable) && freeMaskVariables.contains(dstVariable)) {
+            Double branchCount = edgeUpper.map(Long::doubleValue).orElse(
+                    srcUpper.map(Long::doubleValue).orElse(DEFAULT_COST)
+                    *
+                    dstUpper.map(Long::doubleValue).orElse(DEFAULT_COST)
+            );      
+            return branchCount;
+            
+        } else {
+            
+            Optional<Long> srcLower  = projectionSize(input,   supplierKey,    TupleMask.selectSingle(0, 2),   Accuracy.APPROXIMATION);
+            Optional<Long> dstLower  = projectionSize(input,   supplierKey,    TupleMask.selectSingle(1, 2),   Accuracy.APPROXIMATION);
+            
+            List<Optional<Long>> nodeLower = Arrays.asList(srcLower, dstLower);
+            List<Optional<Long>> nodeUpper = Arrays.asList(srcUpper, dstUpper);
+            
+            int from = isInverse ? 1 : 0;
+            int to   = isInverse ? 0 : 1;
+            
+            Optional<Double> costEstimate = Optional.empty();
+            
+            if (!freeMaskVariables.contains(srcVariable) && !freeMaskVariables.contains(dstVariable)) {
+                // both variables bound, this is a simple check
+                costEstimate = min(costEstimate, 0.9);
+            } // TODO use bucket size estimation in the runtime context
+            costEstimate = min(costEstimate, 
+                edgeUpper.flatMap(edges -> 
+                nodeLower.get(from).map(fromNodes ->
+                    // amortize edges over start nodes
+                    (fromNodes == 0) ? 0.0 : (((double) edges) / fromNodes)
+            )));
+            if (navigatesThroughFunctionalDependencyInverse(input, constraint)) {
+                costEstimate = min(costEstimate, nodeUpper.get(to).flatMap(toNodes -> 
+                        nodeLower.get(from).map(fromNodes ->
+                        // due to a reverse functional dependency, the destination count is an upper bound for the edge count
+                        (fromNodes == 0) ? 0.0 : ((double) toNodes) / fromNodes
+                    )));
+            }
+            if (! edgeUpper.isPresent()) {
+                costEstimate = min(costEstimate, nodeUpper.get(to).flatMap(toNodes -> 
+                        nodeLower.get(from).map(fromNodes ->
+                        // If count is 0, no such element exists in the model, so there will be no branching
+                        // TODO rethink, why dstNodeCount / srcNodeCount instead of dstNodeCount? 
+                        // The universally valid bound would be something like sparseEdgeEstimate = dstNodeCount + 1.0
+                        // If we assume sparseness, we can reduce it by a SPARSENESS_FACTOR (e.g. 0.1). 
+                        // Alternatively, discount dstNodeCount * srcNodeCount on a SPARSENESS_EXPONENT (e.g 0.75) and then amortize over srcNodeCount.
+                        fromNodes != 0 ? Math.max(1.0, ((double) toNodes) / fromNodes) : 1.0
+                    )));
+            } 
+            if (navigatesThroughFunctionalDependency(input, constraint)) {
+                // At most one destination value
+                costEstimate = min(costEstimate, 1.0); 
+            }
+            
+            return costEstimate.orElse(DEFAULT_COST);
+
+        }
+    }
+
+    /**
+     * @since 1.7
+     */
+    protected boolean navigatesThroughFunctionalDependency(final IConstraintEvaluationContext input,
+            final PConstraint constraint) {
+        return navigatesThroughFunctionalDependency(input, constraint, input.getBoundVariables(), input.getFreeVariables());
+    }
+    /**
+     * @since 2.1
+     */
+    protected boolean navigatesThroughFunctionalDependencyInverse(final IConstraintEvaluationContext input,
+            final PConstraint constraint) {
+        return navigatesThroughFunctionalDependency(input, constraint, input.getFreeVariables(), input.getBoundVariables());
+    }
+    /**
+     * @since 2.1
+     */
+    protected boolean navigatesThroughFunctionalDependency(final IConstraintEvaluationContext input,
+            final PConstraint constraint, Collection<PVariable> determining, Collection<PVariable> determined) {
+        final QueryAnalyzer queryAnalyzer = input.getQueryAnalyzer();
+        final Map<Set<PVariable>, Set<PVariable>> functionalDependencies = queryAnalyzer
+                .getFunctionalDependencies(Collections.singleton(constraint), false);
+        final Set<PVariable> impliedVariables = FunctionalDependencyHelper.closureOf(determining,
+                functionalDependencies);
+        return ((impliedVariables != null) && impliedVariables.containsAll(determined));
+    }
+    
+    protected double calculateUnaryConstraintCost(final TypeConstraint constraint,
+            final IConstraintEvaluationContext input) {
+        PVariable variable = (PVariable) constraint.getVariablesTuple().get(0);
+        if (input.getBoundVariables().contains(variable)) {
+            return 0.9;
+        } else {
+            return projectionSize(input, constraint.getSupplierKey(), TupleMask.identity(1), Accuracy.APPROXIMATION)
+                    .map(count -> 1.0 + count).orElse(DEFAULT_COST);
+        }
+    }
+
+    protected double _calculateCost(final ExportedParameter exportedParam, final IConstraintEvaluationContext input) {
+        return 0.0;
+    }
+
+    protected double _calculateCost(final TypeFilterConstraint exportedParam,
+            final IConstraintEvaluationContext input) {
+        return 0.0;
+    }
+
+    protected double _calculateCost(final PositivePatternCall patternCall, final IConstraintEvaluationContext input) {
+        final List<Integer> boundPositions = new ArrayList<>();
+        final List<PParameter> parameters = patternCall.getReferredQuery().getParameters();
+        for (int i = 0; (i < parameters.size()); i++) {
+            final PVariable variable = patternCall.getVariableInTuple(i);
+            if (input.getBoundVariables().contains(variable)) boundPositions.add(i);
+        }
+        TupleMask projMask = TupleMask.fromSelectedIndices(parameters.size(), boundPositions);
+        
+        return bucketSize(patternCall, input, projMask).orElse(DEFAULT_COST);        
+    }
+
+
+    /**
+     * @since 1.7
+     */
+    protected double _calculateCost(final ExpressionEvaluation evaluation, final IConstraintEvaluationContext input) {
+        // Even if there are multiple results here, if all output variable is bound eval unwind will not result in
+        // multiple branches in search graph
+        final double multiplier = evaluation.isUnwinding() && !input.getFreeVariables().isEmpty()
+                ? EVAL_UNWIND_EXTENSION_FACTOR
+                : 1.0;
+        return _calculateCost((PConstraint) evaluation, input) * multiplier;
+    }
+    
+    /**
+     * @since 1.7
+     */
+    protected double _calculateCost(final Inequality inequality, final IConstraintEvaluationContext input) {
+        return _calculateCost((PConstraint)inequality, input);
+    }
+    
+    /**
+     * @since 1.7
+     */
+    protected double _calculateCost(final AggregatorConstraint aggregator, final IConstraintEvaluationContext input) {
+        return _calculateCost((PConstraint)aggregator, input);
+    }
+    
+    /**
+     * @since 1.7
+     */
+    protected double _calculateCost(final NegativePatternCall call, final IConstraintEvaluationContext input) {
+        return _calculateCost((PConstraint)call, input);
+    }
+    
+    /**
+     * @since 1.7
+     */
+    protected double _calculateCost(final PatternMatchCounter counter, final IConstraintEvaluationContext input) {
+        return _calculateCost((PConstraint)counter, input);
+    }
+    
+    /**
+     * @since 1.7
+     */
+    protected double _calculateCost(final BinaryTransitiveClosure closure, final IConstraintEvaluationContext input) {
+        // if (input.getFreeVariables().size() == 1) return 3.0; 
+        return StatisticsBasedConstraintCostFunction.DEFAULT_COST;
+    }
+    
+    /**
+     * @since 2.0
+     */
+    protected double _calculateCost(final BinaryReflexiveTransitiveClosure closure, final IConstraintEvaluationContext input) {
+        // if (input.getFreeVariables().size() == 1) return 3.0; 
+        return StatisticsBasedConstraintCostFunction.DEFAULT_COST;
+    }
+    
+    /**
+     * Default cost calculation strategy
+     */
+    protected double _calculateCost(final PConstraint constraint, final IConstraintEvaluationContext input) {
+        if (input.getFreeVariables().isEmpty()) {
+            return 1.0;
+        } else {
+            return StatisticsBasedConstraintCostFunction.DEFAULT_COST;
+        }
+    }
+
+    /**
+     * @throws ViatraQueryRuntimeException
+     */
+    public double calculateCost(final PConstraint constraint, final IConstraintEvaluationContext input) {
+        Preconditions.checkArgument(constraint != null, "Set constraint value correctly");
+        if (constraint instanceof ExportedParameter) {
+            return _calculateCost((ExportedParameter) constraint, input);
+        } else if (constraint instanceof TypeFilterConstraint) {
+            return _calculateCost((TypeFilterConstraint) constraint, input);
+        } else if (constraint instanceof ConstantValue) {
+            return _calculateCost((ConstantValue) constraint, input);
+        } else if (constraint instanceof PositivePatternCall) {
+            return _calculateCost((PositivePatternCall) constraint, input);
+        } else if (constraint instanceof TypeConstraint) {
+            return _calculateCost((TypeConstraint) constraint, input);
+        } else if (constraint instanceof ExpressionEvaluation) {
+            return _calculateCost((ExpressionEvaluation) constraint, input);
+        } else if (constraint instanceof Inequality) {
+            return _calculateCost((Inequality) constraint, input);
+        } else if (constraint instanceof AggregatorConstraint) {
+            return _calculateCost((AggregatorConstraint) constraint, input);
+        } else if (constraint instanceof NegativePatternCall) {
+            return _calculateCost((NegativePatternCall) constraint, input);
+        } else if (constraint instanceof PatternMatchCounter) {
+            return _calculateCost((PatternMatchCounter) constraint, input);
+        } else if (constraint instanceof BinaryTransitiveClosure) {
+            return _calculateCost((BinaryTransitiveClosure) constraint, input);
+        } else if (constraint instanceof BinaryReflexiveTransitiveClosure) {
+            return _calculateCost((BinaryReflexiveTransitiveClosure) constraint, input);
+        } else {
+            // Default cost calculation
+            return _calculateCost(constraint, input);
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/VariableBindingBasedCostFunction.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/VariableBindingBasedCostFunction.java
new file mode 100644
index 00000000..a517af25
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/cost/impl/VariableBindingBasedCostFunction.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Marton Bur, Balazs Grill, Akos Horvath, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner.cost.impl;
+
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.localsearch.planner.cost.IConstraintEvaluationContext;
+import tools.refinery.viatra.runtime.localsearch.planner.cost.ICostFunction;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
+
+/**
+ * This class can be used to calculate cost of application of a constraint with a given adornment.
+ * 
+ * For now the logic is based on the following principles:
+ * 
+ * <li>The transitive closures, NACs and count finds are the most expensive operations
+ * 
+ * <li>The number of free variables increase the cost
+ * 
+ * <li>If all the variables of a constraint are free, then its cost equals to twice the number of its parameter
+ * variables. This solves the problem of unnecessary iteration over instances at the beginning of a plan (thus causing
+ * very long run times when executing the plan) by applying constraints based on structural features as soon as
+ * possible.
+ * 
+ * <br>
+ * 
+ * @author Marton Bur
+ * @since 1.4
+ *
+ */
+public class VariableBindingBasedCostFunction implements ICostFunction {
+
+    // Static cost definitions
+    private static int MAX = 1000;
+    private static int exportedParameterCost = MAX - 20;
+    private static int binaryTransitiveClosureCost = MAX - 50;
+    private static int nacCost = MAX - 100;
+    private static int aggregatorCost = MAX - 200;
+    private static int constantCost = 0;
+    
+    @Override
+    public double apply(IConstraintEvaluationContext input) {
+        PConstraint constraint = input.getConstraint();
+        Set<PVariable> affectedVariables = constraint.getAffectedVariables();
+
+        int cost = 0;
+
+        // For constants the cost is determined to be 0.0
+        // The following constraints should be checks:
+        // * Binary transitive closure
+        // * NAC
+        // * count
+        // * exported parameter - only a metadata
+        if (constraint instanceof ConstantValue) {
+            cost = constantCost;
+        } else if (constraint instanceof BinaryTransitiveClosure) {
+            cost = binaryTransitiveClosureCost;
+        } else if (constraint instanceof NegativePatternCall) {
+            cost = nacCost;
+        } else if (constraint instanceof AggregatorConstraint) {
+            cost = aggregatorCost;
+        } else if (constraint instanceof ExportedParameter) {
+            cost = exportedParameterCost;
+        } else {
+            // In case of other constraints count the number of unbound variables
+            for (PVariable pVariable : affectedVariables) {
+                if (input.getFreeVariables().contains(pVariable)) {
+                    // For each free variable ('without-value-variable') increase cost
+                    cost += 1;
+                }
+            }
+            if (cost == affectedVariables.size()) {
+                // If all the variables are free, double the cost.
+                // This ensures that iteration costs more
+                cost *= 2;
+            }
+
+        }
+
+        return Float.valueOf(cost);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/util/CompilerHelper.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/util/CompilerHelper.java
new file mode 100644
index 00000000..9b4e9ea5
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/util/CompilerHelper.java
@@ -0,0 +1,209 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Marton Bur, Daniel Segesdi, Akos Horvath, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner.util;
+
+import java.util.ArrayList;
+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.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PApply;
+import tools.refinery.viatra.runtime.matchers.planning.operations.POperation;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+
+/**
+ * 
+ * Helper methods for compiling SubPlans
+ * 
+ * @author Marton Bur
+ *
+ */
+public class CompilerHelper {
+
+    private CompilerHelper() {/*Utility class constructor*/}
+    
+    private static boolean isUserSpecified(PVariable var) {
+        return !var.isVirtual() && !var.getName().startsWith("_"); 
+    }
+    
+    public static Map<PVariable, Integer> createVariableMapping(SubPlan plan) {
+        Map<PVariable, Integer> variableMapping = new HashMap<>();
+
+        int variableNumber = 0;
+
+        // Important note: this list might contain duplications when parameters are made equal inside the pattern
+        // This is the expected and normal behavior
+        List<PVariable> symbolicParameterVariables = plan.getBody().getSymbolicParameterVariables();
+        for (PVariable pVariable : symbolicParameterVariables) {
+            if (!variableMapping.containsKey(pVariable)) {
+                variableMapping.put(pVariable, variableNumber++);
+            }
+        }
+
+        List<PVariable> allVariables = new ArrayList<>(plan.getBody().getUniqueVariables());
+        Collections.sort(allVariables, (left, right) -> {
+                    boolean leftUserSpecified = isUserSpecified(left);
+                    boolean rightUserSpecified = isUserSpecified(right);
+                    if (leftUserSpecified && !rightUserSpecified) {
+                        return -1;
+                    } else if (!leftUserSpecified && rightUserSpecified) {
+                        return +1;
+                    } else {
+                        return left.getName().compareTo(right.getName());
+                    }
+                });
+        for (PVariable pVariable : allVariables) {
+            if (!variableMapping.containsKey(pVariable)) {
+                variableMapping.put(pVariable, variableNumber++);
+            }
+        }
+
+        return variableMapping;
+    }
+
+    public static Map<PConstraint, Set<Integer>> cacheVariableBindings(SubPlan plan,
+            Map<PVariable, Integer> variableMappings, Set<PParameter> adornment) {
+
+        Set<Integer> externallyBoundVariables = getVariableIndicesForParameters(plan, variableMappings,
+                adornment);
+
+        Map<PConstraint, Set<Integer>> variableBindings = new HashMap<>();
+
+        List<SubPlan> allPlansInHierarchy = getAllParentPlans(plan);
+        for (SubPlan subPlan : allPlansInHierarchy) {
+            POperation operation = subPlan.getOperation();
+
+            if (operation instanceof PApply) {
+                PConstraint pConstraint = ((PApply) operation).getPConstraint();
+                Set<Integer> boundVariableIndices = getParametersBoundByParentPlan(variableMappings, subPlan);
+                boundVariableIndices.addAll(externallyBoundVariables);
+                
+                variableBindings.put(pConstraint, boundVariableIndices);
+            }
+        }
+        return variableBindings;
+    }
+
+    /**
+     * Returns the list of variable indexes that are bound by the parent plan.
+     */
+    private static Set<Integer> getParametersBoundByParentPlan(Map<PVariable, Integer> variableMappings,
+            SubPlan subPlan) {
+        if (!subPlan.getParentPlans().isEmpty()) {
+            SubPlan parentPlan = subPlan.getParentPlans().get(0);
+            Set<PConstraint> enforcedConstraints = parentPlan.getAllEnforcedConstraints();
+            Set<PVariable> affectedVariables = getAffectedVariables(enforcedConstraints);
+            return getVariableIndices(variableMappings, affectedVariables);
+        }
+        return Collections.emptySet();
+    }
+
+    /**
+     * @param plan
+     * @return all the ancestor plans including the given plan
+     */
+    private static List<SubPlan> getAllParentPlans(SubPlan plan) {
+        SubPlan currentPlan = plan;
+        List<SubPlan> allPlans = new ArrayList<>();
+        allPlans.add(plan);
+        while (!currentPlan.getParentPlans().isEmpty()) {
+            // In the local search it is assumed that only a single parent exists
+            currentPlan = currentPlan.getParentPlans().get(0);
+            allPlans.add(currentPlan);
+        }
+
+        return allPlans;
+    }
+
+    /**
+     * @param variableMappings
+     *            the mapping between variables and their indices
+     * @param variables
+     *            variables to get the indices for
+     * @return the set of variable indices for the given variables
+     */
+    private static Set<Integer> getVariableIndices(Map<PVariable, Integer> variableMappings,
+            Iterable<PVariable> variables) {
+        Set<Integer> variableIndices = new HashSet<>();
+        for (PVariable pVariable : variables) {
+            variableIndices.add(variableMappings.get(pVariable));
+        }
+        return variableIndices;
+    }
+
+    /**
+     * Returns all affected variables of the given PConstraints.
+     */
+    private static Set<PVariable> getAffectedVariables(Set<PConstraint> pConstraints) {
+        Set<PVariable> allDeducedVariables = new HashSet<>();
+        for (PConstraint pConstraint : pConstraints) {
+            allDeducedVariables.addAll(pConstraint.getAffectedVariables());
+        }
+        return allDeducedVariables;
+    }
+
+    /**
+     * Transforms the index of a parameter into the index of a variable of the normalized body.
+     * 
+     * @param plan
+     *            the SubPlan containing the original body and its parameters
+     * @param variableMappings
+     *            the mapping of PVariables to their indices
+     * @param parameters
+     *            a set of parameters
+     * @return the index of the variable corresponding to the parameter at the given index
+     */
+    private static Set<Integer> getVariableIndicesForParameters(SubPlan plan,
+            Map<PVariable, Integer> variableMappings, Set<PParameter> parameters) {
+        Map<PParameter, PVariable> parameterMapping = new HashMap<>();
+        for (ExportedParameter constraint : plan.getBody().getSymbolicParameters()) {
+            parameterMapping.put(constraint.getPatternParameter(), constraint.getParameterVariable());
+        }
+        
+        Set<Integer> variableIndices = new HashSet<>();
+        for (PParameter parameter : parameters) {
+            PVariable parameterVariable = parameterMapping.get(parameter);
+            if (parameterVariable == null) {
+                // XXX In case of older (pre-1.4) VIATRA versions, PParameters were not stable, see bug 498348
+                parameterVariable = plan.getBody().getVariableByNameChecked(parameter.getName());
+            }
+            Integer variableIndex = variableMappings.get(parameterVariable);
+            variableIndices.add(variableIndex);
+        }
+        return variableIndices;
+    }
+
+    /**
+     * Extracts the operations from a SubPlan into a list of POperations in the order of execution
+     * 
+     * @param plan
+     *            the SubPlan from wich the POperations should be extracted
+     * @return list of POperations extracted from the <code>plan</code>
+     */
+    public static List<POperation> createOperationsList(SubPlan plan) {
+        List<POperation> operationsList = new ArrayList<>();
+        while (plan.getParentPlans().size() > 0) {
+            operationsList.add(plan.getOperation());
+            SubPlan parentPlan = plan.getParentPlans().get(0);
+            plan = parentPlan;
+        }
+        operationsList.add(plan.getOperation());
+        
+        Collections.reverse(operationsList);
+        return operationsList; 
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/util/OperationCostComparator.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/util/OperationCostComparator.java
new file mode 100644
index 00000000..58f4fc41
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/planner/util/OperationCostComparator.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Marton Bur, Zoltan Ujhelyi, Akos Horvath, Istvan Rath and Danil Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.planner.util;
+
+import java.util.Comparator;
+
+import tools.refinery.viatra.runtime.localsearch.planner.PConstraintInfo;
+
+/**
+ * @author Marton Bur
+ *
+ */
+public class OperationCostComparator implements Comparator<PConstraintInfo>{
+
+    @Override
+    public int compare(PConstraintInfo o1, PConstraintInfo o2) {
+        return Double.compare(o1.getCost(), o2.getCost());
+    }
+
+}
diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/profiler/LocalSearchProfilerAdapter.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/profiler/LocalSearchProfilerAdapter.java
new file mode 100644
index 00000000..8c50c694
--- /dev/null
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/profiler/LocalSearchProfilerAdapter.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.localsearch.profiler;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.localsearch.MatchingFrame;
+import tools.refinery.viatra.runtime.localsearch.matcher.ILocalSearchAdapter;
+import tools.refinery.viatra.runtime.localsearch.matcher.LocalSearchMatcher;
+import tools.refinery.viatra.runtime.localsearch.matcher.MatcherReference;
+import tools.refinery.viatra.runtime.localsearch.operations.ISearchOperation;
+import tools.refinery.viatra.runtime.localsearch.plan.SearchPlan;
+import tools.refinery.viatra.runtime.localsearch.plan.SearchPlanExecutor;
+
+/**
+ * This is a simple {@link ILocalSearchAdapter} which capable of counting
+ * each search operation execution then printing it in human readably form 
+ * (along with the executed plans) using {@link #toString()}
+ * @author Grill Balázs
+ * @since 1.5
+ *
+ */
+public class LocalSearchProfilerAdapter implements ILocalSearchAdapter {
+
+    private final Map<MatcherReference, List<SearchPlan>> planReference = new HashMap<>();
+    
+    private final Map<ISearchOperation, Integer> successfulOperationCounts = new HashMap<>();
+    private final Map<ISearchOperation, Integer> failedOperationCounts = new HashMap<>();
+
+    @Override
+    public void patternMatchingStarted(LocalSearchMatcher lsMatcher) {
+        MatcherReference key = new MatcherReference(lsMatcher.getPlanDescriptor().getQuery(),
+                lsMatcher.getPlanDescriptor().getAdornment());
+        planReference.put(key, lsMatcher.getPlan().stream().map(SearchPlanExecutor::getSearchPlan).collect(Collectors.toList()));
+    }
+
+    @Override
+    public void operationExecuted(SearchPlan plan, ISearchOperation operation, MatchingFrame frame, boolean isSuccessful) {
+        Map<ISearchOperation, Integer> counts = isSuccessful ? successfulOperationCounts : failedOperationCounts;
+        counts.merge(operation, 
+                /*no previous entry*/1, 
+                /*increase previous value*/(oldValue, v) -> oldValue + 1);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        for (java.util.Map.Entry<MatcherReference, List<SearchPlan>> entry: planReference.entrySet()){
+            sb.append(entry.getKey());
+            sb.append("\n");
+            
+            sb.append(entry.getValue());
+            
+            List<SearchPlan> bodies = entry.getValue();
+            sb.append("{\n");
+            for(int i=0;i<bodies.size();i++){
+                sb.append("\tbody #");sb.append(i);sb.append("(\n");
+                for(ISearchOperation operation : bodies.get(i).getOperations()){
+                    final int successCount = successfulOperationCounts.computeIfAbsent(operation, op -> 0);
+                    final int failCount = failedOperationCounts.computeIfAbsent(operation, op -> 0);
+                    sb.append("\t\t");sb.append(successCount);
+                    sb.append("\t");sb.append(failCount);
+                    sb.append("\t");sb.append(successCount + failCount);
+                    sb.append("\t");sb.append(operation);
+                    sb.append("\n");
+                }
+                sb.append("\t)\n");
+            }
+            sb.append("}\n");
+        }
+        return sb.toString();
+    }
+    
+}
diff --git a/subprojects/viatra-runtime-rete-recipes/META-INF/MANIFEST.MF b/subprojects/viatra-runtime-rete-recipes/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..c732af46
--- /dev/null
+++ b/subprojects/viatra-runtime-rete-recipes/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: viatra-runtime-rete-recipes;singleton:=true
+Automatic-Module-Name: viatra-runtime-rete-recipes
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: viatra-runtime-rete-recipes.jar
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.eclipse.viatra.query.runtime.rete.recipes,
+ org.eclipse.viatra.query.runtime.rete.recipes.impl,
+ org.eclipse.viatra.query.runtime.rete.recipes.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.emf.ecore.xcore.lib
+Bundle-ActivationPolicy: lazy
diff --git a/subprojects/viatra-runtime-rete-recipes/META-INF/MANIFEST.MF.license b/subprojects/viatra-runtime-rete-recipes/META-INF/MANIFEST.MF.license
new file mode 100644
index 00000000..03d1d42b
--- /dev/null
+++ b/subprojects/viatra-runtime-rete-recipes/META-INF/MANIFEST.MF.license
@@ -0,0 +1,4 @@
+Copyright (c) 2004-2014 Gabor Bergmann and Daniel Varro
+Copyright (c) 2023 The Refinery Authors <https://refinery.tools>
+
+SPDX-License-Identifier: EPL-2.0
diff --git a/subprojects/viatra-runtime-rete-recipes/about.html b/subprojects/viatra-runtime-rete-recipes/about.html
new file mode 100644
index 00000000..d1d5593a
--- /dev/null
+++ b/subprojects/viatra-runtime-rete-recipes/about.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<!--
+  Copyright (c) 2017, Eclipse.org Foundation, Inc.
+
+  SPDX-License-Identifier: LicenseRef-EPL-Steward
+-->
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>March 18, 2019</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v20.php">http://www.eclipse.org/legal/epl-v20.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+</body>
+</html>
diff --git a/subprojects/viatra-runtime-rete-recipes/build.gradle.kts b/subprojects/viatra-runtime-rete-recipes/build.gradle.kts
new file mode 100644
index 00000000..b1b11b4e
--- /dev/null
+++ b/subprojects/viatra-runtime-rete-recipes/build.gradle.kts
@@ -0,0 +1,62 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import tools.refinery.gradle.utils.SonarPropertiesUtils
+
+plugins {
+        id("tools.refinery.gradle.java-library")
+        id("tools.refinery.gradle.mwe2")
+        id("tools.refinery.gradle.sonarqube")
+}
+
+dependencies {
+        api(project(":refinery-viatra-runtime"))
+        api(libs.ecore)
+        mwe2(libs.ecore.codegen)
+        mwe2(libs.mwe.utils)
+        mwe2(libs.mwe2.lib)
+        mwe2(libs.slf4j.simple)
+        mwe2(libs.xtext.core)
+        mwe2(libs.xtext.xbase)
+}
+
+sourceSets {
+        main {
+                java.srcDir("src/main/emf-gen")
+        }
+}
+
+tasks {
+        val generateEPackage by registering(JavaExec::class) {
+                mainClass.set("org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher")
+                classpath(configurations.mwe2)
+                inputs.file("src/main/java/tools/refinery/viatra/runtime/rete/recipes/GenerateReteRecipes.mwe2")
+                inputs.file("src/main/resources/model/recipes.ecore")
+                inputs.file("src/main/resources/model/rete-recipes.genmodel")
+                outputs.file("build.properties")
+                outputs.file("META-INF/MANIFEST.MF")
+                outputs.file("plugin.xml")
+                outputs.file("plugin.properties")
+                outputs.dir("src/main/emf-gen")
+                args("src/main/java/tools/refinery/viatra/runtime/rete/recipes/GenerateReteRecipes.mwe2",
+                                "-p", "rootPath=/$projectDir")
+        }
+
+        for (taskName in listOf("compileJava", "processResources", "generateEclipseSourceFolders")) {
+                named(taskName) {
+                        dependsOn(generateEPackage)
+                }
+        }
+
+        clean {
+                delete("src/main/emf-gen")
+        }
+}
+
+sonarqube.properties {
+        SonarPropertiesUtils.addToList(properties, "sonar.exclusions", "src/main/emf-gen/**")
+}
+
diff --git a/subprojects/viatra-runtime-rete-recipes/build.properties b/subprojects/viatra-runtime-rete-recipes/build.properties
new file mode 100644
index 00000000..97e4d6bd
--- /dev/null
+++ b/subprojects/viatra-runtime-rete-recipes/build.properties
@@ -0,0 +1,15 @@
+# Copyright (c) 2004-2014 Gabor Bergmann and Daniel Varro
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-v20.html.
+# 
+# SPDX-License-Identifier: EPL-2.0
+
+bin.includes = viatra-runtime-rete-recipes.jar,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = viatra-runtime-rete-recipes.jar
+source.viatra-runtime-rete-recipes.jar = src-gen/
+output.viatra-runtime-rete-recipes.jar = bin/
diff --git a/subprojects/viatra-runtime-rete-recipes/plugin.properties b/subprojects/viatra-runtime-rete-recipes/plugin.properties
new file mode 100644
index 00000000..43a7236d
--- /dev/null
+++ b/subprojects/viatra-runtime-rete-recipes/plugin.properties
@@ -0,0 +1,9 @@
+# Copyright (c) 2004-2014 Gabor Bergmann and Daniel Varro
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-v20.html.
+# 
+# SPDX-License-Identifier: EPL-2.0
+
+pluginName = Rete-recipes Model
+providerName = www.example.org
diff --git a/subprojects/viatra-runtime-rete-recipes/plugin.xml b/subprojects/viatra-runtime-rete-recipes/plugin.xml
new file mode 100644
index 00000000..e4917f5d
--- /dev/null
+++ b/subprojects/viatra-runtime-rete-recipes/plugin.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2004-2014 Gabor Bergmann and Daniel Varro
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-v20.html.
+ 
+ SPDX-License-Identifier: EPL-2.0
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated rete-recipes -->
+      <package
+            uri="https://refinery.tools/emf/2023/ViatraReteRecipes"
+            class="tools.refinery.viatra.runtime.rete.recipes.RecipesPackage"
+            genModel="src/main/resources/model/rete-recipes.genmodel"/>
+   </extension>
+
+</plugin>
diff --git a/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/GenerateReteRecipes.mwe2 b/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/GenerateReteRecipes.mwe2
new file mode 100644
index 00000000..424cc9f5
--- /dev/null
+++ b/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/GenerateReteRecipes.mwe2
@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+module tools.refinery.viatra.runtime.rete.recipes.GenerateReteRecipes
+
+Workflow {
+        bean = org.eclipse.emf.mwe.utils.StandaloneSetup {
+                projectMapping = {
+                        projectName = "tools.refinery.refinery-viatra-runtime-rete-recipes"
+                        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-viatra-runtime-rete-recipes/src/main/resources/model/rete-recipes.genmodel"
+                srcPath = "platform:/resource/tools.refinery.refinery-viatra-runtime-rete-recipes/src/main/emf-gen"
+        }
+}
diff --git a/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/helper/RecipeRecognizer.java b/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/helper/RecipeRecognizer.java
new file mode 100644
index 00000000..2c252593
--- /dev/null
+++ b/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/helper/RecipeRecognizer.java
@@ -0,0 +1,204 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.recipes.helper;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.rete.recipes.RecipesPackage;
+import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+
+import java.util.*;
+
+/**
+ * Stores a set of known <em>canonical</em> recipes, each representing a disjoint equivalence class of recipes, modulo
+ * {@link #isEquivalentRecipe(ReteNodeRecipe, ReteNodeRecipe)}.
+ *
+ * @author Gabor Bergmann
+ * @since 1.3
+ *
+ */
+public class RecipeRecognizer {
+    private static long nextRecipeEquivalenceClassID = 0;
+
+    /**
+     * if EcoreUtil.equals(recipe1, recipe2), only one of them will be included here
+     */
+    Map<EClass, Set<ReteNodeRecipe>> canonicalRecipesByClass = new HashMap<>();
+    Map<Long, ReteNodeRecipe> canonicalRecipeByEquivalenceClassID = new HashMap<>();
+
+    private IQueryRuntimeContext runtimeContext;
+
+    /**
+     * @param can be null; if provided, further equivalences can be detected based on {@link IQueryRuntimeContext#wrapElement(Object)}
+     * @since 1.6
+     */
+    public RecipeRecognizer(IQueryRuntimeContext runtimeContext) {
+        this.runtimeContext = runtimeContext;
+    }
+    public RecipeRecognizer() {
+        this(null);
+    }
+
+    /**
+     * Recognizes when an equivalent canonical recipe is already known.
+     *
+     * @return an equivalent canonical recipe, or the null if no known equivalent found
+     */
+    public ReteNodeRecipe peekCanonicalRecipe(final ReteNodeRecipe recipe) {
+        // equivalence class already known
+        for (Long classID : recipe.getEquivalenceClassIDs()) {
+            ReteNodeRecipe knownRecipe = canonicalRecipeByEquivalenceClassID.get(classID);
+            if (knownRecipe != null)
+                return knownRecipe;
+        }
+
+        // equivalence class not known, but maybe equivalent recipe still
+        // available
+        Collection<ReteNodeRecipe> sameClassRecipes = getSameClassCanonicalRecipes(recipe);
+        for (ReteNodeRecipe knownRecipe : sameClassRecipes) {
+            if (isEquivalentRecipe(recipe, knownRecipe)) {
+                // FOUND EQUIVALENT RECIPE
+                recipe.getEquivalenceClassIDs().add(knownRecipe.getEquivalenceClassIDs().get(0));
+                return knownRecipe;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * This recipe will be remembered as a canonical recipe. Method maintains both internal data structures and the
+     * equivalence class attribute of the recipe. PRECONDITION: {@link #peekCanonicalRecipe(ReteNodeRecipe)} must return
+     * null or the recipe itself
+     */
+    public void makeCanonical(final ReteNodeRecipe recipe) {
+        // this is a canonical recipe, chosen representative of its new
+        // equivalence class
+        if (recipe.getEquivalenceClassIDs().isEmpty()) {
+            recipe.getEquivalenceClassIDs().add(nextRecipeEquivalenceClassID++);
+        }
+        for (Long classID : recipe.getEquivalenceClassIDs()) {
+            canonicalRecipeByEquivalenceClassID.put(classID, recipe);
+        }
+        getSameClassCanonicalRecipes(recipe).add(recipe);
+    }
+
+    /**
+     * Ensures that there is an equivalent canonical recipe; if none is known yet, this recipe will be remembered as
+     * canonical.
+     *
+     * @return an equivalent canonical recipe; the argument recipe itself (which is made canonical) if no known
+     *         equivalent found
+     */
+    public ReteNodeRecipe canonicalizeRecipe(final ReteNodeRecipe recipe) {
+        ReteNodeRecipe knownRecipe = peekCanonicalRecipe(recipe);
+        if (knownRecipe == null) {
+            knownRecipe = recipe;
+            makeCanonical(recipe);
+        }
+        return knownRecipe;
+    }
+
+    /**
+     * @return true iff recipe is a canonical recipe
+     */
+    public boolean isKnownCanonicalRecipe(final ReteNodeRecipe recipe) {
+        if (recipe.getEquivalenceClassIDs().isEmpty()) {
+            return false;
+        }
+        ReteNodeRecipe knownRecipe = canonicalRecipeByEquivalenceClassID.get(recipe.getEquivalenceClassIDs().get(0));
+        return recipe == knownRecipe;
+    }
+
+    private Set<ReteNodeRecipe> getSameClassCanonicalRecipes(final ReteNodeRecipe recipe) {
+        Set<ReteNodeRecipe> sameClassRecipes = canonicalRecipesByClass.get(recipe.eClass());
+        if (sameClassRecipes == null) {
+            sameClassRecipes = new HashSet<>();
+            canonicalRecipesByClass.put(recipe.eClass(), sameClassRecipes);
+        }
+        return sameClassRecipes;
+    }
+
+    private boolean isEquivalentRecipe(ReteNodeRecipe recipe, ReteNodeRecipe knownRecipe) {
+        return new EqualityHelper(runtimeContext).equals(recipe, knownRecipe);
+    }
+
+    // TODO reuse in more cases later, e.g. switching join node parents, etc.
+    private static class EqualityHelper extends EcoreUtil.EqualityHelper {
+
+
+
+
+        private static final long serialVersionUID = -8841971394686015188L;
+
+        private static final EAttribute RETE_NODE_RECIPE_EQUIVALENCE_CLASS_IDS =
+                RecipesPackage.eINSTANCE.getReteNodeRecipe_EquivalenceClassIDs();
+        private static final EAttribute CONSTANT_RECIPE_CONSTANT_VALUES =
+                RecipesPackage.eINSTANCE.getConstantRecipe_ConstantValues();
+        private static final EAttribute DISCRIMINATOR_BUCKET_RECIPE_BUCKET_KEY =
+                RecipesPackage.eINSTANCE.getDiscriminatorBucketRecipe_BucketKey();
+
+        private IQueryRuntimeContext runtimeContext;
+
+        public EqualityHelper(IQueryRuntimeContext runtimeContext) {
+            this.runtimeContext = runtimeContext;
+        }
+
+        @Override
+        protected boolean haveEqualFeature(EObject eObject1, EObject eObject2, EStructuralFeature feature) {
+            // ignore differences in this attribute, as it may only be assigned
+            // after the equivalence check
+            if (RETE_NODE_RECIPE_EQUIVALENCE_CLASS_IDS.equals(feature))
+                return true;
+
+            if (runtimeContext != null) {
+                // constant values
+                if (/*CONSTANT_RECIPE_CONSTANT_VALUES.equals(feature) ||*/ DISCRIMINATOR_BUCKET_RECIPE_BUCKET_KEY.equals(feature)) {
+                    // use runtime context to map to canonical wrapped form
+                    // this is costly for constant recipes (TODO improve this), but essential for discriminator buckets
+
+                    Object val1 = eObject1.eGet(feature);
+                    Object val2 = eObject2.eGet(feature);
+
+                    if (val1 != null && val2 != null) {
+                        return runtimeContext.wrapElement(val1).equals(runtimeContext.wrapElement(val2));
+                    } else {
+                        return val1 == null && val2 == null;
+                    }
+
+                }
+            }
+
+            // fallback to general comparison
+            return super.haveEqualFeature(eObject1, eObject2, feature);
+        }
+
+        @Override
+        public boolean equals(EObject eObject1, EObject eObject2) {
+            // short-circuit if already known to be equivalent
+            if (eObject1 instanceof ReteNodeRecipe) {
+                if (eObject2 instanceof ReteNodeRecipe) {
+                    EList<Long> eqClassIDs1 = ((ReteNodeRecipe) eObject1).getEquivalenceClassIDs();
+                    EList<Long> eqClassIDs2 = ((ReteNodeRecipe) eObject2).getEquivalenceClassIDs();
+
+                    if (!Collections.disjoint(eqClassIDs1, eqClassIDs2))
+                        return true;
+                }
+            }
+
+            // fallback to general comparison
+            return super.equals(eObject1, eObject2);
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/helper/RecipesHelper.java b/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/helper/RecipesHelper.java
new file mode 100644
index 00000000..3070fcf5
--- /dev/null
+++ b/subprojects/viatra-runtime-rete-recipes/src/main/java/tools/refinery/viatra/runtime/rete/recipes/helper/RecipesHelper.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) 2004-2014 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.viatra.runtime.rete.recipes.helper;
+
+import org.eclipse.emf.common.util.EList;
+import tools.refinery.viatra.runtime.rete.recipes.*;
+
+import java.util.Collection;
+
+/**
+ * Static helper class for easy construction of recipes.
+ *
+ * @author Bergmann Gabor
+ */
+public class RecipesHelper {
+    private static final RecipesFactory FACTORY = RecipesFactory.eINSTANCE;
+
+    private RecipesHelper() {/* Utility class constructor */}
+
+    /**
+     * @since 2.0
+     */
+    public static Mask mask(final int sourceArity, final Collection<Integer> sourceIndices) {
+        Mask mask = RecipesHelper.FACTORY.createMask();
+        mask.setSourceArity(sourceArity);
+        mask.getSourceIndices().addAll(sourceIndices);
+        return mask;
+    }
+
+    public static Mask mask(final int sourceArity, final int... sourceIndices) {
+        Mask mask = RecipesHelper.FACTORY.createMask();
+        mask.setSourceArity(sourceArity);
+        final EList<Integer> maskIndeces = mask.getSourceIndices();
+        for (int index : sourceIndices) {
+            maskIndeces.add(index);
+        }
+        return mask;
+    }
+
+    public static ProjectionIndexerRecipe projectionIndexerRecipe(final ReteNodeRecipe parent, final Mask mask) {
+        ProjectionIndexerRecipe recipe = RecipesHelper.FACTORY.createProjectionIndexerRecipe();
+        recipe.setParent(parent);
+        recipe.setMask(mask);
+        return recipe;
+    }
+
+    public static ExpressionDefinition expressionDefinition(final Object evaluator) {
+        ExpressionDefinition definition = RecipesHelper.FACTORY.createExpressionDefinition();
+        definition.setEvaluator(evaluator);
+        return definition;
+    }
+
+    public static InputRecipe inputRecipe(final Object inputKey, final String inputKeyID, final int arity) {
+        InputRecipe recipe = RecipesHelper.FACTORY.createInputRecipe();
+        recipe.setInputKey(inputKey);
+        recipe.setKeyArity(arity);
+        recipe.setKeyID(inputKeyID);
+        recipe.setTraceInfo(inputKeyID);
+        return recipe;
+    }
+
+    /**
+     * Mask can be null in case no tuple reordering or trimming is needed
+     */
+    public static InputFilterRecipe inputFilterRecipe(final ReteNodeRecipe parent, final Object inputKey,
+            final String inputKeyID, final Mask mask) {
+        InputFilterRecipe it = RecipesHelper.FACTORY.createInputFilterRecipe();
+        it.setParent(parent);
+        it.setInputKey(inputKey);
+        it.setKeyID(inputKeyID);
+        it.setTraceInfo(inputKeyID);
+        it.setMask(mask);
+        return it;
+    }
+}
diff --git a/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/recipes.ecore b/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/recipes.ecore
new file mode 100644
index 00000000..4eda701e
--- /dev/null
+++ b/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/recipes.ecore
@@ -0,0 +1,400 @@
+<?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="recipes" nsURI="https://refinery.tools/emf/2023/ViatraReteRecipes"
+    nsPrefix="recipes">
+  <eClassifiers xsi:type="ecore:EClass" name="ReteRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Container for Rete recipes."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="recipeNodes" upperBound="-1"
+        eType="#//ReteNodeRecipe" containment="true" resolveProxies="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ReteNodeRecipe" abstract="true">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Abstract base class for model elements that represent &quot;Rete node recipes&quot;,&#xD;&#xA;that is DTOs that carry information for Rete network construction.&#xD;&#xA;&#xD;&#xA;@noimplement"/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value=" The width of tuples contained by this node."/>
+        <details key="body" value="throw new &lt;%java.lang.UnsupportedOperationException%>();"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="traceInfo" unique="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Temporary construct for storing traceability information."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="equivalenceClassIDs" upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong" transient="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="If two recipes were found equivalent, a matching equivalence ID can be assigned to them by {@link RecipeRecognizer}. &#xD;&#xA;If two recipes share (at least one) equivalence ID, they are known to be equivalent.&#xD;&#xA;&#xD;&#xA;&lt;p>&#xD;&#xA;A difference in this attribute only does not preclude two recipe elements to be considered equal. &#xD;&#xA;If they are shown to be equivalent using deeper analysis, equivalence ids can be set so that the equivalence is recognized more easily the next time.&#xD;&#xA;&#xD;&#xA;@since 1.3"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SingleParentNodeRecipe" abstract="true"
+      eSuperTypes="#//ReteNodeRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Abstract base class for single-parent node recipes."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//ReteNodeRecipe"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AlphaRecipe" abstract="true" eSuperTypes="#//SingleParentNodeRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Abstract base class for alpha node recipes."/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="MultiParentNodeRecipe" abstract="true"
+      eSuperTypes="#//ReteNodeRecipe">
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%>> _parents = this.getParents();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _get = _parents.get(0);&#xA;return _get.getArity();"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parents" upperBound="-1"
+        eType="#//ReteNodeRecipe"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="MonotonicityInfo">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="coreMask" eType="#//Mask"
+        containment="true" resolveProxies="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="posetMask" eType="#//Mask"
+        containment="true" resolveProxies="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="posetComparator" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UniquenessEnforcerRecipe" eSuperTypes="#//MultiParentNodeRecipe #//RederivableNodeRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Represents nodes that enforce tuple uniqueness, i.e. filter out&#xA;duplicate input tuples for output."/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ProductionRecipe" eSuperTypes="#//MultiParentNodeRecipe #//RederivableNodeRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="The production node represents the output of the Rete network,&#xA;from which the results of a query can be read."/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="return this.getMappedIndices().size();"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="mappedIndices" upperBound="-1"
+        eType="#//StringIndexMapEntry" containment="true" resolveProxies="false">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="String -> Index map.&#xA;Indicates the positions of parameters."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pattern" unique="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Traceability link to defining pattern object (from EMFPatternLanguage)&#xA;TODO unused?"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="patternFQN" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IndexerRecipe" abstract="true" eSuperTypes="#//SingleParentNodeRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Represents a node that indexes the contents of a parent based on a projection defined by a Mask."/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = this.getMask();&#xA;return _mask.getSourceArity();"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="mask" eType="#//Mask" containment="true"
+        resolveProxies="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ProjectionIndexerRecipe" eSuperTypes="#//IndexerRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Represents helper nodes that provide projection indexing for Beta nodes and user queries."/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AggregatorIndexerRecipe" eSuperTypes="#//IndexerRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Attached to an aggregator node, provides the aggregated values for outer join."/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="BetaRecipe" abstract="true" eSuperTypes="#//ReteNodeRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Abstract base class for Beta node recipes."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="leftParent" eType="#//ProjectionIndexerRecipe"
+        containment="true" resolveProxies="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightParent" eType="#//IndexerRecipe"
+        containment="true" resolveProxies="false">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value=" can be an AggregatorIndexer"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Mask">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="A mask defines the set of tuple variables that need to be taken into consideration for operations."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sourceIndices" unique="false"
+        upperBound="-1" eType="#//Index">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The indices that are relevant for tuple operations."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sourceArity" unique="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The arity of tuples."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="Index" instanceClassName="java.lang.Integer">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Indexes tell which variable of tuples are relevant for a given operation.&#xA;TODO: is this necessary at all?"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="StringIndexMapEntry" instanceClassName="java.util.Map$Entry">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" unique="false" eType="#//Index"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="InputRecipe" eSuperTypes="#//ReteNodeRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Represents input nodes for the Rete network, i.e. nodes&#xA;that generate input tuples for processing."/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="return getKeyArity();"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inputKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="keyID" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Temporary construct for identifying types over the wire.&#xA;TODO improve type references"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="keyArity" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConstantRecipe" eSuperTypes="#//ReteNodeRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Simple node that stores constant values."/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="return this.getConstantValues().size();"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="constantValues" unique="false"
+        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Stores constant values. May be empty.&#xA;&#xA;TODO store constants as strings instead? (for easier serialization)"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="TransitiveClosureRecipe" eSuperTypes="#//AlphaRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Represents transitive closure."/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="return 2;"/>
+      </eAnnotations>
+    </eOperations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FilterRecipe" abstract="true" eSuperTypes="#//AlphaRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Abstract base class for nodes that implement filtering operations."/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+      </eAnnotations>
+    </eOperations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="InequalityFilterRecipe" eSuperTypes="#//FilterRecipe">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="subject" unique="false"
+        eType="#//Index"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inequals" unique="false"
+        upperBound="-1" eType="#//Index"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EqualityFilterRecipe" eSuperTypes="#//FilterRecipe">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="indices" unique="false"
+        upperBound="-1" eType="#//Index"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="TransparentRecipe" eSuperTypes="#//FilterRecipe"/>
+  <eClassifiers xsi:type="ecore:EClass" name="TrimmerRecipe" eSuperTypes="#//AlphaRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Implements projection without uniqueness checking."/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = this.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;return _sourceIndices.size();"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="mask" eType="#//Mask" containment="true"
+        resolveProxies="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ExpressionDefinition">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="evaluator" unique="false"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ExpressionEnforcerRecipe" abstract="true"
+      eSuperTypes="#//AlphaRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="type RuntimeExpressionEvaluator wraps tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator&#xA;class RuntimeExpressionDefinition extends ExpressionDefinition {&#xA;&#x9;RuntimeExpressionEvaluator evaluator&#xA;}"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//ExpressionDefinition"
+        containment="true" resolveProxies="false">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Provides traceability to expression representation."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="mappedIndices" upperBound="-1"
+        eType="#//StringIndexMapEntry" containment="true" resolveProxies="false">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="String -> Index map.&#xA;Maps variable names in the expression to tuple indices."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cacheOutput" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CheckRecipe" eSuperTypes="#//ExpressionEnforcerRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Computes the result of the boolean expression evaluation and&#xA;only passes tuples for which the result is true."/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+      </eAnnotations>
+    </eOperations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EvalRecipe" eSuperTypes="#//ExpressionEnforcerRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Computes the result of expression evaluation and suffixes the result&#xA;to output tuples as the last element."/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;int _arity = _parent.getArity();&#xA;return (1 + _arity);"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unwinding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="@since 2.4"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IndexerBasedAggregatorRecipe" abstract="true"
+      eSuperTypes="#//ReteNodeRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Represents a (compound) node that performs an aggregation operation.&#xA;Parent must be a ProjectionIndexer, which defines how tuples are to be aggregated.&#xA;Usable only through an Join with an AggregatorIndexer as the right parent"/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ProjectionIndexerRecipe%> _parent = this.getParent();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = _parent.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;int _size = _sourceIndices.size();&#xA;return (1 + _size);"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//ProjectionIndexerRecipe"
+        containment="true" resolveProxies="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CountAggregatorRecipe" eSuperTypes="#//IndexerBasedAggregatorRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="The count aggregator node represents a &quot;count find&quot; operation."/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="JoinRecipe" eSuperTypes="#//BetaRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="The most basic beta operation, the join node performs a join operation over two input tuple sets."/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ProjectionIndexerRecipe%> _leftParent = this.getLeftParent();&#xA;int _arity = _leftParent.getArity();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.IndexerRecipe%> _rightParent = this.getRightParent();&#xA;int _arity_1 = _rightParent.getArity();&#xA;int _plus = (_arity + _arity_1);&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.IndexerRecipe%> _rightParent_1 = this.getRightParent();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = _rightParent_1.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;int _size = _sourceIndices.size();&#xA;return (_plus - _size);"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightParentComplementaryMask"
+        eType="#//Mask" containment="true" resolveProxies="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ExistenceJoinRecipe" abstract="true"
+      eSuperTypes="#//BetaRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Existence joins are TODO&#xA;&#xA;See http://en.wikipedia.org/wiki/Relational_algebra"/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ProjectionIndexerRecipe%> _leftParent = this.getLeftParent();&#xA;return _leftParent.getArity();"/>
+      </eAnnotations>
+    </eOperations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SemiJoinRecipe" eSuperTypes="#//ExistenceJoinRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="A semi-join is TODO&#xA;&#xA;See http://en.wikipedia.org/wiki/Relational_algebra"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AntiJoinRecipe" eSuperTypes="#//ExistenceJoinRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="An anti-join is TODO&#xA;&#xA;See http://en.wikipedia.org/wiki/Relational_algebra"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="InputFilterRecipe" eSuperTypes="#//FilterRecipe">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inputKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+        transient="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="keyID" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Temporary construct for identifying types over the wire.&#xA;TODO improve type references"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="mask" eType="#//Mask" containment="true"
+        resolveProxies="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SingleColumnAggregatorRecipe" eSuperTypes="#//AlphaRecipe #//RederivableNodeRecipe">
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.MonotonicityInfo%> info = getOptionalMonotonicityInfo();&#xA;if (info == null) {&#xA;&#x9;return 1 + getGroupByMask().getSourceIndices().size();&#xA;} else {&#x9;&#xA;&#x9;return info.getCoreMask().getSourceIndices().size() + info.getPosetMask().getSourceIndices().size();&#xA;}"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multisetAggregationOperator"
+        eType="#//AggregationOperator"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="aggregableIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="groupByMask" lowerBound="1"
+        eType="#//Mask" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="AggregationOperator" instanceTypeName="tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator&lt;?, ?, ?>"/>
+  <eClassifiers xsi:type="ecore:EClass" name="DiscriminatorDispatcherRecipe" eSuperTypes="#//SingleParentNodeRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Node that sends tuples off to different buckets (attached as children) based on the value of a given column."/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="discriminationColumnIndex"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="DiscriminatorBucketRecipe" eSuperTypes="#//SingleParentNodeRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="A bucket holds a filtered set of tuples of its parent DiscriminatorDispatcher; exactly those that have the given bucket key at their discrimination column."/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bucketKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RederivableNodeRecipe" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deleteRederiveEvaluation"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="optionalMonotonicityInfo"
+        eType="#//MonotonicityInfo" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RelationEvaluationRecipe" eSuperTypes="#//MultiParentNodeRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="@since 2.8"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="evaluator" eType="#//ExpressionDefinition"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RepresentativeElectionRecipe" eSuperTypes="#//AlphaRecipe">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Represents represenative election."/>
+    </eAnnotations>
+    <eOperations name="getArity" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="return 2;"/>
+      </eAnnotations>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="connectivity" eType="#//Connectivity"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="Connectivity" instanceClassName="tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.Connectivity"/>
+</ecore:EPackage>
diff --git a/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/recipes.ecore.license b/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/recipes.ecore.license
new file mode 100644
index 00000000..03d1d42b
--- /dev/null
+++ b/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/recipes.ecore.license
@@ -0,0 +1,4 @@
+Copyright (c) 2004-2014 Gabor Bergmann and Daniel Varro
+Copyright (c) 2023 The Refinery Authors <https://refinery.tools>
+
+SPDX-License-Identifier: EPL-2.0
diff --git a/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/rete-recipes.genmodel b/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/rete-recipes.genmodel
new file mode 100644
index 00000000..6b44fde6
--- /dev/null
+++ b/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/rete-recipes.genmodel
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004-2014 Gabor Bergmann and Daniel Varro&#xA;Copyright (c) 2023 The Refinery Authors &lt;https://refinery.tools>&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License v. 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-v20.html.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0"
+    modelDirectory="/tools.refinery.refinery-viatra-runtime-rete-recipes/src/main/emf-gen"
+    modelPluginID="viatra-runtime-rete-recipes" runtimeJar="true" forceOverwrite="true"
+    modelName="Rete-recipes" updateClasspath="false" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true"
+    complianceLevel="7.0" language="en" operationReflection="true">
+  <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter">
+    <genAnnotations source="selectedPackages">
+      <details key="http://www.eclipse.org/emf/2002/Ecore" value="Ecore.xsd"/>
+    </genAnnotations>
+    <details key="directoryURI" value="."/>
+  </genAnnotations>
+  <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter.xmi">
+    <genAnnotations source="selectedPackages">
+      <details key="http://www.eclipse.org/emf/2002/Ecore" value="EcoreXMI.xsd"/>
+    </genAnnotations>
+    <details key="directoryURI" value="."/>
+  </genAnnotations>
+  <foreignModel>recipes.ecore</foreignModel>
+  <modelPluginVariables>org.eclipse.xtext.xbase.lib</modelPluginVariables>
+  <modelPluginVariables>org.eclipse.emf.ecore.xcore.lib</modelPluginVariables>
+  <genPackages prefix="Recipes" basePackage="tools.refinery.viatra.runtime.rete" disposableProviderFactory="true"
+      ecorePackage="recipes.ecore#/">
+    <genDataTypes ecoreDataType="recipes.ecore#//Index"/>
+    <genDataTypes ecoreDataType="recipes.ecore#//AggregationOperator"/>
+    <genDataTypes ecoreDataType="recipes.ecore#//Connectivity"/>
+    <genClasses ecoreClass="recipes.ecore#//ReteRecipe">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//ReteRecipe/recipeNodes"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="recipes.ecore#//ReteNodeRecipe">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//ReteNodeRecipe/traceInfo"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//ReteNodeRecipe/equivalenceClassIDs"/>
+      <genOperations ecoreOperation="recipes.ecore#//ReteNodeRecipe/getArity" body="throw new &lt;%java.lang.UnsupportedOperationException%>();"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="recipes.ecore#//SingleParentNodeRecipe">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference recipes.ecore#//SingleParentNodeRecipe/parent"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="recipes.ecore#//AlphaRecipe"/>
+    <genClasses image="false" ecoreClass="recipes.ecore#//MultiParentNodeRecipe">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference recipes.ecore#//MultiParentNodeRecipe/parents"/>
+      <genOperations ecoreOperation="recipes.ecore#//MultiParentNodeRecipe/getArity"
+          body="&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%>> _parents = this.getParents();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _get = _parents.get(0);&#xA;return _get.getArity();"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//MonotonicityInfo">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//MonotonicityInfo/coreMask"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//MonotonicityInfo/posetMask"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//MonotonicityInfo/posetComparator"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//UniquenessEnforcerRecipe"/>
+    <genClasses ecoreClass="recipes.ecore#//ProductionRecipe">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//ProductionRecipe/mappedIndices"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//ProductionRecipe/pattern"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//ProductionRecipe/patternFQN"/>
+      <genOperations ecoreOperation="recipes.ecore#//ProductionRecipe/getArity" body="return this.getMappedIndices().size();"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="recipes.ecore#//IndexerRecipe">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//IndexerRecipe/mask"/>
+      <genOperations ecoreOperation="recipes.ecore#//IndexerRecipe/getArity" body="&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = this.getMask();&#xA;return _mask.getSourceArity();"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//ProjectionIndexerRecipe"/>
+    <genClasses ecoreClass="recipes.ecore#//AggregatorIndexerRecipe"/>
+    <genClasses image="false" ecoreClass="recipes.ecore#//BetaRecipe">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//BetaRecipe/leftParent"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//BetaRecipe/rightParent"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//Mask">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//Mask/sourceIndices"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//Mask/sourceArity"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//StringIndexMapEntry">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//StringIndexMapEntry/key"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//StringIndexMapEntry/value"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//InputRecipe">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//InputRecipe/inputKey"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//InputRecipe/keyID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//InputRecipe/keyArity"/>
+      <genOperations ecoreOperation="recipes.ecore#//InputRecipe/getArity" body="return getKeyArity();"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//ConstantRecipe">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//ConstantRecipe/constantValues"/>
+      <genOperations ecoreOperation="recipes.ecore#//ConstantRecipe/getArity" body="return this.getConstantValues().size();"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//TransitiveClosureRecipe">
+      <genOperations ecoreOperation="recipes.ecore#//TransitiveClosureRecipe/getArity"
+          body="return 2;"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="recipes.ecore#//FilterRecipe">
+      <genOperations ecoreOperation="recipes.ecore#//FilterRecipe/getArity" body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//InequalityFilterRecipe">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//InequalityFilterRecipe/subject"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//InequalityFilterRecipe/inequals"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//EqualityFilterRecipe">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//EqualityFilterRecipe/indices"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//TransparentRecipe"/>
+    <genClasses ecoreClass="recipes.ecore#//TrimmerRecipe">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//TrimmerRecipe/mask"/>
+      <genOperations ecoreOperation="recipes.ecore#//TrimmerRecipe/getArity" body="&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = this.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;return _sourceIndices.size();"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//ExpressionDefinition">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//ExpressionDefinition/evaluator"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="recipes.ecore#//ExpressionEnforcerRecipe">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//ExpressionEnforcerRecipe/expression"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//ExpressionEnforcerRecipe/mappedIndices"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//ExpressionEnforcerRecipe/cacheOutput"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//CheckRecipe">
+      <genOperations ecoreOperation="recipes.ecore#//CheckRecipe/getArity" body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//EvalRecipe">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//EvalRecipe/unwinding"/>
+      <genOperations ecoreOperation="recipes.ecore#//EvalRecipe/getArity" body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;int _arity = _parent.getArity();&#xA;return (1 + _arity);"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="recipes.ecore#//IndexerBasedAggregatorRecipe">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//IndexerBasedAggregatorRecipe/parent"/>
+      <genOperations ecoreOperation="recipes.ecore#//IndexerBasedAggregatorRecipe/getArity"
+          body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ProjectionIndexerRecipe%> _parent = this.getParent();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = _parent.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;int _size = _sourceIndices.size();&#xA;return (1 + _size);"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//CountAggregatorRecipe"/>
+    <genClasses ecoreClass="recipes.ecore#//JoinRecipe">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//JoinRecipe/rightParentComplementaryMask"/>
+      <genOperations ecoreOperation="recipes.ecore#//JoinRecipe/getArity" body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ProjectionIndexerRecipe%> _leftParent = this.getLeftParent();&#xA;int _arity = _leftParent.getArity();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.IndexerRecipe%> _rightParent = this.getRightParent();&#xA;int _arity_1 = _rightParent.getArity();&#xA;int _plus = (_arity + _arity_1);&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.IndexerRecipe%> _rightParent_1 = this.getRightParent();&#xA;&lt;%tools.refinery.viatra.runtime.rete.recipes.Mask%> _mask = _rightParent_1.getMask();&#xA;&lt;%org.eclipse.emf.common.util.EList%>&lt;&lt;%java.lang.Integer%>> _sourceIndices = _mask.getSourceIndices();&#xA;int _size = _sourceIndices.size();&#xA;return (_plus - _size);"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="recipes.ecore#//ExistenceJoinRecipe">
+      <genOperations ecoreOperation="recipes.ecore#//ExistenceJoinRecipe/getArity"
+          body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ProjectionIndexerRecipe%> _leftParent = this.getLeftParent();&#xA;return _leftParent.getArity();"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//SemiJoinRecipe"/>
+    <genClasses ecoreClass="recipes.ecore#//AntiJoinRecipe"/>
+    <genClasses ecoreClass="recipes.ecore#//InputFilterRecipe">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//InputFilterRecipe/inputKey"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//InputFilterRecipe/keyID"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//InputFilterRecipe/mask"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//SingleColumnAggregatorRecipe">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//SingleColumnAggregatorRecipe/multisetAggregationOperator"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//SingleColumnAggregatorRecipe/aggregableIndex"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//SingleColumnAggregatorRecipe/groupByMask"/>
+      <genOperations ecoreOperation="recipes.ecore#//SingleColumnAggregatorRecipe/getArity"
+          body="&lt;%tools.refinery.viatra.runtime.rete.recipes.MonotonicityInfo%> info = getOptionalMonotonicityInfo();&#xA;if (info == null) {&#xA;&#x9;return 1 + getGroupByMask().getSourceIndices().size();&#xA;} else {&#x9;&#xA;&#x9;return info.getCoreMask().getSourceIndices().size() + info.getPosetMask().getSourceIndices().size();&#xA;}"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//DiscriminatorDispatcherRecipe">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//DiscriminatorDispatcherRecipe/discriminationColumnIndex"/>
+      <genOperations ecoreOperation="recipes.ecore#//DiscriminatorDispatcherRecipe/getArity"
+          body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//DiscriminatorBucketRecipe">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//DiscriminatorBucketRecipe/bucketKey"/>
+      <genOperations ecoreOperation="recipes.ecore#//DiscriminatorBucketRecipe/getArity"
+          body="&lt;%tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe%> _parent = this.getParent();&#xA;return _parent.getArity();"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="recipes.ecore#//RederivableNodeRecipe">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//RederivableNodeRecipe/deleteRederiveEvaluation"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference recipes.ecore#//RederivableNodeRecipe/optionalMonotonicityInfo"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//RelationEvaluationRecipe">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference recipes.ecore#//RelationEvaluationRecipe/evaluator"/>
+    </genClasses>
+    <genClasses ecoreClass="recipes.ecore#//RepresentativeElectionRecipe">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute recipes.ecore#//RepresentativeElectionRecipe/connectivity"/>
+      <genOperations ecoreOperation="recipes.ecore#//RepresentativeElectionRecipe/getArity"
+          body="return 2;"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/rete-recipes.genmodel.license b/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/rete-recipes.genmodel.license
new file mode 100644
index 00000000..03d1d42b
--- /dev/null
+++ b/subprojects/viatra-runtime-rete-recipes/src/main/resources/model/rete-recipes.genmodel.license
@@ -0,0 +1,4 @@
+Copyright (c) 2004-2014 Gabor Bergmann and Daniel Varro
+Copyright (c) 2023 The Refinery Authors <https://refinery.tools>
+
+SPDX-License-Identifier: EPL-2.0
diff --git a/subprojects/viatra-runtime-rete/about.html b/subprojects/viatra-runtime-rete/about.html
new file mode 100644
index 00000000..d1d5593a
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/about.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<!--
+  Copyright (c) 2017, Eclipse.org Foundation, Inc.
+
+  SPDX-License-Identifier: LicenseRef-EPL-Steward
+-->
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>March 18, 2019</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v20.php">http://www.eclipse.org/legal/epl-v20.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+</body>
+</html>
diff --git a/subprojects/viatra-runtime-rete/build.gradle.kts b/subprojects/viatra-runtime-rete/build.gradle.kts
new file mode 100644
index 00000000..7e795a90
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/build.gradle.kts
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+plugins {
+        id("tools.refinery.gradle.java-library")
+}
+
+dependencies {
+        implementation(project(":refinery-viatra-runtime"))
+        implementation(project(":refinery-viatra-runtime-rete-recipes"))
+        implementation(libs.slf4j.log4j)
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/AbstractColumnAggregatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/AbstractColumnAggregatorNode.java
new file mode 100644
index 00000000..2588bde1
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/AbstractColumnAggregatorNode.java
@@ -0,0 +1,474 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.aggregation;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.Clearable;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.index.Indexer;
+import tools.refinery.viatra.runtime.rete.index.StandardIndexer;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.single.SingleInputNode;
+
+/**
+ * Groups incoming tuples by the given mask, and aggregates values at a specific index in each group.
+ * <p>
+ * Direct children are not supported, use via outer join indexers instead.
+ * <p>
+ * There are both timeless and timely implementations.
+ * 
+ * @author Tamas Szabo
+ * @since 2.2
+ *
+ */
+public abstract class AbstractColumnAggregatorNode<Domain, Accumulator, AggregateResult> extends SingleInputNode
+        implements Clearable, IAggregatorNode {
+
+    /**
+     * @since 1.6
+     */
+    protected final IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator;
+
+    /**
+     * @since 1.6
+     */
+    protected final TupleMask groupMask;
+
+    /**
+     * @since 1.6
+     */
+    protected final TupleMask columnMask;
+
+    /**
+     * @since 1.6
+     */
+    protected final int sourceWidth;
+
+    /**
+     * @since 1.6
+     */
+    protected final IQueryRuntimeContext runtimeContext;
+
+    protected final AggregateResult NEUTRAL;
+
+    protected AggregatorOuterIndexer aggregatorOuterIndexer;
+
+    @SuppressWarnings("rawtypes")
+    protected AbstractColumnAggregatorNode.AggregatorOuterIdentityIndexer[] aggregatorOuterIdentityIndexers;
+
+    /**
+     * Creates a new column aggregator node.
+     * 
+     * @param reteContainer
+     *            the RETE container of the node
+     * @param operator
+     *            the aggregation operator
+     * @param deleteRederiveEvaluation
+     *            true if the node should run in DRED mode, false otherwise
+     * @param groupMask
+     *            the mask that masks a tuple to obtain the key that we are grouping-by
+     * @param columnMask
+     *            the mask that masks a tuple to obtain the tuple element(s) that we are aggregating over
+     * @param posetComparator
+     *            the poset comparator for the column, if known, otherwise it can be null
+     * @since 1.6
+     */
+    public AbstractColumnAggregatorNode(final ReteContainer reteContainer,
+            final IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator,
+            final TupleMask groupMask, final TupleMask columnMask) {
+        super(reteContainer);
+        this.operator = operator;
+        this.groupMask = groupMask;
+        this.columnMask = columnMask;
+        this.sourceWidth = groupMask.indices.length;
+        this.runtimeContext = reteContainer.getNetwork().getEngine().getRuntimeContext();
+        this.NEUTRAL = operator.getAggregate(operator.createNeutral());
+        reteContainer.registerClearable(this);
+    }
+
+    /**
+     * Creates a new column aggregator node.
+     * 
+     * @param reteContainer
+     *            the RETE container of the node
+     * @param operator
+     *            the aggregation operator
+     * @param groupMask
+     *            the mask that masks a tuple to obtain the key that we are grouping-by
+     * @param aggregatedColumn
+     *            the index of the column that the aggregator node is aggregating over
+     */
+    public AbstractColumnAggregatorNode(final ReteContainer reteContainer,
+            final IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator,
+            final TupleMask groupMask, final int aggregatedColumn) {
+        this(reteContainer, operator, groupMask, TupleMask.selectSingle(aggregatedColumn, groupMask.sourceWidth));
+    }
+
+    @Override
+    public CommunicationTracker getCommunicationTracker() {
+        return this.reteContainer.getCommunicationTracker();
+    }
+
+    @Override
+    public void pullInto(Collection<Tuple> collector, boolean flush) {
+        // DIRECT CHILDREN NOT SUPPORTED
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        // DIRECT CHILDREN NOT SUPPORTED
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void appendChild(Receiver receiver) {
+        // DIRECT CHILDREN NOT SUPPORTED
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Indexer getAggregatorOuterIndexer() {
+        if (aggregatorOuterIndexer == null) {
+            aggregatorOuterIndexer = new AggregatorOuterIndexer();
+            this.getCommunicationTracker().registerDependency(this, aggregatorOuterIndexer);
+        }
+        return aggregatorOuterIndexer;
+    }
+
+    @Override
+    public Indexer getAggregatorOuterIdentityIndexer(final int resultPositionInSignature) {
+        if (aggregatorOuterIdentityIndexers == null) {
+            aggregatorOuterIdentityIndexers = new AbstractColumnAggregatorNode.AggregatorOuterIdentityIndexer[sourceWidth
+                    + 1];
+        }
+        if (aggregatorOuterIdentityIndexers[resultPositionInSignature] == null) {
+            aggregatorOuterIdentityIndexers[resultPositionInSignature] = new AggregatorOuterIdentityIndexer(
+                    resultPositionInSignature);
+            this.getCommunicationTracker().registerDependency(this,
+                    aggregatorOuterIdentityIndexers[resultPositionInSignature]);
+        }
+        return aggregatorOuterIdentityIndexers[resultPositionInSignature];
+    }
+
+    /**
+     * @since 2.4
+     */
+    public void propagateAggregateResultUpdate(final Tuple group, final AggregateResult oldValue,
+            final AggregateResult newValue, final Timestamp timestamp) {
+        if (!Objects.equals(oldValue, newValue)) {
+            propagate(Direction.DELETE, group, oldValue, timestamp);
+            propagate(Direction.INSERT, group, newValue, timestamp);
+        }
+    }
+
+    /**
+     * @since 2.4
+     */
+    @SuppressWarnings("unchecked")
+    public void propagate(final Direction direction, final Tuple group, final AggregateResult value,
+            final Timestamp timestamp) {
+        final Tuple tuple = tupleFromAggregateResult(group, value);
+
+        if (aggregatorOuterIndexer != null) {
+            aggregatorOuterIndexer.propagate(direction, tuple, group, timestamp);
+        }
+        if (aggregatorOuterIdentityIndexers != null) {
+            for (final AggregatorOuterIdentityIndexer aggregatorOuterIdentityIndexer : aggregatorOuterIdentityIndexers) {
+                if (aggregatorOuterIdentityIndexer != null) {
+                    aggregatorOuterIdentityIndexer.propagate(direction, tuple, group, timestamp);
+                }
+            }
+        }
+    }
+
+    public abstract Tuple getAggregateTuple(final Tuple key);
+
+    /**
+     * @since 2.4
+     */
+    public abstract Map<Tuple, Timeline<Timestamp>> getAggregateTupleTimeline(final Tuple key);
+
+    public abstract AggregateResult getAggregateResult(final Tuple key);
+
+    /**
+     * @since 2.4
+     */
+    public abstract Map<AggregateResult, Timeline<Timestamp>> getAggregateResultTimeline(final Tuple key);
+
+    protected Tuple tupleFromAggregateResult(final Tuple groupTuple, final AggregateResult aggregateResult) {
+        if (aggregateResult == null) {
+            return null;
+        } else {
+            return Tuples.staticArityLeftInheritanceTupleOf(groupTuple, runtimeContext.wrapElement(aggregateResult));
+        }
+    }
+
+    /**
+     * A special non-iterable index that retrieves the aggregated, packed result (signature+aggregate) for the original
+     * signature.
+     * 
+     * @author Gabor Bergmann
+     * @author Tamas Szabo
+     * 
+     */
+    protected class AggregatorOuterIndexer extends StandardIndexer {
+
+        /**
+         * @since 2.4
+         */
+        protected NetworkStructureChangeSensitiveLogic logic;
+
+        public AggregatorOuterIndexer() {
+            super(AbstractColumnAggregatorNode.this.reteContainer, TupleMask.omit(sourceWidth, sourceWidth + 1));
+            this.parent = AbstractColumnAggregatorNode.this;
+            this.logic = createLogic();
+        }
+
+        @Override
+        public void networkStructureChanged() {
+            super.networkStructureChanged();
+            this.logic = createLogic();
+        }
+
+        @Override
+        public Collection<Tuple> get(final Tuple signature) {
+            return this.logic.get(signature);
+        }
+
+        @Override
+        public Map<Tuple, Timeline<Timestamp>> getTimeline(final Tuple signature) {
+            return this.logic.getTimeline(signature);
+        }
+
+        /**
+         * @since 2.4
+         */
+        public void propagate(final Direction direction, final Tuple tuple, final Tuple group,
+                final Timestamp timestamp) {
+            if (tuple != null) {
+                propagate(direction, tuple, group, true, timestamp);
+            }
+        }
+
+        @Override
+        public Node getActiveNode() {
+            return AbstractColumnAggregatorNode.this;
+        }
+
+        /**
+         * @since 2.4
+         */
+        protected NetworkStructureChangeSensitiveLogic createLogic() {
+            if (this.reteContainer.isTimelyEvaluation()
+                    && this.reteContainer.getCommunicationTracker().isInRecursiveGroup(this)) {
+                return this.TIMELY;
+            } else {
+                return this.TIMELESS;
+            }
+        }
+
+        private final NetworkStructureChangeSensitiveLogic TIMELESS = new NetworkStructureChangeSensitiveLogic() {
+
+            @Override
+            public Collection<Tuple> get(final Tuple signature) {
+                final Tuple aggregateTuple = getAggregateTuple(signature);
+                if (aggregateTuple == null) {
+                    return null;
+                } else {
+                    return Collections.singleton(aggregateTuple);
+                }
+            }
+
+            @Override
+            public Map<Tuple, Timeline<Timestamp>> getTimeline(final Tuple signature) {
+                throw new UnsupportedOperationException();
+            }
+
+        };
+
+        private final NetworkStructureChangeSensitiveLogic TIMELY = new NetworkStructureChangeSensitiveLogic() {
+
+            @Override
+            public Collection<Tuple> get(final Tuple signatureWithResult) {
+                return TIMELESS.get(signatureWithResult);
+            }
+
+            @Override
+            public Map<Tuple, Timeline<Timestamp>> getTimeline(final Tuple signature) {
+                final Map<Tuple, Timeline<Timestamp>> aggregateTuples = getAggregateTupleTimeline(signature);
+                if (aggregateTuples.isEmpty()) {
+                    return null;
+                } else {
+                    return aggregateTuples;
+                }
+            }
+
+        };
+
+    }
+
+    /**
+     * A special non-iterable index that checks a suspected aggregate value for a given signature. The signature for
+     * this index is the original 'group by' masked tuple, with the suspected result inserted at position
+     * resultPositionInSignature.
+     * 
+     * @author Gabor Bergmann
+     * @author Tamas Szabo
+     *
+     */
+    protected class AggregatorOuterIdentityIndexer extends StandardIndexer {
+
+        protected final int resultPositionInSignature;
+        protected final TupleMask pruneResult;
+        protected final TupleMask reorderMask;
+        /**
+         * @since 2.4
+         */
+        protected NetworkStructureChangeSensitiveLogic logic;
+
+        public AggregatorOuterIdentityIndexer(final int resultPositionInSignature) {
+            super(AbstractColumnAggregatorNode.this.reteContainer,
+                    TupleMask.displace(sourceWidth, resultPositionInSignature, sourceWidth + 1));
+            this.resultPositionInSignature = resultPositionInSignature;
+            this.pruneResult = TupleMask.omit(resultPositionInSignature, sourceWidth + 1);
+            if (resultPositionInSignature == sourceWidth) {
+                this.reorderMask = null;
+            } else {
+                this.reorderMask = mask;
+            }
+            this.logic = createLogic();
+        }
+
+        @Override
+        public void networkStructureChanged() {
+            super.networkStructureChanged();
+            this.logic = createLogic();
+        }
+
+        @Override
+        public Collection<Tuple> get(final Tuple signatureWithResult) {
+            return this.logic.get(signatureWithResult);
+        }
+
+        /**
+         * @since 2.4
+         */
+        @Override
+        public Map<Tuple, Timeline<Timestamp>> getTimeline(final Tuple signature) {
+            return this.logic.getTimeline(signature);
+        }
+
+        /**
+         * @since 2.4
+         */
+        public void propagate(final Direction direction, final Tuple tuple, final Tuple group,
+                final Timestamp timestamp) {
+            if (tuple != null) {
+                propagate(direction, reorder(tuple), group, true, timestamp);
+            }
+        }
+
+        private Tuple reorder(final Tuple signatureWithResult) {
+            Tuple transformed;
+            if (reorderMask == null) {
+                transformed = signatureWithResult;
+            } else {
+                transformed = reorderMask.transform(signatureWithResult);
+            }
+            return transformed;
+        }
+
+        @Override
+        public Node getActiveNode() {
+            return this.parent;
+        }
+
+        /**
+         * @since 2.4
+         */
+        protected NetworkStructureChangeSensitiveLogic createLogic() {
+            if (this.reteContainer.isTimelyEvaluation()
+                    && this.reteContainer.getCommunicationTracker().isInRecursiveGroup(this)) {
+                return this.TIMELY;
+            } else {
+                return this.TIMELESS;
+            }
+        }
+
+        private final NetworkStructureChangeSensitiveLogic TIMELESS = new NetworkStructureChangeSensitiveLogic() {
+
+            @Override
+            public Collection<Tuple> get(final Tuple signatureWithResult) {
+                final Tuple prunedSignature = pruneResult.transform(signatureWithResult);
+                final AggregateResult result = getAggregateResult(prunedSignature);
+                if (result != null && Objects.equals(signatureWithResult.get(resultPositionInSignature), result)) {
+                    return Collections.singleton(signatureWithResult);
+                } else {
+                    return null;
+                }
+            }
+
+            @Override
+            public Map<Tuple, Timeline<Timestamp>> getTimeline(final Tuple signature) {
+                throw new UnsupportedOperationException();
+            }
+
+        };
+
+        private final NetworkStructureChangeSensitiveLogic TIMELY = new NetworkStructureChangeSensitiveLogic() {
+
+            @Override
+            public Collection<Tuple> get(final Tuple signatureWithResult) {
+                return TIMELESS.get(signatureWithResult);
+            }
+
+            @Override
+            public Map<Tuple, Timeline<Timestamp>> getTimeline(final Tuple signatureWithResult) {
+                final Tuple prunedSignature = pruneResult.transform(signatureWithResult);
+                final Map<AggregateResult, Timeline<Timestamp>> result = getAggregateResultTimeline(prunedSignature);
+                for (final Entry<AggregateResult, Timeline<Timestamp>> entry : result.entrySet()) {
+                    if (Objects.equals(signatureWithResult.get(resultPositionInSignature), entry.getKey())) {
+                        return Collections.singletonMap(signatureWithResult, entry.getValue());
+                    }
+                }
+                return null;
+            }
+
+        };
+
+    }
+
+    /**
+     * @since 2.4
+     */
+    protected static abstract class NetworkStructureChangeSensitiveLogic {
+
+        public abstract Collection<Tuple> get(final Tuple signatureWithResult);
+
+        public abstract Map<Tuple, Timeline<Timestamp>> getTimeline(final Tuple signature);
+
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/ColumnAggregatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/ColumnAggregatorNode.java
new file mode 100644
index 00000000..4480aed8
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/ColumnAggregatorNode.java
@@ -0,0 +1,369 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.aggregation;
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.PosetAwareReceiver;
+import tools.refinery.viatra.runtime.rete.network.RederivableNode;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.communication.timeless.RecursiveCommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.PosetAwareMailbox;
+
+/**
+ * Timeless implementation of the column aggregator node.
+ * <p>
+ * The node is capable of operating in the delete and re-derive mode. In this mode, it is also possible to equip the
+ * node with an {@link IPosetComparator} to identify monotone changes; thus, ensuring that a fix-point can be reached
+ * during the evaluation.
+ * 
+ * @author Gabor Bergmann
+ * @author Tamas Szabo
+ * @since 1.4
+ */
+public class ColumnAggregatorNode<Domain, Accumulator, AggregateResult>
+        extends AbstractColumnAggregatorNode<Domain, Accumulator, AggregateResult>
+        implements RederivableNode, PosetAwareReceiver {
+
+    /**
+     * @since 1.6
+     */
+    protected final IPosetComparator posetComparator;
+
+    /**
+     * @since 1.6
+     */
+    protected final boolean deleteRederiveEvaluation;
+
+    // invariant: neutral values are not stored
+    /**
+     * @since 1.6
+     */
+    protected final Map<Tuple, Accumulator> memory;
+    /**
+     * @since 1.6
+     */
+    protected final Map<Tuple, Accumulator> rederivableMemory;
+
+    /**
+     * @since 1.7
+     */
+    protected CommunicationGroup currentGroup;
+
+    /**
+     * Creates a new column aggregator node.
+     * 
+     * @param reteContainer
+     *            the RETE container of the node
+     * @param operator
+     *            the aggregation operator
+     * @param deleteRederiveEvaluation
+     *            true if the node should run in DRED mode, false otherwise
+     * @param groupMask
+     *            the mask that masks a tuple to obtain the key that we are grouping-by
+     * @param columnMask
+     *            the mask that masks a tuple to obtain the tuple element(s) that we are aggregating over
+     * @param posetComparator
+     *            the poset comparator for the column, if known, otherwise it can be null
+     * @since 1.6
+     */
+    public ColumnAggregatorNode(final ReteContainer reteContainer,
+            final IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator,
+            final boolean deleteRederiveEvaluation, final TupleMask groupMask, final TupleMask columnMask,
+            final IPosetComparator posetComparator) {
+        super(reteContainer, operator, groupMask, columnMask);
+        this.memory = CollectionsFactory.createMap();
+        this.rederivableMemory = CollectionsFactory.createMap();
+        this.deleteRederiveEvaluation = deleteRederiveEvaluation;
+        this.posetComparator = posetComparator;
+        // mailbox MUST be instantiated after the fields are all set
+        this.mailbox = instantiateMailbox();
+    }
+
+    /**
+     * Creates a new column aggregator node.
+     * 
+     * @param reteContainer
+     *            the RETE container of the node
+     * @param operator
+     *            the aggregation operator
+     * @param groupMask
+     *            the mask that masks a tuple to obtain the key that we are grouping-by
+     * @param aggregatedColumn
+     *            the index of the column that the aggregator node is aggregating over
+     */
+    public ColumnAggregatorNode(final ReteContainer reteContainer,
+            final IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator,
+            final TupleMask groupMask, final int aggregatedColumn) {
+        this(reteContainer, operator, false, groupMask, TupleMask.selectSingle(aggregatedColumn, groupMask.sourceWidth),
+                null);
+    }
+
+    @Override
+    public boolean isInDRedMode() {
+        return this.deleteRederiveEvaluation;
+    }
+
+    @Override
+    protected Mailbox instantiateMailbox() {
+        if (groupMask != null && columnMask != null && posetComparator != null) {
+            return new PosetAwareMailbox(this, this.reteContainer);
+        } else {
+            return new BehaviorChangingMailbox(this, this.reteContainer);
+        }
+    }
+
+    @Override
+    public TupleMask getCoreMask() {
+        return groupMask;
+    }
+
+    @Override
+    public TupleMask getPosetMask() {
+        return columnMask;
+    }
+
+    @Override
+    public IPosetComparator getPosetComparator() {
+        return posetComparator;
+    }
+
+    @Override
+    public void rederiveOne() {
+        final Entry<Tuple, Accumulator> entry = rederivableMemory.entrySet().iterator().next();
+        final Tuple group = entry.getKey();
+        final Accumulator accumulator = entry.getValue();
+        rederivableMemory.remove(group);
+        memory.put(group, accumulator);
+        // unregister the node if there is nothing left to be re-derived
+        if (this.rederivableMemory.isEmpty()) {
+            ((RecursiveCommunicationGroup) currentGroup).removeRederivable(this);
+        }
+        final AggregateResult value = operator.getAggregate(accumulator);
+        propagateAggregateResultUpdate(group, NEUTRAL, value, Timestamp.ZERO);
+    }
+
+    @Override
+    public void updateWithPosetInfo(final Direction direction, final Tuple update, final boolean monotone) {
+        if (this.deleteRederiveEvaluation) {
+            updateWithDeleteAndRederive(direction, update, monotone);
+        } else {
+            updateDefault(direction, update, Timestamp.ZERO);
+        }
+    }
+
+    @Override
+    public void update(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        updateWithPosetInfo(direction, update, false);
+    }
+
+    /**
+     * @since 2.4
+     */
+    protected void updateDefault(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        final Tuple key = groupMask.transform(update);
+        final Tuple value = columnMask.transform(update);
+        @SuppressWarnings("unchecked")
+        final Domain aggregableValue = (Domain) runtimeContext.unwrapElement(value.get(0));
+        final boolean isInsertion = direction == Direction.INSERT;
+
+        final Accumulator oldMainAccumulator = getMainAccumulator(key);
+        final AggregateResult oldValue = operator.getAggregate(oldMainAccumulator);
+
+        final Accumulator newMainAccumulator = operator.update(oldMainAccumulator, aggregableValue, isInsertion);
+        storeIfNotNeutral(key, newMainAccumulator, memory);
+        final AggregateResult newValue = operator.getAggregate(newMainAccumulator);
+
+        propagateAggregateResultUpdate(key, oldValue, newValue, timestamp);
+    }
+
+    /**
+     * @since 2.4
+     */
+    protected void updateWithDeleteAndRederive(final Direction direction, final Tuple update, final boolean monotone) {
+        final Tuple group = groupMask.transform(update);
+        final Tuple value = columnMask.transform(update);
+        @SuppressWarnings("unchecked")
+        final Domain aggregableValue = (Domain) runtimeContext.unwrapElement(value.get(0));
+        final boolean isInsertion = direction == Direction.INSERT;
+
+        Accumulator oldMainAccumulator = memory.get(group);
+        Accumulator oldRederivableAccumulator = rederivableMemory.get(group);
+
+        if (direction == Direction.INSERT) {
+            // INSERT
+            if (oldRederivableAccumulator != null) {
+                // the group is in the re-derivable memory
+                final Accumulator newRederivableAccumulator = operator.update(oldRederivableAccumulator,
+                        aggregableValue, isInsertion);
+                storeIfNotNeutral(group, newRederivableAccumulator, rederivableMemory);
+                if (rederivableMemory.isEmpty()) {
+                    // there is nothing left to be re-derived
+                    // this can happen if the accumulator became neutral in response to the INSERT
+                    ((RecursiveCommunicationGroup) currentGroup).removeRederivable(this);
+                }
+            } else {
+                // the group is in the main memory
+                // at this point, it can happen that we need to initialize with a neutral accumulator
+                if (oldMainAccumulator == null) {
+                    oldMainAccumulator = operator.createNeutral();
+                }
+
+                final AggregateResult oldValue = operator.getAggregate(oldMainAccumulator);
+                final Accumulator newMainAccumulator = operator.update(oldMainAccumulator, aggregableValue,
+                        isInsertion);
+                storeIfNotNeutral(group, newMainAccumulator, memory);
+                final AggregateResult newValue = operator.getAggregate(newMainAccumulator);
+                propagateAggregateResultUpdate(group, oldValue, newValue, Timestamp.ZERO);
+            }
+        } else {
+            // DELETE
+            if (oldRederivableAccumulator != null) {
+                // the group is in the re-derivable memory
+                if (oldMainAccumulator != null) {
+                    issueError("[INTERNAL ERROR] Inconsistent state for " + update
+                            + " because it is present both in the main and re-derivable memory in the ColumnAggregatorNode "
+                            + this + " for pattern(s) " + getTraceInfoPatternsEnumerated(), null);
+                }
+                try {
+                    final Accumulator newRederivableAccumulator = operator.update(oldRederivableAccumulator,
+                            aggregableValue, isInsertion);
+                    storeIfNotNeutral(group, newRederivableAccumulator, rederivableMemory);
+                    if (rederivableMemory.isEmpty()) {
+                        // there is nothing left to be re-derived
+                        // this can happen if the accumulator became neutral in response to the DELETE
+                        ((RecursiveCommunicationGroup) currentGroup).removeRederivable(this);
+                    }
+                } catch (final NullPointerException ex) {
+                    issueError("[INTERNAL ERROR] Deleting a domain element in " + update
+                            + " which did not exist before in ColumnAggregatorNode " + this + " for pattern(s) "
+                            + getTraceInfoPatternsEnumerated(), ex);
+                }
+            } else {
+                // the group is in the main memory
+                // at this point, it can happen that we need to initialize with a neutral accumulator
+                if (oldMainAccumulator == null) {
+                    oldMainAccumulator = operator.createNeutral();
+                }
+
+                final AggregateResult oldValue = operator.getAggregate(oldMainAccumulator);
+                final Accumulator newMainAccumulator = operator.update(oldMainAccumulator, aggregableValue,
+                        isInsertion);
+                final AggregateResult newValue = operator.getAggregate(newMainAccumulator);
+
+                if (monotone) {
+                    storeIfNotNeutral(group, newMainAccumulator, memory);
+                    propagateAggregateResultUpdate(group, oldValue, newValue, Timestamp.ZERO);
+                } else {
+                    final boolean wasEmpty = rederivableMemory.isEmpty();
+                    if (storeIfNotNeutral(group, newMainAccumulator, rederivableMemory) && wasEmpty) {
+                        ((RecursiveCommunicationGroup) currentGroup).addRederivable(this);
+                    }
+                    memory.remove(group);
+                    propagateAggregateResultUpdate(group, oldValue, NEUTRAL, Timestamp.ZERO);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void clear() {
+        this.memory.clear();
+        this.rederivableMemory.clear();
+        this.childMailboxes.clear();
+    }
+
+    /**
+     * Returns true if the accumulator was stored, false otherwise.
+     * 
+     * @since 1.6
+     */
+    protected boolean storeIfNotNeutral(final Tuple key, final Accumulator accumulator,
+            final Map<Tuple, Accumulator> memory) {
+        if (operator.isNeutral(accumulator)) {
+            memory.remove(key);
+            return false;
+        } else {
+            memory.put(key, accumulator);
+            return true;
+        }
+    }
+
+    @Override
+    public Tuple getAggregateTuple(final Tuple group) {
+        final Accumulator accumulator = getMainAccumulator(group);
+        final AggregateResult result = operator.getAggregate(accumulator);
+        return tupleFromAggregateResult(group, result);
+    }
+
+    @Override
+    public AggregateResult getAggregateResult(final Tuple group) {
+        final Accumulator accumulator = getMainAccumulator(group);
+        return operator.getAggregate(accumulator);
+    }
+
+    @Override
+    public Map<AggregateResult, Timeline<Timestamp>> getAggregateResultTimeline(Tuple key) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Map<Tuple, Timeline<Timestamp>> getAggregateTupleTimeline(Tuple key) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @since 1.6
+     */
+    protected Accumulator getMainAccumulator(final Tuple key) {
+        return getAccumulator(key, memory);
+    }
+
+    /**
+     * @since 1.6
+     */
+    protected Accumulator getRederivableAccumulator(final Tuple key) {
+        return getAccumulator(key, rederivableMemory);
+    }
+
+    /**
+     * @since 1.6
+     */
+    protected Accumulator getAccumulator(final Tuple key, final Map<Tuple, Accumulator> memory) {
+        Accumulator accumulator = memory.get(key);
+        if (accumulator == null) {
+            return operator.createNeutral();
+        } else {
+            return accumulator;
+        }
+    }
+
+    @Override
+    public CommunicationGroup getCurrentGroup() {
+        return currentGroup;
+    }
+
+    @Override
+    public void setCurrentGroup(final CommunicationGroup currentGroup) {
+        this.currentGroup = currentGroup;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/CountNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/CountNode.java
new file mode 100644
index 00000000..7c98de0d
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/CountNode.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.aggregation;
+
+import java.util.Collection;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+
+/**
+ * An aggregation node that simply counts the number of tuples conforming to the signature.
+ * 
+ * @author Gabor Bergmann
+ * @since 1.4
+ */
+public class CountNode extends IndexerBasedAggregatorNode {
+
+    public CountNode(ReteContainer reteContainer) {
+        super(reteContainer);
+    }
+
+    int sizeOf(Collection<Tuple> group) {
+        return group == null ? 0 : group.size();
+    }
+
+    @Override
+    public Object aggregateGroup(Tuple signature, Collection<Tuple> group) {
+        return sizeOf(group);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/GroupedMap.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/GroupedMap.java
new file mode 100644
index 00000000..3c7850de
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/GroupedMap.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.aggregation;
+
+import java.util.AbstractMap.SimpleEntry;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+
+/**
+ * An optimized {@link Map} implementation where each key is produced by joining together a group tuple and some other
+ * object (via left inheritance). Only a select few {@link Map} operations are supported. This collection is
+ * unmodifiable.
+ * 
+ * Operations on this map assume that client queries also obey the contract that keys are constructed from a group tuple
+ * and an additional object.
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public class GroupedMap<GroupedKeyType, ValueType> implements Map<Tuple, ValueType> {
+
+    protected final Tuple group;
+    // cached group size value is to be used in get()
+    private final int groupSize;
+    protected final Map<GroupedKeyType, ValueType> mappings;
+    protected final IQueryRuntimeContext runtimeContext;
+
+    public GroupedMap(final Tuple group, final Map<GroupedKeyType, ValueType> mappings,
+            final IQueryRuntimeContext runtimeContext) {
+        this.group = group;
+        this.groupSize = group.getSize();
+        this.mappings = mappings;
+        this.runtimeContext = runtimeContext;
+    }
+
+    @Override
+    public int size() {
+        return this.mappings.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.mappings.isEmpty();
+    }
+
+    @Override
+    public boolean containsKey(final Object key) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean containsValue(final Object value) {
+        return this.mappings.containsValue(value);
+    }
+
+    @Override
+    public ValueType get(final Object key) {
+        if (key instanceof Tuple) {
+            final Object value = ((Tuple) key).get(this.groupSize);
+            final Object unwrappedValue = this.runtimeContext.unwrapElement(value);
+            return this.mappings.get(unwrappedValue);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public ValueType put(final Tuple key, final ValueType value) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public ValueType remove(final Object key) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void putAll(final Map<? extends Tuple, ? extends ValueType> map) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void clear() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Set<Tuple> keySet() {
+        return new GroupedSet<Tuple, GroupedKeyType, Tuple>(this.group, this.mappings.keySet(), (g, v) -> {
+            return Tuples.staticArityLeftInheritanceTupleOf(g, this.runtimeContext.wrapElement(v));
+        });
+    }
+
+    @Override
+    public Collection<ValueType> values() {
+        return this.mappings.values();
+    }
+
+    @Override
+    public Set<Entry<Tuple, ValueType>> entrySet() {
+        return new GroupedSet<Tuple, GroupedKeyType, Entry<Tuple, ValueType>>(this.group, this.mappings.keySet(),
+                (g, v) -> {
+                    final Tuple key = Tuples.staticArityLeftInheritanceTupleOf(g, this.runtimeContext.wrapElement(v));
+                    final ValueType value = this.mappings.get(v);
+                    return new SimpleEntry<Tuple, ValueType>(key, value);
+                });
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/GroupedSet.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/GroupedSet.java
new file mode 100644
index 00000000..65561e53
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/GroupedSet.java
@@ -0,0 +1,114 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.aggregation;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.function.BiFunction;
+
+/**
+ * An optimized {@link Set} implementation where each contained value is produced by combining together a grouping value
+ * and some other (key) object. The way of combining together these two values is specified by the closure passed to the
+ * constructor. Only a select few {@link Set} operations are supported. This collection is unmodifiable.
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public class GroupedSet<GroupingValueType, GroupedKeyType, WholeKeyType> implements Set<WholeKeyType> {
+
+    protected final GroupingValueType group;
+    protected final Collection<GroupedKeyType> values;
+    protected final BiFunction<GroupingValueType, GroupedKeyType, WholeKeyType> valueFunc;
+
+    public GroupedSet(final GroupingValueType group, final Collection<GroupedKeyType> values,
+            final BiFunction<GroupingValueType, GroupedKeyType, WholeKeyType> valueFunc) {
+        this.group = group;
+        this.values = values;
+        this.valueFunc = valueFunc;
+    }
+
+    @Override
+    public int size() {
+        return this.values.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.values.isEmpty();
+    }
+
+    @Override
+    public boolean contains(final Object obj) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Iterator<WholeKeyType> iterator() {
+        final Iterator<GroupedKeyType> wrapped = this.values.iterator();
+        return new Iterator<WholeKeyType>() {
+            @Override
+            public boolean hasNext() {
+                return wrapped.hasNext();
+            }
+
+            @Override
+            public WholeKeyType next() {
+                final GroupedKeyType value = wrapped.next();
+                return valueFunc.apply(group, value);
+            }
+        };
+    }
+
+    @Override
+    public Object[] toArray() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public <T> T[] toArray(final T[] arr) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean add(final WholeKeyType tuple) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean remove(final Object obj) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean containsAll(final Collection<?> c) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean addAll(final Collection<? extends WholeKeyType> coll) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean retainAll(final Collection<?> coll) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean removeAll(final Collection<?> coll) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void clear() {
+        throw new UnsupportedOperationException();
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/IAggregatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/IAggregatorNode.java
new file mode 100644
index 00000000..6c286364
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/IAggregatorNode.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.aggregation;
+
+import tools.refinery.viatra.runtime.rete.index.Indexer;
+
+/**
+ * Expresses that aggregators expose specialized non-enumerable indexers for outer joining.
+ * @author Gabor Bergmann
+ *
+ * @since 1.4
+ * 
+ */
+public interface IAggregatorNode {
+
+    Indexer getAggregatorOuterIndexer();
+
+    Indexer getAggregatorOuterIdentityIndexer(int resultPositionInSignature);
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/IndexerBasedAggregatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/IndexerBasedAggregatorNode.java
new file mode 100644
index 00000000..d9a94a82
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/IndexerBasedAggregatorNode.java
@@ -0,0 +1,278 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.aggregation;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.index.DefaultIndexerListener;
+import tools.refinery.viatra.runtime.rete.index.Indexer;
+import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
+import tools.refinery.viatra.runtime.rete.index.StandardIndexer;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.StandardNode;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+
+/**
+ * A special node depending on a projection indexer to aggregate tuple groups with the same projection. Only propagates
+ * the aggregates of non-empty groups. Use the outer indexers to circumvent.
+ * <p>
+ * This node cannot be used in recursive differential dataflow evaluation. 
+ * 
+ * @author Gabor Bergmann
+ * @since 1.4
+ */
+public abstract class IndexerBasedAggregatorNode extends StandardNode implements IAggregatorNode {
+
+    ProjectionIndexer projection;
+    IndexerBasedAggregatorNode me;
+    int sourceWidth;
+    Map<Tuple, Object> mainAggregates;
+
+    AggregatorOuterIndexer aggregatorOuterIndexer = null;
+    AggregatorOuterIdentityIndexer[] aggregatorOuterIdentityIndexers = null;
+
+    /**
+     * MUST call initializeWith() afterwards!
+     */
+    public IndexerBasedAggregatorNode(ReteContainer reteContainer) {
+        super(reteContainer);
+        this.me = this;
+        mainAggregates = CollectionsFactory.createMap();
+    }
+    
+    @Override
+    public void networkStructureChanged() {
+        if (this.reteContainer.isTimelyEvaluation() && this.reteContainer.getCommunicationTracker().isInRecursiveGroup(this)) {
+            throw new IllegalStateException(this.toString() + " cannot be used in recursive differential dataflow evaluation!");
+        }
+        super.networkStructureChanged();
+    }
+    
+    /**
+     * @param projection
+     *            the projection indexer whose tuple groups should be aggregated
+     */
+    public void initializeWith(ProjectionIndexer projection) {
+        this.projection = projection;
+        this.sourceWidth = projection.getMask().indices.length;
+        
+        for (Tuple signature : projection.getSignatures()) {
+            mainAggregates.put(signature, aggregateGroup(signature, projection.get(signature)));
+        }
+        projection.attachListener(new DefaultIndexerListener(this) {
+            @Override
+            public void notifyIndexerUpdate(Direction direction, Tuple updateElement, Tuple signature, boolean change, Timestamp timestamp) {
+                aggregateUpdate(direction, updateElement, signature, change);
+            }
+        });
+    }
+
+    /**
+     * Aggregates (reduces) a group of tuples. The group can be null.
+     */
+    public abstract Object aggregateGroup(Tuple signature, Collection<Tuple> group);
+
+    
+    /**
+     * Aggregates (reduces) a group of tuples, having access to the previous aggregated value (before the update) and
+     * the update definition. Defaults to aggregateGroup(). Override to increase performance.
+     * @since 2.4
+     */
+    public Object aggregateGroupAfterUpdate(Tuple signature, Collection<Tuple> currentGroup, Object oldAggregate,
+            Direction direction, Tuple updateElement, boolean change) {
+        return aggregateGroup(signature, currentGroup);
+    }
+
+    protected Tuple aggregateAndPack(Tuple signature, Collection<Tuple> group) {
+        return packResult(signature, aggregateGroup(signature, group));
+    }
+
+    @Override
+    public Indexer getAggregatorOuterIndexer() {
+        if (aggregatorOuterIndexer == null) {
+            aggregatorOuterIndexer = new AggregatorOuterIndexer();
+            this.getCommunicationTracker().registerDependency(this, aggregatorOuterIndexer);
+            // reteContainer.connectAndSynchronize(this, aggregatorOuterIndexer);
+        }
+        return aggregatorOuterIndexer;
+    }
+
+    @Override
+    public Indexer getAggregatorOuterIdentityIndexer(int resultPositionInSignature) {
+        if (aggregatorOuterIdentityIndexers == null)
+            aggregatorOuterIdentityIndexers = new AggregatorOuterIdentityIndexer[sourceWidth + 1];
+        if (aggregatorOuterIdentityIndexers[resultPositionInSignature] == null) {
+            aggregatorOuterIdentityIndexers[resultPositionInSignature] = new AggregatorOuterIdentityIndexer(
+                    resultPositionInSignature);
+            this.getCommunicationTracker().registerDependency(this, aggregatorOuterIdentityIndexers[resultPositionInSignature]);
+            // reteContainer.connectAndSynchronize(this, aggregatorOuterIdentityIndexers[resultPositionInSignature]);
+        }
+        return aggregatorOuterIdentityIndexers[resultPositionInSignature];
+    }
+
+    @Override
+    public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+        for (final Entry<Tuple, Object> aggregateEntry : mainAggregates.entrySet()) {
+            collector.add(packResult(aggregateEntry.getKey(), aggregateEntry.getValue()));
+        }
+    }
+    
+    @Override
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        // use all zero timestamps because this node cannot be used in recursive groups anyway
+        for (final Entry<Tuple, Object> aggregateEntry : mainAggregates.entrySet()) {
+            collector.put(packResult(aggregateEntry.getKey(), aggregateEntry.getValue()), Timestamp.INSERT_AT_ZERO_TIMELINE);
+        }
+    }
+
+    protected Tuple packResult(Tuple signature, Object result) {
+        return Tuples.staticArityLeftInheritanceTupleOf(signature, result);
+    }
+
+    /**
+     * @since 2.4
+     */
+    protected void aggregateUpdate(Direction direction, Tuple updateElement, Tuple signature, boolean change) {
+        Collection<Tuple> currentGroup = projection.get(signature);
+        // these will be null if group is empty
+        Object oldAggregate = mainAggregates.get(signature);
+        Object safeOldAggregate = oldAggregate == null ? aggregateGroup(signature, null) : oldAggregate;
+        boolean empty = currentGroup == null || currentGroup.isEmpty();
+        Object newAggregate = empty ? null : aggregateGroupAfterUpdate(signature, currentGroup, safeOldAggregate/*
+                                                                                                                 * non-null
+                                                                                                                 */,
+                direction, updateElement, change);
+        if (!empty)
+            mainAggregates.put(signature, newAggregate);
+        else
+            mainAggregates.remove(signature);
+        Tuple oldTuple = packResult(signature, safeOldAggregate);
+        Tuple newTuple = packResult(signature, newAggregate == null ? aggregateGroup(signature, null) : newAggregate);
+        if (oldAggregate != null)
+            propagateUpdate(Direction.DELETE, oldTuple, Timestamp.ZERO); // direct outputs lack non-empty groups
+        if (newAggregate != null)
+            propagateUpdate(Direction.INSERT, newTuple, Timestamp.ZERO); // direct outputs lack non-empty groups
+        if (aggregatorOuterIndexer != null)
+            aggregatorOuterIndexer.propagate(signature, oldTuple, newTuple);
+        if (aggregatorOuterIdentityIndexers != null)
+            for (AggregatorOuterIdentityIndexer aggregatorOuterIdentityIndexer : aggregatorOuterIdentityIndexers)
+                if (aggregatorOuterIdentityIndexer != null)
+                    aggregatorOuterIdentityIndexer.propagate(signature, oldTuple, newTuple);
+    }
+
+    private Object getAggregate(Tuple signature) {
+        Object aggregate = mainAggregates.get(signature);
+        return aggregate == null ? aggregateGroup(signature, null) : aggregate;
+    }
+    
+    @Override
+    public void assignTraceInfo(TraceInfo traceInfo) {
+        super.assignTraceInfo(traceInfo);
+        if (traceInfo.propagateToIndexerParent() && projection != null)
+            projection.acceptPropagatedTraceInfo(traceInfo);
+    }
+
+    /**
+     * A special non-iterable index that retrieves the aggregated, packed result (signature+aggregate) for the original
+     * signature.
+     * 
+     * @author Gabor Bergmann
+     */
+    class AggregatorOuterIndexer extends StandardIndexer {
+
+        public AggregatorOuterIndexer() {
+            super(me.reteContainer, TupleMask.omit(sourceWidth, sourceWidth + 1));
+            this.parent = me;
+        }
+
+        @Override
+        public Collection<Tuple> get(Tuple signature) {
+            return Collections.singleton(packResult(signature, getAggregate(signature)));
+        }
+
+        public void propagate(Tuple signature, Tuple oldTuple, Tuple newTuple) {
+            propagate(Direction.INSERT, newTuple, signature, false, Timestamp.ZERO);
+            propagate(Direction.DELETE, oldTuple, signature, false, Timestamp.ZERO);
+        }
+
+        @Override
+        public Node getActiveNode() {
+            return projection.getActiveNode();
+        }
+
+    }
+
+    /**
+     * A special non-iterable index that checks a suspected aggregate value for a given signature. The signature for
+     * this index is the original signature of the projection index, with the suspected result inserted at position
+     * resultPositionInSignature.
+     * 
+     * @author Gabor Bergmann
+     */
+
+    class AggregatorOuterIdentityIndexer extends StandardIndexer {
+        int resultPositionInSignature;
+        TupleMask pruneResult;
+        TupleMask reorderMask;
+
+        public AggregatorOuterIdentityIndexer(int resultPositionInSignature) {
+            super(me.reteContainer, TupleMask.displace(sourceWidth, resultPositionInSignature, sourceWidth + 1));
+            this.parent = me;
+            // this.localAggregates = new HashMap<Tuple, Tuple>();
+            this.resultPositionInSignature = resultPositionInSignature;
+            this.pruneResult = TupleMask.omit(resultPositionInSignature, sourceWidth + 1);
+            if (resultPositionInSignature == sourceWidth)
+                this.reorderMask = null;
+            else
+                this.reorderMask = mask;
+        }
+
+        @Override
+        public Collection<Tuple> get(Tuple signatureWithResult) {
+            Tuple prunedSignature = pruneResult.transform(signatureWithResult);
+            Object result = getAggregate(prunedSignature);
+            if (signatureWithResult.get(resultPositionInSignature).equals(result))
+                return Collections.singleton(signatureWithResult);
+            else
+                return null;
+        }
+
+        public void propagate(Tuple signature, Tuple oldTuple, Tuple newTuple) {
+            propagate(Direction.INSERT, reorder(newTuple), signature, true, Timestamp.ZERO);
+            propagate(Direction.DELETE, reorder(oldTuple), signature, true, Timestamp.ZERO);
+        }
+
+        private Tuple reorder(Tuple signatureWithResult) {
+            Tuple transformed;
+            if (reorderMask == null)
+                transformed = signatureWithResult;
+            else
+                transformed = reorderMask.transform(signatureWithResult);
+            return transformed;
+        }
+
+        @Override
+        public Node getActiveNode() {
+            return projection.getActiveNode();
+        }
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulParallelTimelyColumnAggregatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulParallelTimelyColumnAggregatorNode.java
new file mode 100644
index 00000000..19e02f10
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulParallelTimelyColumnAggregatorNode.java
@@ -0,0 +1,212 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.aggregation.timely;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.*;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.CumulativeAggregate;
+import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.FoldingState;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.TreeMap;
+
+/**
+ * Faithful column aggregator with parallel aggregation architecture.
+ *
+ * @author Tamas Szabo
+ * @since 2.4
+ *
+ */
+public class FaithfulParallelTimelyColumnAggregatorNode<Domain, Accumulator, AggregateResult> extends
+        FaithfulTimelyColumnAggregatorNode<Domain, Accumulator, AggregateResult, CumulativeAggregate<Domain, Accumulator>, FoldingState<Domain>>
+        implements ResumableNode {
+
+    public FaithfulParallelTimelyColumnAggregatorNode(final ReteContainer reteContainer,
+            final IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator,
+            final TupleMask groupMask, final TupleMask columnMask) {
+        super(reteContainer, operator, groupMask, columnMask);
+    }
+
+    public FaithfulParallelTimelyColumnAggregatorNode(final ReteContainer reteContainer,
+            final IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator,
+            final TupleMask groupMask, final int aggregatedColumn) {
+        this(reteContainer, operator, groupMask, TupleMask.selectSingle(aggregatedColumn, groupMask.sourceWidth));
+    }
+
+    @Override
+    protected Map<AggregateResult, Diff<Timestamp>> doFoldingStep(final Tuple group, final FoldingState<Domain> state,
+            final Timestamp timestamp) {
+        final CumulativeAggregate<Domain, Accumulator> aggregate = getAggregate(group, timestamp);
+        if (state.delta.isEmpty()) {
+            gcAggregates(aggregate, group, timestamp);
+            return Collections.emptyMap();
+        } else {
+            final Map<AggregateResult, Diff<Timestamp>> diffMap = CollectionsFactory.createMap();
+            final Timestamp nextTimestamp = this.aggregates.get(group).higherKey(timestamp);
+
+            final AggregateResult currentOldResult = operator.getAggregate(aggregate.accumulator);
+
+            for (final Entry<Domain, Integer> entry : state.delta.entriesWithMultiplicities()) {
+                final boolean isInsertion = entry.getValue() > 0;
+                final Domain aggregand = entry.getKey();
+                for (int i = 0; i < Math.abs(entry.getValue()); i++) {
+                    aggregate.accumulator = operator.update(aggregate.accumulator, aggregand, isInsertion);
+                }
+            }
+
+            final AggregateResult currentNewResult = operator.getAggregate(aggregate.accumulator);
+
+            if (!Objects.equals(currentOldResult, currentNewResult)) {
+                // current old result disappears here
+                appendDiff(currentOldResult, new Signed<>(Direction.DELETE, timestamp), diffMap);
+                if (nextTimestamp != null) {
+                    appendDiff(currentOldResult, new Signed<>(Direction.INSERT, nextTimestamp), diffMap);
+                }
+
+                // current new result appears here
+                appendDiff(currentNewResult, new Signed<>(Direction.INSERT, timestamp), diffMap);
+                if (nextTimestamp != null) {
+                    appendDiff(currentNewResult, new Signed<>(Direction.DELETE, nextTimestamp), diffMap);
+                }
+            }
+
+            gcAggregates(aggregate, group, timestamp);
+            updateTimeline(group, diffMap);
+
+            // prepare folding state for next timestamp
+            if (nextTimestamp != null) {
+                final FoldingState<Domain> newState = new FoldingState<>();
+                newState.delta = state.delta;
+                addFoldingState(group, newState, nextTimestamp);
+            }
+
+            return diffMap;
+        }
+    }
+
+    @Override
+    public void update(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        final Tuple group = groupMask.transform(update);
+        final Tuple value = columnMask.transform(update);
+        @SuppressWarnings("unchecked")
+        final Domain aggregand = (Domain) runtimeContext.unwrapElement(value.get(0));
+        final boolean isInsertion = direction == Direction.INSERT;
+
+        final CumulativeAggregate<Domain, Accumulator> aggregate = getAggregate(group, timestamp);
+        final FoldingState<Domain> state = new FoldingState<>();
+        if (isInsertion) {
+            aggregate.aggregands.addOne(aggregand);
+            state.delta.addOne(aggregand);
+        } else {
+            aggregate.aggregands.removeOne(aggregand);
+            state.delta.removeOne(aggregand);
+        }
+
+        addFoldingState(group, state, timestamp);
+    }
+
+    /**
+     * Garbage collects the counter of the given group and timestamp if the bag of aggregands is empty.
+     */
+    @Override
+    protected void gcAggregates(final CumulativeAggregate<Domain, Accumulator> aggregate, final Tuple group,
+            final Timestamp timestamp) {
+        if (aggregate.aggregands.isEmpty()) {
+            final TreeMap<Timestamp, CumulativeAggregate<Domain, Accumulator>> groupAggregates = this.aggregates
+                    .get(group);
+            groupAggregates.remove(timestamp);
+            if (groupAggregates.isEmpty()) {
+                this.aggregates.remove(group);
+            }
+        }
+    }
+
+    /**
+     * On-demand initializes and returns the aggregate for the given group and timestamp.
+     */
+    @Override
+    protected CumulativeAggregate<Domain, Accumulator> getAggregate(final Tuple group, final Timestamp timestamp) {
+        final TreeMap<Timestamp, CumulativeAggregate<Domain, Accumulator>> groupAggregates = this.aggregates
+                .computeIfAbsent(group, k -> CollectionsFactory.createTreeMap());
+        return groupAggregates.computeIfAbsent(timestamp, k -> {
+            final CumulativeAggregate<Domain, Accumulator> aggregate = new CumulativeAggregate<>();
+            final Entry<Timestamp, CumulativeAggregate<Domain, Accumulator>> lowerEntry = groupAggregates
+                    .lowerEntry(timestamp);
+            if (lowerEntry == null) {
+                aggregate.accumulator = operator.createNeutral();
+            } else {
+                aggregate.accumulator = operator.clone(lowerEntry.getValue().accumulator);
+            }
+            return aggregate;
+        });
+    }
+
+    @Override
+    public AggregateResult getAggregateResult(final Tuple group) {
+        final TreeMap<Timestamp, CumulativeAggregate<Domain, Accumulator>> groupAggregates = this.aggregates.get(group);
+        if (groupAggregates != null) {
+            final Entry<Timestamp, CumulativeAggregate<Domain, Accumulator>> lastEntry = groupAggregates.lastEntry();
+            return operator.getAggregate(lastEntry.getValue().accumulator);
+        } else {
+            return NEUTRAL;
+        }
+    }
+
+    protected static class CumulativeAggregate<Domain, Accumulator> {
+        protected Accumulator accumulator;
+        protected IDeltaBag<Domain> aggregands;
+
+        protected CumulativeAggregate() {
+            this.aggregands = CollectionsFactory.createDeltaBag();
+        }
+
+        @Override
+        public String toString() {
+            return "accumulator=" + accumulator + " aggregands=" + aggregands;
+        }
+    }
+
+    protected static class FoldingState<Domain> implements MergeableFoldingState<FoldingState<Domain>> {
+        protected IDeltaBag<Domain> delta;
+
+        protected FoldingState() {
+            this.delta = CollectionsFactory.createDeltaBag();
+        }
+
+        @Override
+        public String toString() {
+            return "delta=" + delta;
+        }
+
+        /**
+         * The returned result will never be null, even if the resulting delta set is empty.
+         */
+        @Override
+        public FoldingState<Domain> merge(final FoldingState<Domain> that) {
+            Preconditions.checkArgument(that != null);
+            // 'this' was the previously registered folding state
+            // 'that' is the new folding state being pushed upwards
+            final FoldingState<Domain> result = new FoldingState<>();
+            this.delta.forEachEntryWithMultiplicities((d, m) -> result.delta.addSigned(d, m));
+            that.delta.forEachEntryWithMultiplicities((d, m) -> result.delta.addSigned(d, m));
+            return result;
+        }
+
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulSequentialTimelyColumnAggregatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulSequentialTimelyColumnAggregatorNode.java
new file mode 100644
index 00000000..cf2c2b2d
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulSequentialTimelyColumnAggregatorNode.java
@@ -0,0 +1,279 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.aggregation.timely;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.TreeMap;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.IDeltaBag;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.viatra.runtime.matchers.util.Signed;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode.CumulativeAggregate;
+import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode.FoldingState;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
+
+/**
+ * Faithful column aggregator with sequential aggregation architecture.
+ *
+ * @author Tamas Szabo
+ * @since 2.4
+ *
+ */
+public class FaithfulSequentialTimelyColumnAggregatorNode<Domain, Accumulator, AggregateResult> extends
+        FaithfulTimelyColumnAggregatorNode<Domain, Accumulator, AggregateResult, CumulativeAggregate<Domain, Accumulator, AggregateResult>, FoldingState<Domain, AggregateResult>>
+        implements ResumableNode {
+
+    protected boolean isRecursiveAggregation;
+
+    public FaithfulSequentialTimelyColumnAggregatorNode(final ReteContainer reteContainer,
+            final IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator,
+            final TupleMask groupMask, final TupleMask columnMask) {
+        super(reteContainer, operator, groupMask, columnMask);
+        this.isRecursiveAggregation = false;
+    }
+
+    @Override
+    public void networkStructureChanged() {
+        super.networkStructureChanged();
+        this.isRecursiveAggregation = this.reteContainer.getCommunicationTracker().isInRecursiveGroup(this);
+    }
+
+    @Override
+    protected Map<AggregateResult, Diff<Timestamp>> doFoldingStep(final Tuple group,
+            final FoldingState<Domain, AggregateResult> state, final Timestamp timestamp) {
+        final CumulativeAggregate<Domain, Accumulator, AggregateResult> aggregate = getAggregate(group, timestamp);
+        if (state.delta.isEmpty() && Objects.equals(state.oldResult, state.newResult)) {
+            gcAggregates(aggregate, group, timestamp);
+            return Collections.emptyMap();
+        } else {
+            final Map<AggregateResult, Diff<Timestamp>> diffMap = CollectionsFactory.createMap();
+            final Timestamp nextTimestamp = this.aggregates.get(group).higherKey(timestamp);
+
+            final AggregateResult previousOldResult = state.oldResult;
+            final AggregateResult previousNewResult = state.newResult;
+
+            final AggregateResult currentOldResult = previousOldResult == null
+                    ? operator.getAggregate(aggregate.positive)
+                    : operator.combine(previousOldResult, aggregate.positive);
+
+            for (final Entry<Domain, Integer> entry : state.delta.entriesWithMultiplicities()) {
+                final boolean isInsertion = entry.getValue() > 0;
+                final Domain aggregand = entry.getKey();
+                if (isInsertion) {
+                    for (int i = 0; i < entry.getValue(); i++) {
+                        if (isRecursiveAggregation) {
+                            final boolean contains = aggregate.negative.containsNonZero(aggregand);
+                            if (contains) {
+                                aggregate.negative.addOne(aggregand);
+                            } else {
+                                aggregate.positive = operator.update(aggregate.positive, aggregand, true);
+                            }
+                        } else {
+                            aggregate.positive = operator.update(aggregate.positive, aggregand, true);
+                        }
+                    }
+                } else {
+                    for (int i = 0; i < -entry.getValue(); i++) {
+                        if (isRecursiveAggregation) {
+                            final boolean contains = operator.contains(aggregand, aggregate.positive);
+                            if (contains) {
+                                aggregate.positive = operator.update(aggregate.positive, aggregand, false);
+                            } else {
+                                aggregate.negative.removeOne(aggregand);
+                            }
+                        } else {
+                            aggregate.positive = operator.update(aggregate.positive, aggregand, false);
+                        }
+                    }
+                }
+            }
+
+            final AggregateResult currentNewResult = previousNewResult == null
+                    ? operator.getAggregate(aggregate.positive)
+                    : operator.combine(previousNewResult, aggregate.positive);
+
+            aggregate.cachedResult = currentNewResult;
+
+            final boolean sameResult = Objects.equals(currentOldResult, currentNewResult);
+            if (!sameResult) {
+                // current old result disappears here
+                appendDiff(currentOldResult, new Signed<>(Direction.DELETE, timestamp), diffMap);
+                if (nextTimestamp != null) {
+                    appendDiff(currentOldResult, new Signed<>(Direction.INSERT, nextTimestamp), diffMap);
+                }
+
+                // current new result appears here
+                appendDiff(currentNewResult, new Signed<>(Direction.INSERT, timestamp), diffMap);
+                if (nextTimestamp != null) {
+                    appendDiff(currentNewResult, new Signed<>(Direction.DELETE, nextTimestamp), diffMap);
+                }
+            }
+
+            gcAggregates(aggregate, group, timestamp);
+            updateTimeline(group, diffMap);
+
+            // prepare folding state for next timestamp
+            if (nextTimestamp != null && !sameResult) {
+                final FoldingState<Domain, AggregateResult> newState = new FoldingState<>();
+                // DO NOT push forward the delta in the folding state!!! that one only affects the input timestamp
+                newState.oldResult = currentOldResult;
+                newState.newResult = currentNewResult;
+                addFoldingState(group, newState, nextTimestamp);
+            }
+
+            return diffMap;
+        }
+    }
+
+    @Override
+    public void update(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        final Tuple group = groupMask.transform(update);
+        final Tuple value = columnMask.transform(update);
+        @SuppressWarnings("unchecked")
+        final Domain aggregand = (Domain) runtimeContext.unwrapElement(value.get(0));
+        final boolean isInsertion = direction == Direction.INSERT;
+
+        final AggregateResult previousResult = getResultRaw(group, timestamp, true);
+        final FoldingState<Domain, AggregateResult> state = new FoldingState<Domain, AggregateResult>();
+        if (isInsertion) {
+            state.delta.addOne(aggregand);
+        } else {
+            state.delta.removeOne(aggregand);
+        }
+        state.oldResult = previousResult;
+        state.newResult = previousResult;
+
+        // it is acceptable if both oldResult and newResult are null at this point
+        // in that case we did not have a previous entry at a lower timestamp
+
+        addFoldingState(group, state, timestamp);
+    }
+
+    protected AggregateResult getResultRaw(final Tuple group, final Timestamp timestamp, final boolean lower) {
+        final TreeMap<Timestamp, CumulativeAggregate<Domain, Accumulator, AggregateResult>> entryMap = this.aggregates
+                .get(group);
+        if (entryMap == null) {
+            return null;
+        } else {
+            CumulativeAggregate<Domain, Accumulator, AggregateResult> aggregate = null;
+            if (lower) {
+                final Entry<Timestamp, CumulativeAggregate<Domain, Accumulator, AggregateResult>> lowerEntry = entryMap
+                        .lowerEntry(timestamp);
+                if (lowerEntry != null) {
+                    aggregate = lowerEntry.getValue();
+                }
+            } else {
+                aggregate = entryMap.get(timestamp);
+            }
+            if (aggregate == null) {
+                return null;
+            } else {
+                return aggregate.cachedResult;
+            }
+        }
+    }
+
+    @Override
+    protected void gcAggregates(final CumulativeAggregate<Domain, Accumulator, AggregateResult> aggregate,
+            final Tuple group, final Timestamp timestamp) {
+        if (operator.isNeutral(aggregate.positive) && aggregate.negative.isEmpty()) {
+            final TreeMap<Timestamp, CumulativeAggregate<Domain, Accumulator, AggregateResult>> groupAggregates = this.aggregates
+                    .get(group);
+            groupAggregates.remove(timestamp);
+            if (groupAggregates.isEmpty()) {
+                this.aggregates.remove(group);
+            }
+        }
+    }
+
+    @Override
+    protected CumulativeAggregate<Domain, Accumulator, AggregateResult> getAggregate(final Tuple group,
+            final Timestamp timestamp) {
+        final TreeMap<Timestamp, CumulativeAggregate<Domain, Accumulator, AggregateResult>> groupAggregates = this.aggregates
+                .computeIfAbsent(group, k -> CollectionsFactory.createTreeMap());
+        return groupAggregates.computeIfAbsent(timestamp, k -> {
+            final CumulativeAggregate<Domain, Accumulator, AggregateResult> aggregate = new CumulativeAggregate<>();
+            aggregate.positive = operator.createNeutral();
+            return aggregate;
+        });
+    }
+
+    @Override
+    public AggregateResult getAggregateResult(final Tuple group) {
+        final TreeMap<Timestamp, CumulativeAggregate<Domain, Accumulator, AggregateResult>> groupAggregates = this.aggregates
+                .get(group);
+        if (groupAggregates != null) {
+            final Entry<Timestamp, CumulativeAggregate<Domain, Accumulator, AggregateResult>> lastEntry = groupAggregates
+                    .lastEntry();
+            return lastEntry.getValue().cachedResult;
+        } else {
+            return NEUTRAL;
+        }
+    }
+
+    protected static class CumulativeAggregate<Domain, Accumulator, AggregateResult> {
+        protected Accumulator positive;
+        protected IDeltaBag<Domain> negative;
+        protected AggregateResult cachedResult;
+
+        protected CumulativeAggregate() {
+            this.negative = CollectionsFactory.createDeltaBag();
+        }
+
+        @Override
+        public String toString() {
+            return "positive=" + positive + " negative=" + negative + " cachedResult=" + cachedResult;
+        }
+    }
+
+    protected static class FoldingState<Domain, AggregateResult>
+            implements MergeableFoldingState<FoldingState<Domain, AggregateResult>> {
+        protected IDeltaBag<Domain> delta;
+        protected AggregateResult oldResult;
+        protected AggregateResult newResult;
+
+        protected FoldingState() {
+            this.delta = CollectionsFactory.createDeltaBag();
+        }
+
+        @Override
+        public String toString() {
+            return "delta=" + delta + " oldResult=" + oldResult + " newResult=" + newResult;
+        }
+
+        /**
+         * The returned result will never be null, even if the resulting delta set is empty.
+         */
+        @Override
+        public FoldingState<Domain, AggregateResult> merge(final FoldingState<Domain, AggregateResult> that) {
+            Preconditions.checkArgument(that != null);
+            // 'this' was the previously registered folding state
+            // 'that' is the new folding state being pushed upwards
+            final FoldingState<Domain, AggregateResult> result = new FoldingState<Domain, AggregateResult>();
+            this.delta.forEachEntryWithMultiplicities((d, m) -> result.delta.addSigned(d, m));
+            that.delta.forEachEntryWithMultiplicities((d, m) -> result.delta.addSigned(d, m));
+            result.oldResult = this.oldResult;
+            result.newResult = that.newResult;
+            return result;
+        }
+
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulTimelyColumnAggregatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulTimelyColumnAggregatorNode.java
new file mode 100644
index 00000000..8fe9a4e9
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulTimelyColumnAggregatorNode.java
@@ -0,0 +1,247 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.aggregation.timely;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.TreeMap;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Signed;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timelines;
+import tools.refinery.viatra.runtime.rete.aggregation.AbstractColumnAggregatorNode;
+import tools.refinery.viatra.runtime.rete.aggregation.GroupedMap;
+import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulTimelyColumnAggregatorNode.MergeableFoldingState;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
+
+/**
+ * Faithful timely implementation of the column aggregator node. Complete timelines (series of appearance &
+ * disappearance) are maintained for tuples. <br>
+ * <br>
+ * Subclasses are responsible for implementing the aggregator architecture, and they must use the CumulativeAggregate
+ * type parameter for that. <br>
+ * <br>
+ * This node supports recursive aggregation.
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public abstract class FaithfulTimelyColumnAggregatorNode<Domain, Accumulator, AggregateResult, CumulativeAggregate, FoldingState extends MergeableFoldingState<FoldingState>>
+        extends AbstractColumnAggregatorNode<Domain, Accumulator, AggregateResult> implements ResumableNode {
+
+    protected final Map<Tuple, TreeMap<Timestamp, CumulativeAggregate>> aggregates;
+    protected final Map<Tuple, Map<AggregateResult, Timeline<Timestamp>>> timelines;
+    protected final TreeMap<Timestamp, Map<Tuple, FoldingState>> foldingState;
+    protected CommunicationGroup communicationGroup;
+
+    public FaithfulTimelyColumnAggregatorNode(final ReteContainer reteContainer,
+            final IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator,
+            final TupleMask groupMask, final TupleMask columnMask) {
+        super(reteContainer, operator, groupMask, columnMask);
+        this.aggregates = CollectionsFactory.createMap();
+        this.timelines = CollectionsFactory.createMap();
+        this.foldingState = CollectionsFactory.createTreeMap();
+        // mailbox MUST be instantiated after the fields are all set
+        this.mailbox = instantiateMailbox();
+    }
+
+    @Override
+    protected Mailbox instantiateMailbox() {
+        return new TimelyMailbox(this, this.reteContainer);
+    }
+
+    @Override
+    public void clear() {
+        this.mailbox.clear();
+        this.aggregates.clear();
+        this.timelines.clear();
+        this.children.clear();
+        this.childMailboxes.clear();
+        this.foldingState.clear();
+    }
+
+    /**
+     * Registers the given folding state for the specified timestamp and tuple. If there is already a state stored, the
+     * two states will be merged together.
+     * 
+     * 
+     */
+    protected void addFoldingState(final Tuple group, final FoldingState state, final Timestamp timestamp) {
+        // assert !state.delta.isEmpty();
+        final Map<Tuple, FoldingState> tupleMap = this.foldingState.computeIfAbsent(timestamp,
+                k -> CollectionsFactory.createMap());
+        tupleMap.compute(group, (k, v) -> {
+            return v == null ? state : v.merge(state);
+        });
+    }
+
+    @Override
+    public Timestamp getResumableTimestamp() {
+        if (this.foldingState.isEmpty()) {
+            return null;
+        } else {
+            return this.foldingState.firstKey();
+        }
+    }
+
+    @Override
+    public void resumeAt(final Timestamp timestamp) {
+        Timestamp current = this.getResumableTimestamp();
+        if (current == null) {
+            throw new IllegalStateException("There is nothing to fold!");
+        } else if (current.compareTo(timestamp) != 0) {
+            throw new IllegalStateException("Expected to continue folding at " + timestamp + "!");
+        }
+
+        final Map<Tuple, FoldingState> tupleMap = this.foldingState.remove(timestamp);
+        for (final Entry<Tuple, FoldingState> groupEntry : tupleMap.entrySet()) {
+            final Tuple group = groupEntry.getKey();
+            final FoldingState value = groupEntry.getValue();
+            final Map<AggregateResult, Diff<Timestamp>> diffMap = doFoldingStep(group, value, timestamp);
+            for (final Entry<AggregateResult, Diff<Timestamp>> resultEntry : diffMap.entrySet()) {
+                for (final Signed<Timestamp> signed : resultEntry.getValue()) {
+                    propagate(signed.getDirection(), group, resultEntry.getKey(), signed.getPayload());
+                }
+            }
+        }
+
+        final Timestamp nextTimestamp = this.getResumableTimestamp();
+        if (Objects.equals(timestamp, nextTimestamp)) {
+            throw new IllegalStateException(
+                    "Folding at " + timestamp + " produced more folding work at the same timestamp!");
+        } else if (nextTimestamp != null) {
+            this.communicationGroup.notifyHasMessage(this.mailbox, nextTimestamp);
+        }
+    }
+
+    protected abstract Map<AggregateResult, Diff<Timestamp>> doFoldingStep(final Tuple group, final FoldingState state,
+            final Timestamp timestamp);
+
+    /**
+     * Updates and garbage collects the timeline of the given tuple based on the given diffs.
+     */
+    protected void updateTimeline(final Tuple group, final Map<AggregateResult, Diff<Timestamp>> diffs) {
+        if (!diffs.isEmpty()) {
+            this.timelines.compute(group, (k, resultTimelines) -> {
+                if (resultTimelines == null) {
+                    resultTimelines = CollectionsFactory.createMap();
+                }
+                for (final Entry<AggregateResult, Diff<Timestamp>> entry : diffs.entrySet()) {
+                    final AggregateResult result = entry.getKey();
+                    resultTimelines.compute(result, (k2, oldResultTimeline) -> {
+                        final Diff<Timestamp> currentResultDiffs = entry.getValue();
+                        if (oldResultTimeline == null) {
+                            oldResultTimeline = getInitialTimeline(result);
+                        }
+                        final Timeline<Timestamp> timeline = oldResultTimeline.mergeAdditive(currentResultDiffs);
+                        if (timeline.isEmpty()) {
+                            return null;
+                        } else {
+                            return timeline;
+                        }
+                    });
+                }
+                if (resultTimelines.isEmpty()) {
+                    return null;
+                } else {
+                    return resultTimelines;
+                }
+            });
+        }
+    }
+
+    /**
+     * Garbage collects the counter of the given group and timestamp if the bag of aggregands is empty.
+     */
+    protected abstract void gcAggregates(final CumulativeAggregate aggregate, final Tuple group,
+            final Timestamp timestamp);
+
+    /**
+     * On-demand initializes and returns the aggregate for the given group and timestamp.
+     */
+    protected abstract CumulativeAggregate getAggregate(final Tuple group, final Timestamp timestamp);
+
+    protected static final Timeline<Timestamp> NEUTRAL_INITIAL_TIMELINE = Timestamp.INSERT_AT_ZERO_TIMELINE;
+    protected static final Timeline<Timestamp> NON_NEUTRAL_INITIAL_TIMELINE = Timelines.createEmpty();
+
+    protected Timeline<Timestamp> getInitialTimeline(final AggregateResult result) {
+        if (NEUTRAL == result) {
+            return NEUTRAL_INITIAL_TIMELINE;
+        } else {
+            return NON_NEUTRAL_INITIAL_TIMELINE;
+        }
+    }
+
+    protected static <AggregateResult> void appendDiff(final AggregateResult result, final Signed<Timestamp> diff,
+            final Map<AggregateResult, Diff<Timestamp>> diffs) {
+        if (result != null) {
+            diffs.compute(result, (k, timeLineDiff) -> {
+                if (timeLineDiff == null) {
+                    timeLineDiff = new Diff<>();
+                }
+                timeLineDiff.add(diff);
+                return timeLineDiff;
+            });
+        }
+    }
+
+    @Override
+    public Tuple getAggregateTuple(final Tuple group) {
+        return tupleFromAggregateResult(group, getAggregateResult(group));
+    }
+
+    @Override
+    public Map<AggregateResult, Timeline<Timestamp>> getAggregateResultTimeline(final Tuple group) {
+        final Map<AggregateResult, Timeline<Timestamp>> resultTimelines = this.timelines.get(group);
+        if (resultTimelines == null) {
+            if (NEUTRAL == null) {
+                return Collections.emptyMap();
+            } else {
+                return Collections.singletonMap(NEUTRAL, NEUTRAL_INITIAL_TIMELINE);
+            }
+        } else {
+            return resultTimelines;
+        }
+    }
+
+    @Override
+    public Map<Tuple, Timeline<Timestamp>> getAggregateTupleTimeline(final Tuple group) {
+        final Map<AggregateResult, Timeline<Timestamp>> resultTimelines = getAggregateResultTimeline(group);
+        return new GroupedMap<AggregateResult, Timeline<Timestamp>>(group, resultTimelines, this.runtimeContext);
+    }
+
+    @Override
+    public CommunicationGroup getCurrentGroup() {
+        return communicationGroup;
+    }
+
+    @Override
+    public void setCurrentGroup(final CommunicationGroup currentGroup) {
+        this.communicationGroup = currentGroup;
+    }
+
+    protected interface MergeableFoldingState<T> {
+
+        public abstract T merge(final T that);
+
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlyParallelTimelyColumnAggregatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlyParallelTimelyColumnAggregatorNode.java
new file mode 100644
index 00000000..733d2585
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlyParallelTimelyColumnAggregatorNode.java
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.aggregation.timely;
+
+import java.util.Map.Entry;
+import java.util.TreeMap;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * First-only column aggregator with parallel aggregation architecture.
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public class FirstOnlyParallelTimelyColumnAggregatorNode<Domain, Accumulator, AggregateResult>
+        extends FirstOnlyTimelyColumnAggregatorNode<Domain, Accumulator, AggregateResult> {
+
+    public FirstOnlyParallelTimelyColumnAggregatorNode(final ReteContainer reteContainer,
+            final IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator,
+            final TupleMask groupMask, final TupleMask columnMask) {
+        super(reteContainer, operator, groupMask, columnMask);
+    }
+
+    /**
+     * Accumulator gets modified at the input timestamp and at all higher timestamps. Folding cannot be interrupted if
+     * the new aggregate result is the same as the old at an intermediate timestamp because aggregands need to be copied
+     * over to all accumulators at the higher timestamps.
+     */
+    @Override
+    public void update(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        final Tuple group = groupMask.transform(update);
+        final Tuple value = columnMask.transform(update);
+        @SuppressWarnings("unchecked")
+        final Domain aggregand = (Domain) runtimeContext.unwrapElement(value.get(0));
+        final boolean isInsertion = direction == Direction.INSERT;
+
+        final AggregateResult previousResult = getResultRaw(group, timestamp, true);
+
+        Accumulator oldAccumulator = getAccumulator(group, timestamp);
+        AggregateResult oldResult = operator.getAggregate(oldAccumulator);
+
+        Accumulator newAccumulator = operator.update(oldAccumulator, aggregand, isInsertion);
+        AggregateResult newResult = operator.getAggregate(newAccumulator);
+
+        storeIfNotNeutral(group, newAccumulator, newResult, timestamp);
+
+        propagateWithChecks(group, timestamp, previousResult, previousResult, oldResult, newResult);
+
+        AggregateResult previousOldResult = oldResult;
+        AggregateResult previousNewResult = newResult;
+        final TreeMap<Timestamp, CumulativeAggregate<Accumulator, AggregateResult>> groupEntries = this.memory
+                .get(group);
+
+        Timestamp currentTimestamp = groupEntries == null ? null : groupEntries.higherKey(timestamp);
+
+        while (currentTimestamp != null) {
+            final CumulativeAggregate<Accumulator, AggregateResult> groupEntry = groupEntries.get(currentTimestamp);
+            oldResult = groupEntry.result;
+            oldAccumulator = groupEntry.accumulator;
+            newAccumulator = operator.update(oldAccumulator, aggregand, isInsertion);
+            newResult = operator.getAggregate(newAccumulator);
+
+            storeIfNotNeutral(group, newAccumulator, newResult, currentTimestamp);
+
+            propagateWithChecks(group, currentTimestamp, previousOldResult, previousNewResult, oldResult, newResult);
+
+            previousOldResult = oldResult;
+            previousNewResult = newResult;
+            currentTimestamp = groupEntries.higherKey(currentTimestamp);
+        }
+    }
+
+    @Override
+    protected Accumulator getAccumulator(final Tuple group, final Timestamp timestamp) {
+        final TreeMap<Timestamp, CumulativeAggregate<Accumulator, AggregateResult>> entryMap = this.memory.get(group);
+        if (entryMap == null) {
+            return operator.createNeutral();
+        } else {
+            final CumulativeAggregate<Accumulator, AggregateResult> entry = entryMap.get(timestamp);
+            if (entry == null) {
+                final Entry<Timestamp, CumulativeAggregate<Accumulator, AggregateResult>> lowerEntry = entryMap
+                        .lowerEntry(timestamp);
+                if (lowerEntry == null) {
+                    return operator.createNeutral();
+                } else {
+                    return operator.clone(lowerEntry.getValue().accumulator);
+                }
+            } else {
+                return entry.accumulator;
+            }
+        }
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlySequentialTimelyColumnAggregatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlySequentialTimelyColumnAggregatorNode.java
new file mode 100644
index 00000000..79197aac
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlySequentialTimelyColumnAggregatorNode.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.aggregation.timely;
+
+import java.util.Objects;
+import java.util.TreeMap;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * First-only column aggregator with sequential aggregation architecture. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public class FirstOnlySequentialTimelyColumnAggregatorNode<Domain, Accumulator, AggregateResult>
+        extends FirstOnlyTimelyColumnAggregatorNode<Domain, Accumulator, AggregateResult> {
+
+    public FirstOnlySequentialTimelyColumnAggregatorNode(final ReteContainer reteContainer,
+            final IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator,
+            final TupleMask groupMask, final TupleMask columnMask) {
+        super(reteContainer, operator, groupMask, columnMask);
+    }
+
+    /**
+     * Accumulator gets modified only at the timestamp where the update happened. During the folding, accumulators are
+     * never changed at higher timestamps. Aggregate results at higher timestamps may change due to the change at the
+     * input timestamp. Uniqueness enforcement may require from aggregate results to jump up/down on demand during the
+     * folding.
+     */
+    @Override
+    public void update(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        final Tuple group = groupMask.transform(update);
+        final Tuple value = columnMask.transform(update);
+        @SuppressWarnings("unchecked")
+        final Domain aggregand = (Domain) runtimeContext.unwrapElement(value.get(0));
+        final boolean isInsertion = direction == Direction.INSERT;
+
+        final AggregateResult previousResult = getResultRaw(group, timestamp, true);
+
+        final Accumulator oldAccumulator = getAccumulator(group, timestamp);
+        final AggregateResult oldResult = previousResult == null ? operator.getAggregate(oldAccumulator)
+                : operator.combine(previousResult, oldAccumulator);
+
+        final Accumulator newAccumulator = operator.update(oldAccumulator, aggregand, isInsertion);
+        final AggregateResult newResult = previousResult == null ? operator.getAggregate(newAccumulator)
+                : operator.combine(previousResult, newAccumulator);
+
+        storeIfNotNeutral(group, newAccumulator, newResult, timestamp);
+
+        propagateWithChecks(group, timestamp, previousResult, previousResult, oldResult, newResult);
+
+        // fold up the state towards higher timestamps
+        if (!Objects.equals(oldResult, newResult)) {
+            AggregateResult previousOldResult = oldResult;
+            AggregateResult previousNewResult = newResult;
+            AggregateResult currentOldResult = null;
+            AggregateResult currentNewResult = null;
+            final TreeMap<Timestamp, CumulativeAggregate<Accumulator, AggregateResult>> groupEntries = this.memory
+                    .get(group);
+
+            Timestamp currentTimestamp = groupEntries == null ? null : groupEntries.higherKey(timestamp);
+
+            while (currentTimestamp != null) {
+                // they cannot be the same, otherwise we would not even be here
+                assert !Objects.equals(previousOldResult, previousNewResult);
+
+                final Accumulator accumulator = getAccumulator(group, currentTimestamp);
+                currentOldResult = groupEntries.get(currentTimestamp).result;
+                currentNewResult = operator.combine(previousNewResult, accumulator);
+
+                // otherwise we would not be iterating over this timestamp
+                assert !operator.isNeutral(accumulator);
+
+                propagateWithChecks(group, currentTimestamp, previousOldResult, previousNewResult, currentOldResult,
+                        currentNewResult);
+
+                if (!Objects.equals(currentOldResult, currentNewResult)) {
+                    storeIfNotNeutral(group, accumulator, currentNewResult, currentTimestamp);
+                    previousOldResult = currentOldResult;
+                    previousNewResult = currentNewResult;
+                    currentTimestamp = groupEntries.higherKey(currentTimestamp);
+                } else {
+                    // we can stop the folding from here
+                    break;
+                }
+            }
+        }
+    }
+
+    @Override
+    protected Accumulator getAccumulator(final Tuple group, final Timestamp timestamp) {
+        final TreeMap<Timestamp, CumulativeAggregate<Accumulator, AggregateResult>> entryMap = this.memory.get(group);
+        if (entryMap == null) {
+            return operator.createNeutral();
+        } else {
+            final CumulativeAggregate<Accumulator, AggregateResult> entry = entryMap.get(timestamp);
+            if (entry == null) {
+                return operator.createNeutral();
+            } else {
+                return entry.accumulator;
+            }
+        }
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlyTimelyColumnAggregatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlyTimelyColumnAggregatorNode.java
new file mode 100644
index 00000000..0c73000e
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FirstOnlyTimelyColumnAggregatorNode.java
@@ -0,0 +1,212 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.aggregation.timely;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.TreeMap;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timelines;
+import tools.refinery.viatra.runtime.rete.aggregation.AbstractColumnAggregatorNode;
+import tools.refinery.viatra.runtime.rete.aggregation.GroupedMap;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
+
+/**
+ * First-only timely implementation of the column aggregator node. Only timestamps of appearance are maintained for
+ * tuples instead of complete timelines. 
+ * <br><br>
+ * Subclasses are responsible for implementing the aggregator architecture, and they must make use of the inner class {@link CumulativeAggregate}.
+ * <br><br>
+ * This node supports recursive aggregation.
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public abstract class FirstOnlyTimelyColumnAggregatorNode<Domain, Accumulator, AggregateResult>
+        extends AbstractColumnAggregatorNode<Domain, Accumulator, AggregateResult> {
+
+    protected final Map<Tuple, TreeMap<Timestamp, CumulativeAggregate<Accumulator, AggregateResult>>> memory;
+
+    public FirstOnlyTimelyColumnAggregatorNode(final ReteContainer reteContainer,
+            final IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> operator,
+            final TupleMask groupMask, final TupleMask columnMask) {
+        super(reteContainer, operator, groupMask, columnMask);
+        this.memory = CollectionsFactory.createMap();
+        // mailbox MUST be instantiated after the fields are all set
+        this.mailbox = instantiateMailbox();
+    }
+
+    protected static class CumulativeAggregate<Accumulator, AggregateResult> {
+        // the accumulator storing the aggregands
+        protected Accumulator accumulator;
+        // the aggregate result at the timestamp where this cumulative aggregate is stored
+        protected AggregateResult result;
+
+        private CumulativeAggregate(final Accumulator accumulator, final AggregateResult result) {
+            this.accumulator = accumulator;
+            this.result = result;
+        }
+
+    }
+
+    public Collection<Tuple> getGroups() {
+        return this.memory.keySet();
+    }
+
+    public AggregateResult getLastResult(final Tuple group) {
+        final TreeMap<Timestamp, CumulativeAggregate<Accumulator, AggregateResult>> groupMap = this.memory.get(group);
+        if (groupMap == null) {
+            return null;
+        } else {
+            return groupMap.lastEntry().getValue().result;
+        }
+    }
+
+    public Timestamp getLastTimestamp(final Tuple group) {
+        final TreeMap<Timestamp, CumulativeAggregate<Accumulator, AggregateResult>> groupMap = this.memory.get(group);
+        if (groupMap == null) {
+            return null;
+        } else {
+            return groupMap.lastEntry().getKey();
+        }
+    }
+
+    @Override
+    protected Mailbox instantiateMailbox() {
+        return new TimelyMailbox(this, this.reteContainer);
+    }
+
+    @Override
+    public void clear() {
+        this.mailbox.clear();
+        this.memory.clear();
+        this.children.clear();
+        this.childMailboxes.clear();
+    }
+
+    protected void propagateWithChecks(final Tuple group, final Timestamp timestamp,
+            final AggregateResult previousOldResult, final AggregateResult previousNewResult,
+            final AggregateResult currentOldResult, final AggregateResult currentNewResult) {
+        final boolean jumpDown = Objects.equals(previousNewResult, currentOldResult);
+        final boolean jumpUp = Objects.equals(previousOldResult, currentNewResult);
+        final boolean resultsDiffer = !Objects.equals(currentOldResult, currentNewResult);
+
+        // uniqueness enforcement is happening here
+        if ((resultsDiffer || jumpDown) && !Objects.equals(previousOldResult, currentOldResult)) {
+            propagate(Direction.DELETE, group, currentOldResult, timestamp);
+        }
+        if ((resultsDiffer || jumpUp) && !Objects.equals(previousNewResult, currentNewResult)) {
+            propagate(Direction.INSERT, group, currentNewResult, timestamp);
+        }
+    }
+
+    /**
+     * Returns the aggregation architecture-specific accumulator at the specified timestamp for the given group.   
+     */
+    protected abstract Accumulator getAccumulator(final Tuple group, final Timestamp timestamp);
+    
+    protected AggregateResult getResultRaw(final Tuple group, final Timestamp timestamp, final boolean lower) {
+        final TreeMap<Timestamp, CumulativeAggregate<Accumulator, AggregateResult>> entryMap = this.memory.get(group);
+        if (entryMap == null) {
+            return null;
+        } else {
+            CumulativeAggregate<Accumulator, AggregateResult> entry = null;
+            if (lower) {
+                final Entry<Timestamp, CumulativeAggregate<Accumulator, AggregateResult>> lowerEntry = entryMap
+                        .lowerEntry(timestamp);
+                if (lowerEntry != null) {
+                    entry = lowerEntry.getValue();
+                }
+            } else {
+                entry = entryMap.get(timestamp);
+            }
+            if (entry == null) {
+                return null;
+            } else {
+                return entry.result;
+            }
+        }
+    }
+
+    protected AggregateResult getResult(final Tuple group, final Timestamp timestamp, final boolean lower) {
+        final AggregateResult result = getResultRaw(group, timestamp, lower);
+        if (result == null) {
+            return NEUTRAL;
+        } else {
+            return result;
+        }
+    }
+
+    protected AggregateResult getResult(final Tuple group, final Timestamp timestamp) {
+        return getResult(group, timestamp, false);
+    }
+
+    protected void storeIfNotNeutral(final Tuple group, final Accumulator accumulator, final AggregateResult value,
+            final Timestamp timestamp) {
+        TreeMap<Timestamp, CumulativeAggregate<Accumulator, AggregateResult>> entryMap = this.memory.get(group);
+        if (operator.isNeutral(accumulator)) {
+            if (entryMap != null) {
+                entryMap.remove(timestamp);
+                if (entryMap.isEmpty()) {
+                    this.memory.remove(group);
+                }
+            }
+        } else {
+            if (entryMap == null) {
+                entryMap = CollectionsFactory.createTreeMap();
+                this.memory.put(group, entryMap);
+            }
+            entryMap.put(timestamp, new CumulativeAggregate<>(accumulator, value));
+        }
+    }
+
+    @Override
+    public Tuple getAggregateTuple(final Tuple group) {
+        return tupleFromAggregateResult(group, getResult(group, Timestamp.ZERO));
+    }
+
+    @Override
+    public AggregateResult getAggregateResult(final Tuple group) {
+        return getResult(group, Timestamp.ZERO);
+    }
+
+    @Override
+    public Map<AggregateResult, Timeline<Timestamp>> getAggregateResultTimeline(final Tuple group) {
+        final TreeMap<Timestamp, CumulativeAggregate<Accumulator, AggregateResult>> entryMap = this.memory.get(group);
+        if (entryMap == null) {
+            return Collections.emptyMap();
+        } else {
+            final Map<AggregateResult, Timeline<Timestamp>> result = CollectionsFactory.createMap();
+            for (final Entry<Timestamp, CumulativeAggregate<Accumulator, AggregateResult>> entry : entryMap
+                    .descendingMap().entrySet()) {
+                result.put(entry.getValue().result, Timelines.createFrom(entry.getKey()));
+            }
+            return result;
+        }
+    }
+
+    @Override
+    public Map<Tuple, Timeline<Timestamp>> getAggregateTupleTimeline(final Tuple group) {
+        final Map<AggregateResult, Timeline<Timestamp>> resultTimelines = getAggregateResultTimeline(group);
+        return new GroupedMap<AggregateResult, Timeline<Timestamp>>(group, resultTimelines, this.runtimeContext);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/Disconnectable.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/Disconnectable.java
new file mode 100644
index 00000000..7bbf74ea
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/Disconnectable.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.boundary;
+
+/**
+ * For objects that connect a RETE implementation to the underlying model.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public interface Disconnectable {
+
+    /**
+     * Disconnects this rete engine component from the underlying model. Disconnecting enables the garbage collection
+     * mechanisms to dispose of the rete network.
+     */
+    void disconnect();
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ExternalInputEnumeratorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ExternalInputEnumeratorNode.java
new file mode 100644
index 00000000..51f89b52
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ExternalInputEnumeratorNode.java
@@ -0,0 +1,209 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.boundary;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContextListener;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.matcher.ReteEngine;
+import tools.refinery.viatra.runtime.rete.network.Network;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.StandardNode;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
+import tools.refinery.viatra.runtime.rete.remote.Address;
+
+/**
+ * An input node representing an enumerable extensional input relation and receiving external updates.
+ * 
+ * <p>
+ * Contains those tuples that are in the extensional relation identified by the input key, and also conform to the
+ * global seed (if any).
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public class ExternalInputEnumeratorNode extends StandardNode
+        implements Disconnectable, Receiver, IQueryRuntimeContextListener {
+
+    private IQueryRuntimeContext context = null;
+    private IInputKey inputKey;
+    private Tuple globalSeed;
+    private InputConnector inputConnector;
+    private Network network;
+    private Address<? extends Receiver> myAddress;
+    private boolean parallelExecutionEnabled;
+    /**
+     * @since 1.6
+     */
+    protected final Mailbox mailbox;
+    private final IQueryBackendContext qBackendContext;
+
+    public ExternalInputEnumeratorNode(ReteContainer reteContainer) {
+        super(reteContainer);
+        myAddress = Address.of(this);
+        network = reteContainer.getNetwork();
+        inputConnector = network.getInputConnector();
+        qBackendContext = network.getEngine().getBackendContext();
+        mailbox = instantiateMailbox();
+        reteContainer.registerClearable(mailbox);
+    }
+
+    /**
+     * Instantiates the {@link Mailbox} of this receiver. Subclasses may override this method to provide their own
+     * mailbox implementation.
+     * 
+     * @return the mailbox
+     * @since 2.0
+     */
+    protected Mailbox instantiateMailbox() {
+        if (this.reteContainer.isTimelyEvaluation()) {
+            return new TimelyMailbox(this, this.reteContainer);
+        } else {
+            return new BehaviorChangingMailbox(this, this.reteContainer);
+        }
+    }
+
+    @Override
+    public Mailbox getMailbox() {
+        return this.mailbox;
+    }
+
+    public void connectThroughContext(ReteEngine engine, IInputKey inputKey, Tuple globalSeed) {
+        this.inputKey = inputKey;
+        this.globalSeed = globalSeed;
+        setTag(inputKey);
+
+        final IQueryRuntimeContext context = engine.getRuntimeContext();
+        if (!context.getMetaContext().isEnumerable(inputKey))
+            throw new IllegalArgumentException(this.getClass().getSimpleName()
+                    + " only applicable for enumerable input keys; received instead " + inputKey);
+
+        this.context = context;
+        this.parallelExecutionEnabled = engine.isParallelExecutionEnabled();
+
+        engine.addDisconnectable(this);
+        context.addUpdateListener(inputKey, globalSeed, this);
+    }
+
+    @Override
+    public void disconnect() {
+        if (context != null) { // if connected
+            context.removeUpdateListener(inputKey, globalSeed, this);
+            context = null;
+        }
+    }
+
+    /**
+     * @since 2.2
+     */
+    protected Iterable<Tuple> getTuplesInternal() {
+        Iterable<Tuple> tuples = null;
+        
+        if (context != null) { // if connected
+            if (globalSeed == null) {
+                tuples = context.enumerateTuples(inputKey, TupleMask.empty(inputKey.getArity()),
+                        Tuples.staticArityFlatTupleOf());
+            } else {
+                final TupleMask mask = TupleMask.fromNonNullIndices(globalSeed);
+                tuples = context.enumerateTuples(inputKey, mask, mask.transform(globalSeed));
+            }
+        }
+        
+        return tuples;
+    }
+
+    @Override
+    public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+        final Iterable<Tuple> tuples = getTuplesInternal();
+        if (tuples != null) {
+            for (final Tuple tuple : tuples) {
+                collector.add(tuple);
+            }            
+        }
+    }
+
+    @Override
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        final Iterable<Tuple> tuples = getTuplesInternal();
+        if (tuples != null) {
+            for (final Tuple tuple : tuples) {
+                collector.put(tuple, Timestamp.INSERT_AT_ZERO_TIMELINE);
+            }            
+        }
+    }
+
+    /* Update from runtime context */
+    @Override
+    public void update(IInputKey key, Tuple update, boolean isInsertion) {
+        if (parallelExecutionEnabled) {
+            // send back to myself as an official external update, and then propagate it transparently
+            network.sendExternalUpdate(myAddress, direction(isInsertion), update);
+        } else {
+            if (qBackendContext.areUpdatesDelayed()) {
+                // post the update into the mailbox of the node
+                mailbox.postMessage(direction(isInsertion), update, Timestamp.ZERO);
+            } else {
+                // just propagate the input
+                update(direction(isInsertion), update, Timestamp.ZERO);
+            }
+            // if the the update method is called from within a delayed execution, 
+            // the following invocation will be a no-op
+            network.waitForReteTermination();
+        }
+    }
+
+    private static Direction direction(boolean isInsertion) {
+        return isInsertion ? Direction.INSERT : Direction.DELETE;
+    }
+
+    /* Self-addressed from network */
+    @Override
+    public void update(Direction direction, Tuple updateElement, Timestamp timestamp) {
+        propagateUpdate(direction, updateElement, timestamp);
+    }
+
+    @Override
+    public void appendParent(Supplier supplier) {
+        throw new UnsupportedOperationException("Input nodes can't have parents");
+    }
+
+    @Override
+    public void removeParent(Supplier supplier) {
+        throw new UnsupportedOperationException("Input nodes can't have parents");
+    }
+
+    @Override
+    public Collection<Supplier> getParents() {
+        return Collections.emptySet();
+    }
+
+    public IInputKey getInputKey() {
+        return inputKey;
+    }
+
+    public Tuple getGlobalSeed() {
+        return globalSeed;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ExternalInputStatelessFilterNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ExternalInputStatelessFilterNode.java
new file mode 100644
index 00000000..57e06911
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ExternalInputStatelessFilterNode.java
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.boundary;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.rete.matcher.ReteEngine;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.single.FilterNode;
+
+/**
+ * A filter node representing a (stateless, typically non-enumerable) extensional input relation.
+ * 
+ * <p> Contains those tuples of its parents, that (when transformed by a mask, if given) are present in the extensional relation identified by the input key.
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public class ExternalInputStatelessFilterNode extends FilterNode implements Disconnectable {
+    
+    IQueryRuntimeContext context = null;
+    IInputKey inputKey;
+    private InputConnector inputConnector;
+    private TupleMask mask;
+
+    public ExternalInputStatelessFilterNode(ReteContainer reteContainer, TupleMask mask) {
+        super(reteContainer);
+        this.mask = mask;
+        this.inputConnector = reteContainer.getNetwork().getInputConnector();
+    }
+    
+    @Override
+    public boolean check(Tuple ps) {
+        if (mask != null) 
+            ps = mask.transform(ps);
+        return context.containsTuple(inputKey, ps);
+    }
+    
+    
+    public void connectThroughContext(ReteEngine engine, IInputKey inputKey) {
+        this.inputKey = inputKey;
+        setTag(inputKey);
+        
+        final IQueryRuntimeContext context = engine.getRuntimeContext();
+        if (!context.getMetaContext().isStateless(inputKey))
+            throw new IllegalArgumentException(
+                    this.getClass().getSimpleName() + 
+                    " only applicable for stateless input keys; received instead " + 
+                    inputKey);
+        
+        this.context = context;
+        
+        engine.addDisconnectable(this);
+    }
+    
+    @Override
+    public void disconnect() {
+        this.context = null;
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/InputConnector.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/InputConnector.java
new file mode 100644
index 00000000..c044850f
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/InputConnector.java
@@ -0,0 +1,208 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.boundary;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.rete.network.Network;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.recipes.InputFilterRecipe;
+import tools.refinery.viatra.runtime.rete.recipes.InputRecipe;
+import tools.refinery.viatra.runtime.rete.remote.Address;
+
+/**
+ * A class responsible for connecting input nodes to the runtime context.
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public final class InputConnector {
+    Network network;
+    
+    private Map<IInputKey, Map<Tuple, Address<ExternalInputEnumeratorNode>>> externalInputRoots = CollectionsFactory.createMap();
+    
+//    /*
+//     * arity:1 used as simple entity constraints label is the object representing the type null label means all entities
+//     * regardless of type (global supertype), if allowed
+//     */
+//    protected Map<Object, Address<? extends Tunnel>> unaryRoots = CollectionsFactory.getMap();
+//    /*
+//     * arity:3 (rel, from, to) used as VPM relation constraints null label means all relations regardless of type
+//     * (global supertype)
+//     */
+//    protected Map<Object, Address<? extends Tunnel>> ternaryEdgeRoots = CollectionsFactory.getMap();
+//    /*
+//     * arity:2 (from, to) not used over VPM; can be used as EMF references for instance label is the object representing
+//     * the type null label means all entities regardless of type if allowed (global supertype), if allowed
+//     */
+//    protected Map<Object, Address<? extends Tunnel>> binaryEdgeRoots = CollectionsFactory.getMap();
+//      
+//    protected Address<? extends Tunnel> containmentRoot = null;
+//    protected Address<? extends Supplier> containmentTransitiveRoot = null;
+//    protected Address<? extends Tunnel> instantiationRoot = null;
+//    protected Address<? extends Supplier> instantiationTransitiveRoot = null;
+//    protected Address<? extends Tunnel> generalizationRoot = null;
+//    protected Address<? extends Supplier> generalizationTransitiveRoot = null;
+    
+
+    public InputConnector(Network network) {
+        super();
+        this.network = network;
+    }
+    
+
+    public Network getNetwork() {
+        return network;
+    }
+
+
+    /**
+     * Connects a given input filter node to the external input source.
+     */
+    public void connectInputFilter(InputFilterRecipe recipe, Node freshNode) {
+        final ExternalInputStatelessFilterNode inputNode = (ExternalInputStatelessFilterNode)freshNode;
+        
+        IInputKey inputKey = (IInputKey) recipe.getInputKey();
+        inputNode.connectThroughContext(network.getEngine(), inputKey);
+    }
+
+
+    /**
+     * Connects a given input enumerator node to the external input source.
+     */
+    public void connectInput(InputRecipe recipe, Node freshNode) {
+        final ExternalInputEnumeratorNode inputNode = (ExternalInputEnumeratorNode)freshNode;
+        
+        IInputKey inputKey = (IInputKey) recipe.getInputKey();
+        Tuple seed = nopSeed(inputKey); // no preseeding as of now
+        final Address<ExternalInputEnumeratorNode> freshAddress = Address.of(inputNode);
+        externalInputRoots.computeIfAbsent(inputKey, k -> CollectionsFactory.createMap()).put(seed, freshAddress);
+        inputNode.connectThroughContext(network.getEngine(), inputKey, seed);
+        
+//              final Address<Tunnel> freshAddress = Address.of((Tunnel)freshNode);
+//              if (recipe instanceof TypeInputRecipe) {
+//                      final Object typeKey = ((TypeInputRecipe) recipe).getTypeKey();
+//                      
+//                      if (recipe instanceof UnaryInputRecipe) {
+//                              unaryRoots.put(typeKey, freshAddress);
+//                              new EntityFeeder(freshAddress, this, typeKey).feed();
+////                    if (typeObject != null && generalizationQueryDirection == GeneralizationQueryDirection.BOTH) {
+////                        Collection<? extends Object> subTypes = context.enumerateDirectUnarySubtypes(typeObject);
+////            
+////                        for (Object subType : subTypes) {
+////                            Address<? extends Tunnel> subRoot = accessUnaryRoot(subType);
+////                            network.connectRemoteNodes(subRoot, tn, true);
+////                        }
+////                    }
+//                      } else if (recipe instanceof BinaryInputRecipe) {
+//                              binaryEdgeRoots.put(typeKey, freshAddress);
+//                              externalInputRoots.put(rowKey, columnKey, freshAddress);
+//                              new ReferenceFeeder(freshAddress, this, typeKey).feed();
+//                              //        if (typeObject != null && generalizationQueryDirection == GeneralizationQueryDirection.BOTH) {
+//                              //            Collection<? extends Object> subTypes = context.enumerateDirectTernaryEdgeSubtypes(typeObject);
+//                              //
+//                              //            for (Object subType : subTypes) {
+//                              //                Address<? extends Tunnel> subRoot = accessTernaryEdgeRoot(subType);
+//                              //                network.connectRemoteNodes(subRoot, tn, true);
+//                              //            }
+//                              //        }
+//                      }
+//                      
+//                      
+//              }
+        
+    }
+        
+//    /**
+//     * fetches the entity Root node under specified label; returns null if it doesn't exist yet
+//     */
+//    public Address<? extends Tunnel> getUnaryRoot(Object label) {
+//        return unaryRoots.get(label);
+//    }
+//
+//    public Collection<Address<? extends Tunnel>> getAllUnaryRoots() {
+//        return unaryRoots.values();
+//    }
+//
+//    /**
+//     * fetches the relation Root node under specified label; returns null if it doesn't exist yet
+//     */
+//    public Address<? extends Tunnel> getTernaryEdgeRoot(Object label) {
+//        return ternaryEdgeRoots.get(label);
+//    }
+//
+//    public Collection<Address<? extends Tunnel>> getAllTernaryEdgeRoots() {
+//        return ternaryEdgeRoots.values();
+//    }
+//    
+//    /**
+//     * fetches the reference Root node under specified label; returns null if it doesn't exist yet
+//     */
+//    public Address<? extends Tunnel> getBinaryEdgeRoot(Object label) {
+//        return binaryEdgeRoots.get(label);
+//    }
+//
+//    public Collection<Address<? extends Tunnel>> getAllBinaryEdgeRoots() {
+//        return binaryEdgeRoots.values();
+//    }
+//
+//
+//      public Address<? extends Tunnel> getContainmentRoot() {
+//              return containmentRoot;
+//      }
+//
+//
+//      public Address<? extends Supplier> getContainmentTransitiveRoot() {
+//              return containmentTransitiveRoot;
+//      }
+//
+//
+//      public Address<? extends Tunnel> getInstantiationRoot() {
+//              return instantiationRoot;
+//      }
+//
+//
+//      public Address<? extends Supplier> getInstantiationTransitiveRoot() {
+//              return instantiationTransitiveRoot;
+//      }
+//
+//
+//      public Address<? extends Tunnel> getGeneralizationRoot() {
+//              return generalizationRoot;
+//      }
+
+    
+    public Stream<Address<ExternalInputEnumeratorNode>> getAllExternalInputNodes() {
+        return externalInputRoots.values().stream().flatMap(map -> map.values().stream());
+    }
+    public Collection<Address<ExternalInputEnumeratorNode>> getAllExternalInputNodesForKey(IInputKey inputKey) {
+        return externalInputRoots.getOrDefault(inputKey, Collections.emptyMap()).values();
+    }
+    public Address<ExternalInputEnumeratorNode> getExternalInputNodeForKeyUnseeded(IInputKey inputKey) {
+        return externalInputRoots.getOrDefault(inputKey, Collections.emptyMap()).get(nopSeed(inputKey));
+    }
+    public Address<ExternalInputEnumeratorNode> getExternalInputNode(IInputKey inputKey, Tuple seed) {
+        if (seed == null) seed = nopSeed(inputKey);
+        return externalInputRoots.getOrDefault(inputKey, Collections.emptyMap()).get(seed);
+    }
+
+
+    Tuple nopSeed(IInputKey inputKey) {
+        return Tuples.flatTupleOf(new Object[inputKey.getArity()]);
+    }
+    
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ReteBoundary.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ReteBoundary.java
new file mode 100644
index 00000000..fe9c795e
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/boundary/ReteBoundary.java
@@ -0,0 +1,551 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.boundary;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.matcher.ReteEngine;
+import tools.refinery.viatra.runtime.rete.network.Network;
+import tools.refinery.viatra.runtime.rete.network.ProductionNode;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.remote.Address;
+import tools.refinery.viatra.runtime.rete.traceability.CompiledQuery;
+import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
+
+/**
+ * Responsible for the storage, maintenance and communication of the nodes of the network that are accessible form the
+ * outside for various reasons.
+ *
+ * @author Gabor Bergmann
+ * 
+ * <p> TODO: should eventually be merged into {@link InputConnector} and deleted
+ *
+ */
+public class ReteBoundary /*implements IPatternMatcherRuntimeContextListener*/ {
+
+    protected ReteEngine engine;
+    protected Network network;
+    protected ReteContainer headContainer;
+
+    public ReteContainer getHeadContainer() {
+        return headContainer;
+    }
+
+    protected final InputConnector inputConnector;
+
+
+    protected Map<SubPlan, Address<? extends Supplier>> subplanToAddressMapping;
+
+
+    /**
+     * SubPlans of parent nodes that have the key node as their child. For RETE --> SubPlan traceability, mainly at production
+     * nodes.
+     */
+    protected Map<Address<? extends Receiver>, Set<SubPlan>> parentPlansOfReceiver;
+
+    /**
+     * Prerequisite: engine has its network and framework fields initialized
+     */
+    public ReteBoundary(ReteEngine engine) {
+        super();
+        this.engine = engine;
+        this.network = engine.getReteNet();
+        this.headContainer = network.getHeadContainer();
+        inputConnector = network.getInputConnector();
+
+        this.parentPlansOfReceiver = CollectionsFactory.createMap();
+
+        // productionsScoped = new HashMap<GTPattern, Map<Map<Integer,Scope>,Address<? extends Production>>>();
+        subplanToAddressMapping = CollectionsFactory.createMap();
+
+    }
+
+    public Collection<? extends RecipeTraceInfo> getAllProductionNodes() {
+        return engine.getCompiler().getCachedCompiledQueries().values();
+    }
+
+//    /**
+//     * accesses the entity Root node under specified label; creates the node if it doesn't exist yet
+//     */
+//    public Address<? extends Tunnel> accessUnaryRoot(Object typeObject) {
+//        Address<? extends Tunnel> tn;
+//        tn = unaryRoots.get(typeObject);
+//        if (tn == null) {
+//            tn = headContainer.getProvisioner().newUniquenessEnforcerNode(1, typeObject);
+//            unaryRoots.put(typeObject, tn);
+//
+//            new EntityFeeder(tn, context, network, this, typeObject).feed();
+//
+//            if (typeObject != null && generalizationQueryDirection == GeneralizationQueryDirection.BOTH) {
+//                Collection<? extends Object> subTypes = context.enumerateDirectUnarySubtypes(typeObject);
+//
+//                for (Object subType : subTypes) {
+//                    Address<? extends Tunnel> subRoot = accessUnaryRoot(subType);
+//                    network.connectRemoteNodes(subRoot, tn, true);
+//                }
+//            }
+//
+//        }
+//        return tn;
+//    }
+//
+//    /**
+//     * accesses the relation Root node under specified label; creates the node if it doesn't exist yet
+//     */
+//    public Address<? extends Tunnel> accessTernaryEdgeRoot(Object typeObject) {
+//        Address<? extends Tunnel> tn;
+//        tn = ternaryEdgeRoots.get(typeObject);
+//        if (tn == null) {
+//            tn = headContainer.getProvisioner().newUniquenessEnforcerNode(3, typeObject);
+//            ternaryEdgeRoots.put(typeObject, tn);
+//
+//            new RelationFeeder(tn, context, network, this, typeObject).feed();
+//
+//            if (typeObject != null && generalizationQueryDirection == GeneralizationQueryDirection.BOTH) {
+//                Collection<? extends Object> subTypes = context.enumerateDirectTernaryEdgeSubtypes(typeObject);
+//
+//                for (Object subType : subTypes) {
+//                    Address<? extends Tunnel> subRoot = accessTernaryEdgeRoot(subType);
+//                    network.connectRemoteNodes(subRoot, tn, true);
+//                }
+//            }
+//        }
+//        return tn;
+//    }
+//
+//    /**
+//     * accesses the reference Root node under specified label; creates the node if it doesn't exist yet
+//     */
+//    public Address<? extends Tunnel> accessBinaryEdgeRoot(Object typeObject) {
+//        Address<? extends Tunnel> tn;
+//        tn = binaryEdgeRoots.get(typeObject);
+//        if (tn == null) {
+//            tn = headContainer.getProvisioner().newUniquenessEnforcerNode(2, typeObject);
+//            binaryEdgeRoots.put(typeObject, tn);
+//
+//            new ReferenceFeeder(tn, context, network, this, typeObject).feed();
+//
+//            if (typeObject != null && generalizationQueryDirection == GeneralizationQueryDirection.BOTH) {
+//                Collection<? extends Object> subTypes = context.enumerateDirectBinaryEdgeSubtypes(typeObject);
+//
+//                for (Object subType : subTypes) {
+//                    Address<? extends Tunnel> subRoot = accessBinaryEdgeRoot(subType);
+//                    network.connectRemoteNodes(subRoot, tn, true);
+//                }
+//            }
+//        }
+//        return tn;
+//    }
+//
+//    /**
+//     * accesses the special direct containment relation Root node; creates the node if it doesn't exist yet
+//     */
+//    public Address<? extends Tunnel> accessContainmentRoot() {
+//        if (containmentRoot == null) {
+//            // containment: relation quasi-type
+//            containmentRoot = headContainer.getProvisioner().newUniquenessEnforcerNode(2, "$containment");
+//
+//            new ContainmentFeeder(containmentRoot, context, network, this).feed();
+//        }
+//        return containmentRoot;
+//    }
+//
+//    /**
+//     * accesses the special transitive containment relation Root node; creates the node if it doesn't exist yet
+//     */
+//    public Address<? extends Supplier> accessContainmentTransitiveRoot() {
+//        if (containmentTransitiveRoot == null) {
+//            // transitive containment: derived
+//            Address<? extends Tunnel> containmentTransitiveRoot = headContainer.getProvisioner().newUniquenessEnforcerNode(
+//                    2, "$containmentTransitive");
+//            network.connectRemoteNodes(accessContainmentRoot(), containmentTransitiveRoot, true);
+//
+//            final int[] actLI = { 1 };
+//            final int arcLIw = 2;
+//            final int[] actRI = { 0 };
+//            final int arcRIw = 2;
+//            Address<? extends IterableIndexer> jPrimarySlot = headContainer.getProvisioner().accessProjectionIndexer(
+//                    accessContainmentRoot(), new TupleMask(actLI, arcLIw));
+//            Address<? extends IterableIndexer> jSecondarySlot = headContainer.getProvisioner().accessProjectionIndexer(
+//                    containmentTransitiveRoot, new TupleMask(actRI, arcRIw));
+//
+//            final int[] actRIcomp = { 1 };
+//            final int arcRIwcomp = 2;
+//            TupleMask complementerMask = new TupleMask(actRIcomp, arcRIwcomp);
+//
+//            Address<? extends Supplier> andCT = headContainer.getProvisioner().accessJoinNode(jPrimarySlot, jSecondarySlot,
+//                    complementerMask);
+//
+//            final int[] mask = { 0, 2 };
+//            final int maskw = 3;
+//            Address<? extends Supplier> tr = headContainer.getProvisioner().accessTrimmerNode(andCT, new TupleMask(mask, maskw));
+//            network.connectRemoteNodes(tr, containmentTransitiveRoot, true);
+//
+//            this.containmentTransitiveRoot = containmentTransitiveRoot; // cast
+//                                                                        // back
+//                                                                        // to
+//                                                                        // Supplier
+//        }
+//        return containmentTransitiveRoot;
+//    }
+//
+//    /**
+//     * accesses the special instantiation relation Root node; creates the node if it doesn't exist yet
+//     */
+//    public Address<? extends Tunnel> accessInstantiationRoot() {
+//        if (instantiationRoot == null) {
+//            // instantiation: relation quasi-type
+//            instantiationRoot = headContainer.getProvisioner().newUniquenessEnforcerNode(2, "$instantiation");
+//
+//            new InstantiationFeeder(instantiationRoot, context, network, this).feed();
+//        }
+//        return instantiationRoot;
+//    }
+//
+//    /**
+//     * accesses the special transitive instantiation relation Root node; creates the node if it doesn't exist yet
+//     * InstantiationTransitive = Instantiation o (Generalization)^*
+//     */
+//    public Address<? extends Supplier> accessInstantiationTransitiveRoot() {
+//        if (instantiationTransitiveRoot == null) {
+//            // transitive instantiation: derived
+//            Address<? extends Tunnel> instantiationTransitiveRoot = headContainer.getProvisioner()
+//                    .newUniquenessEnforcerNode(2, "$instantiationTransitive");
+//            network.connectRemoteNodes(accessInstantiationRoot(), instantiationTransitiveRoot, true);
+//
+//            final int[] actLI = { 1 };
+//            final int arcLIw = 2;
+//            final int[] actRI = { 0 };
+//            final int arcRIw = 2;
+//            Address<? extends IterableIndexer> jPrimarySlot = headContainer.getProvisioner().accessProjectionIndexer(
+//                    accessGeneralizationRoot(), new TupleMask(actLI, arcLIw));
+//            Address<? extends Indexer> jSecondarySlot = headContainer.getProvisioner().accessProjectionIndexer(
+//                    instantiationTransitiveRoot, new TupleMask(actRI, arcRIw));
+//
+//            final int[] actRIcomp = { 1 };
+//            final int arcRIwcomp = 2;
+//            TupleMask complementerMask = new TupleMask(actRIcomp, arcRIwcomp);
+//
+//            Address<? extends Supplier> andCT = headContainer.getProvisioner().accessJoinNode(jPrimarySlot, jSecondarySlot,
+//                    complementerMask);
+//
+//            final int[] mask = { 0, 2 };
+//            final int maskw = 3;
+//            Address<? extends Supplier> tr = headContainer.getProvisioner().accessTrimmerNode(andCT,
+//                    new TupleMask(mask, maskw));
+//            network.connectRemoteNodes(tr, instantiationTransitiveRoot, true);
+//
+//            this.instantiationTransitiveRoot = instantiationTransitiveRoot; // cast
+//                                                                            // back
+//                                                                            // to
+//                                                                            // Supplier
+//        }
+//        return instantiationTransitiveRoot;
+//    }
+//
+//    /**
+//     * accesses the special generalization relation Root node; creates the node if it doesn't exist yet
+//     */
+//    public Address<? extends Tunnel> accessGeneralizationRoot() {
+//        if (generalizationRoot == null) {
+//            // generalization: relation quasi-type
+//            generalizationRoot = headContainer.getProvisioner().newUniquenessEnforcerNode(2, "$generalization");
+//
+//            new GeneralizationFeeder(generalizationRoot, context, network, this).feed();
+//        }
+//        return generalizationRoot;
+//    }
+//
+//    /**
+//     * accesses the special transitive containment relation Root node; creates the node if it doesn't exist yet
+//     */
+//    public Address<? extends Supplier> accessGeneralizationTransitiveRoot() {
+//        if (generalizationTransitiveRoot == null) {
+//            // transitive generalization: derived
+//            Address<? extends Tunnel> generalizationTransitiveRoot = headContainer.getProvisioner()
+//                    .newUniquenessEnforcerNode(2, "$generalizationTransitive");
+//            network.connectRemoteNodes(accessGeneralizationRoot(), generalizationTransitiveRoot, true);
+//
+//            final int[] actLI = { 1 };
+//            final int arcLIw = 2;
+//            final int[] actRI = { 0 };
+//            final int arcRIw = 2;
+//            Address<? extends IterableIndexer> jPrimarySlot = headContainer.getProvisioner().accessProjectionIndexer(
+//                    accessGeneralizationRoot(), new TupleMask(actLI, arcLIw));
+//            Address<? extends Indexer> jSecondarySlot = headContainer.getProvisioner().accessProjectionIndexer(
+//                    generalizationTransitiveRoot, new TupleMask(actRI, arcRIw));
+//
+//            final int[] actRIcomp = { 1 };
+//            final int arcRIwcomp = 2;
+//            TupleMask complementerMask = new TupleMask(actRIcomp, arcRIwcomp);
+//
+//            Address<? extends Supplier> andCT = headContainer.getProvisioner().accessJoinNode(jPrimarySlot, jSecondarySlot,
+//                    complementerMask);
+//
+//            final int[] mask = { 0, 2 };
+//            final int maskw = 3;
+//            Address<? extends Supplier> tr = headContainer.getProvisioner().accessTrimmerNode(andCT, new TupleMask(mask, maskw));
+//            network.connectRemoteNodes(tr, generalizationTransitiveRoot, true);
+//
+//            this.generalizationTransitiveRoot = generalizationTransitiveRoot; // cast
+//                                                                              // back
+//                                                                              // to
+//                                                                              // Supplier
+//        }
+//        return generalizationTransitiveRoot;
+//    }
+
+    // /**
+    // * Registers and publishes a supplier under specified label.
+    // */
+    // public void publishSupplier(Supplier s, Object label)
+    // {
+    // publishedSuppliers.put(label, s);
+    // }
+    //
+    // /**
+    // * fetches the production node under specified label;
+    // * returns null if it doesn't exist yet
+    // */
+    // public Production getProductionNode(Object label)
+    // {
+    // return productions.get(label);
+    // }
+    //
+    // /**
+    // * fetches the published supplier under specified label;
+    // * returns null if it doesn't exist yet
+    // */
+    // public Supplier getPublishedSupplier(Object label)
+    // {
+    // return publishedSuppliers.get(label);
+    // }
+
+    /**
+     * accesses the production node for specified pattern; builds pattern matcher if it doesn't exist yet
+     * @throws ViatraQueryRuntimeException
+     */
+    public synchronized RecipeTraceInfo accessProductionTrace(PQuery query) 
+    {
+        final CompiledQuery compiled = engine.getCompiler().getCompiledForm(query);
+        return compiled;
+//      RecipeTraceInfo pn;
+//        pn = queryPlans.get(query);
+//        if (pn == null) {
+//            pn = construct(query);
+//            TODO handle recursion by reinterpret-RecipeTrace
+//            queryPlans.put(query, pn);
+//            if (pn == null) {
+//                String[] args = { query.toString() };
+//                throw new RetePatternBuildException("Unsuccessful planning of RETE construction recipe for query {1}",
+//                        args, "Could not create RETE recipe plan.", query);
+//            }
+//        }
+//        return pn;
+    }
+    /**
+     * accesses the production node for specified pattern; builds pattern matcher if it doesn't exist yet
+     * @throws ViatraQueryRuntimeException
+     */
+    public synchronized Address<? extends ProductionNode> accessProductionNode(PQuery query) {
+        final RecipeTraceInfo productionTrace = accessProductionTrace(query);
+        return (Address<? extends ProductionNode>) headContainer.getProvisioner().getOrCreateNodeByRecipe(productionTrace);
+    }
+
+//    /**
+//     * creates the production node for the specified pattern Contract: only call from the builder (through Buildable)
+//     * responsible for building this pattern
+//     *
+//     * @throws PatternMatcherCompileTimeException
+//     *             if production node is already created
+//     */
+//    public synchronized Address<? extends Production> createProductionInternal(PQuery gtPattern)
+//            throws QueryPlannerException {
+//        if (queryPlans.containsKey(gtPattern)) {
+//            String[] args = { gtPattern.toString() };
+//            throw new RetePatternBuildException("Multiple creation attempts of production node for {1}", args,
+//                    "Duplicate RETE production node.", gtPattern);
+//        }
+//
+//        Map<String, Integer> posMapping = engine.getBuilder().getPosMapping(gtPattern);
+//        Address<? extends Production> pn = headContainer.getProvisioner().newProductionNode(posMapping, gtPattern);
+//        queryPlans.put(gtPattern, pn);
+//        context.reportPatternDependency(gtPattern);
+//
+//        return pn;
+//    }
+
+    // /**
+    // * accesses the production node for specified pattern and scope map; creates the node if
+    // * it doesn't exist yet
+    // */
+    // public synchronized Address<? extends Production> accessProductionScoped(
+    // GTPattern gtPattern, Map<Integer, Scope> additionalScopeMap) throws PatternMatcherCompileTimeException {
+    // if (additionalScopeMap.isEmpty()) return accessProduction(gtPattern);
+    //
+    // Address<? extends Production> pn;
+    //
+    // Map<Map<Integer, Scope>, Address<? extends Production>> scopes = productionsScoped.get(gtPattern);
+    // if (scopes == null) {
+    // scopes = new HashMap<Map<Integer, Scope>, Address<? extends Production>>();
+    // productionsScoped.put(gtPattern, scopes);
+    // }
+    //
+    // pn = scopes.get(additionalScopeMap);
+    // if (pn == null) {
+    // Address<? extends Production> unscopedProduction = accessProduction(gtPattern);
+    //
+    // HashMap<Object, Integer> posMapping = headContainer.resolveLocal(unscopedProduction).getPosMapping();
+    // pn = headContainer.getLibrary().newProductionNode(posMapping);
+    // scopes.put(additionalScopeMap, pn);
+    //
+    // constructScoper(unscopedProduction, additionalScopeMap, pn);
+    // }
+    // return pn;
+    // }
+
+    // protected void constructScoper(
+    // Address<? extends Production> unscopedProduction,
+    // Map<Integer, Scope> additionalScopeMap,
+    // Address<? extends Production> production)
+    // throws PatternMatcherCompileTimeException {
+    // engine.reteNet.waitForReteTermination();
+    // engine.builder.constructScoper(unscopedProduction, additionalScopeMap, production);
+    // }
+
+    // /**
+    // * Invalidates the subnet constructed for the recognition of a given
+    // pattern.
+    // * The pattern matcher will have to be rebuilt.
+    // * @param gtPattern the pattern whose matcher subnet should be invalidated
+    // */
+    // public void invalidatePattern(GTPattern gtPattern) {
+    // Production production = null;
+    // try {
+    // production = accessProduction(gtPattern);
+    // } catch (PatternMatcherCompileTimeException e) {
+    // // this should not occur here, since we already have a production node
+    // e.printStackTrace();
+    // }
+    //
+    // production.tearOff();
+    // //production.setDirty(true);
+    // }
+
+    // updaters for change notification
+    // if the corresponding rete input isn't created yet, call is ignored
+    
+    private static Direction direction(boolean isInsertion) {
+        return isInsertion ? Direction.INSERT : Direction.DELETE;
+    }
+    
+//    @Override
+//      public void updateUnary(boolean isInsertion, Object entity, Object typeObject) {
+//        Address<? extends Tunnel> root = inputConnector.getUnaryRoot(typeObject);
+//        if (root != null) {
+//            network.sendExternalUpdate(root, direction(isInsertion), new FlatTuple(inputConnector.wrapElement(entity)));
+//            if (!engine.isParallelExecutionEnabled())
+//                network.waitForReteTermination();
+//        }
+//        if (typeObject != null && generalizationQueryDirection == GeneralizationQueryDirection.SUPERTYPE_ONLY) {
+//            for (Object superType : context.enumerateDirectUnarySupertypes(typeObject)) {
+//                updateUnary(isInsertion, entity, superType);
+//            }
+//        }
+//    }
+//
+//    @Override
+//      public void updateTernaryEdge(boolean isInsertion, Object relation, Object from, Object to, Object typeObject) {
+//        Address<? extends Tunnel> root = inputConnector.getTernaryEdgeRoot(typeObject);
+//        if (root != null) {
+//            network.sendExternalUpdate(root, direction(isInsertion), new FlatTuple(inputConnector.wrapElement(relation), inputConnector.wrapElement(from),
+//                    inputConnector.wrapElement(to)));
+//            if (!engine.isParallelExecutionEnabled())
+//                network.waitForReteTermination();
+//        }
+//        if (typeObject != null && generalizationQueryDirection == GeneralizationQueryDirection.SUPERTYPE_ONLY) {
+//            for (Object superType : context.enumerateDirectTernaryEdgeSupertypes(typeObject)) {
+//                updateTernaryEdge(isInsertion, relation, from, to, superType);
+//            }
+//        }
+//    }
+//    @Override
+//      public void updateBinaryEdge(boolean isInsertion, Object from, Object to, Object typeObject) {
+//        Address<? extends Tunnel> root = inputConnector.getBinaryEdgeRoot(typeObject);
+//        if (root != null) {
+//            network.sendExternalUpdate(root, direction(isInsertion), new FlatTuple(inputConnector.wrapElement(from), inputConnector.wrapElement(to)));
+//            if (!engine.isParallelExecutionEnabled())
+//                network.waitForReteTermination();
+//        }
+//        if (typeObject != null && generalizationQueryDirection == GeneralizationQueryDirection.SUPERTYPE_ONLY) {
+//            for (Object superType : context.enumerateDirectBinaryEdgeSupertypes(typeObject)) {
+//                updateBinaryEdge(isInsertion, from, to, superType);
+//            }
+//        }
+//    }
+//
+//    @Override
+//      public void updateContainment(boolean isInsertion, Object container, Object element) {
+//        final Address<? extends Tunnel> containmentRoot = inputConnector.getContainmentRoot();
+//              if (containmentRoot != null) {
+//            network.sendExternalUpdate(containmentRoot, direction(isInsertion), new FlatTuple(inputConnector.wrapElement(container),
+//                    inputConnector.wrapElement(element)));
+//            if (!engine.isParallelExecutionEnabled())
+//                network.waitForReteTermination();
+//        }
+//    }
+//
+//    @Override
+//      public void updateInstantiation(boolean isInsertion, Object parent, Object child) {
+//        final Address<? extends Tunnel> instantiationRoot = inputConnector.getInstantiationRoot();
+//       if (instantiationRoot != null) {
+//            network.sendExternalUpdate(instantiationRoot, direction(isInsertion), new FlatTuple(inputConnector.wrapElement(parent),
+//                    inputConnector.wrapElement(child)));
+//            if (!engine.isParallelExecutionEnabled())
+//                network.waitForReteTermination();
+//        }
+//    }
+//
+//    @Override
+//      public void updateGeneralization(boolean isInsertion, Object parent, Object child) {
+//       final Address<? extends Tunnel> generalizationRoot = inputConnector.getGeneralizationRoot();
+//       if (generalizationRoot != null) {
+//            network.sendExternalUpdate(generalizationRoot, direction(isInsertion), new FlatTuple(inputConnector.wrapElement(parent),
+//                    inputConnector.wrapElement(child)));
+//            if (!engine.isParallelExecutionEnabled())
+//                network.waitForReteTermination();
+//        }
+//    }
+
+    // no wrapping needed!
+    public void notifyEvaluator(Address<? extends Receiver> receiver, Tuple tuple) {
+        network.sendExternalUpdate(receiver, Direction.INSERT, tuple);
+        if (!engine.isParallelExecutionEnabled())
+            network.waitForReteTermination();
+    }
+
+    public void mapPlanToAddress(SubPlan plan, Address<? extends Supplier> handle) {
+        subplanToAddressMapping.put(plan, handle);
+    }
+
+    public Address<? extends Supplier> getAddress(SubPlan plan) {
+        return subplanToAddressMapping.get(plan);
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/RetePatternBuildException.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/RetePatternBuildException.java
new file mode 100644
index 00000000..bd1b219e
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/RetePatternBuildException.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.construction;
+
+import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+
+/**
+ * A problem has occurred during the construction of the RETE net.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public class RetePatternBuildException extends QueryProcessingException {
+
+    private static final long serialVersionUID = 6966585498204577548L;
+
+    /**
+     * @param message
+     *            The template of the exception message
+     * @param context
+     *            The data elements to be used to instantiate the template. Can be null if no context parameter is
+     *            defined
+     * @param patternDescription
+     *            the PatternDescription where the exception occurred
+     */
+    public RetePatternBuildException(String message, String[] context, String shortMessage, Object patternDescription) {
+        super(message, context, shortMessage, patternDescription);
+    }
+
+    /**
+     * @param message
+     *            The template of the exception message
+     * @param context
+     *            The data elements to be used to instantiate the template. Can be null if no context parameter is
+     *            defined
+     * @param patternDescription
+     *            the PatternDescription where the exception occurred
+     */
+    public RetePatternBuildException(String message, String[] context, String shortMessage, Object patternDescription,
+            Throwable cause) {
+        super(message, context, shortMessage, patternDescription, cause);
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/basiclinear/BasicLinearLayout.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/basiclinear/BasicLinearLayout.java
new file mode 100644
index 00000000..bd22e1a0
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/basiclinear/BasicLinearLayout.java
@@ -0,0 +1,171 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.construction.basiclinear;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.planning.IQueryPlannerStrategy;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlanFactory;
+import tools.refinery.viatra.runtime.matchers.planning.helpers.BuildHelper;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PApply;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PProject;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PStart;
+import tools.refinery.viatra.runtime.matchers.psystem.DeferredPConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.VariableDeferredPConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.Equality;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.rete.construction.RetePatternBuildException;
+
+/**
+ * Basic layout that builds a linear RETE net based on a heuristic ordering of constraints.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public class BasicLinearLayout implements IQueryPlannerStrategy {
+
+    //SubPlanProcessor planProcessor = new SubPlanProcessor();
+    
+    private IQueryBackendHintProvider hintProvider;
+    private IQueryBackendContext bContext;
+    /**
+     * @param bContext
+     * @since 1.5
+     */
+    public BasicLinearLayout(IQueryBackendContext bContext) {
+        this.bContext = bContext;
+        this.hintProvider = bContext.getHintProvider();
+    }
+
+    @Override
+    public SubPlan plan(final PBody pSystem, Logger logger, IQueryMetaContext context) {
+        SubPlanFactory planFactory = new SubPlanFactory(pSystem);
+        PQuery query = pSystem.getPattern();
+        //planProcessor.setCompiler(compiler);
+        try {
+            logger.debug(String.format(
+                    "%s: patternbody build started for %s",
+                    getClass().getSimpleName(), 
+                    query.getFullyQualifiedName()));
+
+            // STARTING THE LINE
+            SubPlan plan = planFactory.createSubPlan(new PStart());
+
+            Set<PConstraint> pQueue = CollectionsFactory.createSet(pSystem.getConstraints());
+
+            // MAIN LOOP
+            while (!pQueue.isEmpty()) {
+                PConstraint pConstraint = Collections.min(pQueue,
+                        new OrderingHeuristics(plan, context)); // pQueue.iterator().next();
+                pQueue.remove(pConstraint);
+
+                // if we have no better option than an unready deferred constraint, raise error
+                if (pConstraint instanceof DeferredPConstraint) {
+                    final DeferredPConstraint deferred = (DeferredPConstraint) pConstraint;
+                    if (!deferred.isReadyAt(plan, context)) {
+                        raiseForeverDeferredError(deferred, plan, context);
+                    }
+                }
+                // TODO integrate the check above in SubPlan / POperation??
+                
+                // replace incumbent plan with its child
+                plan = planFactory.createSubPlan(new PApply(pConstraint), plan);                        
+            }
+
+            // PROJECT TO PARAMETERS
+            SubPlan finalPlan = planFactory.createSubPlan(new PProject(pSystem.getSymbolicParameterVariables()), plan);
+            
+            // FINAL CHECK, whether all exported variables are present + all constraint satisfied
+            BuildHelper.finalCheck(pSystem, finalPlan, context);
+            // TODO integrate the check above in SubPlan / POperation 
+            
+            logger.debug(String.format(
+                    "%s: patternbody query plan concluded for %s as: %s",
+                    getClass().getSimpleName(), 
+                    query.getFullyQualifiedName(),
+                    finalPlan.toLongString()));
+
+            return finalPlan;
+
+        } catch (RetePatternBuildException ex) {
+            ex.setPatternDescription(query);
+            throw ex;
+        }
+    }
+
+    /**
+     * Called when the constraint is not ready, but cannot be deferred further.
+     * 
+     * @param plan
+     * @throws RetePatternBuildException
+     *             to indicate the error in detail.
+     */
+    private void raiseForeverDeferredError(DeferredPConstraint constraint, SubPlan plan, IQueryMetaContext context) {
+        if (constraint instanceof Equality) {
+            raiseForeverDeferredError((Equality)constraint, plan, context);
+        } else if (constraint instanceof ExportedParameter) {
+            raiseForeverDeferredError((ExportedParameter)constraint, plan, context);
+        } else if (constraint instanceof ExpressionEvaluation) {
+            raiseForeverDeferredError((ExpressionEvaluation)constraint, plan, context);
+        } else if (constraint instanceof VariableDeferredPConstraint) {
+            raiseForeverDeferredError(constraint, plan, context);
+        }
+    }
+    
+    private void raiseForeverDeferredError(Equality constraint, SubPlan plan, IQueryMetaContext context) {
+        String[] args = { constraint.getWho().toString(), constraint.getWithWhom().toString() };
+        String msg = "Cannot express equality of variables {1} and {2} if neither of them is deducable.";
+        String shortMsg = "Equality between undeducible variables.";
+        throw new RetePatternBuildException(msg, args, shortMsg, null);
+    }
+    private void raiseForeverDeferredError(ExportedParameter constraint, SubPlan plan, IQueryMetaContext context) {
+        String[] args = { constraint.getParameterName() };
+        String msg = "Pattern Graph Search terminated incompletely: "
+                + "exported pattern variable {1} could not be determined based on the pattern constraints. "
+                + "HINT: certain constructs (e.g. negative patterns or check expressions) cannot output symbolic parameters.";
+        String shortMsg = "Could not deduce value of parameter";
+        throw new RetePatternBuildException(msg, args, shortMsg, null);
+    }
+    private void raiseForeverDeferredError(ExpressionEvaluation constraint, SubPlan plan, IQueryMetaContext context) {
+        if (constraint.checkTypeSafety(plan, context) == null) {
+            raiseForeverDeferredError(constraint, plan);
+        } else {
+            String[] args = { toString(), constraint.checkTypeSafety(plan, context).toString() };
+            String msg = "The checking of pattern constraint {1} cannot be deferred further, but variable {2} is still not type safe. "
+                    + "HINT: the incremental matcher is not an equation solver, please make sure that all variable values are deducible.";
+            String shortMsg = "Could not check all constraints due to undeducible type restrictions";
+            throw new RetePatternBuildException(msg, args, shortMsg, null);
+        }
+    }
+    private void raiseForeverDeferredError(VariableDeferredPConstraint constraint, SubPlan plan) {
+        Set<PVariable> missing = CollectionsFactory.createSet(constraint.getDeferringVariables());//new HashSet<PVariable>(getDeferringVariables());
+        missing.removeAll(plan.getVisibleVariables());
+        String[] args = { toString(), Arrays.toString(missing.toArray()) };
+        String msg = "The checking of pattern constraint {1} requires the values of variables {2}, but it cannot be deferred further. "
+                + "HINT: the incremental matcher is not an equation solver, please make sure that all variable values are deducible.";
+        String shortMsg = "Could not check all constraints due to undeducible variables";
+        throw new RetePatternBuildException(msg, args, shortMsg, null);
+    }
+    
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/basiclinear/OrderingHeuristics.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/basiclinear/OrderingHeuristics.java
new file mode 100644
index 00000000..2b4e8890
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/basiclinear/OrderingHeuristics.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.construction.basiclinear;
+
+import java.util.Comparator;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.psystem.DeferredPConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.EnumerablePConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.rete.util.OrderingCompareAgent;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+public class OrderingHeuristics implements Comparator<PConstraint> {
+    private SubPlan plan;
+    private IQueryMetaContext context;
+
+    public OrderingHeuristics(SubPlan plan, IQueryMetaContext context) {
+        super();
+        this.plan = plan;
+        this.context = context;
+    }
+
+    @Override
+    public int compare(PConstraint o1, PConstraint o2) {
+        return new OrderingCompareAgent<PConstraint>(o1, o2) {
+            @Override
+            protected void doCompare() {
+                boolean temp = consider(preferTrue(isConstant(a), isConstant(b)))
+                        && consider(preferTrue(isReady(a), isReady(b)));
+                if (!temp)
+                    return;
+
+                Set<PVariable> bound1 = boundVariables(a);
+                Set<PVariable> bound2 = boundVariables(b);
+                swallowBoolean(temp && consider(preferTrue(isBound(a, bound1), isBound(b, bound2)))
+                        && consider(preferMore(degreeBound(a, bound1), degreeBound(b, bound2)))
+                        && consider(preferLess(degreeFree(a, bound1), degreeFree(b, bound2)))
+
+                        // tie breaking
+                        && consider(preferLess(a.getMonotonousID(), b.getMonotonousID())) // this is hopefully deterministic
+                        && consider(preferLess(System.identityHashCode(a), System.identityHashCode(b))));
+            }
+        }.compare();
+    }
+
+    boolean isConstant(PConstraint o) {
+        return (o instanceof ConstantValue);
+    }
+
+    boolean isReady(PConstraint o) {
+        return (o instanceof EnumerablePConstraint)
+                || (o instanceof DeferredPConstraint && ((DeferredPConstraint) o)
+                        .isReadyAt(plan, context));
+    }
+
+    Set<PVariable> boundVariables(PConstraint o) {
+        Set<PVariable> boundVariables = CollectionsFactory.createSet(o.getAffectedVariables());
+        boundVariables.retainAll(plan.getVisibleVariables());
+        return boundVariables;
+    }
+
+    boolean isBound(PConstraint o, Set<PVariable> boundVariables) {
+        return boundVariables.size() == o.getAffectedVariables().size();
+    }
+
+    int degreeBound(PConstraint o, Set<PVariable> boundVariables) {
+        return boundVariables.size();
+    }
+
+    int degreeFree(PConstraint o, Set<PVariable> boundVariables) {
+        return o.getAffectedVariables().size() - boundVariables.size();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/CompilerHelper.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/CompilerHelper.java
new file mode 100644
index 00000000..da2fb432
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/CompilerHelper.java
@@ -0,0 +1,390 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.construction.plancompiler;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.planning.helpers.TypeHelper;
+import tools.refinery.viatra.runtime.matchers.psystem.EnumerablePConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration;
+import tools.refinery.viatra.runtime.rete.recipes.EqualityFilterRecipe;
+import tools.refinery.viatra.runtime.rete.recipes.IndexerBasedAggregatorRecipe;
+import tools.refinery.viatra.runtime.rete.recipes.IndexerRecipe;
+import tools.refinery.viatra.runtime.rete.recipes.JoinRecipe;
+import tools.refinery.viatra.runtime.rete.recipes.Mask;
+import tools.refinery.viatra.runtime.rete.recipes.MonotonicityInfo;
+import tools.refinery.viatra.runtime.rete.recipes.ProductionRecipe;
+import tools.refinery.viatra.runtime.rete.recipes.ProjectionIndexerRecipe;
+import tools.refinery.viatra.runtime.rete.recipes.RecipesFactory;
+import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+import tools.refinery.viatra.runtime.rete.recipes.SingleColumnAggregatorRecipe;
+import tools.refinery.viatra.runtime.rete.recipes.TrimmerRecipe;
+import tools.refinery.viatra.runtime.rete.recipes.helper.RecipesHelper;
+import tools.refinery.viatra.runtime.rete.traceability.CompiledQuery;
+import tools.refinery.viatra.runtime.rete.traceability.CompiledSubPlan;
+import tools.refinery.viatra.runtime.rete.traceability.PlanningTrace;
+import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
+import tools.refinery.viatra.runtime.rete.util.ReteHintOptions;
+
+/**
+ * @author Bergmann Gabor
+ *
+ */
+public class CompilerHelper {
+
+    private CompilerHelper() {/*Utility class constructor*/}
+    
+    static final RecipesFactory FACTORY = RecipesFactory.eINSTANCE;
+
+    /**
+     * Makes sure that all variables in the tuple are different so that it can be used as {@link CompiledSubPlan}. If a
+     * variable occurs multiple times, equality checks are applied and then the results are trimmed so that duplicates
+     * are hidden. If no manipulation is necessary, the original trace is returned.
+     * 
+     * <p>
+     * to be used whenever a constraint introduces new variables.
+     */
+    public static PlanningTrace checkAndTrimEqualVariables(SubPlan plan, final PlanningTrace coreTrace) {
+        // are variables in the constraint all different?
+        final List<PVariable> coreVariablesTuple = coreTrace.getVariablesTuple();
+        final int constraintArity = coreVariablesTuple.size();
+        final int distinctVariables = coreTrace.getPosMapping().size();
+        if (constraintArity == distinctVariables) {
+            // all variables occur exactly once in tuple
+            return coreTrace;
+        } else { // apply equality checks and trim
+
+            // find the positions in the tuple for each variable
+            Map<PVariable, SortedSet<Integer>> posMultimap = new HashMap<PVariable, SortedSet<Integer>>();
+            List<PVariable> trimmedVariablesTuple = new ArrayList<PVariable>(distinctVariables);
+            int[] trimIndices = new int[distinctVariables];
+            for (int i = 0; i < constraintArity; ++i) {
+                final PVariable variable = coreVariablesTuple.get(i);
+                SortedSet<Integer> indexSet = posMultimap.get(variable);
+                if (indexSet == null) { // first occurrence of variable
+                    indexSet = new TreeSet<Integer>();
+                    posMultimap.put(variable, indexSet);
+
+                    // this is the first occurrence, set up trimming
+                    trimIndices[trimmedVariablesTuple.size()] = i;
+                    trimmedVariablesTuple.add(variable);
+                }
+                indexSet.add(i);
+            }
+
+            // construct equality checks for each variable occurring multiple times
+            PlanningTrace lastTrace = coreTrace;
+            for (Entry<PVariable, SortedSet<Integer>> entry : posMultimap.entrySet()) {
+                if (entry.getValue().size() > 1) {
+                    EqualityFilterRecipe equalityFilterRecipe = FACTORY.createEqualityFilterRecipe();
+                    equalityFilterRecipe.setParent(lastTrace.getRecipe());
+                    equalityFilterRecipe.getIndices().addAll(entry.getValue());
+                    lastTrace = new PlanningTrace(plan, coreVariablesTuple, equalityFilterRecipe, lastTrace);
+                }
+            }
+
+            // trim so that each variable occurs only once
+            TrimmerRecipe trimmerRecipe = FACTORY.createTrimmerRecipe();
+            trimmerRecipe.setParent(lastTrace.getRecipe());
+            trimmerRecipe.setMask(tools.refinery.viatra.runtime.rete.recipes.helper.RecipesHelper
+                    .mask(constraintArity, trimIndices));
+            return new PlanningTrace(plan, trimmedVariablesTuple, trimmerRecipe, lastTrace);
+        }
+    }
+
+    /**
+     * Extracts the variable list representation of the variables tuple.
+     */
+    public static List<PVariable> convertVariablesTuple(EnumerablePConstraint constraint) {
+        return convertVariablesTuple(constraint.getVariablesTuple());
+    }
+
+    /**
+     * Extracts the variable list representation of the variables tuple.
+     */
+    public static List<PVariable> convertVariablesTuple(Tuple variablesTuple) {
+        List<PVariable> result = new ArrayList<PVariable>();
+        for (Object o : variablesTuple.getElements())
+            result.add((PVariable) o);
+        return result;
+    }
+
+    /**
+     * Returns a compiled indexer trace according to a mask
+     */
+    public static RecipeTraceInfo makeIndexerTrace(SubPlan planToCompile, PlanningTrace parentTrace, TupleMask mask) {
+        final ReteNodeRecipe parentRecipe = parentTrace.getRecipe();
+        if (parentRecipe instanceof IndexerBasedAggregatorRecipe
+                || parentRecipe instanceof SingleColumnAggregatorRecipe)
+            throw new IllegalArgumentException(
+                    "Cannot take projection indexer of aggregator node at plan " + planToCompile);
+        IndexerRecipe recipe = RecipesHelper.projectionIndexerRecipe(parentRecipe, toRecipeMask(mask));
+        // final List<PVariable> maskedVariables = mask.transform(parentTrace.getVariablesTuple());
+        return new PlanningTrace(planToCompile, /* maskedVariables */ parentTrace.getVariablesTuple(), recipe,
+                parentTrace);
+        // TODO add specialized indexer trace info?
+    }
+
+    /**
+     * Creates a trimmer that keeps selected variables only.
+     */
+    protected static TrimmerRecipe makeTrimmerRecipe(final PlanningTrace compiledParent,
+            List<PVariable> projectedVariables) {
+        final Mask projectionMask = makeProjectionMask(compiledParent, projectedVariables);
+        final TrimmerRecipe trimmerRecipe = ReteRecipeCompiler.FACTORY.createTrimmerRecipe();
+        trimmerRecipe.setParent(compiledParent.getRecipe());
+        trimmerRecipe.setMask(projectionMask);
+        return trimmerRecipe;
+    }
+
+    public static Mask makeProjectionMask(final PlanningTrace compiledParent, Iterable<PVariable> projectedVariables) {
+        List<Integer> projectionSourceIndices = new ArrayList<Integer>();
+        for (PVariable pVariable : projectedVariables) {
+            projectionSourceIndices.add(compiledParent.getPosMapping().get(pVariable));
+        }
+        final Mask projectionMask = RecipesHelper.mask(compiledParent.getRecipe().getArity(), projectionSourceIndices);
+        return projectionMask;
+    }
+
+    /**
+     * @since 1.6
+     */
+    public static final class PosetTriplet {
+        public Mask coreMask;
+        public Mask posetMask;
+        public IPosetComparator comparator;
+    }
+
+    /**
+     * @since 1.6
+     */
+    public static PosetTriplet computePosetInfo(List<PVariable> variables, PBody body, IQueryMetaContext context) {
+        Map<PVariable, Set<IInputKey>> typeMap = TypeHelper.inferUnaryTypesFor(variables, body.getConstraints(),
+                context);
+        List<Set<IInputKey>> keys = new LinkedList<Set<IInputKey>>();
+
+        for (int i = 0; i < variables.size(); i++) {
+            keys.add(typeMap.get(variables.get(i)));
+        }
+
+        return computePosetInfo(keys, context);
+    }
+
+    /**
+     * @since 1.6
+     */
+    public static PosetTriplet computePosetInfo(List<PParameter> parameters, IQueryMetaContext context) {
+        List<Set<IInputKey>> keys = new LinkedList<Set<IInputKey>>();
+        for (int i = 0; i < parameters.size(); i++) {
+            IInputKey key = parameters.get(i).getDeclaredUnaryType();
+            if (key == null) {
+                keys.add(Collections.emptySet());
+            } else {
+                keys.add(Collections.singleton(parameters.get(i).getDeclaredUnaryType()));
+            }
+        }
+        return computePosetInfo(keys, context);
+    }
+    
+    
+
+    /**
+     * @since 1.6
+     */
+    public static PosetTriplet computePosetInfo(Iterable<Set<IInputKey>> keys, IQueryMetaContext context) {
+        PosetTriplet result = new PosetTriplet();
+        List<Integer> coreIndices = new ArrayList<Integer>();
+        List<Integer> posetIndices = new ArrayList<Integer>();
+        List<IInputKey> filtered = new ArrayList<IInputKey>();
+        boolean posetKey = false;
+        int index = -1;
+
+        for (Set<IInputKey> _keys : keys) {
+            ++index;
+            posetKey = false;
+
+            for (IInputKey key : _keys) {
+                if (key != null && context.isPosetKey(key)) {
+                    posetKey = true;
+                    filtered.add(key);
+                    break;
+                }
+            }
+
+            if (posetKey) {
+                posetIndices.add(index);
+            } else {
+                coreIndices.add(index);
+            }
+        }
+
+        result.comparator = context.getPosetComparator(filtered);
+        result.coreMask = RecipesHelper.mask(index + 1, coreIndices);
+        result.posetMask = RecipesHelper.mask(index + 1, posetIndices);
+
+        return result;
+    }
+
+    /**
+     * Creates a recipe for a production node and the corresponding trace.
+     * <p> PRE: in case this is a recursion cutoff point (see {@link RecursionCutoffPoint}) 
+     *  and bodyFinalTraces will be filled later, 
+     *  the object yielded now by bodyFinalTraces.values() must return up-to-date results later 
+     * @since 2.4
+     */
+    public static CompiledQuery makeQueryTrace(PQuery query, Map<PBody, RecipeTraceInfo> bodyFinalTraces,
+            Collection<ReteNodeRecipe> bodyFinalRecipes, QueryEvaluationHint hint, IQueryMetaContext context, 
+            boolean deleteAndRederiveEvaluation, TimelyConfiguration timelyEvaluation) {
+        ProductionRecipe recipe = ReteRecipeCompiler.FACTORY.createProductionRecipe();
+
+        // temporary solution to support the deprecated option for now
+        boolean deleteAndRederiveEvaluationDep = deleteAndRederiveEvaluation || ReteHintOptions.deleteRederiveEvaluation.getValueOrDefault(hint);
+        
+        recipe.setDeleteRederiveEvaluation(deleteAndRederiveEvaluationDep);
+        
+        if (deleteAndRederiveEvaluationDep || (timelyEvaluation != null)) {
+            PosetTriplet triplet = computePosetInfo(query.getParameters(), context);
+            if (triplet.comparator != null) {
+                MonotonicityInfo info = FACTORY.createMonotonicityInfo();
+                info.setCoreMask(triplet.coreMask);
+                info.setPosetMask(triplet.posetMask);
+                info.setPosetComparator(triplet.comparator);
+                recipe.setOptionalMonotonicityInfo(info);
+            }
+        }
+
+        recipe.setPattern(query);
+        recipe.setPatternFQN(query.getFullyQualifiedName());
+        recipe.setTraceInfo(recipe.getPatternFQN());
+        recipe.getParents().addAll(bodyFinalRecipes);
+        for (int i = 0; i < query.getParameterNames().size(); ++i) {
+            recipe.getMappedIndices().put(query.getParameterNames().get(i), i);
+        }
+
+        return new CompiledQuery(recipe, bodyFinalTraces, query);
+    }
+
+    /**
+     * Calculated index mappings for a join, based on the common variables of the two parent subplans.
+     * 
+     * @author Gabor Bergmann
+     * 
+     */
+    public static class JoinHelper {
+        private TupleMask primaryMask;
+        private TupleMask secondaryMask;
+        private TupleMask complementerMask;
+        private RecipeTraceInfo primaryIndexer;
+        private RecipeTraceInfo secondaryIndexer;
+        private JoinRecipe naturalJoinRecipe;
+        private List<PVariable> naturalJoinVariablesTuple;
+
+        /**
+         * @pre enforceVariableCoincidences() has been called on both sides.
+         */
+        public JoinHelper(SubPlan planToCompile, PlanningTrace primaryCompiled, PlanningTrace callTrace) {
+            super();
+
+            Set<PVariable> primaryVariables = new LinkedHashSet<PVariable>(primaryCompiled.getVariablesTuple());
+            Set<PVariable> secondaryVariables = new LinkedHashSet<PVariable>(callTrace.getVariablesTuple());
+            int oldNodes = 0;
+            Set<Integer> introducingSecondaryIndices = new TreeSet<Integer>();
+            for (PVariable var : secondaryVariables) {
+                if (primaryVariables.contains(var))
+                    oldNodes++;
+                else
+                    introducingSecondaryIndices.add(callTrace.getPosMapping().get(var));
+            }
+            List<Integer> primaryIndices = new ArrayList<Integer>(oldNodes);
+            List<Integer> secondaryIndices = new ArrayList<Integer>(oldNodes);
+            for (PVariable var : secondaryVariables) {
+                if (primaryVariables.contains(var)) {
+                    primaryIndices.add(primaryCompiled.getPosMapping().get(var));
+                    secondaryIndices.add(callTrace.getPosMapping().get(var));
+                }
+            }
+            Collection<Integer> complementerIndices = introducingSecondaryIndices;
+
+            primaryMask = TupleMask.fromSelectedIndices(primaryCompiled.getVariablesTuple().size(), primaryIndices);
+            secondaryMask = TupleMask.fromSelectedIndices(callTrace.getVariablesTuple().size(), secondaryIndices);
+            complementerMask = TupleMask.fromSelectedIndices(callTrace.getVariablesTuple().size(), complementerIndices);
+
+            primaryIndexer = makeIndexerTrace(planToCompile, primaryCompiled, primaryMask);
+            secondaryIndexer = makeIndexerTrace(planToCompile, callTrace, secondaryMask);
+
+            naturalJoinRecipe = FACTORY.createJoinRecipe();
+            naturalJoinRecipe.setLeftParent((ProjectionIndexerRecipe) primaryIndexer.getRecipe());
+            naturalJoinRecipe.setRightParent((IndexerRecipe) secondaryIndexer.getRecipe());
+            naturalJoinRecipe.setRightParentComplementaryMask(CompilerHelper.toRecipeMask(complementerMask));
+
+            naturalJoinVariablesTuple = new ArrayList<PVariable>(primaryCompiled.getVariablesTuple());
+            for (int complementerIndex : complementerMask.indices)
+                naturalJoinVariablesTuple.add(callTrace.getVariablesTuple().get(complementerIndex));
+        }
+
+        public TupleMask getPrimaryMask() {
+            return primaryMask;
+        }
+
+        public TupleMask getSecondaryMask() {
+            return secondaryMask;
+        }
+
+        public TupleMask getComplementerMask() {
+            return complementerMask;
+        }
+
+        public RecipeTraceInfo getPrimaryIndexer() {
+            return primaryIndexer;
+        }
+
+        public RecipeTraceInfo getSecondaryIndexer() {
+            return secondaryIndexer;
+        }
+
+        public JoinRecipe getNaturalJoinRecipe() {
+            return naturalJoinRecipe;
+        }
+
+        public List<PVariable> getNaturalJoinVariablesTuple() {
+            return naturalJoinVariablesTuple;
+        }
+
+    }
+
+    /**
+     * @since 1.4
+     */
+    public static Mask toRecipeMask(TupleMask mask) {
+        return RecipesHelper.mask(mask.sourceWidth, mask.indices);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/RecursionCutoffPoint.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/RecursionCutoffPoint.java
new file mode 100644
index 00000000..7d1e4d3a
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/RecursionCutoffPoint.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.construction.plancompiler;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration;
+import tools.refinery.viatra.runtime.rete.recipes.ProductionRecipe;
+import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+import tools.refinery.viatra.runtime.rete.traceability.CompiledQuery;
+import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
+
+/**
+ * In a recursive query structure, query composition references can be cut off so that the remaining structure is DAG.
+ * {@link RecursionCutoffPoint} represents one such cut off query composition. 
+ * When the compilation of the recursive query finishes and the compiled form becomes available, 
+ *   the {@link RecursionCutoffPoint} has to be signaled to update parent traces and recipes of the recursive call.
+ *  
+ * @author Bergmann Gabor
+ * @noreference This class is not intended to be referenced by clients 
+ *
+ */
+public class RecursionCutoffPoint {
+    final Map<PBody, RecipeTraceInfo> futureTraceMap;
+    final CompiledQuery compiledQuery;
+    final ProductionRecipe recipe;
+    final QueryEvaluationHint hint;
+    
+    public RecursionCutoffPoint(PQuery query, QueryEvaluationHint hint, IQueryMetaContext context, boolean deleteAndRederiveEvaluation, TimelyConfiguration timelyEvaluation) {
+        super();
+        this.hint = hint;
+        this.futureTraceMap = new HashMap<>(); // IMPORTANT: the identity of futureTraceMap.values() will not change
+        this.compiledQuery = CompilerHelper.makeQueryTrace(query, futureTraceMap, Collections.<ReteNodeRecipe>emptySet(), hint, context, deleteAndRederiveEvaluation, timelyEvaluation);
+        this.recipe = (ProductionRecipe)compiledQuery.getRecipe();
+        if (!compiledQuery.getParentRecipeTraces().isEmpty()) {
+            throw new IllegalArgumentException(String.format("Recursion cut-off point of query %s has trace parents: %s", 
+                    compiledQuery.getQuery(),
+                    prettyPrintParentRecipeTraces(compiledQuery.getParentRecipeTraces())));
+        }
+        if (!recipe.getParents().isEmpty()) {
+            throw new IllegalArgumentException(String.format("Recursion cut-off point of query %s has recipe parents: %s", 
+                    compiledQuery.getQuery(),
+                    prettyPrintParentRecipeTraces(compiledQuery.getParentRecipeTraces())));
+        }
+    }
+    
+    
+    
+    private String prettyPrintParentRecipeTraces(List<RecipeTraceInfo> trace) {
+        return trace.stream().map(Object::toString).collect(Collectors.joining(", "));
+    }
+    
+    /**
+     * Signals that compilation of the recursive query has terminated, culminating into the given compiled form.
+     * The query composition that has been cut off will be connected now.
+     */
+    public void mend(CompiledQuery finalCompiledForm) {
+        futureTraceMap.putAll(finalCompiledForm.getParentRecipeTracesPerBody());
+        recipe.getParents().addAll(((ProductionRecipe)finalCompiledForm.getRecipe()).getParents());
+    }
+
+    public CompiledQuery getCompiledQuery() {
+        return compiledQuery;
+    }
+
+    public ProductionRecipe getRecipe() {
+        return recipe;
+    }
+    
+    
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/ReteRecipeCompiler.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/ReteRecipeCompiler.java
new file mode 100644
index 00000000..5df3a971
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/plancompiler/ReteRecipeCompiler.java
@@ -0,0 +1,949 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * Copyright (c) 2023 The Refinery Authors <https://refinery.tools>
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.construction.plancompiler;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.backend.CommonQueryHintOptions;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
+import tools.refinery.viatra.runtime.matchers.context.IQueryCacheContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.planning.IQueryPlannerStrategy;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.planning.helpers.BuildHelper;
+import tools.refinery.viatra.runtime.matchers.planning.operations.*;
+import tools.refinery.viatra.runtime.matchers.psystem.*;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.*;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.*;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PVisibility;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.*;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
+import tools.refinery.viatra.runtime.rete.construction.plancompiler.CompilerHelper.JoinHelper;
+import tools.refinery.viatra.runtime.rete.construction.plancompiler.CompilerHelper.PosetTriplet;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration;
+import tools.refinery.viatra.runtime.rete.recipes.*;
+import tools.refinery.viatra.runtime.rete.recipes.helper.RecipesHelper;
+import tools.refinery.viatra.runtime.rete.traceability.*;
+import tools.refinery.viatra.runtime.rete.util.ReteHintOptions;
+
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+/**
+ * Compiles queries and query plans into Rete recipes, traced by respectively a {@link CompiledQuery} or
+ * {@link CompiledSubPlan}.
+ *
+ * @author Bergmann Gabor
+ *
+ */
+public class ReteRecipeCompiler {
+
+    private final IQueryPlannerStrategy plannerStrategy;
+    private final IQueryMetaContext metaContext;
+    private final IQueryBackendHintProvider hintProvider;
+    private final PDisjunctionRewriter normalizer;
+    private final QueryAnalyzer queryAnalyzer;
+    private final Logger logger;
+
+    /**
+     * @since 2.2
+     */
+    protected final boolean deleteAndRederiveEvaluation;
+    /**
+     * @since 2.4
+     */
+    protected final TimelyConfiguration timelyEvaluation;
+
+    /**
+     * @since 1.5
+     */
+    public ReteRecipeCompiler(IQueryPlannerStrategy plannerStrategy, Logger logger, IQueryMetaContext metaContext,
+            IQueryCacheContext queryCacheContext, IQueryBackendHintProvider hintProvider, QueryAnalyzer queryAnalyzer) {
+        this(plannerStrategy, logger, metaContext, queryCacheContext, hintProvider, queryAnalyzer, false, null);
+    }
+
+    /**
+     * @since 2.4
+     */
+    public ReteRecipeCompiler(IQueryPlannerStrategy plannerStrategy, Logger logger, IQueryMetaContext metaContext,
+            IQueryCacheContext queryCacheContext, IQueryBackendHintProvider hintProvider, QueryAnalyzer queryAnalyzer,
+            boolean deleteAndRederiveEvaluation, TimelyConfiguration timelyEvaluation) {
+        super();
+        this.deleteAndRederiveEvaluation = deleteAndRederiveEvaluation;
+        this.timelyEvaluation = timelyEvaluation;
+        this.plannerStrategy = plannerStrategy;
+        this.logger = logger;
+        this.metaContext = metaContext;
+        this.queryAnalyzer = queryAnalyzer;
+        this.normalizer = new PDisjunctionRewriterCacher(new SurrogateQueryRewriter(),
+                new PBodyNormalizer(metaContext) {
+
+                    @Override
+                    protected boolean shouldExpandWeakenedAlternatives(PQuery query) {
+                        QueryEvaluationHint hint = ReteRecipeCompiler.this.hintProvider.getQueryEvaluationHint(query);
+                        Boolean expandWeakenedAlternativeConstraints = ReteHintOptions.expandWeakenedAlternativeConstraints
+                                .getValueOrDefault(hint);
+                        return expandWeakenedAlternativeConstraints;
+                    }
+
+                });
+        this.hintProvider = hintProvider;
+    }
+
+    static final RecipesFactory FACTORY = RecipesFactory.eINSTANCE;
+
+    // INTERNALLY CACHED
+    private Map<PBody, SubPlan> plannerCache = new HashMap<PBody, SubPlan>();
+    private Set<PBody> planningInProgress = new HashSet<PBody>();
+
+    private Map<PQuery, CompiledQuery> queryCompilerCache = new HashMap<PQuery, CompiledQuery>();
+    private Set<PQuery> compilationInProgress = new HashSet<PQuery>();
+    private IMultiLookup<PQuery, RecursionCutoffPoint> recursionCutoffPoints = CollectionsFactory.createMultiLookup(Object.class, MemoryType.SETS, Object.class);
+    private Map<SubPlan, CompiledSubPlan> subPlanCompilerCache = new HashMap<SubPlan, CompiledSubPlan>();
+    private Map<ReteNodeRecipe, SubPlan> compilerBackTrace = new HashMap<ReteNodeRecipe, SubPlan>();
+
+    /**
+     * Clears internal state
+     */
+    public void reset() {
+        plannerCache.clear();
+        planningInProgress.clear();
+        queryCompilerCache.clear();
+        subPlanCompilerCache.clear();
+        compilerBackTrace.clear();
+    }
+
+    /**
+     * Returns a {@link CompiledQuery} compiled from a query
+     * @throws ViatraQueryRuntimeException
+     */
+    public CompiledQuery getCompiledForm(PQuery query) {
+        CompiledQuery compiled = queryCompilerCache.get(query);
+        if (compiled == null) {
+
+            IRewriterTraceCollector traceCollector = CommonQueryHintOptions.normalizationTraceCollector
+                    .getValueOrDefault(hintProvider.getQueryEvaluationHint(query));
+            if (traceCollector != null) {
+                traceCollector.addTrace(query, query);
+            }
+
+            boolean reentrant = !compilationInProgress.add(query);
+            if (reentrant) { // oops, recursion into body in progress
+                RecursionCutoffPoint cutoffPoint = new RecursionCutoffPoint(query, getHints(query), metaContext,
+                        deleteAndRederiveEvaluation, timelyEvaluation);
+                recursionCutoffPoints.addPair(query, cutoffPoint);
+                return cutoffPoint.getCompiledQuery();
+            } else { // not reentrant, therefore no recursion, do the compilation
+                try {
+                    compiled = compileProduction(query);
+                    queryCompilerCache.put(query, compiled);
+                    // backTrace.put(compiled.getRecipe(), plan);
+
+                    // if this was a recursive query, mend all points where recursion was cut off
+                    for (RecursionCutoffPoint cutoffPoint : recursionCutoffPoints.lookupOrEmpty(query)) {
+                        cutoffPoint.mend(compiled);
+                    }
+                } finally {
+                    compilationInProgress.remove(query);
+                }
+            }
+        }
+        return compiled;
+    }
+
+    /**
+     * Returns a {@link CompiledSubPlan} compiled from a query plan
+     * @throws ViatraQueryRuntimeException
+     */
+    public CompiledSubPlan getCompiledForm(SubPlan plan) {
+        CompiledSubPlan compiled = subPlanCompilerCache.get(plan);
+        if (compiled == null) {
+            compiled = doCompileDispatch(plan);
+            subPlanCompilerCache.put(plan, compiled);
+            compilerBackTrace.put(compiled.getRecipe(), plan);
+        }
+        return compiled;
+    }
+
+    /**
+     * @throws ViatraQueryRuntimeException
+     */
+    public SubPlan getPlan(PBody pBody) {
+        // if the query is not marked as being compiled, initiate compilation
+        // (this is useful in case of recursion if getPlan() is the entry point)
+        PQuery pQuery = pBody.getPattern();
+        if (!compilationInProgress.contains(pQuery))
+            getCompiledForm(pQuery);
+
+        // Is the plan already cached?
+        SubPlan plan = plannerCache.get(pBody);
+        if (plan == null) {
+            boolean reentrant = !planningInProgress.add(pBody);
+            if (reentrant) { // oops, recursion into body in progress
+                throw new IllegalArgumentException(
+                        "Planning-level recursion unsupported: " + pBody.getPattern().getFullyQualifiedName());
+            } else { // not reentrant, therefore no recursion, do the planning
+                try {
+                    plan = plannerStrategy.plan(pBody, logger, metaContext);
+                    plannerCache.put(pBody, plan);
+                } finally {
+                    planningInProgress.remove(pBody);
+                }
+            }
+        }
+        return plan;
+    }
+
+    private CompiledQuery compileProduction(PQuery query) {
+        Collection<SubPlan> bodyPlans = new ArrayList<SubPlan>();
+        normalizer.setTraceCollector(CommonQueryHintOptions.normalizationTraceCollector
+                .getValueOrDefault(hintProvider.getQueryEvaluationHint(query)));
+        for (PBody pBody : normalizer.rewrite(query).getBodies()) {
+            SubPlan bodyPlan = getPlan(pBody);
+            bodyPlans.add(bodyPlan);
+        }
+        return doCompileProduction(query, bodyPlans);
+    }
+
+    private CompiledQuery doCompileProduction(PQuery query, Collection<SubPlan> bodies) {
+        // TODO skip production node if there is just one body and no projection needed?
+        Map<PBody, RecipeTraceInfo> bodyFinalTraces = new HashMap<PBody, RecipeTraceInfo>();
+        Collection<ReteNodeRecipe> bodyFinalRecipes = new HashSet<ReteNodeRecipe>();
+
+        for (SubPlan bodyFinalPlan : bodies) {
+            // skip over any projections at the end
+            bodyFinalPlan = BuildHelper.eliminateTrailingProjections(bodyFinalPlan);
+
+            // TODO checkAndTrimEqualVariables may introduce superfluous trim,
+            // but whatever (no uniqueness enforcer needed)
+
+            // compile body
+            final CompiledSubPlan compiledBody = getCompiledForm(bodyFinalPlan);
+
+            // project to parameter list
+            RecipeTraceInfo finalTrace = projectBodyFinalToParameters(compiledBody, false);
+
+            bodyFinalTraces.put(bodyFinalPlan.getBody(), finalTrace);
+            bodyFinalRecipes.add(finalTrace.getRecipe());
+        }
+
+        CompiledQuery compiled = CompilerHelper.makeQueryTrace(query, bodyFinalTraces, bodyFinalRecipes,
+                getHints(query), metaContext, deleteAndRederiveEvaluation, timelyEvaluation);
+
+        return compiled;
+    }
+
+    private CompiledSubPlan doCompileDispatch(SubPlan plan) {
+        final POperation operation = plan.getOperation();
+        if (operation instanceof PEnumerate) {
+            return doCompileEnumerate(((PEnumerate) operation).getEnumerablePConstraint(), plan);
+        } else if (operation instanceof PApply) {
+            final PConstraint pConstraint = ((PApply) operation).getPConstraint();
+            if (pConstraint instanceof EnumerablePConstraint) {
+                CompiledSubPlan primaryParent = getCompiledForm(plan.getParentPlans().get(0));
+                PlanningTrace secondaryParent = doEnumerateDispatch(plan, (EnumerablePConstraint) pConstraint);
+                return compileToNaturalJoin(plan, primaryParent, secondaryParent);
+            } else if (pConstraint instanceof DeferredPConstraint) {
+                return doDeferredDispatch((DeferredPConstraint) pConstraint, plan);
+            } else {
+                throw new IllegalArgumentException("Unsupported PConstraint in query plan: " + plan.toShortString());
+            }
+        } else if (operation instanceof PJoin) {
+            return doCompileJoin((PJoin) operation, plan);
+        } else if (operation instanceof PProject) {
+            return doCompileProject((PProject) operation, plan);
+        } else if (operation instanceof PStart) {
+            return doCompileStart((PStart) operation, plan);
+        } else {
+            throw new IllegalArgumentException("Unsupported POperation in query plan: " + plan.toShortString());
+        }
+    }
+
+    private CompiledSubPlan doDeferredDispatch(DeferredPConstraint constraint, SubPlan plan) {
+        final SubPlan parentPlan = plan.getParentPlans().get(0);
+        final CompiledSubPlan parentCompiled = getCompiledForm(parentPlan);
+        if (constraint instanceof Equality) {
+            return compileDeferred((Equality) constraint, plan, parentPlan, parentCompiled);
+        } else if (constraint instanceof ExportedParameter) {
+            return compileDeferred((ExportedParameter) constraint, plan, parentPlan, parentCompiled);
+        } else if (constraint instanceof Inequality) {
+            return compileDeferred((Inequality) constraint, plan, parentPlan, parentCompiled);
+        } else if (constraint instanceof NegativePatternCall) {
+            return compileDeferred((NegativePatternCall) constraint, plan, parentPlan, parentCompiled);
+        } else if (constraint instanceof PatternMatchCounter) {
+            return compileDeferred((PatternMatchCounter) constraint, plan, parentPlan, parentCompiled);
+        } else if (constraint instanceof AggregatorConstraint) {
+            return compileDeferred((AggregatorConstraint) constraint, plan, parentPlan, parentCompiled);
+        } else if (constraint instanceof ExpressionEvaluation) {
+            return compileDeferred((ExpressionEvaluation) constraint, plan, parentPlan, parentCompiled);
+        } else if (constraint instanceof TypeFilterConstraint) {
+            return compileDeferred((TypeFilterConstraint) constraint, plan, parentPlan, parentCompiled);
+        }
+        throw new UnsupportedOperationException("Unknown deferred constraint " + constraint);
+    }
+
+    private CompiledSubPlan compileDeferred(Equality constraint, SubPlan plan, SubPlan parentPlan,
+            CompiledSubPlan parentCompiled) {
+        if (constraint.isMoot())
+            return parentCompiled.cloneFor(plan);
+
+        Integer index1 = parentCompiled.getPosMapping().get(constraint.getWho());
+        Integer index2 = parentCompiled.getPosMapping().get(constraint.getWithWhom());
+
+        if (index1 != null && index2 != null && index1.intValue() != index2.intValue()) {
+            Integer indexLower = Math.min(index1, index2);
+            Integer indexHigher = Math.max(index1, index2);
+
+            EqualityFilterRecipe equalityFilterRecipe = FACTORY.createEqualityFilterRecipe();
+            equalityFilterRecipe.setParent(parentCompiled.getRecipe());
+            equalityFilterRecipe.getIndices().add(indexLower);
+            equalityFilterRecipe.getIndices().add(indexHigher);
+
+            return new CompiledSubPlan(plan, parentCompiled.getVariablesTuple(), equalityFilterRecipe, parentCompiled);
+        } else {
+            throw new IllegalArgumentException(String.format("Unable to interpret %s after compiled parent %s",
+                    plan.toShortString(), parentCompiled.toString()));
+        }
+    }
+
+    /**
+     * Precondition: constantTrace must map to a ConstantRecipe, and all of its variables must be contained in
+     * toFilterTrace.
+     */
+    private CompiledSubPlan compileConstantFiltering(SubPlan plan, PlanningTrace toFilterTrace,
+            ConstantRecipe constantRecipe, List<PVariable> filteredVariables) {
+        PlanningTrace resultTrace = toFilterTrace;
+
+        int constantVariablesSize = filteredVariables.size();
+        for (int i = 0; i < constantVariablesSize; ++i) {
+            Object constantValue = constantRecipe.getConstantValues().get(i);
+            PVariable filteredVariable = filteredVariables.get(i);
+            int filteredColumn = resultTrace.getVariablesTuple().indexOf(filteredVariable);
+
+            DiscriminatorDispatcherRecipe dispatcherRecipe = FACTORY.createDiscriminatorDispatcherRecipe();
+            dispatcherRecipe.setDiscriminationColumnIndex(filteredColumn);
+            dispatcherRecipe.setParent(resultTrace.getRecipe());
+
+            PlanningTrace dispatcherTrace = new PlanningTrace(plan, resultTrace.getVariablesTuple(), dispatcherRecipe,
+                    resultTrace);
+
+            DiscriminatorBucketRecipe bucketRecipe = FACTORY.createDiscriminatorBucketRecipe();
+            bucketRecipe.setBucketKey(constantValue);
+            bucketRecipe.setParent(dispatcherRecipe);
+
+            PlanningTrace bucketTrace = new PlanningTrace(plan, dispatcherTrace.getVariablesTuple(), bucketRecipe,
+                    dispatcherTrace);
+
+            resultTrace = bucketTrace;
+        }
+
+        return resultTrace.cloneFor(plan);
+    }
+
+    private CompiledSubPlan compileDeferred(ExportedParameter constraint, SubPlan plan, SubPlan parentPlan,
+            CompiledSubPlan parentCompiled) {
+        return parentCompiled.cloneFor(plan);
+    }
+
+    private CompiledSubPlan compileDeferred(Inequality constraint, SubPlan plan, SubPlan parentPlan,
+            CompiledSubPlan parentCompiled) {
+        if (constraint.isEliminable())
+            return parentCompiled.cloneFor(plan);
+
+        Integer index1 = parentCompiled.getPosMapping().get(constraint.getWho());
+        Integer index2 = parentCompiled.getPosMapping().get(constraint.getWithWhom());
+
+        if (index1 != null && index2 != null && index1.intValue() != index2.intValue()) {
+            Integer indexLower = Math.min(index1, index2);
+            Integer indexHigher = Math.max(index1, index2);
+
+            InequalityFilterRecipe inequalityFilterRecipe = FACTORY.createInequalityFilterRecipe();
+            inequalityFilterRecipe.setParent(parentCompiled.getRecipe());
+            inequalityFilterRecipe.setSubject(indexLower);
+            inequalityFilterRecipe.getInequals().add(indexHigher);
+
+            return new CompiledSubPlan(plan, parentCompiled.getVariablesTuple(), inequalityFilterRecipe,
+                    parentCompiled);
+        } else {
+            throw new IllegalArgumentException(String.format("Unable to interpret %s after compiled parent %s",
+                    plan.toShortString(), parentCompiled.toString()));
+        }
+    }
+
+    private CompiledSubPlan compileDeferred(TypeFilterConstraint constraint, SubPlan plan, SubPlan parentPlan,
+            CompiledSubPlan parentCompiled) {
+        final IInputKey inputKey = constraint.getInputKey();
+        if (!metaContext.isStateless(inputKey))
+            throw new UnsupportedOperationException(
+                    "Non-enumerable input keys are currently supported in Rete only if they are stateless, unlike "
+                            + inputKey);
+
+        final Tuple constraintVariables = constraint.getVariablesTuple();
+        final List<PVariable> parentVariables = parentCompiled.getVariablesTuple();
+
+        Mask mask; // select elements of the tuple to check against extensional relation
+        if (Tuples.flatTupleOf(parentVariables.toArray()).equals(constraintVariables)) {
+            mask = null; // lucky case, parent signature equals that of input key
+        } else {
+            List<PVariable> variables = new ArrayList<PVariable>();
+            for (Object variable : constraintVariables.getElements()) {
+                variables.add((PVariable) variable);
+            }
+            mask = CompilerHelper.makeProjectionMask(parentCompiled, variables);
+        }
+        InputFilterRecipe inputFilterRecipe = RecipesHelper.inputFilterRecipe(parentCompiled.getRecipe(), inputKey,
+                inputKey.getStringID(), mask);
+        return new CompiledSubPlan(plan, parentVariables, inputFilterRecipe, parentCompiled);
+    }
+
+    private CompiledSubPlan compileDeferred(NegativePatternCall constraint, SubPlan plan, SubPlan parentPlan,
+            CompiledSubPlan parentCompiled) {
+        final PlanningTrace callTrace = referQuery(constraint.getReferredQuery(), plan,
+                constraint.getActualParametersTuple());
+
+        JoinHelper joinHelper = new JoinHelper(plan, parentCompiled, callTrace);
+        final RecipeTraceInfo primaryIndexer = joinHelper.getPrimaryIndexer();
+        final RecipeTraceInfo secondaryIndexer = joinHelper.getSecondaryIndexer();
+
+        AntiJoinRecipe antiJoinRecipe = FACTORY.createAntiJoinRecipe();
+        antiJoinRecipe.setLeftParent((ProjectionIndexerRecipe) primaryIndexer.getRecipe());
+        antiJoinRecipe.setRightParent((IndexerRecipe) secondaryIndexer.getRecipe());
+
+        return new CompiledSubPlan(plan, parentCompiled.getVariablesTuple(), antiJoinRecipe, primaryIndexer,
+                secondaryIndexer);
+    }
+
+    private CompiledSubPlan compileDeferred(PatternMatchCounter constraint, SubPlan plan, SubPlan parentPlan,
+            CompiledSubPlan parentCompiled) {
+        final PlanningTrace callTrace = referQuery(constraint.getReferredQuery(), plan,
+                constraint.getActualParametersTuple());
+
+        // hack: use some mask computations (+ the indexers) from a fake natural join against the called query
+        JoinHelper fakeJoinHelper = new JoinHelper(plan, parentCompiled, callTrace);
+        final RecipeTraceInfo primaryIndexer = fakeJoinHelper.getPrimaryIndexer();
+        final RecipeTraceInfo callProjectionIndexer = fakeJoinHelper.getSecondaryIndexer();
+
+        final List<PVariable> sideVariablesTuple =  new ArrayList<PVariable>(
+                fakeJoinHelper.getSecondaryMask().transform(callTrace.getVariablesTuple()));
+        /* if (!booleanCheck) */ sideVariablesTuple.add(constraint.getResultVariable());
+
+        CountAggregatorRecipe aggregatorRecipe = FACTORY.createCountAggregatorRecipe();
+        aggregatorRecipe.setParent((ProjectionIndexerRecipe) callProjectionIndexer.getRecipe());
+        PlanningTrace aggregatorTrace = new PlanningTrace(plan, sideVariablesTuple, aggregatorRecipe,
+                callProjectionIndexer);
+
+        IndexerRecipe aggregatorIndexerRecipe = FACTORY.createAggregatorIndexerRecipe();
+        aggregatorIndexerRecipe.setParent(aggregatorRecipe);
+        // aggregatorIndexerRecipe.setMask(RecipesHelper.mask(
+        // sideVariablesTuple.size(),
+        // //use same indices as in the projection indexer
+        // // EVEN if result variable already visible in left parent
+        // fakeJoinHelper.getSecondaryMask().indices
+        // ));
+
+        int aggregatorWidth = sideVariablesTuple.size();
+        int aggregateResultIndex = aggregatorWidth - 1;
+
+        aggregatorIndexerRecipe.setMask(CompilerHelper.toRecipeMask(TupleMask.omit(
+                // aggregate according all but the last index
+                aggregateResultIndex, aggregatorWidth)));
+        PlanningTrace aggregatorIndexerTrace = new PlanningTrace(plan, sideVariablesTuple, aggregatorIndexerRecipe,
+                aggregatorTrace);
+
+        JoinRecipe naturalJoinRecipe = FACTORY.createJoinRecipe();
+        naturalJoinRecipe.setLeftParent((ProjectionIndexerRecipe) primaryIndexer.getRecipe());
+        naturalJoinRecipe.setRightParent(aggregatorIndexerRecipe);
+        naturalJoinRecipe.setRightParentComplementaryMask(RecipesHelper.mask(aggregatorWidth,
+                // extend with last element only - the computation value
+                aggregateResultIndex));
+
+        // what if the new variable already has a value?
+        // even if already known, we add the new result variable, so that it can be filtered at the end
+        // boolean alreadyKnown = parentPlan.getVisibleVariables().contains(constraint.getResultVariable());
+
+        final List<PVariable> aggregatedVariablesTuple = new ArrayList<PVariable>(parentCompiled.getVariablesTuple());
+        aggregatedVariablesTuple.add(constraint.getResultVariable());
+
+        PlanningTrace joinTrace = new PlanningTrace(plan, aggregatedVariablesTuple, naturalJoinRecipe, primaryIndexer,
+                aggregatorIndexerTrace);
+
+        return CompilerHelper.checkAndTrimEqualVariables(plan, joinTrace).cloneFor(plan);
+        // if (!alreadyKnown) {
+        // return joinTrace.cloneFor(plan);
+        // } else {
+        // //final Integer equalsWithIndex = parentCompiled.getPosMapping().get(parentCompiled.getVariablesTuple());
+        // }
+    }
+
+    private CompiledSubPlan compileDeferred(AggregatorConstraint constraint, SubPlan plan, SubPlan parentPlan,
+            CompiledSubPlan parentCompiled) {
+        final PlanningTrace callTrace = referQuery(constraint.getReferredQuery(), plan,
+                constraint.getActualParametersTuple());
+
+        // hack: use some mask computations (+ the indexers) from a fake natural join against the called query
+        JoinHelper fakeJoinHelper = new JoinHelper(plan, parentCompiled, callTrace);
+        final RecipeTraceInfo primaryIndexer = fakeJoinHelper.getPrimaryIndexer();
+        TupleMask callGroupMask = fakeJoinHelper.getSecondaryMask();
+
+        final List<PVariable> sideVariablesTuple = new ArrayList<PVariable>(
+                callGroupMask.transform(callTrace.getVariablesTuple()));
+        /* if (!booleanCheck) */ sideVariablesTuple.add(constraint.getResultVariable());
+
+        IMultisetAggregationOperator<?, ?, ?> operator = constraint.getAggregator().getOperator();
+
+        SingleColumnAggregatorRecipe columnAggregatorRecipe = FACTORY.createSingleColumnAggregatorRecipe();
+        columnAggregatorRecipe.setParent(callTrace.getRecipe());
+        columnAggregatorRecipe.setMultisetAggregationOperator(operator);
+
+        int columnIndex = constraint.getAggregatedColumn();
+        IPosetComparator posetComparator = null;
+        Mask groupMask = CompilerHelper.toRecipeMask(callGroupMask);
+
+        // temporary solution to support the deprecated option for now
+        final boolean deleteAndRederiveEvaluationDep = this.deleteAndRederiveEvaluation || ReteHintOptions.deleteRederiveEvaluation.getValueOrDefault(getHints(plan));
+
+        columnAggregatorRecipe.setDeleteRederiveEvaluation(deleteAndRederiveEvaluationDep);
+        if (deleteAndRederiveEvaluationDep || (this.timelyEvaluation != null)) {
+            List<PParameter> parameters = constraint.getReferredQuery().getParameters();
+            IInputKey key = parameters.get(columnIndex).getDeclaredUnaryType();
+            if (key != null && metaContext.isPosetKey(key)) {
+                posetComparator = metaContext.getPosetComparator(Collections.singleton(key));
+            }
+        }
+
+        if (posetComparator == null) {
+            columnAggregatorRecipe.setGroupByMask(groupMask);
+            columnAggregatorRecipe.setAggregableIndex(columnIndex);
+        } else {
+            MonotonicityInfo monotonicityInfo = FACTORY.createMonotonicityInfo();
+            monotonicityInfo.setCoreMask(groupMask);
+            monotonicityInfo.setPosetMask(CompilerHelper.toRecipeMask(
+                    TupleMask.selectSingle(columnIndex, constraint.getActualParametersTuple().getSize())));
+            monotonicityInfo.setPosetComparator(posetComparator);
+            columnAggregatorRecipe.setOptionalMonotonicityInfo(monotonicityInfo);
+        }
+
+        ReteNodeRecipe aggregatorRecipe = columnAggregatorRecipe;
+        PlanningTrace aggregatorTrace = new PlanningTrace(plan, sideVariablesTuple, aggregatorRecipe, callTrace);
+
+        IndexerRecipe aggregatorIndexerRecipe = FACTORY.createAggregatorIndexerRecipe();
+        aggregatorIndexerRecipe.setParent(aggregatorRecipe);
+
+        int aggregatorWidth = sideVariablesTuple.size();
+        int aggregateResultIndex = aggregatorWidth - 1;
+
+        aggregatorIndexerRecipe.setMask(CompilerHelper.toRecipeMask(TupleMask.omit(
+                // aggregate according all but the last index
+                aggregateResultIndex, aggregatorWidth)));
+        PlanningTrace aggregatorIndexerTrace = new PlanningTrace(plan, sideVariablesTuple, aggregatorIndexerRecipe,
+                aggregatorTrace);
+
+        JoinRecipe naturalJoinRecipe = FACTORY.createJoinRecipe();
+        naturalJoinRecipe.setLeftParent((ProjectionIndexerRecipe) primaryIndexer.getRecipe());
+        naturalJoinRecipe.setRightParent(aggregatorIndexerRecipe);
+        naturalJoinRecipe.setRightParentComplementaryMask(RecipesHelper.mask(aggregatorWidth,
+                // extend with last element only - the computation value
+                aggregateResultIndex));
+
+        // what if the new variable already has a value?
+        // even if already known, we add the new result variable, so that it can be filtered at the end
+        // boolean alreadyKnown = parentPlan.getVisibleVariables().contains(constraint.getResultVariable());
+
+        final List<PVariable> finalVariablesTuple = new ArrayList<PVariable>(parentCompiled.getVariablesTuple());
+        finalVariablesTuple.add(constraint.getResultVariable());
+
+        PlanningTrace joinTrace = new PlanningTrace(plan, finalVariablesTuple, naturalJoinRecipe, primaryIndexer,
+                aggregatorIndexerTrace);
+
+        return CompilerHelper.checkAndTrimEqualVariables(plan, joinTrace).cloneFor(plan);
+        // if (!alreadyKnown) {
+        // return joinTrace.cloneFor(plan);
+        // } else {
+        // //final Integer equalsWithIndex = parentCompiled.getPosMapping().get(parentCompiled.getVariablesTuple());
+        // }
+    }
+
+    private CompiledSubPlan compileDeferred(ExpressionEvaluation constraint, SubPlan plan, SubPlan parentPlan,
+            CompiledSubPlan parentCompiled) {
+        Map<String, Integer> tupleNameMap = new HashMap<String, Integer>();
+        for (String name : constraint.getEvaluator().getInputParameterNames()) {
+            Map<? extends Object, Integer> index = parentCompiled.getPosMapping();
+            PVariable variable = constraint.getPSystem().getVariableByNameChecked(name);
+            Integer position = index.get(variable);
+            tupleNameMap.put(name, position);
+        }
+
+        final PVariable outputVariable = constraint.getOutputVariable();
+        final boolean booleanCheck = outputVariable == null;
+
+        // TODO determine whether expression is costly
+        boolean cacheOutput = ReteHintOptions.cacheOutputOfEvaluatorsByDefault.getValueOrDefault(getHints(plan));
+        // for (PAnnotation pAnnotation :
+        // plan.getBody().getPattern().getAnnotationsByName(EXPRESSION_EVALUATION_ANNOTATION"")) {
+        // for (Object value : pAnnotation.getAllValues("expensive")) {
+        // if (value instanceof Boolean)
+        // cacheOutput = (boolean) value;
+        // }
+        // }
+
+        ExpressionEnforcerRecipe enforcerRecipe = booleanCheck ? FACTORY.createCheckRecipe()
+                : FACTORY.createEvalRecipe();
+        enforcerRecipe.setParent(parentCompiled.getRecipe());
+        enforcerRecipe.setExpression(RecipesHelper.expressionDefinition(constraint.getEvaluator()));
+        enforcerRecipe.setCacheOutput(cacheOutput);
+        if (enforcerRecipe instanceof EvalRecipe) {
+            ((EvalRecipe) enforcerRecipe).setUnwinding(constraint.isUnwinding());
+        }
+        for (Entry<String, Integer> entry : tupleNameMap.entrySet()) {
+            enforcerRecipe.getMappedIndices().put(entry.getKey(), entry.getValue());
+        }
+
+        final List<PVariable> enforcerVariablesTuple = new ArrayList<PVariable>(parentCompiled.getVariablesTuple());
+        if (!booleanCheck)
+            enforcerVariablesTuple.add(outputVariable);
+        PlanningTrace enforcerTrace = new PlanningTrace(plan, enforcerVariablesTuple, enforcerRecipe, parentCompiled);
+
+        return CompilerHelper.checkAndTrimEqualVariables(plan, enforcerTrace).cloneFor(plan);
+    }
+
+    private CompiledSubPlan doCompileJoin(PJoin operation, SubPlan plan) {
+        final List<CompiledSubPlan> compiledParents = getCompiledFormOfParents(plan);
+        final CompiledSubPlan leftCompiled = compiledParents.get(0);
+        final CompiledSubPlan rightCompiled = compiledParents.get(1);
+
+        return compileToNaturalJoin(plan, leftCompiled, rightCompiled);
+    }
+
+    private CompiledSubPlan compileToNaturalJoin(SubPlan plan, final PlanningTrace leftCompiled,
+            final PlanningTrace rightCompiled) {
+        // CHECK IF SPECIAL CASE
+
+        // Is constant filtering applicable?
+        if (ReteHintOptions.useDiscriminatorDispatchersForConstantFiltering.getValueOrDefault(getHints(plan))) {
+            if (leftCompiled.getRecipe() instanceof ConstantRecipe
+                    && rightCompiled.getVariablesTuple().containsAll(leftCompiled.getVariablesTuple())) {
+                return compileConstantFiltering(plan, rightCompiled, (ConstantRecipe) leftCompiled.getRecipe(),
+                        leftCompiled.getVariablesTuple());
+            }
+            if (rightCompiled.getRecipe() instanceof ConstantRecipe
+                    && leftCompiled.getVariablesTuple().containsAll(rightCompiled.getVariablesTuple())) {
+                return compileConstantFiltering(plan, leftCompiled, (ConstantRecipe) rightCompiled.getRecipe(),
+                        rightCompiled.getVariablesTuple());
+            }
+        }
+
+        // ELSE: ACTUAL JOIN
+        JoinHelper joinHelper = new JoinHelper(plan, leftCompiled, rightCompiled);
+        return new CompiledSubPlan(plan, joinHelper.getNaturalJoinVariablesTuple(), joinHelper.getNaturalJoinRecipe(),
+                joinHelper.getPrimaryIndexer(), joinHelper.getSecondaryIndexer());
+    }
+
+    private CompiledSubPlan doCompileProject(PProject operation, SubPlan plan) {
+        final List<CompiledSubPlan> compiledParents = getCompiledFormOfParents(plan);
+        final CompiledSubPlan compiledParent = compiledParents.get(0);
+
+        List<PVariable> projectedVariables = new ArrayList<PVariable>(operation.getToVariables());
+        // Determinizing projection: try to keep original order (hopefully facilitates node reuse)
+        Map<PVariable, Integer> parentPosMapping = compiledParent.getPosMapping();
+        Collections.sort(projectedVariables, Comparator.comparing(parentPosMapping::get));
+
+        return doProjectPlan(compiledParent, projectedVariables, true,
+                parentTrace -> parentTrace.cloneFor(plan),
+                (recipe, parentTrace) -> new PlanningTrace(plan, projectedVariables, recipe, parentTrace),
+                (recipe, parentTrace) -> new CompiledSubPlan(plan, projectedVariables, recipe, parentTrace)
+        );
+    }
+
+    /**
+     * Projects a subplan onto the specified variable tuple
+     * @param compiledParentPlan the compiled form of the subplan
+     * @param targetVariables list of variables to project to
+     * @param enforceUniqueness whether distinctness shall be enforced after the projection.
+     * Specify false only if directly connecting to a production node.
+     * @param reinterpretTraceFactory constructs a reinterpreted trace that simply relabels the compiled parent plan, in case it is sufficient
+     * @param intermediateTraceFactory constructs a recipe trace for an intermediate node, given the recipe of the node and its parent trace
+     * @param finalTraceFactory constructs a recipe trace for the final resulting node, given the recipe of the node and its parent trace
+     * @since 2.1
+     */
+    <ResultTrace extends RecipeTraceInfo> ResultTrace doProjectPlan(
+            final CompiledSubPlan compiledParentPlan,
+            final List<PVariable> targetVariables,
+            boolean enforceUniqueness,
+            Function<CompiledSubPlan, ResultTrace> reinterpretTraceFactory,
+            BiFunction<ReteNodeRecipe, RecipeTraceInfo, RecipeTraceInfo> intermediateTraceFactory,
+            BiFunction<ReteNodeRecipe, RecipeTraceInfo, ResultTrace> finalTraceFactory)
+    {
+        if (targetVariables.equals(compiledParentPlan.getVariablesTuple())) // no projection needed
+            return reinterpretTraceFactory.apply(compiledParentPlan);
+
+        // otherwise, we need at least a trimmer
+        TrimmerRecipe trimmerRecipe = CompilerHelper.makeTrimmerRecipe(compiledParentPlan, targetVariables);
+
+        // do we need to eliminate duplicates?
+        SubPlan parentPlan = compiledParentPlan.getSubPlan();
+        if (!enforceUniqueness || BuildHelper.areAllVariablesDetermined(
+                parentPlan,
+                targetVariables,
+                queryAnalyzer,
+                true))
+        {
+            // if uniqueness enforcess is unwanted or unneeeded, skip it
+            return finalTraceFactory.apply(trimmerRecipe, compiledParentPlan);
+        } else {
+            // add a uniqueness enforcer
+            UniquenessEnforcerRecipe recipe = FACTORY.createUniquenessEnforcerRecipe();
+            recipe.getParents().add(trimmerRecipe);
+
+            // temporary solution to support the deprecated option for now
+            final boolean deleteAndRederiveEvaluationDep = this.deleteAndRederiveEvaluation || ReteHintOptions.deleteRederiveEvaluation.getValueOrDefault(getHints(parentPlan));
+
+            recipe.setDeleteRederiveEvaluation(deleteAndRederiveEvaluationDep);
+            if (deleteAndRederiveEvaluationDep || (this.timelyEvaluation != null)) {
+                PosetTriplet triplet = CompilerHelper.computePosetInfo(targetVariables, parentPlan.getBody(), metaContext);
+
+                if (triplet.comparator != null) {
+                    MonotonicityInfo info = FACTORY.createMonotonicityInfo();
+                    info.setCoreMask(triplet.coreMask);
+                    info.setPosetMask(triplet.posetMask);
+                    info.setPosetComparator(triplet.comparator);
+                    recipe.setOptionalMonotonicityInfo(info);
+                }
+            }
+
+            RecipeTraceInfo trimmerTrace = intermediateTraceFactory.apply(trimmerRecipe, compiledParentPlan);
+            return finalTraceFactory.apply(recipe, trimmerTrace);
+        }
+    }
+
+    /**
+     * Projects the final compiled form of a PBody onto the parameter tuple
+     * @param compiledBody the compiled form of the body, with all constraints enforced, not yet projected to query parameters
+     * @param enforceUniqueness whether distinctness shall be enforced after the projection.
+     * Specify false only if directly connecting to a production node.
+     * @since 2.1
+     */
+    RecipeTraceInfo projectBodyFinalToParameters(
+            final CompiledSubPlan compiledBody,
+            boolean enforceUniqueness)
+    {
+        final PBody body = compiledBody.getSubPlan().getBody();
+        final List<PVariable> parameterList = body.getSymbolicParameterVariables();
+
+        return doProjectPlan(compiledBody, parameterList, enforceUniqueness,
+                parentTrace -> parentTrace,
+                (recipe, parentTrace) -> new ParameterProjectionTrace(body, recipe, parentTrace),
+                (recipe, parentTrace) -> new ParameterProjectionTrace(body, recipe, parentTrace)
+        );
+    }
+
+    private CompiledSubPlan doCompileStart(PStart operation, SubPlan plan) {
+        if (!operation.getAPrioriVariables().isEmpty()) {
+            throw new IllegalArgumentException("Input variables unsupported by Rete: " + plan.toShortString());
+        }
+        final ConstantRecipe recipe = FACTORY.createConstantRecipe();
+        recipe.getConstantValues().clear();
+
+        return new CompiledSubPlan(plan, new ArrayList<PVariable>(), recipe);
+    }
+
+    private CompiledSubPlan doCompileEnumerate(EnumerablePConstraint constraint, SubPlan plan) {
+        final PlanningTrace trimmedTrace = doEnumerateAndDeduplicate(constraint, plan);
+
+        return trimmedTrace.cloneFor(plan);
+    }
+
+    private PlanningTrace doEnumerateAndDeduplicate(EnumerablePConstraint constraint, SubPlan plan) {
+        final PlanningTrace coreTrace = doEnumerateDispatch(plan, constraint);
+        final PlanningTrace trimmedTrace = CompilerHelper.checkAndTrimEqualVariables(plan, coreTrace);
+        return trimmedTrace;
+    }
+
+    private PlanningTrace doEnumerateDispatch(SubPlan plan, EnumerablePConstraint constraint) {
+        if (constraint instanceof RelationEvaluation) {
+            return compileEnumerable(plan, (RelationEvaluation) constraint);
+        } else if (constraint instanceof BinaryTransitiveClosure) {
+            return compileEnumerable(plan, (BinaryTransitiveClosure) constraint);
+        } else if (constraint instanceof BinaryReflexiveTransitiveClosure) {
+            return compileEnumerable(plan, (BinaryReflexiveTransitiveClosure) constraint);
+                } else if (constraint instanceof RepresentativeElectionConstraint) {
+                        return compileEnumerable(plan, (RepresentativeElectionConstraint) constraint);
+        } else if (constraint instanceof ConstantValue) {
+            return compileEnumerable(plan, (ConstantValue) constraint);
+        } else if (constraint instanceof PositivePatternCall) {
+            return compileEnumerable(plan, (PositivePatternCall) constraint);
+        } else if (constraint instanceof TypeConstraint) {
+            return compileEnumerable(plan, (TypeConstraint) constraint);
+        }
+        throw new UnsupportedOperationException("Unknown enumerable constraint " + constraint);
+    }
+
+    private PlanningTrace compileEnumerable(SubPlan plan, BinaryReflexiveTransitiveClosure constraint) {
+        // TODO the implementation would perform better if an inequality check would be used after tcRecipe and
+        // uniqueness enforcer be replaced by a transparent node with multiple parents, but such a node is not available
+        // in recipe metamodel in VIATRA 2.0
+
+        // Find called query
+        final PQuery referredQuery = constraint.getSupplierKey();
+        final PlanningTrace callTrace = referQuery(referredQuery, plan, constraint.getVariablesTuple());
+
+        // Calculate irreflexive transitive closure
+        final TransitiveClosureRecipe tcRecipe = FACTORY.createTransitiveClosureRecipe();
+        tcRecipe.setParent(callTrace.getRecipe());
+        final PlanningTrace tcTrace = new PlanningTrace(plan, CompilerHelper.convertVariablesTuple(constraint), tcRecipe, callTrace);
+
+        // Enumerate universe type
+        final IInputKey inputKey = constraint.getUniverseType();
+        final InputRecipe universeTypeRecipe = RecipesHelper.inputRecipe(inputKey, inputKey.getStringID(), inputKey.getArity());
+        final PlanningTrace universeTypeTrace = new PlanningTrace(plan, CompilerHelper.convertVariablesTuple(
+                Tuples.staticArityFlatTupleOf(constraint.getVariablesTuple().get(0))), universeTypeRecipe);
+
+        // Calculate reflexive access by duplicating universe type column
+        final TrimmerRecipe reflexiveRecipe = FACTORY.createTrimmerRecipe();
+        reflexiveRecipe.setMask(RecipesHelper.mask(1, 0, 0));
+        reflexiveRecipe.setParent(universeTypeRecipe);
+        final PlanningTrace reflexiveTrace = new PlanningTrace(plan, CompilerHelper.convertVariablesTuple(constraint), reflexiveRecipe, universeTypeTrace);
+
+        // Finally, reduce duplicates after a join
+        final UniquenessEnforcerRecipe brtcRecipe = FACTORY.createUniquenessEnforcerRecipe();
+        brtcRecipe.getParents().add(tcRecipe);
+        brtcRecipe.getParents().add(reflexiveRecipe);
+
+        return new PlanningTrace(plan, CompilerHelper.convertVariablesTuple(constraint), brtcRecipe, reflexiveTrace, tcTrace);
+    }
+
+        private PlanningTrace compileEnumerable(SubPlan plan, RepresentativeElectionConstraint constraint) {
+                var referredQuery = constraint.getSupplierKey();
+                var callTrace = referQuery(referredQuery, plan, constraint.getVariablesTuple());
+                var recipe = FACTORY.createRepresentativeElectionRecipe();
+                recipe.setParent(callTrace.getRecipe());
+                recipe.setConnectivity(constraint.getConnectivity());
+                return new PlanningTrace(plan, CompilerHelper.convertVariablesTuple(constraint), recipe, callTrace);
+        }
+
+    private PlanningTrace compileEnumerable(SubPlan plan, BinaryTransitiveClosure constraint) {
+        final PQuery referredQuery = constraint.getSupplierKey();
+        final PlanningTrace callTrace = referQuery(referredQuery, plan, constraint.getVariablesTuple());
+
+        final TransitiveClosureRecipe recipe = FACTORY.createTransitiveClosureRecipe();
+        recipe.setParent(callTrace.getRecipe());
+
+        return new PlanningTrace(plan, CompilerHelper.convertVariablesTuple(constraint), recipe, callTrace);
+    }
+
+    private PlanningTrace compileEnumerable(SubPlan plan, RelationEvaluation constraint) {
+        final List<ReteNodeRecipe> parentRecipes = new ArrayList<ReteNodeRecipe>();
+        final List<RecipeTraceInfo> parentTraceInfos = new ArrayList<RecipeTraceInfo>();
+        for (final PQuery inputQuery : constraint.getReferredQueries()) {
+            final CompiledQuery compiledQuery = getCompiledForm(inputQuery);
+            parentRecipes.add(compiledQuery.getRecipe());
+            parentTraceInfos.add(compiledQuery);
+        }
+        final RelationEvaluationRecipe recipe = FACTORY.createRelationEvaluationRecipe();
+        recipe.getParents().addAll(parentRecipes);
+        recipe.setEvaluator(RecipesHelper.expressionDefinition(constraint.getEvaluator()));
+        return new PlanningTrace(plan, CompilerHelper.convertVariablesTuple(constraint), recipe, parentTraceInfos);
+    }
+
+    private PlanningTrace compileEnumerable(SubPlan plan, PositivePatternCall constraint) {
+        final PQuery referredQuery = constraint.getReferredQuery();
+        return referQuery(referredQuery, plan, constraint.getVariablesTuple());
+    }
+
+    private PlanningTrace compileEnumerable(SubPlan plan, TypeConstraint constraint) {
+        final IInputKey inputKey = constraint.getSupplierKey();
+        final InputRecipe recipe = RecipesHelper.inputRecipe(inputKey, inputKey.getStringID(), inputKey.getArity());
+        return new PlanningTrace(plan, CompilerHelper.convertVariablesTuple(constraint), recipe);
+    }
+
+    private PlanningTrace compileEnumerable(SubPlan plan, ConstantValue constraint) {
+        final ConstantRecipe recipe = FACTORY.createConstantRecipe();
+        recipe.getConstantValues().add(constraint.getSupplierKey());
+        return new PlanningTrace(plan, CompilerHelper.convertVariablesTuple(constraint), recipe);
+    }
+
+    // TODO handle recursion
+    private PlanningTrace referQuery(PQuery query, SubPlan plan, Tuple actualParametersTuple) {
+        RecipeTraceInfo referredQueryTrace = originalTraceOfReferredQuery(query);
+        return new PlanningTrace(plan, CompilerHelper.convertVariablesTuple(actualParametersTuple),
+                referredQueryTrace.getRecipe(), referredQueryTrace.getParentRecipeTracesForCloning());
+    }
+
+    private RecipeTraceInfo originalTraceOfReferredQuery(PQuery query) {
+        // eliminate superfluous production node?
+        if (PVisibility.EMBEDDED == query.getVisibility()) { // currently inline patterns only
+            Set<PBody> rewrittenBodies = normalizer.rewrite(query).getBodies();
+            if (1 == rewrittenBodies.size()) { // non-disjunctive
+                // TODO in the future, check if non-recursive - (not currently permitted)
+
+                PBody pBody = rewrittenBodies.iterator().next();
+                SubPlan bodyFinalPlan = getPlan(pBody);
+
+                // skip over any projections at the end
+                bodyFinalPlan = BuildHelper.eliminateTrailingProjections(bodyFinalPlan);
+
+                // TODO checkAndTrimEqualVariables may introduce superfluous trim,
+                // but whatever (no uniqueness enforcer needed)
+
+                // compile body
+                final CompiledSubPlan compiledBody = getCompiledForm(bodyFinalPlan);
+
+                // project to parameter list, add uniqueness enforcer if necessary
+                return projectBodyFinalToParameters(compiledBody, true /* ensure uniqueness, as no production node is used */);
+            }
+        }
+
+        // otherwise, regular reference to recipe realizing the query
+        return getCompiledForm(query);
+    }
+
+    protected List<CompiledSubPlan> getCompiledFormOfParents(SubPlan plan) {
+        List<CompiledSubPlan> results = new ArrayList<CompiledSubPlan>();
+        for (SubPlan parentPlan : plan.getParentPlans()) {
+            results.add(getCompiledForm(parentPlan));
+        }
+        return results;
+    }
+
+    /**
+     * Returns an unmodifiable view of currently cached compiled queries.
+     */
+    public Map<PQuery, CompiledQuery> getCachedCompiledQueries() {
+        return Collections.unmodifiableMap(queryCompilerCache);
+    }
+
+    /**
+     * Returns an unmodifiable view of currently cached query plans.
+     */
+    public Map<PBody, SubPlan> getCachedQueryPlans() {
+        return Collections.unmodifiableMap(plannerCache);
+    }
+
+    private QueryEvaluationHint getHints(SubPlan plan) {
+        return getHints(plan.getBody().getPattern());
+    }
+
+    private QueryEvaluationHint getHints(PQuery pattern) {
+        return hintProvider.getQueryEvaluationHint(pattern);
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/JoinCandidate.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/JoinCandidate.java
new file mode 100644
index 00000000..45350099
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/JoinCandidate.java
@@ -0,0 +1,162 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.construction.quasitree;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlanFactory;
+import tools.refinery.viatra.runtime.matchers.planning.helpers.FunctionalDependencyHelper;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PJoin;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+class JoinCandidate {
+    private QueryAnalyzer analyzer;
+    
+    SubPlan primary;
+    SubPlan secondary;
+    
+    Set<PVariable> varPrimary;
+    Set<PVariable> varSecondary;
+    Set<PVariable> varCommon;
+    
+    List<PConstraint> consPrimary;
+    List<PConstraint> consSecondary;
+    
+
+    JoinCandidate(SubPlan primary, SubPlan secondary, QueryAnalyzer analyzer) {
+        super();
+        this.primary = primary;
+        this.secondary = secondary;
+        this.analyzer = analyzer;
+
+        varPrimary = getPrimary().getVisibleVariables();
+        varSecondary = getSecondary().getVisibleVariables();
+        varCommon = CollectionsFactory.createSet(varPrimary);
+        varCommon.retainAll(varSecondary);
+        
+        consPrimary = new ArrayList<PConstraint>(primary.getAllEnforcedConstraints());
+        Collections.sort(consPrimary, TieBreaker.CONSTRAINT_COMPARATOR);
+        consSecondary = new ArrayList<PConstraint>(secondary.getAllEnforcedConstraints());
+        Collections.sort(consSecondary, TieBreaker.CONSTRAINT_COMPARATOR);
+    }
+    
+    
+    
+    /**
+     * @return the a
+     */
+    public SubPlan getPrimary() {
+        return primary;
+    }
+
+    /**
+     * @return the b
+     */
+    public SubPlan getSecondary() {
+        return secondary;
+    }
+
+    public SubPlan getJoinedPlan(SubPlanFactory factory) {
+        // check special cases first
+        if (isTrivial())
+            return primary;
+        if (isSubsumption())
+            return 
+                (consPrimary.size() > consSecondary.size()) ? primary : secondary;
+                            
+        
+        // default case
+        return factory.createSubPlan(new PJoin(), primary, secondary);
+    }
+
+    @Override
+    public String toString() {
+        return primary.toString() + " |x| " + secondary.toString();
+    }
+
+    /**
+     * @return the varPrimary
+     */
+    public Set<PVariable> getVarPrimary() {
+        return varPrimary;
+    }
+
+    /**
+     * @return the varSecondary
+     */
+    public Set<PVariable> getVarSecondary() {
+        return varSecondary;
+    }
+    
+    /**
+     * @return constraints of primary, sorted according to {@link TieBreaker#CONSTRAINT_COMPARATOR}.
+     */
+    public List<PConstraint> getConsPrimary() {
+        return consPrimary;
+    }
+    /**
+     * @return constraints of secondary, sorted according to {@link TieBreaker#CONSTRAINT_COMPARATOR}.
+     */
+    public List<PConstraint> getConsSecondary() {
+        return consSecondary;
+    }
+
+
+
+    public boolean isTrivial() {
+        return getPrimary().equals(getSecondary());
+    }
+    
+    public boolean isSubsumption() {
+        return consPrimary.containsAll(consSecondary) || consSecondary.containsAll(consPrimary);
+    }
+
+    public boolean isCheckOnly() {
+        return varPrimary.containsAll(varSecondary) || varSecondary.containsAll(varPrimary);
+    }
+
+    public boolean isDescartes() {
+        return Collections.disjoint(varPrimary, varSecondary);
+    }
+
+    private Boolean heath;
+
+    // it is a Heath-join iff common variables functionally determine either all primary or all secondary variables
+    public boolean isHeath() {
+        if (heath == null) {
+            Set<PConstraint> union = Stream.concat(
+                    primary.getAllEnforcedConstraints().stream(),
+                    secondary.getAllEnforcedConstraints().stream()
+            ).collect(Collectors.toSet());
+            Map<Set<PVariable>, Set<PVariable>> dependencies = 
+                    analyzer.getFunctionalDependencies(union, false);
+            // does varCommon determine either varPrimary or varSecondary?
+            Set<PVariable> varCommonClosure = FunctionalDependencyHelper.closureOf(varCommon, dependencies);
+
+            heath = varCommonClosure.containsAll(varPrimary) || varCommonClosure.containsAll(varSecondary);
+        }
+        return heath;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/JoinOrderingHeuristics.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/JoinOrderingHeuristics.java
new file mode 100644
index 00000000..0ea7c1d9
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/JoinOrderingHeuristics.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.construction.quasitree;
+
+import java.util.Comparator;
+
+import tools.refinery.viatra.runtime.rete.util.Options;
+import tools.refinery.viatra.runtime.rete.util.OrderingCompareAgent;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+public class JoinOrderingHeuristics implements Comparator<JoinCandidate> {
+
+    @Override
+    public int compare(JoinCandidate jc1, JoinCandidate jc2) {
+        return new OrderingCompareAgent<JoinCandidate>(jc1, jc2) {
+            @Override
+            protected void doCompare() {
+                swallowBoolean(true && consider(preferTrue(a.isTrivial(), b.isTrivial()))
+                        && consider(preferTrue(a.isSubsumption(), b.isSubsumption()))
+                        && consider(preferTrue(a.isCheckOnly(), b.isCheckOnly()))
+                        && consider( 
+                                Options.functionalDependencyOption == Options.FunctionalDependencyOption.OFF ?
+                                dontCare() :
+                                preferTrue(a.isHeath(), b.isHeath())
+                            )
+                        && consider(preferFalse(a.isDescartes(), b.isDescartes()))
+
+                        // TODO main heuristic decisions
+
+                        // tie breaking
+                        && consider(preferLess(a.getConsPrimary(), b.getConsPrimary(), TieBreaker.CONSTRAINT_LIST_COMPARATOR))
+                        && consider(preferLess(a.getConsSecondary(), b.getConsSecondary(), TieBreaker.CONSTRAINT_LIST_COMPARATOR))
+                        && consider(preferLess(System.identityHashCode(a), System.identityHashCode(b))));
+            }
+        }.compare();
+
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/QuasiTreeLayout.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/QuasiTreeLayout.java
new file mode 100644
index 00000000..9b814376
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/QuasiTreeLayout.java
@@ -0,0 +1,205 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.construction.quasitree;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.planning.IQueryPlannerStrategy;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlanFactory;
+import tools.refinery.viatra.runtime.matchers.planning.helpers.BuildHelper;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PApply;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PEnumerate;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PProject;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PStart;
+import tools.refinery.viatra.runtime.matchers.psystem.DeferredPConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.EnumerablePConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.rete.construction.RetePatternBuildException;
+import tools.refinery.viatra.runtime.rete.util.ReteHintOptions;
+
+/**
+ * Layout ideas: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=398763
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public class QuasiTreeLayout implements IQueryPlannerStrategy {
+
+    private IQueryBackendHintProvider hintProvider;
+    private IQueryBackendContext backendContext;
+    private QueryAnalyzer queryAnalyzer;
+
+    public QuasiTreeLayout(IQueryBackendContext backendContext) {
+        this(backendContext, backendContext.getHintProvider());
+    }
+
+    public QuasiTreeLayout(IQueryBackendContext backendContext, IQueryBackendHintProvider hintProvider) {
+        this.backendContext = backendContext;
+        this.hintProvider = hintProvider;
+        queryAnalyzer = backendContext.getQueryAnalyzer();
+    }
+
+    @Override
+    public SubPlan plan(PBody pSystem, Logger logger, IQueryMetaContext context) {
+        return new Scaffold(pSystem, logger, context).run();
+    }
+
+    public class Scaffold {
+        PBody pSystem;
+        PQuery query;
+        IQueryMetaContext context;
+        private QueryEvaluationHint hints;
+        //IOperationCompiler compiler;
+        //SubPlanProcessor planProcessor = new SubPlanProcessor();
+        SubPlanFactory planFactory;
+
+        Set<DeferredPConstraint> deferredConstraints = null;
+        Set<EnumerablePConstraint> enumerableConstraints = null;
+        Set<ConstantValue> constantConstraints = null;
+        Set<SubPlan> forefront = new LinkedHashSet<SubPlan>();
+        Logger logger;
+
+        Scaffold(PBody pSystem, Logger logger, /*IOperationCompiler compiler,*/ IQueryMetaContext context) {
+            this.pSystem = pSystem;
+            this.logger = logger;
+            this.context = context;
+            this.planFactory = new SubPlanFactory(pSystem);
+            query = pSystem.getPattern();
+            //this.compiler = compiler;
+            //planProcessor.setCompiler(compiler);
+            
+            hints = hintProvider.getQueryEvaluationHint(query);
+        }
+
+        /**
+         * @throws ViatraQueryRuntimeException
+         */
+        public SubPlan run() {
+            try {
+                logger.debug(String.format(
+                        "%s: patternbody build started for %s",
+                        getClass().getSimpleName(), 
+                        query.getFullyQualifiedName()));
+
+                // PROCESS CONSTRAINTS
+                deferredConstraints = pSystem.getConstraintsOfType(DeferredPConstraint.class);
+                enumerableConstraints = pSystem.getConstraintsOfType(EnumerablePConstraint.class);
+                constantConstraints = pSystem.getConstraintsOfType(ConstantValue.class);
+                
+                for (EnumerablePConstraint enumerable : enumerableConstraints) {
+                    SubPlan plan = planFactory.createSubPlan(new PEnumerate(enumerable));
+                    admitSubPlan(plan);
+                }
+                if (enumerableConstraints.isEmpty()) { // EXTREME CASE
+                    SubPlan plan = planFactory.createSubPlan(new PStart());
+                    admitSubPlan(plan);
+                }
+
+                // JOIN FOREFRONT PLANS WHILE POSSIBLE
+                while (forefront.size() > 1) {
+                    // TODO QUASI-TREE TRIVIAL JOINS?
+
+                    List<JoinCandidate> candidates = generateJoinCandidates();
+                    JoinOrderingHeuristics ordering = new JoinOrderingHeuristics();
+                    JoinCandidate selectedJoin = Collections.min(candidates, ordering);
+                    doJoin(selectedJoin);
+                }
+                assert (forefront.size() == 1);
+
+                // PROJECT TO PARAMETERS
+                SubPlan preFinalPlan = forefront.iterator().next();
+                SubPlan finalPlan = planFactory.createSubPlan(new PProject(pSystem.getSymbolicParameterVariables()), preFinalPlan);
+                
+                // FINAL CHECK, whether all exported variables are present + all constraint satisfied
+                BuildHelper.finalCheck(pSystem, finalPlan, context);
+                // TODO integrate the check above in SubPlan / POperation 
+
+                logger.debug(String.format(
+                        "%s: patternbody query plan concluded for %s as: %s",
+                        getClass().getSimpleName(), 
+                        query.getFullyQualifiedName(),
+                        finalPlan.toLongString()));
+               return finalPlan;
+            } catch (RetePatternBuildException ex) {
+                ex.setPatternDescription(query);
+                throw ex;
+            }
+        }
+
+        public List<JoinCandidate> generateJoinCandidates() {
+            List<JoinCandidate> candidates = new ArrayList<JoinCandidate>();
+            int bIndex = 0;
+            for (SubPlan b : forefront) {
+                int aIndex = 0;
+                for (SubPlan a : forefront) {
+                    if (aIndex++ >= bIndex)
+                        break;
+                    candidates.add(new JoinCandidate(a, b, queryAnalyzer));
+                }
+                bIndex++;
+            }
+            return candidates;
+        }
+
+        private void admitSubPlan(SubPlan plan) {
+            // are there any unapplied constant filters that we can apply here?
+            if (ReteHintOptions.prioritizeConstantFiltering.getValueOrDefault(hints)) {
+                for (ConstantValue constantConstraint : constantConstraints) {
+                    if (!plan.getAllEnforcedConstraints().contains(constantConstraint) &&
+                            plan.getVisibleVariables().containsAll(constantConstraint.getAffectedVariables())) {
+                        plan = planFactory.createSubPlan(new PApply(constantConstraint), plan);
+                    }                    
+                }
+            }
+            // are there any variables that will not be needed anymore and are worth trimming?
+            // (check only if there are unenforced enumerables, so that there are still upcoming joins)
+//            if (Options.planTrimOption != Options.PlanTrimOption.OFF &&
+//                    !plan.getAllEnforcedConstraints().containsAll(enumerableConstraints)) {
+            if (true) {
+                final SubPlan trimmed = BuildHelper.trimUnneccessaryVariables(
+                        planFactory, plan, true, queryAnalyzer);
+                plan = trimmed;
+            }           
+            // are there any checkable constraints?
+            for (DeferredPConstraint deferred : deferredConstraints) {
+                if (!plan.getAllEnforcedConstraints().contains(deferred)) {
+                    if (deferred.isReadyAt(plan, context)) {
+                        admitSubPlan(planFactory.createSubPlan(new PApply(deferred), plan));
+                        return;
+                    }
+                }
+            }
+            // if no checkable constraints and no unused variables
+            forefront.add(plan);
+        }
+
+        private void doJoin(JoinCandidate selectedJoin) {
+            forefront.remove(selectedJoin.getPrimary());
+            forefront.remove(selectedJoin.getSecondary());
+            admitSubPlan(selectedJoin.getJoinedPlan(planFactory));
+        }
+
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/TieBreaker.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/TieBreaker.java
new file mode 100644
index 00000000..0b955922
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/construction/quasitree/TieBreaker.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.construction.quasitree;
+
+import java.util.Comparator;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.rete.util.LexicographicComparator;
+
+/**
+ * Class providing comparators for breaking ties somewhat more deterministically.
+ * @author Bergmann Gabor
+ *
+ */
+public class TieBreaker {
+    
+    private TieBreaker() {/*Utility class constructor*/}
+    
+    public static final Comparator<PConstraint> CONSTRAINT_COMPARATOR = (arg0, arg1) -> arg0.getMonotonousID() - arg1.getMonotonousID();
+    
+    public static final Comparator<Iterable<? extends PConstraint>> CONSTRAINT_LIST_COMPARATOR = 
+            new LexicographicComparator<PConstraint>(CONSTRAINT_COMPARATOR);
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/AbstractEvaluatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/AbstractEvaluatorNode.java
new file mode 100644
index 00000000..d32a0449
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/AbstractEvaluatorNode.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.eval;
+
+import java.util.Iterator;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.single.SingleInputNode;
+
+/**
+ * @author Bergmann Gabor
+ */
+public abstract class AbstractEvaluatorNode extends SingleInputNode implements IEvaluatorNode {
+    
+    /**
+     * @since 1.5
+     */
+    protected EvaluatorCore core;
+
+
+    /**
+     * @since 1.5
+     */
+    public AbstractEvaluatorNode(ReteContainer reteContainer, EvaluatorCore core) {
+        super(reteContainer);
+        this.core = core;
+        core.init(this);
+    }
+    
+    /**
+     * @since 1.5
+     */
+    @Override
+    public ReteContainer getReteContainer() {
+        return getContainer();
+    }
+    
+    /**
+     * @since 1.5
+     */
+    @Override
+    public String prettyPrintTraceInfoPatternList() {
+        return getTraceInfoPatternsEnumerated();
+    }
+    
+    /**
+     * @since 2.4
+     */
+    protected void propagateIterableUpdate(final Direction direction, final Iterable<Tuple> update, final Timestamp timestamp) {
+        final Iterator<Tuple> itr = update.iterator();
+        while (itr.hasNext()) {
+            propagateUpdate(direction, itr.next(), timestamp);
+        }
+    }
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/EvaluatorCore.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/EvaluatorCore.java
new file mode 100644
index 00000000..c45c6048
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/EvaluatorCore.java
@@ -0,0 +1,180 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.eval;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleValueProvider;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.Sets;
+
+/**
+ * An instance of this class performs the evaluation of Java expressions.
+ * 
+ * @author Bergmann Gabor
+ * @author Tamas Szabo
+ * @since 1.5
+ */
+public abstract class EvaluatorCore {
+
+    protected Logger logger;
+    protected IExpressionEvaluator evaluator;
+    /**
+     * @since 2.4
+     */
+    protected int sourceTupleWidth;
+    private Map<String, Integer> parameterPositions;
+    protected IQueryRuntimeContext runtimeContext;
+    protected IEvaluatorNode evaluatorNode;
+
+    public EvaluatorCore(final Logger logger, final IExpressionEvaluator evaluator,
+            final Map<String, Integer> parameterPositions, final int sourceTupleWidth) {
+        this.logger = logger;
+        this.evaluator = evaluator;
+        this.parameterPositions = parameterPositions;
+        this.sourceTupleWidth = sourceTupleWidth;
+    }
+
+    public void init(final IEvaluatorNode evaluatorNode) {
+        this.evaluatorNode = evaluatorNode;
+        this.runtimeContext = evaluatorNode.getReteContainer().getNetwork().getEngine().getRuntimeContext();
+    }
+
+    /**
+     * @since 2.4
+     */
+    public abstract Iterable<Tuple> performEvaluation(final Tuple input);
+
+    protected abstract String evaluationKind();
+
+    public Object evaluateTerm(final Tuple input) {
+        // actual evaluation
+        Object result = null;
+        try {
+            final TupleValueProvider tupleParameters = new TupleValueProvider(runtimeContext.unwrapTuple(input),
+                    parameterPositions);
+            result = evaluator.evaluateExpression(tupleParameters);
+        } catch (final Exception e) {
+            logger.warn(String.format(
+                    "The incremental pattern matcher encountered an error during %s evaluation for pattern(s) %s over values %s. Error message: %s. (Developer note: %s in %s)",
+                    evaluationKind(), evaluatorNode.prettyPrintTraceInfoPatternList(), prettyPrintTuple(input),
+                    e.getMessage(), e.getClass().getSimpleName(), this.evaluatorNode), e);
+            result = errorResult();
+        }
+
+        return result;
+    }
+
+    protected String prettyPrintTuple(final Tuple tuple) {
+        return tuple.toString();
+    }
+
+    protected Object errorResult() {
+        return null;
+    }
+
+    public static class PredicateEvaluatorCore extends EvaluatorCore {
+
+        public PredicateEvaluatorCore(final Logger logger, final IExpressionEvaluator evaluator,
+                final Map<String, Integer> parameterPositions, final int sourceTupleWidth) {
+            super(logger, evaluator, parameterPositions, sourceTupleWidth);
+        }
+
+        @Override
+        public Iterable<Tuple> performEvaluation(final Tuple input) {
+            final Object result = evaluateTerm(input);
+            if (Boolean.TRUE.equals(result)) {
+                return Collections.singleton(input);
+            } else {
+                return null;
+            }
+        }
+
+        @Override
+        protected String evaluationKind() {
+            return "check()";
+        }
+
+    }
+
+    public static class FunctionEvaluatorCore extends EvaluatorCore {
+
+        /**
+         * @since 2.4
+         */
+        protected final boolean isUnwinding;
+
+        public FunctionEvaluatorCore(final Logger logger, final IExpressionEvaluator evaluator,
+                final Map<String, Integer> parameterPositions, final int sourceTupleWidth) {
+            this(logger, evaluator, parameterPositions, sourceTupleWidth, false);
+        }
+
+        /**
+         * @since 2.4
+         */
+        public FunctionEvaluatorCore(final Logger logger, final IExpressionEvaluator evaluator,
+                final Map<String, Integer> parameterPositions, final int sourceTupleWidth, final boolean isUnwinding) {
+            super(logger, evaluator, parameterPositions, sourceTupleWidth);
+            this.isUnwinding = isUnwinding;
+        }
+
+        @Override
+        public Iterable<Tuple> performEvaluation(final Tuple input) {
+            final Object result = evaluateTerm(input);
+            if (result != null) {
+                if (this.isUnwinding) {
+                    final Set<?> resultAsSet = (result instanceof Set<?>) ? (Set<?>) result
+                            : (result instanceof Iterable<?>) ? Sets.newSet((Iterable<?>) result) : null;
+
+                    if (resultAsSet != null) {
+                        return () -> {
+                            final Iterator<?> wrapped = resultAsSet.iterator();
+                            return new Iterator<Tuple>() {
+                                @Override
+                                public boolean hasNext() {
+                                    return wrapped.hasNext();
+                                }
+
+                                @Override
+                                public Tuple next() {
+                                    final Object next = wrapped.next();
+                                    return Tuples.staticArityLeftInheritanceTupleOf(input,
+                                            runtimeContext.wrapElement(next));
+                                }
+                            };
+                        };
+                    } else {
+                        throw new IllegalStateException(
+                                "This is an unwinding evaluator, which expects the evaluation result to either be a set or an iterable, but it was "
+                                        + result);
+                    }
+                } else {
+                    return Collections.singleton(
+                            Tuples.staticArityLeftInheritanceTupleOf(input, runtimeContext.wrapElement(result)));
+                }
+            } else {
+                return null;
+            }
+        }
+
+        @Override
+        protected String evaluationKind() {
+            return "eval" + (this.isUnwinding ? "Unwind" : "") + "()";
+        }
+
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/IEvaluatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/IEvaluatorNode.java
new file mode 100644
index 00000000..177433ab
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/IEvaluatorNode.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.eval;
+
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+
+/**
+ * This interface is required for the communication between the evaluation core end the evaluator node.
+ * @author Gabor Bergmann
+ * @since 1.5
+ */
+public interface IEvaluatorNode {
+
+    ReteContainer getReteContainer();
+
+    String prettyPrintTraceInfoPatternList();
+    
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/MemorylessEvaluatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/MemorylessEvaluatorNode.java
new file mode 100644
index 00000000..8928645c
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/MemorylessEvaluatorNode.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.eval;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * @author Bergmann Gabor
+ *
+ */
+public class MemorylessEvaluatorNode extends AbstractEvaluatorNode {
+
+    /**
+     * @since 1.5
+     */
+    public MemorylessEvaluatorNode(final ReteContainer reteContainer, final EvaluatorCore core) {
+        super(reteContainer, core);
+    }
+
+    @Override
+    public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+        final Collection<Tuple> parentTuples = new ArrayList<Tuple>();
+        propagatePullInto(parentTuples, flush);
+        for (final Tuple parentTuple : parentTuples) {
+            final Iterable<Tuple> output = core.performEvaluation(parentTuple);
+            if (output != null) {
+                final Iterator<Tuple> itr = output.iterator();
+                while (itr.hasNext()) {
+                    collector.add(itr.next());
+                }
+            }
+        }
+    }
+
+    @Override
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        final Map<Tuple, Timeline<Timestamp>> parentTuples = CollectionsFactory.createMap();
+        propagatePullIntoWithTimestamp(parentTuples, flush);
+        for (final Entry<Tuple, Timeline<Timestamp>> entry : parentTuples.entrySet()) {
+            final Iterable<Tuple> output = core.performEvaluation(entry.getKey());
+            if (output != null) {
+                final Iterator<Tuple> itr = output.iterator();
+                while (itr.hasNext()) {
+                    collector.put(itr.next(), entry.getValue());
+                }
+            }
+        }
+    }
+
+    @Override
+    public void update(final Direction direction, final Tuple input, final Timestamp timestamp) {
+        final Iterable<Tuple> output = core.performEvaluation(input);
+        if (output != null) {
+            propagateIterableUpdate(direction, output, timestamp);
+        }
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/OutputCachingEvaluatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/OutputCachingEvaluatorNode.java
new file mode 100644
index 00000000..40a20c4e
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/OutputCachingEvaluatorNode.java
@@ -0,0 +1,311 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.eval;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.Clearable;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.Signed;
+import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.TimelineRepresentation;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
+
+/**
+ * An evaluator node that caches the evaluation result. This node is also capable of caching the timestamps associated
+ * with the result tuples if it is used in recursive differential dataflow evaluation.
+ * 
+ * @author Bergmann Gabor
+ * @author Tamas Szabo
+ */
+public class OutputCachingEvaluatorNode extends AbstractEvaluatorNode implements Clearable, ResumableNode {
+
+    /**
+     * @since 2.3
+     */
+    protected NetworkStructureChangeSensitiveLogic logic;
+
+    /**
+     * @since 2.4
+     */
+    protected Map<Tuple, Iterable<Tuple>> outputCache;
+
+    /**
+     * Maps input tuples to timestamps. It is wrong to map evaluation result to timestamps because the different input
+     * tuples may yield the same evaluation result. This field is null as long as this node is in a non-recursive group.
+     * 
+     * @since 2.4
+     */
+    protected TimelyMemory<Timestamp> memory;
+
+    /**
+     * @since 2.4
+     */
+    protected CommunicationGroup group;
+
+    /**
+     * @since 1.5
+     */
+    public OutputCachingEvaluatorNode(final ReteContainer reteContainer, final EvaluatorCore core) {
+        super(reteContainer, core);
+        reteContainer.registerClearable(this);
+        this.outputCache = CollectionsFactory.createMap();
+        this.logic = createLogic();
+    }
+
+    @Override
+    public CommunicationGroup getCurrentGroup() {
+        return this.group;
+    }
+
+    @Override
+    public void setCurrentGroup(final CommunicationGroup group) {
+        this.group = group;
+    }
+
+    @Override
+    public void networkStructureChanged() {
+        super.networkStructureChanged();
+        this.logic = createLogic();
+    }
+
+    @Override
+    public void clear() {
+        this.outputCache.clear();
+        if (this.memory != null) {
+            this.memory.clear();
+        }
+    }
+
+    /**
+     * @since 2.3
+     */
+    protected NetworkStructureChangeSensitiveLogic createLogic() {
+        if (this.reteContainer.isTimelyEvaluation()
+                && this.reteContainer.getCommunicationTracker().isInRecursiveGroup(this)) {
+            if (this.memory == null) {
+                this.memory = new TimelyMemory<Timestamp>(reteContainer.isTimelyEvaluation() && reteContainer
+                        .getTimelyConfiguration().getTimelineRepresentation() == TimelineRepresentation.FAITHFUL);
+            }
+            return TIMELY;
+        } else {
+            return TIMELESS;
+        }
+    }
+
+    @Override
+    public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+        this.logic.pullInto(collector, flush);
+    }
+
+    @Override
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        this.logic.pullIntoWithTimeline(collector, flush);
+    }
+
+    @Override
+    public void update(final Direction direction, final Tuple input, final Timestamp timestamp) {
+        this.logic.update(direction, input, timestamp);
+    }
+
+    /**
+     * @since 2.4
+     */
+    @Override
+    public Timestamp getResumableTimestamp() {
+        if (this.memory == null) {
+            return null;
+        } else {
+            return this.memory.getResumableTimestamp();
+        }
+    }
+
+    /**
+     * @since 2.4
+     */
+    @Override
+    public void resumeAt(final Timestamp timestamp) {
+        this.logic.resumeAt(timestamp);
+    }
+
+    /**
+     * @since 2.3
+     */
+    protected static abstract class NetworkStructureChangeSensitiveLogic {
+
+        /**
+         * @since 2.4
+         */
+        public abstract void update(final Direction direction, final Tuple input, final Timestamp timestamp);
+
+        public abstract void pullInto(final Collection<Tuple> collector, final boolean flush);
+
+        /**
+         * @since 2.4
+         */
+        public abstract void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush);
+
+        /**
+         * @since 2.4
+         */
+        public abstract void resumeAt(final Timestamp timestamp);
+
+    }
+
+    private final NetworkStructureChangeSensitiveLogic TIMELESS = new NetworkStructureChangeSensitiveLogic() {
+
+        @Override
+        public void resumeAt(final Timestamp timestamp) {
+            // there is nothing to resume in the timeless case because we do not even care about timestamps
+        }
+
+        @Override
+        public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+            for (final Iterable<Tuple> output : outputCache.values()) {
+                if (output != NORESULT) {
+                    final Iterator<Tuple> itr = output.iterator();
+                    while (itr.hasNext()) {
+                        collector.add(itr.next());
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void update(final Direction direction, final Tuple input, final Timestamp timestamp) {
+            if (direction == Direction.INSERT) {
+                final Iterable<Tuple> output = core.performEvaluation(input);
+                if (output != null) {
+                    final Iterable<Tuple> previous = outputCache.put(input, output);
+                    if (previous != null) {
+                        throw new IllegalStateException(
+                                String.format("Duplicate insertion of tuple %s into node %s", input, this));
+                    }
+                    propagateIterableUpdate(direction, output, timestamp);
+                }
+            } else {
+                final Iterable<Tuple> output = outputCache.remove(input);
+                if (output != null) {
+                    // may be null if no result was yielded
+                    propagateIterableUpdate(direction, output, timestamp);
+                }
+            }
+        }
+    };
+
+    private final NetworkStructureChangeSensitiveLogic TIMELY = new NetworkStructureChangeSensitiveLogic() {
+
+        @Override
+        public void resumeAt(final Timestamp timestamp) {
+            final Map<Tuple, Diff<Timestamp>> diffMap = memory.resumeAt(timestamp);
+
+            for (final Entry<Tuple, Diff<Timestamp>> entry : diffMap.entrySet()) {
+                final Tuple input = entry.getKey();
+                final Iterable<Tuple> output = outputCache.get(input);
+                if (output != NORESULT) {
+                    for (final Signed<Timestamp> signed : entry.getValue()) {
+                        propagateIterableUpdate(signed.getDirection(), output, signed.getPayload());
+                    }
+                }
+
+                if (memory.get(input) == null) {
+                    outputCache.remove(input);
+                }
+            }
+
+            final Timestamp nextTimestamp = memory.getResumableTimestamp();
+            if (nextTimestamp != null) {
+                group.notifyHasMessage(mailbox, nextTimestamp);
+            }
+        }
+
+        @Override
+        public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+            for (final Entry<Tuple, Timeline<Timestamp>> entry : memory.asMap().entrySet()) {
+                final Tuple input = entry.getKey();
+                final Iterable<Tuple> output = outputCache.get(input);
+                if (output != NORESULT) {
+                    final Timeline<Timestamp> timestamp = entry.getValue();
+                    final Iterator<Tuple> itr = output.iterator();
+                    while (itr.hasNext()) {
+                        collector.put(itr.next(), timestamp);
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+            TIMELESS.pullInto(collector, flush);
+        }
+
+        @Override
+        public void update(final Direction direction, final Tuple input, final Timestamp timestamp) {
+            if (direction == Direction.INSERT) {
+                Iterable<Tuple> output = outputCache.get(input);
+                if (output == null) {
+                    output = core.performEvaluation(input);
+                    if (output == null) {
+                        // the evaluation result is really null
+                        output = NORESULT;
+                    }
+                    outputCache.put(input, output);
+                }
+                final Diff<Timestamp> diff = memory.put(input, timestamp);
+                if (output != NORESULT) {
+                    for (final Signed<Timestamp> signed : diff) {
+                        propagateIterableUpdate(signed.getDirection(), output, signed.getPayload());
+                    }
+                }
+            } else {
+                final Iterable<Tuple> output = outputCache.get(input);
+                final Diff<Timestamp> diff = memory.remove(input, timestamp);
+                if (memory.get(input) == null) {
+                    outputCache.remove(input);
+                }
+                if (output != NORESULT) {
+                    for (final Signed<Timestamp> signed : diff) {
+                        propagateIterableUpdate(signed.getDirection(), output, signed.getPayload());
+                    }
+                }
+            }
+        }
+    };
+
+    /**
+     * This field is used to represent the "null" evaluation result. This is an optimization used in the timely case
+     * where the same tuple may be inserted multiple times with different timestamps. This way, we can also cache if
+     * something evaluated to null (instead of just forgetting about the previously computed result), thus avoiding the
+     * need to re-run a potentially expensive evaluation.
+     */
+    private static final Iterable<Tuple> NORESULT = Collections
+            .singleton(Tuples.staticArityFlatTupleOf(NoResult.INSTANCE));
+
+    private enum NoResult {
+        INSTANCE
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/RelationEvaluatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/RelationEvaluatorNode.java
new file mode 100644
index 00000000..68d277e8
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/eval/RelationEvaluatorNode.java
@@ -0,0 +1,183 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2022, Tamas Szabo, GitHub
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.eval;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.psystem.IRelationEvaluator;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.RelationEvaluation;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Clearable;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timelines;
+import tools.refinery.viatra.runtime.rete.misc.SimpleReceiver;
+import tools.refinery.viatra.runtime.rete.network.ProductionNode;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.StandardNode;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.single.AbstractUniquenessEnforcerNode;
+
+/**
+ * A node that operates in batch-style (see {@link Receiver#doesProcessUpdatesInBatch()} and evaluates arbitrary Java
+ * logic represented by an {@link IRelationEvaluator} on the input relations. This is the backing computation node of a
+ * {@link RelationEvaluation} constraint.
+ * 
+ * @author Tamas Szabo
+ * @since 2.8
+ */
+public class RelationEvaluatorNode extends StandardNode implements Supplier, Clearable {
+
+    private final IRelationEvaluator evaluator;
+    private Set<Tuple> cachedOutputs;
+    private Supplier[] inputSuppliers;
+    private BatchingReceiver[] inputReceivers;
+
+    public RelationEvaluatorNode(final ReteContainer container, final IRelationEvaluator evaluator) {
+        super(container);
+        this.evaluator = evaluator;
+        this.reteContainer.registerClearable(this);
+    }
+    
+    @Override
+    public void clear() {
+        this.cachedOutputs.clear();
+    }
+
+    public void connectToParents(final List<Supplier> inputSuppliers) {
+        this.inputSuppliers = new Supplier[inputSuppliers.size()];
+        this.inputReceivers = new BatchingReceiver[inputSuppliers.size()];
+
+        final List<Integer> inputArities = evaluator.getInputArities();
+
+        if (inputArities.size() != inputSuppliers.size()) {
+            throw new IllegalStateException(evaluator.toString() + " expects " + inputArities.size()
+                    + " inputs, but got " + inputSuppliers.size() + " input(s)!");
+        }
+
+        for (int i = 0; i < inputSuppliers.size(); i++) {
+            final int currentExpectedInputArity = inputArities.get(i);
+            final Supplier inputSupplier = inputSuppliers.get(i);
+            // it is expected that the supplier is a production node because
+            // the corresponding constraint itself accepts a list of PQuery
+            if (!(inputSupplier instanceof ProductionNode)) {
+                throw new IllegalStateException(
+                        evaluator.toString() + " expects each one of its suppliers to be instances of "
+                                + ProductionNode.class.getSimpleName() + " but got an instance of "
+                                + inputSupplier.getClass().getSimpleName() + "!");
+            }
+            final int currentActualInputArity = ((ProductionNode) inputSupplier).getPosMapping().size();
+            if (currentActualInputArity != currentExpectedInputArity) {
+                throw new IllegalStateException(
+                        evaluator.toString() + " expects input arity " + currentExpectedInputArity + " at position " + i
+                                + " but got " + currentActualInputArity + "!");
+            }
+            final BatchingReceiver inputReceiver = new BatchingReceiver((ProductionNode) inputSupplier,
+                    this.reteContainer);
+            this.inputSuppliers[i] = inputSupplier;
+            this.inputReceivers[i] = inputReceiver;
+            this.reteContainer.connectAndSynchronize(inputSupplier, inputReceiver);
+            reteContainer.getCommunicationTracker().registerDependency(inputReceiver, this);
+        }
+
+        // initialize the output relation
+        final List<Set<Tuple>> inputSets = new ArrayList<Set<Tuple>>();
+        for (final BatchingReceiver inputReceiver : this.inputReceivers) {
+            inputSets.add(inputReceiver.getTuples());
+        }
+        this.cachedOutputs = evaluateRelation(inputSets);
+    }
+
+    @Override
+    public void networkStructureChanged() {
+        if (this.reteContainer.getCommunicationTracker().isInRecursiveGroup(this)) {
+            throw new IllegalStateException(this.toString() + " cannot be used in recursive evaluation!");
+        }
+        super.networkStructureChanged();
+    }
+
+    @Override
+    public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+        collector.addAll(this.cachedOutputs);
+    }
+
+    @Override
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        final Timeline<Timestamp> timeline = Timelines.createFrom(Timestamp.ZERO);
+        for (final Tuple output : this.cachedOutputs) {
+            collector.put(output, timeline);
+        }
+    }
+
+    private Set<Tuple> evaluateRelation(final List<Set<Tuple>> inputs) {
+        try {
+            return this.evaluator.evaluateRelation(inputs);
+        } catch (final Exception e) {
+            throw new IllegalStateException("Exception during the evaluation of " + this.evaluator.toString() + "!", e);
+        }
+    }
+
+    private void batchUpdateCompleted() {
+        final List<Set<Tuple>> inputSets = new ArrayList<Set<Tuple>>();
+        for (final BatchingReceiver inputReceiver : this.inputReceivers) {
+            inputSets.add(inputReceiver.getTuples());
+        }
+        final Set<Tuple> newOutputs = evaluateRelation(inputSets);
+        for (final Tuple tuple : newOutputs) {
+            if (this.cachedOutputs != null && this.cachedOutputs.remove(tuple)) {
+                // already known tuple - do nothing
+            } else {
+                // newly inserted tuple
+                propagateUpdate(Direction.INSERT, tuple, Timestamp.ZERO);
+            }
+        }
+        if (this.cachedOutputs != null) {
+            for (final Tuple tuple : this.cachedOutputs) {
+                // lost tuple
+                propagateUpdate(Direction.DELETE, tuple, Timestamp.ZERO);
+            }
+        }
+        this.cachedOutputs = newOutputs;
+    }
+
+    public class BatchingReceiver extends SimpleReceiver {
+        private final ProductionNode source;
+
+        private BatchingReceiver(final ProductionNode source, final ReteContainer container) {
+            super(container);
+            this.source = source;
+        }
+
+        private Set<Tuple> getTuples() {
+            return ((AbstractUniquenessEnforcerNode) this.source).getTuples();
+        }
+
+        @Override
+        public void update(final Direction direction, final Tuple updateElement, final Timestamp timestamp) {
+            throw new UnsupportedOperationException("This receiver only supports batch-style operation!");
+        }
+
+        @Override
+        public void batchUpdate(final Collection<Entry<Tuple, Integer>> updates, final Timestamp timestamp) {
+            assert Timestamp.ZERO.equals(timestamp);
+            // there is nothing to do here because the source production node has already updated itself
+            // the only thing we need to do is to issue the callback
+            RelationEvaluatorNode.this.batchUpdateCompleted();
+        }
+
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/DefaultIndexerListener.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/DefaultIndexerListener.java
new file mode 100644
index 00000000..6306a482
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/DefaultIndexerListener.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.lang.ref.WeakReference;
+
+import tools.refinery.viatra.runtime.rete.network.Node;
+
+public abstract class DefaultIndexerListener implements IndexerListener {
+
+    WeakReference<Node> owner;
+
+    public DefaultIndexerListener(Node owner) {
+        this.owner = new WeakReference<Node>(owner);
+    }
+
+    @Override
+    public Node getOwner() {
+        return owner.get();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/DualInputNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/DualInputNode.java
new file mode 100644
index 00000000..170ac460
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/DualInputNode.java
@@ -0,0 +1,348 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.NetworkStructureChangeSensitiveNode;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.StandardNode;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp.AllZeroMap;
+import tools.refinery.viatra.runtime.rete.network.delayed.DelayedConnectCommand;
+import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+import tools.refinery.viatra.runtime.rete.util.Options;
+
+/**
+ * Abstract superclass for nodes with two inputs that are matched against each other.
+ * 
+ * @author Gabor Bergmann
+ */
+public abstract class DualInputNode extends StandardNode implements NetworkStructureChangeSensitiveNode {
+
+    /**
+     * @since 2.3
+     */
+    protected NetworkStructureChangeSensitiveLogic logic;
+
+    public IterableIndexer getPrimarySlot() {
+        return primarySlot;
+    }
+
+    public Indexer getSecondarySlot() {
+        return secondarySlot;
+    }
+
+    /**
+     * @author Gabor Bergmann
+     * 
+     */
+    public enum Side {
+        PRIMARY, SECONDARY, BOTH;
+
+        public Side opposite() {
+            switch (this) {
+            case PRIMARY:
+                return SECONDARY;
+            case SECONDARY:
+                return PRIMARY;
+            case BOTH:
+                return BOTH;
+            default:
+                return BOTH;
+            }
+        }
+    }
+
+    /**
+     * Holds the primary input slot of this node.
+     */
+    protected IterableIndexer primarySlot;
+
+    /**
+     * Holds the secondary input slot of this node.
+     */
+    protected Indexer secondarySlot;
+
+    /**
+     * Optional complementer mask
+     */
+    protected TupleMask complementerSecondaryMask;
+
+    /**
+     * true if the primary and secondary slots coincide
+     */
+    protected boolean coincidence;
+
+    /**
+     * @param reteContainer
+     */
+    public DualInputNode(final ReteContainer reteContainer, final TupleMask complementerSecondaryMask) {
+        super(reteContainer);
+        this.complementerSecondaryMask = complementerSecondaryMask;
+        this.indexerGroupCache = CollectionsFactory.createMap();
+        this.refreshIndexerGroupCache();
+    }
+
+    /**
+     * Should be called only once, when node is initialized.
+     */
+    public void connectToIndexers(final IterableIndexer primarySlot, final Indexer secondarySlot) {
+        this.primarySlot = primarySlot;
+        this.secondarySlot = secondarySlot;
+
+        reteContainer.getCommunicationTracker().registerDependency(primarySlot, this);
+        reteContainer.getCommunicationTracker().registerDependency(secondarySlot, this);
+
+        // attach listeners
+        // if there is syncing, do this after the flush done for pulling, but before syncing updates
+        coincidence = primarySlot.equals(secondarySlot);
+
+        if (!coincidence) { // regular case
+            primarySlot.attachListener(new DefaultIndexerListener(this) {
+                @Override
+                public void notifyIndexerUpdate(final Direction direction, final Tuple updateElement,
+                        final Tuple signature, final boolean change, final Timestamp timestamp) {
+                    DualInputNode.this.logic.notifyUpdate(Side.PRIMARY, direction, updateElement, signature, change,
+                            timestamp);
+                }
+
+                @Override
+                public String toString() {
+                    return "primary@" + DualInputNode.this;
+                }
+            });
+            secondarySlot.attachListener(new DefaultIndexerListener(this) {
+                public void notifyIndexerUpdate(final Direction direction, final Tuple updateElement,
+                        final Tuple signature, final boolean change, final Timestamp timestamp) {
+                    DualInputNode.this.logic.notifyUpdate(Side.SECONDARY, direction, updateElement, signature, change,
+                            timestamp);
+                }
+
+                @Override
+                public String toString() {
+                    return "secondary@" + DualInputNode.this;
+                }
+            });
+        } else { // if the two slots are the same, updates have to be handled carefully
+            primarySlot.attachListener(new DefaultIndexerListener(this) {
+                public void notifyIndexerUpdate(final Direction direction, final Tuple updateElement,
+                        final Tuple signature, final boolean change, final Timestamp timestamp) {
+                    DualInputNode.this.logic.notifyUpdate(Side.BOTH, direction, updateElement, signature, change,
+                            timestamp);
+                }
+
+                @Override
+                public String toString() {
+                    return "both@" + DualInputNode.this;
+                }
+            });
+        }
+
+        for (final Receiver receiver : getReceivers()) {
+            this.reteContainer.getDelayedCommandQueue()
+                    .add(new DelayedConnectCommand(this, receiver, this.reteContainer));
+        }
+        
+        // Given that connectToIndexers registers new dependencies, the networkStructureChanged() method will be called
+        // by the CommunicationTracker, and the implementation of that method in turn will call refreshIndexerGroupCache() anyway.
+        this.refreshIndexerGroupCache();
+    }
+
+    /**
+     * Helper: retrieves all stored substitutions from the opposite side memory.
+     *
+     * @return the collection of opposite substitutions if any, or null if none
+     */
+    protected Collection<Tuple> retrieveOpposites(final Side side, final Tuple signature) {
+        return getSlot(side.opposite()).get(signature);
+    }
+
+    /**
+     * @since 2.3
+     */
+    protected NetworkStructureChangeSensitiveLogic createLogic() {
+        if (this.reteContainer.isTimelyEvaluation()
+                && this.reteContainer.getCommunicationTracker().isInRecursiveGroup(this)) {
+            return createTimelyLogic();
+        } else {
+            return createTimelessLogic();
+        }
+    }
+
+    /**
+     * Helper: unifies a left and right partial matching.
+     */
+    protected Tuple unify(final Tuple left, final Tuple right) {
+        return complementerSecondaryMask.combine(left, right, Options.enableInheritance, true);
+    }
+
+    @Override
+    public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+        this.logic.pullInto(collector, flush);
+    }
+
+    @Override
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        this.logic.pullIntoWithTimeline(collector, flush);
+    }
+
+    /**
+     * Helper: unifies a substitution from the specified side with another substitution from the other side.
+     */
+    protected Tuple unify(final Side side, final Tuple ps, final Tuple opposite) {
+        switch (side) {
+        case PRIMARY:
+            return unify(ps, opposite);
+        case SECONDARY:
+            return unify(opposite, ps);
+        case BOTH:
+            return unify(ps, opposite);
+        default:
+            return null;
+        }
+    }
+
+    /**
+     * Simulates the behavior of the node for calibration purposes only.
+     */
+    public abstract Tuple calibrate(final Tuple primary, final Tuple secondary);
+
+    /**
+     * @param complementerSecondaryMask
+     *            the complementerSecondaryMask to set
+     */
+    public void setComplementerSecondaryMask(final TupleMask complementerSecondaryMask) {
+        this.complementerSecondaryMask = complementerSecondaryMask;
+    }
+
+    /**
+     * Retrieves the slot corresponding to the specified side.
+     */
+    protected Indexer getSlot(final Side side) {
+        if (side == Side.SECONDARY) {
+            return secondarySlot;
+        } else {
+            return primarySlot;
+        }
+    }
+
+    @Override
+    public void assignTraceInfo(final TraceInfo traceInfo) {
+        super.assignTraceInfo(traceInfo);
+        if (traceInfo.propagateToIndexerParent()) {
+            if (primarySlot != null) {
+                primarySlot.acceptPropagatedTraceInfo(traceInfo);
+            }
+            if (secondarySlot != null) {
+                secondarySlot.acceptPropagatedTraceInfo(traceInfo);
+            }
+        }
+    }
+
+    @Override
+    public void networkStructureChanged() {
+        super.networkStructureChanged();
+        this.logic = createLogic();
+        this.refreshIndexerGroupCache();
+    }
+
+    /**
+     * @since 2.3
+     */
+    protected abstract NetworkStructureChangeSensitiveLogic createTimelyLogic();
+
+    /**
+     * @since 2.3
+     */
+    protected abstract NetworkStructureChangeSensitiveLogic createTimelessLogic();
+
+    /**
+     * This map caches the result of a CommunicationTracker.areInSameGroup(indexer, this) call. It does that for both
+     * the primary and secondary slots. This way we can avoid the lookup in the getWithTimestamp call for each tuple.
+     * The cache needs to be maintained when the network structure changes.
+     * @since 2.3
+     */
+    protected Map<Indexer, Boolean> indexerGroupCache;
+
+    /**
+     * @since 2.3
+     */
+    protected void refreshIndexerGroupCache() {
+        this.indexerGroupCache.clear();
+        if (this.primarySlot != null) {
+            this.indexerGroupCache.put(this.primarySlot,
+                    this.reteContainer.getCommunicationTracker().areInSameGroup(this.primarySlot, this));
+        }
+        if (this.secondarySlot != null) {
+            this.indexerGroupCache.put(this.secondarySlot,
+                    this.reteContainer.getCommunicationTracker().areInSameGroup(this.secondarySlot, this));
+        }
+    }
+
+    /**
+     * @since 2.4
+     */
+    protected Map<Tuple, Timeline<Timestamp>> getTimeline(final Tuple signature, final Indexer indexer) {
+        if (this.indexerGroupCache.get(indexer)) {
+            // recursive timely case
+            return indexer.getTimeline(signature);
+        } else {
+            // the indexer is in a different group, treat all of its tuples as they would have timestamp 0
+            final Collection<Tuple> tuples = indexer.get(signature);
+            if (tuples == null) {
+                return null;
+            } else {
+                return new AllZeroMap<Tuple>((Set<Tuple>) tuples);
+            }
+        }
+    }
+
+    /**
+     * @since 2.3
+     */
+    protected static abstract class NetworkStructureChangeSensitiveLogic {
+
+        /**
+         * Abstract handler for update event.
+         * 
+         * @param side
+         *            The side on which the event occurred.
+         * @param direction
+         *            The direction of the update.
+         * @param updateElement
+         *            The partial matching that is inserted.
+         * @param signature
+         *            Masked signature of updateElement.
+         * @param change
+         *            Indicates whether this is/was the first/last instance of this signature in this slot.
+         * @since 2.4
+         */
+        public abstract void notifyUpdate(final Side side, final Direction direction, final Tuple updateElement,
+                final Tuple signature, final boolean change, final Timestamp timestamp);
+
+        public abstract void pullInto(final Collection<Tuple> collector, final boolean flush);
+
+        /**
+         * @since 2.4
+         */
+        public abstract void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush);
+
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/ExistenceNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/ExistenceNode.java
new file mode 100644
index 00000000..275ff638
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/ExistenceNode.java
@@ -0,0 +1,199 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.util.Collection;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.Signed;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * Propagates all substitutions arriving at the PRIMARY slot if and only if (a matching substitution on the SECONDARY is
+ * present) xor (NEGATIVE).
+ * 
+ * The negative parameter specifies whether this node checks for existence or non-existence.
+ * <p>
+ * It is mandatory in differential dataflow evaluation that the secondary parent is in an upstream dependency component
+ * (so that every secondary tuple comes with zero timestamp).
+ * 
+ * @author Gabor Bergmann
+ */
+public class ExistenceNode extends DualInputNode {
+
+    protected boolean negative;
+
+    /**
+     * @param reteContainer
+     * @param negative
+     *            if false, act as existence checker, otherwise a nonexistence-checker
+     */
+    public ExistenceNode(final ReteContainer reteContainer, final boolean negative) {
+        super(reteContainer, null);
+        this.negative = negative;
+        this.logic = createLogic();
+    }
+
+    @Override
+    public Tuple calibrate(final Tuple primary, final Tuple secondary) {
+        return primary;
+    }
+
+    @Override
+    public void networkStructureChanged() {
+        if (this.reteContainer.isTimelyEvaluation() && this.secondarySlot != null
+                && this.reteContainer.getCommunicationTracker().areInSameGroup(this, this.secondarySlot)) {
+            throw new IllegalStateException("Secondary parent must be in an upstream dependency component!");
+        }
+        super.networkStructureChanged();
+    }
+
+    private final NetworkStructureChangeSensitiveLogic TIMELESS = new NetworkStructureChangeSensitiveLogic() {
+
+        @Override
+        public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+            if (primarySlot == null || secondarySlot == null) {
+                return;
+            }
+            if (flush) {
+                reteContainer.flushUpdates();
+            }
+
+            for (final Tuple signature : primarySlot.getSignatures()) {
+                // primaries can not be null due to the contract of IterableIndex.getSignatures()
+                final Collection<Tuple> primaries = primarySlot.get(signature);
+                final Collection<Tuple> opposites = secondarySlot.get(signature);
+                if ((opposites != null) ^ negative) {
+                    collector.addAll(primaries);
+                }
+            }
+        }
+
+        @Override
+        public void notifyUpdate(final Side side, final Direction direction, final Tuple updateElement,
+                final Tuple signature, final boolean change, final Timestamp timestamp) {
+            // in the default case, all timestamps must be zero
+            assert Timestamp.ZERO.equals(timestamp);
+
+            switch (side) {
+            case PRIMARY:
+                if ((retrieveOpposites(side, signature) != null) ^ negative) {
+                    propagateUpdate(direction, updateElement, timestamp);
+                }
+                break;
+            case SECONDARY:
+                if (change) {
+                    final Collection<Tuple> opposites = retrieveOpposites(side, signature);
+                    if (opposites != null) {
+                        for (final Tuple opposite : opposites) {
+                            propagateUpdate((negative ? direction.opposite() : direction), opposite, timestamp);
+                        }
+                    }
+                }
+                break;
+            case BOTH:
+                // in case the slots coincide,
+                // negative --> always empty
+                // !positive --> identity
+                if (!negative) {
+                    propagateUpdate(direction, updateElement, timestamp);
+                }
+                break;
+            }
+        }
+    };
+
+    private final NetworkStructureChangeSensitiveLogic TIMELY = new NetworkStructureChangeSensitiveLogic() {
+
+        @Override
+        public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+            if (primarySlot == null || secondarySlot == null) {
+                return;
+            }
+            if (flush) {
+                reteContainer.flushUpdates();
+            }
+
+            for (final Tuple signature : primarySlot.getSignatures()) {
+                // primaries can not be null due to the contract of IterableIndex.getSignatures()
+                final Map<Tuple, Timeline<Timestamp>> primaries = getTimeline(signature, primarySlot);
+                // see contract: secondary must be in an upstream SCC
+                final Collection<Tuple> opposites = secondarySlot.get(signature);
+                if ((opposites != null) ^ negative) {
+                    for (final Tuple primary : primaries.keySet()) {
+                        collector.put(primary, primaries.get(primary));
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+            ExistenceNode.this.TIMELESS.pullInto(collector, flush);
+        }
+
+        @Override
+        public void notifyUpdate(final Side side, final Direction direction, final Tuple updateElement,
+                final Tuple signature, final boolean change, final Timestamp timestamp) {
+            switch (side) {
+            case PRIMARY: {
+                final Collection<Tuple> opposites = secondarySlot.get(signature);
+                if ((opposites != null) ^ negative) {
+                    propagateUpdate(direction, updateElement, timestamp);
+                }
+                break;
+            }
+            case SECONDARY: {
+                final Map<Tuple, Timeline<Timestamp>> opposites = primarySlot.getTimeline(signature);
+                if (change) {
+                    if (opposites != null) {
+                        for (final Tuple opposite : opposites.keySet()) {
+                            for (final Signed<Timestamp> oppositeSigned : opposites.get(opposite).asChangeSequence()) {
+                                final Direction product = direction.multiply(oppositeSigned.getDirection());
+                                propagateUpdate((negative ? product.opposite() : product), opposite,
+                                        oppositeSigned.getPayload());
+                            }
+                        }
+                    }
+                }
+                break;
+            }
+            case BOTH:
+                // in case the slots coincide,
+                // negative --> always empty
+                // positive --> identity
+                if (!negative) {
+                    propagateUpdate(direction, updateElement, timestamp);
+                }
+                break;
+            }
+        }
+    };
+
+    @Override
+    protected NetworkStructureChangeSensitiveLogic createTimelessLogic() {
+        return this.TIMELESS;
+    }
+
+    @Override
+    protected NetworkStructureChangeSensitiveLogic createTimelyLogic() {
+        return this.TIMELY;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/GenericProjectionIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/GenericProjectionIndexer.java
new file mode 100644
index 00000000..3de10def
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/GenericProjectionIndexer.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * A generic Indexer capable of indexing along any valid TupleMask. Does not keep track of parents, because will not
+ * ever pull parents.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public class GenericProjectionIndexer extends IndexerWithMemory implements ProjectionIndexer {
+
+    public GenericProjectionIndexer(ReteContainer reteContainer, TupleMask mask) {
+        super(reteContainer, mask);
+    }
+
+    @Override
+    protected void update(Direction direction, Tuple updateElement, Tuple signature, boolean change,
+            Timestamp timestamp) {
+        propagate(direction, updateElement, signature, change, timestamp);
+    }
+
+    @Override
+    public Collection<Tuple> get(Tuple signature) {
+        return memory.get(signature);
+    }
+
+    @Override
+    public Map<Tuple, Timeline<Timestamp>> getTimeline(Tuple signature) {
+        return memory.getWithTimeline(signature);
+    }
+
+    @Override
+    public Iterator<Tuple> iterator() {
+        return memory.iterator();
+    }
+
+    @Override
+    public Iterable<Tuple> getSignatures() {
+        return memory.getSignatures();
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public int getBucketCount() {
+        return memory.getKeysetSize();
+    }
+
+    @Override
+    public Receiver getActiveNode() {
+        return this;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IdentityIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IdentityIndexer.java
new file mode 100644
index 00000000..6c158f2c
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IdentityIndexer.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2012 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * Defines an abstract trivial indexer that identically projects the contents of some stateful node, and can therefore
+ * save space. Can only exist in connection with a stateful store, and must be operated by another node (the active
+ * node). Do not attach parents directly!
+ * 
+ * @author Gabor Bergmann
+ * @noimplement Rely on the provided implementations
+ * @noreference Use only via standard Node and Indexer interfaces
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public abstract class IdentityIndexer extends SpecializedProjectionIndexer {
+
+    protected abstract Collection<Tuple> getTuples();
+
+    public IdentityIndexer(ReteContainer reteContainer, int tupleWidth, Supplier parent, 
+            Node activeNode, List<ListenerSubscription> sharedSubscriptionList) {
+        super(reteContainer, TupleMask.identity(tupleWidth), parent, activeNode, sharedSubscriptionList);
+    }
+
+    @Override
+    public Collection<Tuple> get(Tuple signature) {
+        if (contains(signature)) {
+            return Collections.singleton(signature);
+        } else
+            return null;
+    }
+    
+    protected boolean contains(Tuple signature) {
+        return getTuples().contains(signature);
+    }
+
+    @Override
+    public Collection<Tuple> getSignatures() {
+        return getTuples();
+    }
+    
+    @Override
+    public int getBucketCount() {
+        return getTuples().size();
+    }
+    
+    @Override
+    public Iterator<Tuple> iterator() {
+        return getTuples().iterator();
+    }
+    
+    @Override
+    public void propagateToListener(IndexerListener listener, Direction direction, Tuple updateElement, Timestamp timestamp) {
+        listener.notifyIndexerUpdate(direction, updateElement, updateElement, true, timestamp);
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/Indexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/Indexer.java
new file mode 100644
index 00000000..fc9d7781
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/Indexer.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.util.Collection;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * A node that indexes incoming Tuples by their signatures as specified by a TupleMask. Notifies listeners about such
+ * update events through the IndexerListener.
+ * 
+ * Signature tuples are created by transforming the update tuples using the mask. Tuples stored with the same signature
+ * are grouped together. The group or a reduction thereof is retrievable.
+ * 
+ * @author Gabor Bergmann
+ */
+public interface Indexer extends Node {
+    /**
+     * @return the mask by which the contents are indexed.
+     */
+    public TupleMask getMask();
+
+    /**
+     * @return the node whose contents are indexed.
+     */
+    public Supplier getParent();
+
+    /**
+     * @return all stored tuples that conform to the specified signature, null if there are none such. CONTRACT: do not
+     *         modify!
+     */
+    public Collection<Tuple> get(Tuple signature);
+    
+    /**
+     * @since 2.4
+     */
+    default public Map<Tuple, Timeline<Timestamp>> getTimeline(Tuple signature) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * This indexer will be updated whenever a Rete update is sent to the active node (or an equivalent time slot
+     * allotted to it). The active node is typically the indexer itself, but it can be a different node such as its
+     * parent.
+     * 
+     * @return the active node that operates this indexer
+     */
+    public Node getActiveNode();
+
+    
+    public Collection<IndexerListener> getListeners();
+    
+    public void attachListener(IndexerListener listener);
+
+    public void detachListener(IndexerListener listener);
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IndexerListener.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IndexerListener.java
new file mode 100644
index 00000000..f52b6a06
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IndexerListener.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * A listener for update events concerning an Indexer.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public interface IndexerListener {
+    /**
+     * Notifies recipient that the indexer has just received an update. Contract: indexer already reflects the updated
+     * state.
+     * 
+     * @param direction
+     *            the direction of the update.
+     * @param updateElement
+     *            the tuple that was updated.
+     * @param signature
+     *            the signature of the tuple according to the indexer's mask.
+     * @param change
+     *            whether this was the first inserted / last revoked update element with this particular signature.
+     * @since 2.4
+     */
+    void notifyIndexerUpdate(Direction direction, Tuple updateElement, Tuple signature, boolean change, Timestamp timestamp);
+
+    Node getOwner();
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IndexerWithMemory.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IndexerWithMemory.java
new file mode 100644
index 00000000..a31562e9
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IndexerWithMemory.java
@@ -0,0 +1,284 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import tools.refinery.viatra.runtime.matchers.memories.MaskedTupleMemory;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.Signed;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.TimelineRepresentation;
+import tools.refinery.viatra.runtime.rete.network.NetworkStructureChangeSensitiveNode;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
+
+/**
+ * @author Gabor Bergmann
+ * @author Tamas Szabo
+ */
+public abstract class IndexerWithMemory extends StandardIndexer
+        implements Receiver, NetworkStructureChangeSensitiveNode, ResumableNode {
+
+    protected MaskedTupleMemory<Timestamp> memory;
+
+    /**
+     * @since 2.3
+     */
+    protected NetworkStructureChangeSensitiveLogic logic;
+
+    /**
+     * @since 1.6
+     */
+    protected final Mailbox mailbox;
+
+    /**
+     * @since 2.4
+     */
+    protected CommunicationGroup group;
+
+    public IndexerWithMemory(final ReteContainer reteContainer, final TupleMask mask) {
+        super(reteContainer, mask);
+        final boolean isTimely = reteContainer.isTimelyEvaluation()
+                && reteContainer.getCommunicationTracker().isInRecursiveGroup(this);
+        memory = MaskedTupleMemory.create(mask, MemoryType.SETS, this, isTimely, isTimely && reteContainer
+                .getTimelyConfiguration().getTimelineRepresentation() == TimelineRepresentation.FAITHFUL);
+        reteContainer.registerClearable(memory);
+        mailbox = instantiateMailbox();
+        reteContainer.registerClearable(mailbox);
+        this.logic = createLogic();
+    }
+
+    @Override
+    public CommunicationGroup getCurrentGroup() {
+        return this.group;
+    }
+
+    @Override
+    public void setCurrentGroup(final CommunicationGroup group) {
+        this.group = group;
+    }
+
+    @Override
+    public void networkStructureChanged() {
+        super.networkStructureChanged();
+        final boolean wasTimely = this.memory.isTimely();
+        final boolean isTimely = this.reteContainer.isTimelyEvaluation()
+                && this.reteContainer.getCommunicationTracker().isInRecursiveGroup(this);
+        if (wasTimely != isTimely) {
+            final MaskedTupleMemory<Timestamp> newMemory = MaskedTupleMemory.create(mask, MemoryType.SETS, this,
+                    isTimely, isTimely && reteContainer.getTimelyConfiguration()
+                            .getTimelineRepresentation() == TimelineRepresentation.FAITHFUL);
+            newMemory.initializeWith(this.memory, Timestamp.ZERO);
+            memory.clear();
+            memory = newMemory;
+        }
+        this.logic = createLogic();
+    }
+
+    /**
+     * Instantiates the {@link Mailbox} of this receiver. Subclasses may override this method to provide their own
+     * mailbox implementation.
+     * 
+     * @return the mailbox
+     * @since 2.0
+     */
+    protected Mailbox instantiateMailbox() {
+        if (this.reteContainer.isTimelyEvaluation()) {
+            return new TimelyMailbox(this, this.reteContainer);
+        } else {
+            return new BehaviorChangingMailbox(this, this.reteContainer);
+        }
+    }
+
+    @Override
+    public Mailbox getMailbox() {
+        return this.mailbox;
+    }
+
+    /**
+     * @since 2.0
+     */
+    public MaskedTupleMemory<Timestamp> getMemory() {
+        return memory;
+    }
+
+    @Override
+    public void update(final Direction direction, final Tuple updateElement, final Timestamp timestamp) {
+        this.logic.update(direction, updateElement, timestamp);
+    }
+
+    /**
+     * Refined version of update
+     * 
+     * @since 2.4
+     */
+    protected abstract void update(final Direction direction, final Tuple updateElement, final Tuple signature,
+            final boolean change, final Timestamp timestamp);
+
+    @Override
+    public void appendParent(final Supplier supplier) {
+        if (parent == null) {
+            parent = supplier;
+        } else {
+            throw new UnsupportedOperationException("Illegal RETE edge: " + this + " already has a parent (" + parent
+                    + ") and cannot connect to additional parent (" + supplier + "). ");
+        }
+    }
+
+    @Override
+    public void removeParent(final Supplier supplier) {
+        if (parent == supplier) {
+            parent = null;
+        } else {
+            throw new IllegalArgumentException(
+                    "Illegal RETE edge removal: the parent of " + this + " is not " + supplier);
+        }
+    }
+
+    /**
+     * @since 2.4
+     */
+    @Override
+    public Collection<Supplier> getParents() {
+        return Collections.singleton(parent);
+    }
+
+    /**
+     * @since 2.4
+     */
+    @Override
+    public void resumeAt(final Timestamp timestamp) {
+        this.logic.resumeAt(timestamp);
+    }
+
+    /**
+     * @since 2.4
+     */
+    @Override
+    public Timestamp getResumableTimestamp() {
+        return this.memory.getResumableTimestamp();
+    }
+
+    /**
+     * @since 2.3
+     */
+    protected static abstract class NetworkStructureChangeSensitiveLogic {
+
+        /**
+         * @since 2.4
+         */
+        public abstract void update(final Direction direction, final Tuple updateElement, final Timestamp timestamp);
+
+        /**
+         * @since 2.4
+         */
+        public abstract void resumeAt(final Timestamp timestamp);
+
+    }
+
+    /**
+     * @since 2.3
+     */
+    protected NetworkStructureChangeSensitiveLogic createLogic() {
+        if (this.reteContainer.isTimelyEvaluation()
+                && this.reteContainer.getCommunicationTracker().isInRecursiveGroup(this)) {
+            return TIMELY;
+        } else {
+            return TIMELESS;
+        }
+    }
+
+    private final NetworkStructureChangeSensitiveLogic TIMELY = new NetworkStructureChangeSensitiveLogic() {
+
+        @Override
+        public void resumeAt(final Timestamp timestamp) {
+            final Iterable<Tuple> signatures = memory.getResumableSignatures();
+
+            final Map<Tuple, Boolean> wasPresent = CollectionsFactory.createMap();
+            for (final Tuple signature : signatures) {
+                wasPresent.put(signature, memory.isPresentAtInfinity(signature));
+            }
+
+            final Map<Tuple, Map<Tuple, Diff<Timestamp>>> signatureMap = memory.resumeAt(timestamp);
+
+            for (final Entry<Tuple, Map<Tuple, Diff<Timestamp>>> outerEntry : signatureMap.entrySet()) {
+                final Tuple signature = outerEntry.getKey();
+                final Map<Tuple, Diff<Timestamp>> diffMap = outerEntry.getValue();
+                final boolean isPresent = memory.isPresentAtInfinity(signature);
+                // only send out a potential true value the first time for a given signature, then set it to false
+                boolean change = wasPresent.get(signature) ^ isPresent;
+
+                for (final Entry<Tuple, Diff<Timestamp>> innerEntry : diffMap.entrySet()) {
+                    final Tuple tuple = innerEntry.getKey();
+                    final Diff<Timestamp> diffs = innerEntry.getValue();
+                    for (final Signed<Timestamp> signed : diffs) {
+                        IndexerWithMemory.this.update(signed.getDirection(), tuple, signature, change,
+                                signed.getPayload());
+                    }
+                    // change is a signature-wise flag, so it is ok to "try" to signal it for the first tuple only
+                    change = false;
+                }
+            }
+
+            final Timestamp nextTimestamp = memory.getResumableTimestamp();
+            if (nextTimestamp != null) {
+                group.notifyHasMessage(mailbox, nextTimestamp);
+            }
+        }
+
+        @Override
+        public void update(final Direction direction, final Tuple update, final Timestamp timestamp) {
+            final Tuple signature = mask.transform(update);
+            final boolean wasPresent = memory.isPresentAtInfinity(signature);
+            final Diff<Timestamp> resultDiff = direction == Direction.INSERT
+                    ? memory.addWithTimestamp(update, signature, timestamp)
+                    : memory.removeWithTimestamp(update, signature, timestamp);
+            final boolean isPresent = memory.isPresentAtInfinity(signature);
+            final boolean change = wasPresent ^ isPresent;
+            for (final Signed<Timestamp> signed : resultDiff) {
+                IndexerWithMemory.this.update(signed.getDirection(), update, signature, change, signed.getPayload());
+            }
+        }
+
+    };
+
+    private final NetworkStructureChangeSensitiveLogic TIMELESS = new NetworkStructureChangeSensitiveLogic() {
+
+        @Override
+        public void update(final Direction direction, final Tuple update, final Timestamp timestamp) {
+            final Tuple signature = mask.transform(update);
+            final boolean change = direction == Direction.INSERT ? memory.add(update, signature)
+                    : memory.remove(update, signature);
+            IndexerWithMemory.this.update(direction, update, signature, change, timestamp);
+        }
+
+        @Override
+        public void resumeAt(final Timestamp timestamp) {
+            // there is nothing to resume in the timeless case because we do not even care about timestamps
+        }
+
+    };
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IterableIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IterableIndexer.java
new file mode 100644
index 00000000..d6f8ef05
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/IterableIndexer.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * An indexer that allows the iteration of all retrievable tuple groups (or reduced groups).
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public interface IterableIndexer extends Indexer, Iterable<Tuple> {
+
+    /**
+     * A view consisting of exactly those signatures whose tuple group is not empty
+     * @since 2.0
+     */
+    public Iterable<Tuple> getSignatures();
+
+    /**
+     * @return the number of signatures whose tuple group is not empty
+     * @since 2.0
+     */
+    public int getBucketCount();
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/JoinNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/JoinNode.java
new file mode 100644
index 00000000..9a6a0de9
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/JoinNode.java
@@ -0,0 +1,193 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.util.Collection;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.Signed;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+public class JoinNode extends DualInputNode {
+
+    public JoinNode(final ReteContainer reteContainer, final TupleMask complementerSecondaryMask) {
+        super(reteContainer, complementerSecondaryMask);
+        this.logic = createLogic();
+    }
+
+    @Override
+    public Tuple calibrate(final Tuple primary, final Tuple secondary) {
+        return unify(primary, secondary);
+    }
+
+    private final NetworkStructureChangeSensitiveLogic TIMELESS = new NetworkStructureChangeSensitiveLogic() {
+
+        @Override
+        public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+            if (primarySlot == null || secondarySlot == null) {
+                return;
+            }
+
+            if (flush) {
+                reteContainer.flushUpdates();
+            }
+
+            for (final Tuple signature : primarySlot.getSignatures()) {
+                // primaries can not be null due to the contract of IterableIndex.getSignatures()
+                final Collection<Tuple> primaries = primarySlot.get(signature);
+                final Collection<Tuple> opposites = secondarySlot.get(signature);
+                if (opposites != null) {
+                    for (final Tuple primary : primaries) {
+                        for (final Tuple opposite : opposites) {
+                            collector.add(unify(primary, opposite));
+                        }
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void notifyUpdate(final Side side, final Direction direction, final Tuple updateElement,
+                final Tuple signature, final boolean change, final Timestamp timestamp) {
+            // in the default case, all timestamps must be zero
+            assert Timestamp.ZERO.equals(timestamp);
+
+            final Collection<Tuple> opposites = retrieveOpposites(side, signature);
+
+            if (!coincidence) {
+                if (opposites != null) {
+                    for (final Tuple opposite : opposites) {
+                        propagateUpdate(direction, unify(side, updateElement, opposite), timestamp);
+                    }
+                }
+            } else {
+                // compensate for coincidence of slots - this is the case when an Indexer is joined with itself
+                if (opposites != null) {
+                    for (final Tuple opposite : opposites) {
+                        if (opposite.equals(updateElement)) {
+                            // handle self-joins of a single tuple separately
+                            continue;
+                        }
+                        propagateUpdate(direction, unify(opposite, updateElement), timestamp);
+                        propagateUpdate(direction, unify(updateElement, opposite), timestamp);
+                    }
+                }
+
+                // handle self-joins here
+                propagateUpdate(direction, unify(updateElement, updateElement), timestamp);
+            }
+        }
+    };
+
+    private final NetworkStructureChangeSensitiveLogic TIMELY = new NetworkStructureChangeSensitiveLogic() {
+
+        @Override
+        public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+            if (primarySlot == null || secondarySlot == null) {
+                return;
+            }
+
+            if (flush) {
+                reteContainer.flushUpdates();
+            }
+
+            for (final Tuple signature : primarySlot.getSignatures()) {
+                // primaries can not be null due to the contract of IterableIndex.getSignatures()
+                final Map<Tuple, Timeline<Timestamp>> primaries = getTimeline(signature, primarySlot);
+                final Map<Tuple, Timeline<Timestamp>> opposites = getTimeline(signature, secondarySlot);
+                if (opposites != null) {
+                    for (final Tuple primary : primaries.keySet()) {
+                        for (final Tuple opposite : opposites.keySet()) {
+                            final Timeline<Timestamp> primaryTimeline = primaries.get(primary);
+                            final Timeline<Timestamp> oppositeTimeline = opposites.get(opposite);
+                            final Timeline<Timestamp> mergedTimeline = primaryTimeline
+                                    .mergeMultiplicative(oppositeTimeline);
+                            if (!mergedTimeline.isEmpty()) {
+                                collector.put(unify(primary, opposite), mergedTimeline);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+            JoinNode.this.TIMELESS.pullInto(collector, flush);
+        }
+
+        @Override
+        public void notifyUpdate(final Side side, final Direction direction, final Tuple updateElement,
+                final Tuple signature, final boolean change, final Timestamp timestamp) {
+            final Indexer oppositeIndexer = getSlot(side.opposite());
+            final Map<Tuple, Timeline<Timestamp>> opposites = getTimeline(signature, oppositeIndexer);
+
+            if (!coincidence) {
+                if (opposites != null) {
+                    for (final Tuple opposite : opposites.keySet()) {
+                        final Tuple unifiedTuple = unify(side, updateElement, opposite);
+                        for (final Signed<Timestamp> signed : opposites.get(opposite).asChangeSequence()) {
+                            // TODO only consider signed timestamps that are greater or equal to timestamp
+                            // plus compact the previous timestamps into at most one update
+                            propagateUpdate(signed.getDirection().multiply(direction), unifiedTuple,
+                                    timestamp.max(signed.getPayload()));
+                        }
+                    }
+                }
+            } else {
+                // compensate for coincidence of slots - this is the case when an Indexer is joined with itself
+                if (opposites != null) {
+                    for (final Tuple opposite : opposites.keySet()) {
+                        if (opposite.equals(updateElement)) {
+                            // handle self-joins of a single tuple separately
+                            continue;
+                        }
+                        final Tuple u1 = unify(opposite, updateElement);
+                        final Tuple u2 = unify(updateElement, opposite);
+                        for (final Signed<Timestamp> oppositeSigned : opposites.get(opposite).asChangeSequence()) {
+                            final Direction updateDirection = direction.multiply(oppositeSigned.getDirection());
+                            final Timestamp updateTimestamp = timestamp.max(oppositeSigned.getPayload());
+                            propagateUpdate(updateDirection, u1, updateTimestamp);
+                            propagateUpdate(updateDirection, u2, updateTimestamp);
+                        }
+                    }
+                }
+
+                // handle self-join here
+                propagateUpdate(direction, unify(updateElement, updateElement), timestamp);
+            }
+        }
+    };
+
+    @Override
+    protected NetworkStructureChangeSensitiveLogic createTimelessLogic() {
+        return this.TIMELESS;
+    }
+
+    @Override
+    protected NetworkStructureChangeSensitiveLogic createTimelyLogic() {
+        return this.TIMELY;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/MemoryIdentityIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/MemoryIdentityIndexer.java
new file mode 100644
index 00000000..59b75c33
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/MemoryIdentityIndexer.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.util.Collection;
+import java.util.List;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+
+/**
+ * Defines a trivial indexer that identically projects the contents of a memory-equipped node, and can therefore save
+ * space. Can only exist in connection with a memory, and must be operated by another node. Do not attach parents
+ * directly!
+ * 
+ * @noimplement Rely on the provided implementations
+ * @noreference Use only via standard Node and Indexer interfaces
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ * @author Gabor Bergmann
+ */
+
+public class MemoryIdentityIndexer extends IdentityIndexer {
+
+    protected final Collection<Tuple> memory;
+
+    /**
+     * @param reteContainer
+     * @param tupleWidth
+     *            the width of the tuples of memoryNode
+     * @param memory
+     *            the memory whose contents are to be identity-indexed
+     * @param parent
+     *            the parent node that owns the memory
+     */
+    public MemoryIdentityIndexer(ReteContainer reteContainer, int tupleWidth, Collection<Tuple> memory,
+            Supplier parent, Receiver activeNode, List<ListenerSubscription> sharedSubscriptionList) {
+        super(reteContainer, tupleWidth, parent, activeNode, sharedSubscriptionList);
+        this.memory = memory;
+    }
+
+    @Override
+    protected Collection<Tuple> getTuples() {
+        return this.memory;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/MemoryNullIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/MemoryNullIndexer.java
new file mode 100644
index 00000000..204fe433
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/MemoryNullIndexer.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.util.Collection;
+import java.util.List;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+
+/**
+ * Defines a trivial indexer that projects the contents of a memory-equipped node to the empty tuple, and can therefore
+ * save space. Can only exist in connection with a memory, and must be operated by another node. Do not attach parents
+ * directly!
+ * 
+ * @author Gabor Bergmann
+ * @noimplement Rely on the provided implementations
+ * @noreference Use only via standard Node and Indexer interfaces
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class MemoryNullIndexer extends NullIndexer {
+
+    Collection<Tuple> memory;
+
+    /**
+     * @param reteContainer
+     * @param tupleWidth
+     *            the width of the tuples of memoryNode
+     * @param memory
+     *            the memory whose contents are to be null-indexed
+     * @param parent
+     *            the parent node that owns the memory
+     */
+    public MemoryNullIndexer(ReteContainer reteContainer, int tupleWidth, Collection<Tuple> memory,
+            Supplier parent, Receiver activeNode, List<ListenerSubscription> sharedSubscriptionList) {
+        super(reteContainer, tupleWidth, parent, activeNode, sharedSubscriptionList);
+        this.memory = memory;
+    }
+
+    @Override
+    protected Collection<Tuple> getTuples() {
+        return this.memory;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/NullIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/NullIndexer.java
new file mode 100644
index 00000000..a875b29f
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/NullIndexer.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2012 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * Defines an abstract trivial indexer that projects the contents of some stateful node to the empty tuple, and can
+ * therefore save space. Can only exist in connection with a stateful store, and must be operated by another node (the
+ * active node). Do not attach parents directly!
+ * 
+ * @author Gabor Bergmann
+ * @noimplement Rely on the provided implementations
+ * @noreference Use only via standard Node and Indexer interfaces
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public abstract class NullIndexer extends SpecializedProjectionIndexer {
+
+    protected abstract Collection<Tuple> getTuples();
+
+    protected static final Tuple nullSignature = Tuples.staticArityFlatTupleOf();
+    protected static final Collection<Tuple> nullSingleton = Collections.singleton(nullSignature);
+    protected static final Collection<Tuple> emptySet = Collections.emptySet();
+
+    public NullIndexer(ReteContainer reteContainer, int tupleWidth, Supplier parent, Node activeNode,
+            List<ListenerSubscription> sharedSubscriptionList) {
+        super(reteContainer, TupleMask.linear(0, tupleWidth), parent, activeNode, sharedSubscriptionList);
+    }
+
+    @Override
+    public Collection<Tuple> get(Tuple signature) {
+        if (nullSignature.equals(signature))
+            return isEmpty() ? null : getTuples();
+        else
+            return null;
+    }
+
+    @Override
+    public Collection<Tuple> getSignatures() {
+        return isEmpty() ? emptySet : nullSingleton;
+    }
+
+    protected boolean isEmpty() {
+        return getTuples().isEmpty();
+    }
+
+    protected boolean isSingleElement() {
+        return getTuples().size() == 1;
+    }
+
+    @Override
+    public Iterator<Tuple> iterator() {
+        return getTuples().iterator();
+    }
+
+    @Override
+    public int getBucketCount() {
+        return getTuples().isEmpty() ? 0 : 1;
+    }
+
+    @Override
+    public void propagateToListener(IndexerListener listener, Direction direction, Tuple updateElement,
+            Timestamp timestamp) {
+        boolean radical = (direction == Direction.DELETE && isEmpty())
+                || (direction == Direction.INSERT && isSingleElement());
+        listener.notifyIndexerUpdate(direction, updateElement, nullSignature, radical, timestamp);
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/OnetimeIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/OnetimeIndexer.java
new file mode 100644
index 00000000..fef84bb1
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/OnetimeIndexer.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.util.Collection;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+
+/**
+ * @author Gabor Bergmann Indexer whose lifetime last until the first get() DO NOT connect to nodes!
+ */
+public class OnetimeIndexer extends GenericProjectionIndexer {
+
+    public OnetimeIndexer(ReteContainer reteContainer, TupleMask mask) {
+        super(reteContainer, mask);
+    }
+
+    @Override
+    public Collection<Tuple> get(Tuple signature) {
+        if (tools.refinery.viatra.runtime.rete.util.Options.releaseOnetimeIndexers) {
+            reteContainer.unregisterClearable(memory);
+            reteContainer.unregisterNode(this);
+        }
+        return super.get(signature);
+    }
+
+    @Override
+    public void appendParent(Supplier supplier) {
+        throw new UnsupportedOperationException("onetime indexer cannot have parents");
+    }
+
+    @Override
+    public void attachListener(IndexerListener listener) {
+        throw new UnsupportedOperationException("onetime indexer cannot have listeners");
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/ProjectionIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/ProjectionIndexer.java
new file mode 100644
index 00000000..58e593d9
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/ProjectionIndexer.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+/**
+ * An iterable indexer that receives updates from a node, and groups received tuples intact, i.e. it does not reduce
+ * tuple groups.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public interface ProjectionIndexer extends IterableIndexer {
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/SpecializedProjectionIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/SpecializedProjectionIndexer.java
new file mode 100644
index 00000000..9c647aa9
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/SpecializedProjectionIndexer.java
@@ -0,0 +1,176 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2012 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * A specialized projection indexer that can be memory-less (relying on an external source of information).
+ * 
+ * <p>
+ * All specialized projection indexers of a single node will share the same listener list, so that notification order is
+ * maintained (see Bug 518434).
+ * 
+ * @author Gabor Bergmann
+ * @noimplement Rely on the provided implementations
+ * @noreference Use only via standard Node and Indexer interfaces
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public abstract class SpecializedProjectionIndexer extends StandardIndexer implements ProjectionIndexer {
+
+    protected Node activeNode;
+    protected List<ListenerSubscription> subscriptions;
+
+    /**
+     * @since 1.7
+     */
+    public SpecializedProjectionIndexer(final ReteContainer reteContainer, final TupleMask mask, final Supplier parent,
+            final Node activeNode, final List<ListenerSubscription> subscriptions) {
+        super(reteContainer, mask);
+        this.parent = parent;
+        this.activeNode = activeNode;
+        this.subscriptions = subscriptions;
+    }
+
+    public List<ListenerSubscription> getSubscriptions() {
+        return subscriptions;
+    }
+
+    @Override
+    public Node getActiveNode() {
+        return activeNode;
+    }
+
+    @Override
+    protected void propagate(final Direction direction, final Tuple updateElement, final Tuple signature,
+            final boolean change, final Timestamp timestamp) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void attachListener(final IndexerListener listener) {
+        super.attachListener(listener);
+        final CommunicationTracker tracker = this.getCommunicationTracker();
+        final IndexerListener proxy = tracker.proxifyIndexerListener(this, listener);
+        final ListenerSubscription subscription = new ListenerSubscription(this, proxy);
+        tracker.registerDependency(this, proxy.getOwner());
+        // See Bug 518434
+        // Must add to the first position, so that the later listeners are notified earlier.
+        // Thus if the beta node added as listener is also an indirect descendant of the same indexer on its opposite
+        // slot,
+        // then the beta node is connected later than its ancestor's listener, therefore it will be notified earlier,
+        // eliminating duplicate insertions and lost deletions that would result from fall-through update propagation
+        subscriptions.add(0, subscription);
+    }
+
+    @Override
+    public void detachListener(final IndexerListener listener) {
+        final CommunicationTracker tracker = this.getCommunicationTracker();
+        // obtain the proxy before the super call would unregister the dependency
+        final IndexerListener proxy = tracker.proxifyIndexerListener(this, listener);
+        super.detachListener(listener);
+        final ListenerSubscription subscription = new ListenerSubscription(this, proxy);
+        final boolean wasContained = subscriptions.remove(subscription);
+        assert wasContained;
+        tracker.unregisterDependency(this, proxy.getOwner());
+    }
+
+    @Override
+    public void networkStructureChanged() {
+        super.networkStructureChanged();
+        final List<ListenerSubscription> oldSubscriptions = new ArrayList<ListenerSubscription>();
+        oldSubscriptions.addAll(subscriptions);
+        subscriptions.clear();
+        for (final ListenerSubscription oldSubscription : oldSubscriptions) {
+            // there is no need to unregister and re-register the dependency between indexer and listener
+            // because the owner of the listener is the same (even if it is proxified)
+            final CommunicationTracker tracker = this.getCommunicationTracker();
+            // the subscriptions are shared, so we MUST reuse the indexer of the subscription instead of simply 'this'
+            final IndexerListener proxy = tracker.proxifyIndexerListener(oldSubscription.indexer, oldSubscription.listener);
+            final ListenerSubscription newSubscription = new ListenerSubscription(oldSubscription.indexer, proxy);
+            subscriptions.add(newSubscription);
+        }
+    }
+
+    /**
+     * @since 2.4
+     */
+    public abstract void propagateToListener(IndexerListener listener, Direction direction, Tuple updateElement,
+            Timestamp timestamp);
+
+    /**
+     * Infrastructure to share subscriptions between specialized indexers of the same parent node.
+     * 
+     * @author Gabor Bergmann
+     * @since 1.7
+     */
+    public static class ListenerSubscription {
+        protected SpecializedProjectionIndexer indexer;
+        protected IndexerListener listener;
+
+        public ListenerSubscription(SpecializedProjectionIndexer indexer, IndexerListener listener) {
+            super();
+            this.indexer = indexer;
+            this.listener = listener;
+        }
+
+        /**
+         * @since 2.4
+         */
+        public SpecializedProjectionIndexer getIndexer() {
+            return indexer;
+        }
+
+        /**
+         * @since 2.4
+         */
+        public IndexerListener getListener() {
+            return listener;
+        }
+
+        /**
+         * Call this from parent node.
+         * @since 2.4
+         */
+        public void propagate(Direction direction, Tuple updateElement, Timestamp timestamp) {
+            indexer.propagateToListener(listener, direction, updateElement, timestamp);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(indexer, listener);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            ListenerSubscription other = (ListenerSubscription) obj;
+            return Objects.equals(listener, other.listener) && Objects.equals(indexer, other.indexer);
+        }
+
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/StandardIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/StandardIndexer.java
new file mode 100644
index 00000000..9847a8dd
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/StandardIndexer.java
@@ -0,0 +1,127 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.util.Collection;
+import java.util.List;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.BaseNode;
+import tools.refinery.viatra.runtime.rete.network.NetworkStructureChangeSensitiveNode;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+
+/**
+ * An abstract standard implementation of the Indexer interface, providing common bookkeeping functionality.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public abstract class StandardIndexer extends BaseNode implements Indexer, NetworkStructureChangeSensitiveNode {
+
+    protected Supplier parent;
+    private final List<IndexerListener> originalListeners;
+    private final List<IndexerListener> proxyListeners;
+    protected TupleMask mask;
+
+    public StandardIndexer(ReteContainer reteContainer, TupleMask mask) {
+        super(reteContainer);
+        this.parent = null;
+        this.mask = mask;
+        this.originalListeners = CollectionsFactory.createObserverList();
+        this.proxyListeners = CollectionsFactory.createObserverList();
+    }
+
+    /**
+     * @since 2.4
+     */
+    protected void propagate(Direction direction, Tuple updateElement, Tuple signature, boolean change, Timestamp timestamp) {
+        for (IndexerListener listener : proxyListeners) {
+            listener.notifyIndexerUpdate(direction, updateElement, signature, change, timestamp);
+        }
+    }
+
+    @Override
+    public TupleMask getMask() {
+        return mask;
+    }
+
+    @Override
+    public Supplier getParent() {
+        return parent;
+    }
+
+    @Override
+    public void attachListener(IndexerListener listener) {
+        this.getCommunicationTracker().registerDependency(this, listener.getOwner());
+        // obtain the proxy after registering the dependency because then the proxy reflects the new SCC structure
+        final IndexerListener proxy = this.getCommunicationTracker().proxifyIndexerListener(this, listener);
+        // See Bug 518434
+        // Must add to the first position, so that the later listeners are notified earlier.
+        // Thus if the beta node added as listener is also an indirect descendant of the same indexer on its opposite slot, 
+        // then the beta node is connected later than its ancestor's listener, therefore it will be notified earlier,
+        // eliminating duplicate insertions and lost deletions that would result from fall-through update propagation
+        this.originalListeners.add(0, listener);
+        this.proxyListeners.add(0, proxy);
+    }
+
+    @Override
+    public void detachListener(IndexerListener listener) {
+        this.originalListeners.remove(listener);
+        IndexerListener listenerToRemove = null;
+        for (final IndexerListener proxyListener : this.proxyListeners) {
+            if (proxyListener.getOwner() == listener.getOwner()) {
+                listenerToRemove = proxyListener;
+                break;
+            }
+        }
+        assert listenerToRemove != null;
+        this.proxyListeners.remove(listenerToRemove);
+        this.getCommunicationTracker().unregisterDependency(this, listener.getOwner());
+    }
+    
+    @Override
+    public void networkStructureChanged() {
+        this.proxyListeners.clear();
+        for (final IndexerListener original : this.originalListeners) {
+            this.proxyListeners.add(this.getCommunicationTracker().proxifyIndexerListener(this, original));
+        }
+    }
+
+    @Override
+    public Collection<IndexerListener> getListeners() {
+        return proxyListeners;
+    }
+
+    @Override
+    public ReteContainer getContainer() {
+        return reteContainer;
+    }
+
+    @Override
+    protected String toStringCore() {
+        return super.toStringCore() + "(" + parent + "/" + mask + ")";
+    }
+    
+    @Override
+    public void assignTraceInfo(TraceInfo traceInfo) {
+        super.assignTraceInfo(traceInfo);
+        if (traceInfo.propagateFromIndexerToSupplierParent())
+            if (parent != null)
+                parent.acceptPropagatedTraceInfo(traceInfo);
+    }
+
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/TransitiveClosureNodeIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/TransitiveClosureNodeIndexer.java
new file mode 100644
index 00000000..77202004
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/TransitiveClosureNodeIndexer.java
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Gabor Bergmann, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.index;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.rete.itc.alg.incscc.IncSCCAlg;
+import tools.refinery.viatra.runtime.matchers.tuple.MaskedTuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.single.TransitiveClosureNode;
+
+// UNFINISHED, not used yet
+public class TransitiveClosureNodeIndexer extends StandardIndexer implements IterableIndexer {
+    private TransitiveClosureNode tcNode;
+    private IncSCCAlg<Object> tcAlg;
+    private Collection<Tuple> emptySet;
+
+    public TransitiveClosureNodeIndexer(TupleMask mask, IncSCCAlg<Object> tcAlg, TransitiveClosureNode tcNode) {
+        super(tcNode.getContainer(), mask);
+        this.tcAlg = tcAlg;
+        this.tcNode = tcNode;
+        this.emptySet = Collections.emptySet();
+        this.parent = tcNode;
+    }
+
+    @Override
+    public Collection<Tuple> get(Tuple signature) {
+        if (signature.getSize() == mask.sourceWidth) {
+            if (mask.indices.length == 0) {
+                // mask ()/2
+                return getSignatures();
+            } else if (mask.indices.length == 1) {
+                Set<Tuple> retSet = CollectionsFactory.createSet();
+
+                // mask (0)/2
+                if (mask.indices[0] == 0) {
+                    Object source = signature.get(0);
+                    for (Object target : tcAlg.getAllReachableTargets(source)) {
+                        retSet.add(Tuples.staticArityFlatTupleOf(source, target));
+                    }
+                    return retSet;
+                }
+                // mask (1)/2
+                if (mask.indices[0] == 1) {
+                    Object target = signature.get(1);
+                    for (Object source : tcAlg.getAllReachableSources(target)) {
+                        retSet.add(Tuples.staticArityFlatTupleOf(source, target));
+                    }
+                    return retSet;
+                }
+            } else {
+                // mask (0,1)/2
+                if (mask.indices[0] == 0 && mask.indices[1] == 1) {
+                    Object source = signature.get(0);
+                    Object target = signature.get(1);
+                    Tuple singleton = Tuples.staticArityFlatTupleOf(source, target);
+                    return (tcAlg.isReachable(source, target) ? Collections.singleton(singleton) : emptySet);
+                }
+                // mask (1,0)/2
+                if (mask.indices[0] == 1 && mask.indices[1] == 0) {
+                    Object source = signature.get(1);
+                    Object target = signature.get(0);
+                    Tuple singleton = Tuples.staticArityFlatTupleOf(source, target);
+                    return (tcAlg.isReachable(source, target) ? Collections.singleton(singleton) : emptySet);
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public int getBucketCount() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Collection<Tuple> getSignatures() {
+        return asTupleCollection(tcAlg.getTcRelation());
+    }
+
+    @Override
+    public Iterator<Tuple> iterator() {
+        return asTupleCollection(tcAlg.getTcRelation()).iterator();
+    }
+
+    private Collection<Tuple> asTupleCollection(
+            Collection<tools.refinery.viatra.runtime.rete.itc.alg.misc.Tuple<Object>> tuples) {
+        Set<Tuple> retSet = CollectionsFactory.createSet();
+        for (tools.refinery.viatra.runtime.rete.itc.alg.misc.Tuple<Object> tuple : tuples) {
+            retSet.add(Tuples.staticArityFlatTupleOf(tuple.getSource(), tuple.getTarget()));
+        }
+        return retSet;
+    }
+
+    /**
+     * @since 2.4
+     */
+    public void propagate(Direction direction, Tuple updateElement, boolean change) {
+        propagate(direction, updateElement, new MaskedTuple(updateElement, mask), change, null);
+    }
+
+    @Override
+    public Receiver getActiveNode() {
+        return tcNode;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/timely/TimelyMemoryIdentityIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/timely/TimelyMemoryIdentityIndexer.java
new file mode 100644
index 00000000..4319ee29
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/timely/TimelyMemoryIdentityIndexer.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.index.timely;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.index.IdentityIndexer;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+public class TimelyMemoryIdentityIndexer extends IdentityIndexer {
+
+    protected final TimelyMemory<Timestamp> memory;
+
+    public TimelyMemoryIdentityIndexer(final ReteContainer reteContainer, final int tupleWidth,
+            final TimelyMemory<Timestamp> memory, final Supplier parent, final Receiver activeNode,
+            final List<ListenerSubscription> sharedSubscriptionList) {
+        super(reteContainer, tupleWidth, parent, activeNode, sharedSubscriptionList);
+        this.memory = memory;
+    }
+
+    @Override
+    public Map<Tuple, Timeline<Timestamp>> getTimeline(final Tuple signature) {
+        final Timeline<Timestamp> timestamp = this.memory.get(signature);
+        if (timestamp != null) {
+            return Collections.singletonMap(signature, timestamp);
+        } else {
+            return null;
+        }
+    }
+    
+    @Override
+    protected Collection<Tuple> getTuples() {
+        return this.memory.getTuplesAtInfinity();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/timely/TimelyMemoryNullIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/timely/TimelyMemoryNullIndexer.java
new file mode 100644
index 00000000..0386b006
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/index/timely/TimelyMemoryNullIndexer.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.index.timely;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.index.NullIndexer;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+public class TimelyMemoryNullIndexer extends NullIndexer {
+
+    protected final TimelyMemory<Timestamp> memory;
+
+    public TimelyMemoryNullIndexer(final ReteContainer reteContainer, final int tupleWidth,
+            final TimelyMemory<Timestamp> memory, final Supplier parent,
+            final Receiver activeNode, final List<ListenerSubscription> sharedSubscriptionList) {
+        super(reteContainer, tupleWidth, parent, activeNode, sharedSubscriptionList);
+        this.memory = memory;
+    }
+
+    @Override
+    public Map<Tuple, Timeline<Timestamp>> getTimeline(final Tuple signature) {
+        if (nullSignature.equals(signature)) {
+            return isEmpty() ? null : this.memory.asMap();
+        } else {
+            return null;
+        }
+    }
+    
+    @Override
+    protected Collection<Tuple> getTuples() {
+        return this.memory.getTuplesAtInfinity();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/counting/CountingAlg.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/counting/CountingAlg.java
new file mode 100644
index 00000000..199b44b1
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/counting/CountingAlg.java
@@ -0,0 +1,226 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.alg.counting;
+
+import java.util.List;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.DFSPathFinder;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.IGraphPathFinder;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.ITcRelation;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalGraphDataSource;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalWrapper;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphObserver;
+import tools.refinery.viatra.runtime.rete.itc.igraph.ITcDataSource;
+import tools.refinery.viatra.runtime.rete.itc.igraph.ITcObserver;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+
+/**
+ * This class is the optimized implementation of the Counting algorithm.
+ *
+ * @author Tamas Szabo
+ *
+ * @param <V>
+ *            the type parameter of the nodes in the graph data source
+ */
+public class CountingAlg<V> implements IGraphObserver<V>, ITcDataSource<V> {
+
+    private CountingTcRelation<V> tc = null;
+    private IBiDirectionalGraphDataSource<V> gds = null;
+    private List<ITcObserver<V>> observers;
+
+    /**
+     * Constructs a new Counting algorithm and initializes the transitive closure relation with the given graph data
+     * source. Attach itself on the graph data source as an observer.
+     *
+     * @param gds
+     *            the graph data source instance
+     */
+    public CountingAlg(IGraphDataSource<V> gds) {
+
+        if (gds instanceof IBiDirectionalGraphDataSource<?>) {
+            this.gds = (IBiDirectionalGraphDataSource<V>) gds;
+        } else {
+            this.gds = new IBiDirectionalWrapper<V>(gds);
+        }
+
+        observers = CollectionsFactory.<ITcObserver<V>>createObserverList();
+        tc = new CountingTcRelation<V>(true);
+
+        initTc();
+        gds.attachObserver(this);
+    }
+
+    /**
+     * Initializes the transitive closure relation.
+     */
+    private void initTc() {
+        this.setTcRelation(CountingTcRelation.createFrom(gds));
+    }
+
+    @Override
+    public void edgeInserted(V source, V target) {
+        if (!source.equals(target)) {
+            deriveTc(source, target, true);
+        }
+    }
+
+    @Override
+    public void edgeDeleted(V source, V target) {
+        if (!source.equals(target)) {
+            deriveTc(source, target, false);
+        }
+    }
+
+    @Override
+    public void nodeInserted(V n) {
+
+    }
+
+    @Override
+    public void nodeDeleted(V n) {
+        this.tc.deleteTupleEnd(n);
+    }
+
+    /**
+     * Derives the transitive closure relation when an edge is inserted or deleted.
+     *
+     * @param source
+     *            the source of the edge
+     * @param target
+     *            the target of the edge
+     * @param dCount
+     *            the value is -1 if an edge was deleted and +1 if an edge was inserted
+     */
+    private void deriveTc(V source, V target, boolean isInsertion) {
+
+        // if (dCount == 1 && isReachable(target, source)) {
+        // System.out.println("The graph contains cycle with (" + source + ","+ target + ") edge!");
+        // }
+
+        CountingTcRelation<V> dtc = new CountingTcRelation<V>(false);
+        Set<V> tupEnds = null;
+
+        // 1. d(tc(x,y)) :- d(l(x,y))
+        if (tc.updateTuple(source, target, isInsertion)) {
+            dtc.updateTuple(source, target, true /* deltas implicitly have the same sign as isInsertion*/);
+            notifyTcObservers(source, target, isInsertion);
+        }
+
+        // 2. d(tc(x,y)) :- d(l(x,z)) & tc(z,y)
+        tupEnds = tc.getTupleEnds(target);
+        if (tupEnds != null) {
+            for (V tupEnd : tupEnds) {
+                if (!tupEnd.equals(source)) {
+                    if (tc.updateTuple(source, tupEnd, isInsertion)) {
+                        dtc.updateTuple(source, tupEnd, true /* deltas implicitly have the same sign as isInsertion*/);
+                        notifyTcObservers(source, tupEnd, isInsertion);
+                    }
+                }
+            }
+        }
+
+        // 3. d(tc(x,y)) :- lv(x,z) & d(tc(z,y))
+        CountingTcRelation<V> newTuples = dtc;
+        CountingTcRelation<V> tmp = null;
+        dtc = new CountingTcRelation<V>(false);
+
+        IMemoryView<V> nodes = null;
+
+        while (!newTuples.isEmpty()) {
+
+            tmp = dtc;
+            dtc = newTuples;
+            newTuples = tmp;
+            newTuples.clear();
+
+            for (V tS : dtc.getTupleStarts()) {
+                nodes = gds.getSourceNodes(tS);
+                for (V nS : nodes.distinctValues()) {
+                    int count = nodes.getCount(nS);
+                    for (int i = 0; i < count; i++) {
+                        tupEnds = dtc.getTupleEnds(tS);
+                        if (tupEnds != null) {
+                            for (V tT : tupEnds) {
+                                if (!nS.equals(tT)) {
+                                    if (tc.updateTuple(nS, tT, isInsertion)) {
+                                        newTuples.updateTuple(nS, tT, true /* deltas implicitly have the same sign as isInsertion*/);
+                                        notifyTcObservers(nS, tT, isInsertion);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // System.out.println(tc);
+    }
+
+    public ITcRelation<V> getTcRelation() {
+        return this.tc;
+    }
+
+    public void setTcRelation(CountingTcRelation<V> tc) {
+        this.tc = tc;
+    }
+
+    @Override
+    public boolean isReachable(V source, V target) {
+        return tc.containsTuple(source, target);
+    }
+
+    @Override
+    public void attachObserver(ITcObserver<V> to) {
+        this.observers.add(to);
+
+    }
+
+    @Override
+    public void detachObserver(ITcObserver<V> to) {
+        this.observers.remove(to);
+    }
+
+    @Override
+    public Set<V> getAllReachableTargets(V source) {
+        return tc.getTupleEnds(source);
+    }
+
+    @Override
+    public Set<V> getAllReachableSources(V target) {
+        return tc.getTupleStarts(target);
+    }
+
+    private void notifyTcObservers(V source, V target, boolean isInsertion) {
+        if (isInsertion) {
+            for (ITcObserver<V> o : observers) {
+                o.tupleInserted(source, target);
+            }
+        } else {
+            for (ITcObserver<V> o : observers) {
+                o.tupleDeleted(source, target);
+            }
+        }
+    }
+
+    @Override
+    public void dispose() {
+        tc.clear();
+        this.gds.detachObserver(this);
+    }
+
+    @Override
+    public IGraphPathFinder<V> getPathFinder() {
+        return new DFSPathFinder<V>(gds, this);
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/counting/CountingTcRelation.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/counting/CountingTcRelation.java
new file mode 100644
index 00000000..474c7461
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/counting/CountingTcRelation.java
@@ -0,0 +1,259 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.alg.counting;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.topsort.TopologicalSorting;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.ITcRelation;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalGraphDataSource;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
+import tools.refinery.viatra.runtime.matchers.util.IMultiLookup.ChangeGranularity;
+
+/**
+ * Transitive closure relation implementation for the Counting algorithm.
+ *
+ * @author Tamas Szabo
+ *
+ * @param <V>
+ */
+public class CountingTcRelation<V> implements ITcRelation<V> {
+
+    private IMultiLookup<V, V> tuplesForward = null;
+    private IMultiLookup<V, V> tuplesBackward = null;
+
+    protected CountingTcRelation(boolean backwardIndexing) {
+        tuplesForward = CollectionsFactory.createMultiLookup(Object.class, MemoryType.MULTISETS, Object.class);
+        if (backwardIndexing)
+            tuplesBackward = CollectionsFactory.createMultiLookup(Object.class, MemoryType.MULTISETS, Object.class);
+    }
+
+    protected boolean isEmpty() {
+        return 0 == this.tuplesForward.countKeys();
+    }
+
+    protected void clear() {
+        this.tuplesForward.clear();
+
+        if (tuplesBackward != null) {
+            this.tuplesBackward.clear();
+        }
+    }
+
+    protected void union(CountingTcRelation<V> rA) {
+        IMultiLookup<V, V> rForward = rA.tuplesForward;
+        for (V source : rForward.distinctKeys()) {
+            IMemoryView<V> targetBag = rForward.lookup(source);
+            for (V target : targetBag.distinctValues()) {
+                this.addTuple(source, target, targetBag.getCount(target));
+            }
+        }
+    }
+
+    public int getCount(V source, V target) {
+        IMemoryView<V> bucket = tuplesForward.lookup(source);
+        return bucket == null ? 0 : bucket.getCount(target);
+    }
+
+    /**
+     * Returns true if the tc relation did not contain previously such a tuple that is defined by (source,target), false
+     * otherwise (in this case count is incremented with the given count parameter).
+     *
+     * @param source
+     *            the source of the tuple
+     * @param target
+     *            the target of the tuple
+     * @param count
+     *            the count of the tuple, must be positive
+     * @return true if the relation did not contain previously the tuple
+     */
+    public boolean addTuple(V source, V target, int count) {
+        if (tuplesBackward != null) {
+            tuplesBackward.addPairPositiveMultiplicity(target, source, count);
+        }
+
+        ChangeGranularity change =
+                tuplesForward.addPairPositiveMultiplicity(source, target, count);
+
+        return change != ChangeGranularity.DUPLICATE;
+    }
+
+    /**
+     * Derivation count of the tuple  (source,target) is incremented or decremented.
+     * Returns true iff updated to / from zero derivation count.
+     * @since 1.7
+     */
+    public boolean updateTuple(V source, V target, boolean isInsertion) {
+        if (isInsertion) {
+            if (tuplesBackward != null) {
+                tuplesBackward.addPair(target, source);
+            }
+            ChangeGranularity change =
+                    tuplesForward.addPair(source, target);
+            return change != ChangeGranularity.DUPLICATE;
+        } else {
+            if (tuplesBackward != null) {
+                tuplesBackward.removePair(target, source);
+            }
+            ChangeGranularity change =
+                    tuplesForward.removePair(source, target);
+            return change != ChangeGranularity.DUPLICATE;
+        }
+    }
+
+    public void deleteTupleEnd(V deleted) {
+        Set<V> sourcesToDelete = CollectionsFactory.createSet();
+        Set<V> targetsToDelete = CollectionsFactory.createSet();
+
+        for (V target : tuplesForward.lookupOrEmpty(deleted).distinctValues()) {
+            targetsToDelete.add(target);
+        }
+        if (tuplesBackward != null) {
+            for (V source : tuplesBackward.lookupOrEmpty(deleted).distinctValues()) {
+                sourcesToDelete.add(source);
+            }
+        } else {
+            for (V sourceCandidate : tuplesForward.distinctKeys()) {
+                if (tuplesForward.lookupOrEmpty(sourceCandidate).containsNonZero(deleted))
+                    sourcesToDelete.add(sourceCandidate);
+            }
+        }
+
+        for (V source : sourcesToDelete) {
+            int count = tuplesForward.lookupOrEmpty(source).getCount(deleted);
+            for (int i=0; i< count; ++i) tuplesForward.removePair(source, deleted);
+        }
+        for (V target : targetsToDelete) {
+            int count = tuplesForward.lookupOrEmpty(deleted).getCount(target);
+            for (int i=0; i< count; ++i) tuplesForward.removePair(deleted, target);
+        }
+
+        if (tuplesBackward != null) {
+            for (V source : sourcesToDelete) {
+                int count = tuplesBackward.lookupOrEmpty(deleted).getCount(source);
+                for (int i=0; i< count; ++i) tuplesBackward.removePair(deleted, source);
+            }
+            for (V target : targetsToDelete) {
+                int count = tuplesBackward.lookupOrEmpty(target).getCount(deleted);
+                for (int i=0; i< count; ++i) tuplesBackward.removePair(target, deleted);
+            }
+        }
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder("TcRelation = ");
+
+        for (V source : tuplesForward.distinctKeys()) {
+            IMemoryView<V> targets = tuplesForward.lookup(source);
+            for (V target : targets.distinctValues()) {
+                sb.append("{(" + source + "," + target + ")," + targets.getCount(target) + "} ");
+            }
+        }
+
+        return sb.toString();
+    }
+
+    @Override
+    public Set<V> getTupleEnds(V source) {
+        IMemoryView<V> tupEnds = tuplesForward.lookup(source);
+        if (tupEnds == null)
+            return null;
+        return tupEnds.distinctValues();
+    }
+
+    /**
+     * Returns the set of nodes from which the target node is reachable, if already computed.
+     *
+     * @param target
+     *            the target node
+     * @return the set of source nodes
+     * @throws UnsupportedOperationException if backwards index not computed
+     */
+    public Set<V> getTupleStarts(V target) {
+        if (tuplesBackward != null) {
+            IMemoryView<V> tupStarts = tuplesBackward.lookup(target);
+            if (tupStarts == null)
+                return null;
+            return tupStarts.distinctValues();
+        } else {
+            throw new UnsupportedOperationException("built without backward indexing");
+        }
+    }
+
+    @Override
+    public Set<V> getTupleStarts() {
+        Set<V> nodes = CollectionsFactory.createSet();
+        for (V s : tuplesForward.distinctKeys()) {
+            nodes.add(s);
+        }
+        return nodes;
+    }
+
+    /**
+     * Returns true if a (source, target) node is present in the transitive closure relation, false otherwise.
+     *
+     * @param source
+     *            the source node
+     * @param target
+     *            the target node
+     * @return true if tuple is present, false otherwise
+     */
+    public boolean containsTuple(V source, V target) {
+        return tuplesForward.lookupOrEmpty(source).containsNonZero(target);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        } else if (obj == null || this.getClass() != obj.getClass()) {
+            return false;
+        } else {
+            CountingTcRelation<V> aTR = (CountingTcRelation<V>) obj;
+
+            return tuplesForward.equals(aTR.tuplesForward);
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return tuplesForward.hashCode();
+    }
+
+    public static <V> CountingTcRelation<V> createFrom(IBiDirectionalGraphDataSource<V> gds) {
+        List<V> topologicalSorting = TopologicalSorting.compute(gds);
+        CountingTcRelation<V> tc = new CountingTcRelation<V>(true);
+        Collections.reverse(topologicalSorting);
+        for (V n : topologicalSorting) {
+            IMemoryView<V> sourceNodes = gds.getSourceNodes(n);
+            Set<V> tupEnds = tc.getTupleEnds(n);
+            for (V s : sourceNodes.distinctValues()) {
+                int count = sourceNodes.getCount(s);
+                for (int i = 0; i < count; i++) {
+                    tc.updateTuple(s, n, true);
+                    if (tupEnds != null) {
+                        for (V t : tupEnds) {
+                            tc.updateTuple(s, t, true);
+                        }
+                    }
+                }
+            }
+        }
+
+        return tc;
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/incscc/CountingListener.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/incscc/CountingListener.java
new file mode 100644
index 00000000..7d507d82
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/incscc/CountingListener.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.itc.alg.incscc;
+
+import tools.refinery.viatra.runtime.rete.itc.igraph.ITcObserver;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+
+/**
+ * @author Tamas Szabo
+ *
+ */
+public class CountingListener<V> implements ITcObserver<V> {
+
+    private IncSCCAlg<V> alg;
+
+    public CountingListener(IncSCCAlg<V> alg) {
+        this.alg = alg;
+    }
+
+    @Override
+    public void tupleInserted(V source, V target) {
+        alg.notifyTcObservers(alg.sccs.getPartition(source), alg.sccs.getPartition(target), Direction.INSERT);
+    }
+
+    @Override
+    public void tupleDeleted(V source, V target) {
+        alg.notifyTcObservers(alg.sccs.getPartition(source), alg.sccs.getPartition(target), Direction.DELETE);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/incscc/IncSCCAlg.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/incscc/IncSCCAlg.java
new file mode 100644
index 00000000..774e55eb
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/incscc/IncSCCAlg.java
@@ -0,0 +1,609 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.alg.incscc;
+
+import tools.refinery.viatra.runtime.matchers.algorithms.UnionFind;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+import tools.refinery.viatra.runtime.rete.itc.alg.counting.CountingAlg;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.DFSPathFinder;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.GraphHelper;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.IGraphPathFinder;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.Tuple;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.bfs.BFS;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.scc.SCC;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.scc.SCCResult;
+import tools.refinery.viatra.runtime.rete.itc.alg.util.CollectionHelper;
+import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
+import tools.refinery.viatra.runtime.rete.itc.igraph.*;
+
+import java.util.*;
+import java.util.Map.Entry;
+
+/**
+ * Incremental SCC maintenance + counting algorithm.
+ *
+ * @author Tamas Szabo
+ *
+ * @param <V>
+ *            the type parameter of the nodes in the graph data source
+ */
+public class IncSCCAlg<V> implements IGraphObserver<V>, ITcDataSource<V> {
+
+    public UnionFind<V> sccs;
+    public IBiDirectionalGraphDataSource<V> gds;
+    private CountingAlg<V> counting;
+    private Graph<V> reducedGraph;
+    private IBiDirectionalGraphDataSource<V> reducedGraphIndexer;
+    private List<ITcObserver<V>> observers;
+    private CountingListener<V> countingListener;
+
+    public IncSCCAlg(IGraphDataSource<V> graphDataSource) {
+
+        if (graphDataSource instanceof IBiDirectionalGraphDataSource<?>) {
+            gds = (IBiDirectionalGraphDataSource<V>) graphDataSource;
+        } else {
+            gds = new IBiDirectionalWrapper<V>(graphDataSource);
+        }
+        observers = CollectionsFactory.createObserverList();
+        sccs = new UnionFind<V>();
+        reducedGraph = new Graph<V>();
+        reducedGraphIndexer = new IBiDirectionalWrapper<V>(reducedGraph);
+        countingListener = new CountingListener<V>(this);
+        initalizeInternalDataStructures();
+        gds.attachObserver(this);
+    }
+
+    private void initalizeInternalDataStructures() {
+        SCCResult<V> _sccres = SCC.computeSCC(gds);
+        Set<Set<V>> _sccs = _sccres.getSccs();
+
+        for (Set<V> _set : _sccs) {
+            sccs.makeSet(_set);
+        }
+
+        // Initalization of the reduced graph
+        for (V n : sccs.getPartitionHeads()) {
+            reducedGraph.insertNode(n);
+        }
+
+        for (V source : gds.getAllNodes()) {
+            final IMemoryView<V> targetNodes = gds.getTargetNodes(source);
+            for (Entry<V, Integer> entry : targetNodes.entriesWithMultiplicities()) {
+                for (int i = 0; i < entry.getValue(); i++) {
+                    V target = entry.getKey();
+                    V sourceRoot = sccs.find(source);
+                    V targetRoot = sccs.find(target);
+
+                    if (!sourceRoot.equals(targetRoot)) {
+                        reducedGraph.insertEdge(sourceRoot, targetRoot);
+                    }
+                }
+            }
+        }
+
+        counting = new CountingAlg<V>(reducedGraph);
+    }
+
+    @Override
+    public void edgeInserted(V source, V target) {
+        V sourceRoot = sccs.find(source);
+        V targetRoot = sccs.find(target);
+
+        // Different SCC
+        if (!sourceRoot.equals(targetRoot)) {
+
+            // source is reachable from target?
+            if (counting.isReachable(targetRoot, sourceRoot)) {
+
+                Set<V> predecessorRoots = counting.getAllReachableSources(sourceRoot);
+                Set<V> successorRoots = counting.getAllReachableTargets(targetRoot);
+
+                // 1. intersection of source and target roots, these will be in the merged SCC
+                Set<V> isectRoots = CollectionHelper.intersection(predecessorRoots, successorRoots);
+                isectRoots.add(sourceRoot);
+                isectRoots.add(targetRoot);
+
+                // notifications must be issued before Union-Find modifications
+                if (observers.size() > 0) {
+                    Set<V> sourceSCCs = createSetNullTolerant(predecessorRoots);
+                    sourceSCCs.add(sourceRoot);
+                    Set<V> targetSCCs = createSetNullTolerant(successorRoots);
+                    targetSCCs.add(targetRoot);
+
+                    // tracing back to actual nodes
+                    for (V sourceSCC : sourceSCCs) {
+                        targetLoop: for (V targetSCC : targetSCCs) {
+                            if (counting.isReachable(sourceSCC, targetSCC)) continue targetLoop;
+
+                            boolean needsNotification =
+                                // Case 1. sourceSCC and targetSCC are the same and it is a one sized scc.
+                                // Issue notifications only if there is no self-loop present at the moment
+                                (sourceSCC.equals(targetSCC) && sccs.getPartition(sourceSCC).size() == 1 && GraphHelper
+                                        .getEdgeCount(sccs.getPartition(sourceSCC).iterator().next(), gds) == 0)
+                                ||
+                                // Case 2. sourceSCC and targetSCC are different sccs.
+                                (!sourceSCC.equals(targetSCC));
+                            // if self loop is already present omit the notification
+                            if (needsNotification) {
+                                notifyTcObservers(sccs.getPartition(sourceSCC), sccs.getPartition(targetSCC),
+                                        Direction.INSERT);
+                            }
+                        }
+                    }
+                }
+
+                // 2. delete edges, nodes
+                List<V> sourceSCCs = new ArrayList<V>();
+                List<V> targetSCCs = new ArrayList<V>();
+
+                for (V r : isectRoots) {
+                    List<V> sourceSCCsOfSCC = getSourceSCCsOfSCC(r);
+                    List<V> targetSCCsOfSCC = getTargetSCCsOfSCC(r);
+
+                    for (V sourceSCC : sourceSCCsOfSCC) {
+                        if (!sourceSCC.equals(r)) {
+                            reducedGraph.deleteEdgeIfExists(sourceSCC, r);
+                        }
+                    }
+
+                    for (V targetSCC : targetSCCsOfSCC) {
+                        if (!isectRoots.contains(targetSCC) && !r.equals(targetSCC)) {
+                            reducedGraph.deleteEdgeIfExists(r, targetSCC);
+                        }
+                    }
+
+                    sourceSCCs.addAll(sourceSCCsOfSCC);
+                    targetSCCs.addAll(targetSCCsOfSCC);
+                }
+
+                for (V r : isectRoots) {
+                    reducedGraph.deleteNode(r);
+                }
+
+                // 3. union
+                Iterator<V> iterator = isectRoots.iterator();
+                V newRoot = iterator.next();
+                while (iterator.hasNext()) {
+                    newRoot = sccs.union(newRoot, iterator.next());
+                }
+
+                // 4. add new node
+                reducedGraph.insertNode(newRoot);
+
+                // 5. add edges
+                Set<V> containedNodes = sccs.getPartition(newRoot);
+
+                for (V sourceSCC : sourceSCCs) {
+                    if (!containedNodes.contains(sourceSCC) && !sourceSCC.equals(newRoot)) {
+                        reducedGraph.insertEdge(sourceSCC, newRoot);
+                    }
+                }
+                for (V targetSCC : targetSCCs) {
+                    if (!containedNodes.contains(targetSCC) && !targetSCC.equals(newRoot)) {
+                        reducedGraph.insertEdge(newRoot, targetSCC);
+                    }
+                }
+            } else {
+                if (observers.size() > 0 && GraphHelper.getEdgeCount(source, target, gds) == 1) {
+                    counting.attachObserver(countingListener);
+                }
+                reducedGraph.insertEdge(sourceRoot, targetRoot);
+                counting.detachObserver(countingListener);
+            }
+        } else {
+            // Notifications about self-loops
+            if (observers.size() > 0 && sccs.getPartition(sourceRoot).size() == 1
+                    && GraphHelper.getEdgeCount(source, target, gds) == 1) {
+                notifyTcObservers(source, source, Direction.INSERT);
+            }
+        }
+    }
+
+    @Override
+    public void edgeDeleted(V source, V target) {
+        V sourceRoot = sccs.find(source);
+        V targetRoot = sccs.find(target);
+
+        if (!sourceRoot.equals(targetRoot)) {
+            if (observers.size() > 0 && GraphHelper.getEdgeCount(source, target, gds) == 0) {
+                counting.attachObserver(countingListener);
+            }
+            reducedGraph.deleteEdgeIfExists(sourceRoot, targetRoot);
+            counting.detachObserver(countingListener);
+        } else {
+            // get the graph for the scc whose root is sourceRoot
+            Graph<V> g = GraphHelper.getSubGraph(sccs.getPartition(sourceRoot), gds);
+
+            // if source is not reachable from target anymore
+            if (!BFS.isReachable(source, target, g)) {
+                // create copies of the current state before destructive manipulation
+                Map<V, Integer> reachableSources = CollectionsFactory.createMap();
+                for (Entry<V, Integer> entry : reducedGraphIndexer.getSourceNodes(sourceRoot).entriesWithMultiplicities()) {
+                    reachableSources.put(entry.getKey(), entry.getValue());
+                }
+                Map<V, Integer> reachableTargets = CollectionsFactory.createMap();
+                for (Entry<V, Integer> entry : reducedGraphIndexer.getTargetNodes(sourceRoot).entriesWithMultiplicities()) {
+                    reachableTargets.put(entry.getKey(), entry.getValue());
+                }
+
+                SCCResult<V> _newSccs = SCC.computeSCC(g);
+
+                // delete scc node (and with its edges too)
+                for (Entry<V, Integer> entry : reachableSources.entrySet()) {
+                    V s = entry.getKey();
+                    for (int i = 0; i < entry.getValue(); i++) {
+                        reducedGraph.deleteEdgeIfExists(s, sourceRoot);
+                    }
+                }
+
+                for (Entry<V, Integer> entry : reachableTargets.entrySet()) {
+                    V t = entry.getKey();
+                    for (int i = 0; i < entry.getValue(); i++) {
+                        reducedGraph.deleteEdgeIfExists(sourceRoot, t);
+                    }
+                }
+
+                sccs.deleteSet(sourceRoot);
+                reducedGraph.deleteNode(sourceRoot);
+
+                Set<Set<V>> newSCCs = _newSccs.getSccs();
+                Set<V> newSCCRoots = CollectionsFactory.createSet();
+
+                // add new nodes and edges to the reduced graph
+                for (Set<V> newSCC : newSCCs) {
+                    V newRoot = sccs.makeSet(newSCC);
+                    reducedGraph.insertNode(newRoot);
+                    newSCCRoots.add(newRoot);
+                }
+                for (V newSCCRoot : newSCCRoots) {
+                    List<V> sourceSCCsOfSCC = getSourceSCCsOfSCC(newSCCRoot);
+                    List<V> targetSCCsOfSCC = getTargetSCCsOfSCC(newSCCRoot);
+
+                    for (V sourceSCC : sourceSCCsOfSCC) {
+                        if (!sourceSCC.equals(newSCCRoot)) {
+                            reducedGraph.insertEdge(sccs.find(sourceSCC), newSCCRoot);
+                        }
+                    }
+                    for (V targetSCC : targetSCCsOfSCC) {
+                        if (!newSCCRoots.contains(targetSCC) && !targetSCC.equals(newSCCRoot))
+                            reducedGraph.insertEdge(newSCCRoot, targetSCC);
+                    }
+                }
+
+                // Must be after the union-find modifications
+                if (observers.size() > 0) {
+                    V newSourceRoot = sccs.find(source);
+                    V newTargetRoot = sccs.find(target);
+
+                    Set<V> sourceSCCs = createSetNullTolerant(counting.getAllReachableSources(newSourceRoot));
+                    sourceSCCs.add(newSourceRoot);
+
+                    Set<V> targetSCCs = createSetNullTolerant(counting.getAllReachableTargets(newTargetRoot));
+                    targetSCCs.add(newTargetRoot);
+
+                    for (V sourceSCC : sourceSCCs) {
+                        targetLoop: for (V targetSCC : targetSCCs) {
+                            if (counting.isReachable(sourceSCC, targetSCC)) continue targetLoop;
+
+                            boolean needsNotification =
+                                // Case 1. sourceSCC and targetSCC are the same and it is a one sized scc.
+                                // Issue notifications only if there is no self-loop present at the moment
+                                (sourceSCC.equals(targetSCC) && sccs.getPartition(sourceSCC).size() == 1 && GraphHelper
+                                        .getEdgeCount(sccs.getPartition(sourceSCC).iterator().next(), gds) == 0)
+                                ||
+                                // Case 2. sourceSCC and targetSCC are different sccs.
+                                (!sourceSCC.equals(targetSCC));
+                            // if self loop is already present omit the notification
+                            if (needsNotification) {
+                                notifyTcObservers(sccs.getPartition(sourceSCC), sccs.getPartition(targetSCC),
+                                        Direction.DELETE);
+                            }
+                        }
+                    }
+                }
+            } else {
+                // only handle self-loop notifications - sourceRoot equals to targetRoot
+                if (observers.size() > 0 && sccs.getPartition(sourceRoot).size() == 1
+                        && GraphHelper.getEdgeCount(source, target, gds) == 0) {
+                    notifyTcObservers(source, source, Direction.DELETE);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void nodeInserted(V n) {
+        sccs.makeSet(n);
+        reducedGraph.insertNode(n);
+    }
+
+    @Override
+    public void nodeDeleted(V n) {
+        IMemoryView<V> sources = gds.getSourceNodes(n);
+        IMemoryView<V> targets = gds.getTargetNodes(n);
+
+        for (Entry<V, Integer> entry : sources.entriesWithMultiplicities()) {
+            for (int i = 0; i < entry.getValue(); i++) {
+                V source = entry.getKey();
+                edgeDeleted(source, n);
+            }
+        }
+
+        for (Entry<V, Integer> entry : targets.entriesWithMultiplicities()) {
+            for (int i = 0; i < entry.getValue(); i++) {
+                V target = entry.getKey();
+                edgeDeleted(n, target);
+            }
+        }
+
+        sccs.deleteSet(n);
+    }
+
+    @Override
+    public void attachObserver(ITcObserver<V> to) {
+        observers.add(to);
+    }
+
+    @Override
+    public void detachObserver(ITcObserver<V> to) {
+        observers.remove(to);
+    }
+
+    @Override
+    public Set<V> getAllReachableTargets(V source) {
+        V sourceRoot = sccs.find(source);
+        Set<V> containedNodes = sccs.getPartition(sourceRoot);
+        Set<V> targets = CollectionsFactory.createSet();
+
+        if (containedNodes.size() > 1 || GraphHelper.getEdgeCount(source, gds) == 1) {
+            targets.addAll(containedNodes);
+        }
+
+        Set<V> rootSet = counting.getAllReachableTargets(sourceRoot);
+        if (rootSet != null) {
+            for (V _root : rootSet) {
+                targets.addAll(sccs.getPartition(_root));
+            }
+        }
+
+        return targets;
+    }
+
+    @Override
+    public Set<V> getAllReachableSources(V target) {
+        V targetRoot = sccs.find(target);
+        Set<V> containedNodes = sccs.getPartition(targetRoot);
+        Set<V> sources = CollectionsFactory.createSet();
+
+        if (containedNodes.size() > 1 || GraphHelper.getEdgeCount(target, gds) == 1) {
+            sources.addAll(containedNodes);
+        }
+
+        Set<V> rootSet = counting.getAllReachableSources(targetRoot);
+        if (rootSet != null) {
+            for (V _root : rootSet) {
+                sources.addAll(sccs.getPartition(_root));
+            }
+        }
+        return sources;
+    }
+
+    @Override
+    public boolean isReachable(V source, V target) {
+        V sourceRoot = sccs.find(source);
+        V targetRoot = sccs.find(target);
+
+        if (sourceRoot.equals(targetRoot))
+            return true;
+        else
+            return counting.isReachable(sourceRoot, targetRoot);
+    }
+
+    public List<V> getReachabilityPath(V source, V target) {
+        if (!isReachable(source, target)) {
+            return null;
+        } else {
+            Set<V> sccsInSubGraph = CollectionHelper.intersection(counting.getAllReachableTargets(source),
+                    counting.getAllReachableSources(target));
+            sccsInSubGraph.add(sccs.find(source));
+            sccsInSubGraph.add(sccs.find(target));
+            Set<V> nodesInSubGraph = CollectionsFactory.createSet();
+
+            for (V sccRoot : sccsInSubGraph) {
+                nodesInSubGraph.addAll(sccs.getPartition(sccRoot));
+            }
+
+            return GraphHelper.constructPath(source, target, nodesInSubGraph, gds);
+        }
+    }
+
+    /**
+     * Return the SCCs from which the SCC represented by the root node is reachable. Note that an SCC can be present
+     * multiple times in the returned list (multiple edges between the two SCCs).
+     *
+     * @param root
+     * @return the list of reachable target SCCs
+     */
+    private List<V> getSourceSCCsOfSCC(V root) {
+        List<V> sourceSCCs = new ArrayList<V>();
+
+        for (V containedNode : this.sccs.getPartition(root)) {
+            IMemoryView<V> sourceNodes = this.gds.getSourceNodes(containedNode);
+            for (V source : sourceNodes.distinctValues()) {
+                sourceSCCs.add(this.sccs.find(source));
+            }
+        }
+
+        return sourceSCCs;
+    }
+
+    /**
+     * Returns true if the SCC represented by the given root node has incoming edges in the reduced graph,
+     * false otherwise (if this SCC is a source in the reduced graph).
+     *
+     * @param root the root node of an SCC
+     * @return true if it has incoming edges, false otherwise
+     * @since 1.6
+     */
+    public boolean hasIncomingEdges(final V root) {
+        for (final V containedNode : this.sccs.getPartition(root)) {
+            final IMemoryView<V> sourceNodes = this.gds.getSourceNodes(containedNode);
+            for (final V source : sourceNodes.distinctValues()) {
+                final V otherRoot = this.sccs.find(source);
+                if (!Objects.equals(root, otherRoot)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Return the SCCs which are reachable from the SCC represented by the root node. Note that an SCC can be present
+     * multiple times in the returned list (multiple edges between the two SCCs).
+     *
+     * @param root
+     * @return the list of reachable target SCCs
+     */
+    private List<V> getTargetSCCsOfSCC(V root) {
+        List<V> targetSCCs = new ArrayList<V>();
+
+        for (V containedNode : this.sccs.getPartition(root)) {
+            IMemoryView<V> targetNodes = this.gds.getTargetNodes(containedNode);
+            for (V target : targetNodes.distinctValues()) {
+                targetSCCs.add(this.sccs.find(target));
+            }
+        }
+
+        return targetSCCs;
+    }
+
+    /**
+     * Returns true if the SCC represented by the given root node has outgoing edges in the reduced graph,
+     * false otherwise (if this SCC is a sink in the reduced graph).
+     *
+     * @param root the root node of an SCC
+     * @return true if it has outgoing edges, false otherwise
+     * @since 1.6
+     */
+    public boolean hasOutgoingEdges(V root) {
+        for (final V containedNode : this.sccs.getPartition(root)) {
+            final IMemoryView<V> targetNodes = this.gds.getTargetNodes(containedNode);
+            for (final V target : targetNodes.distinctValues()) {
+                final V otherRoot = this.sccs.find(target);
+                if (!Objects.equals(root, otherRoot)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void dispose() {
+        gds.detachObserver(this);
+        counting.dispose();
+    }
+
+    /**
+     * Call this method to notify the observers of the transitive closure relation. The tuples used in the notification
+     * will be the Descartes product of the two sets given.
+     *
+     * @param sources
+     *            the source nodes
+     * @param targets
+     *            the target nodes
+     * @param direction
+     */
+    protected void notifyTcObservers(Set<V> sources, Set<V> targets, Direction direction) {
+        for (V s : sources) {
+            for (V t : targets) {
+                notifyTcObservers(s, t, direction);
+            }
+        }
+    }
+
+    private void notifyTcObservers(V source, V target, Direction direction) {
+        for (ITcObserver<V> observer : observers) {
+            if (direction == Direction.INSERT) {
+                observer.tupleInserted(source, target);
+            }
+            if (direction == Direction.DELETE) {
+                observer.tupleDeleted(source, target);
+            }
+        }
+    }
+
+    /**
+     * Returns the node that is selected as the representative of the SCC containing the argument.
+     * @since 1.6
+     */
+    public V getRepresentative(V node) {
+        return sccs.find(node);
+    }
+
+    public Set<Tuple<V>> getTcRelation() {
+        Set<Tuple<V>> resultSet = new HashSet<Tuple<V>>();
+
+        for (V sourceRoot : sccs.getPartitionHeads()) {
+            Set<V> sources = sccs.getPartition(sourceRoot);
+            if (sources.size() > 1 || GraphHelper.getEdgeCount(sources.iterator().next(), gds) == 1) {
+                for (V source : sources) {
+                    for (V target : sources) {
+                        resultSet.add(new Tuple<V>(source, target));
+                    }
+                }
+            }
+
+            Set<V> reachableTargets = counting.getAllReachableTargets(sourceRoot);
+            if (reachableTargets != null) {
+                for (V targetRoot : reachableTargets) {
+                    for (V source : sources) {
+                        for (V target : sccs.getPartition(targetRoot)) {
+                            resultSet.add(new Tuple<V>(source, target));
+                        }
+                    }
+                }
+            }
+        }
+
+        return resultSet;
+    }
+
+    public boolean isIsolated(V node) {
+        IMemoryView<V> targets = gds.getTargetNodes(node);
+        IMemoryView<V> sources = gds.getSourceNodes(node);
+        return targets.isEmpty() && sources.isEmpty();
+    }
+
+    @Override
+    public IGraphPathFinder<V> getPathFinder() {
+        return new DFSPathFinder<V>(gds, this);
+    }
+
+    /**
+     * The graph of SCCs; each SCC is represented by its representative node (see {@link #getRepresentative(Object)})
+     * @since 1.6
+     */
+    public Graph<V> getReducedGraph() {
+        return reducedGraph;
+    }
+
+    private static <V> Set<V> createSetNullTolerant(Set<V> initial) {
+        if (initial != null)
+            return CollectionsFactory.createSet(initial);
+        else
+            return CollectionsFactory.createSet();
+    }
+
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/DFSPathFinder.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/DFSPathFinder.java
new file mode 100644
index 00000000..2cec33a2
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/DFSPathFinder.java
@@ -0,0 +1,146 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Abel Hegedus and IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.itc.alg.misc;
+
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.viatra.runtime.rete.itc.igraph.ITcDataSource;
+import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+
+/**
+ * A depth-first search implementation of the {@link IGraphPathFinder}.
+ *
+ * TODO use ITC to filter nodes that must be traversed, instead of checks
+ *
+ * @author Abel Hegedus
+ *
+ * @param <V>
+ *            the node type of the graph
+ */
+public class DFSPathFinder<V> implements IGraphPathFinder<V> {
+
+    private IGraphDataSource<V> graph;
+    private ITcDataSource<V> itc;
+
+    public DFSPathFinder(IGraphDataSource<V> graph, ITcDataSource<V> itc) {
+        this.graph = graph;
+        this.itc = itc;
+    }
+
+    @Override
+    public Iterable<Deque<V>> getAllPaths(V sourceNode, V targetNode) {
+        Set<V> endNodes = new HashSet<V>();
+        endNodes.add(targetNode);
+        return getAllPathsToTargets(sourceNode, endNodes);
+    }
+
+    @Override
+    public Iterable<Deque<V>> getAllPathsToTargets(V sourceNode, Set<V> targetNodes) {
+        List<Deque<V>> paths = new ArrayList<Deque<V>>();
+        Deque<V> visited = new LinkedList<V>();
+        Set<V> reachableTargets = new HashSet<V>();
+        for (V targetNode : targetNodes) {
+            if (itc.isReachable(sourceNode, targetNode)) {
+                reachableTargets.add(targetNode);
+            }
+        }
+        if (!reachableTargets.isEmpty()) {
+            return paths;
+        }
+        visited.add(sourceNode);
+        return getPaths(paths, visited, reachableTargets);
+    }
+
+    protected Iterable<Deque<V>> getPaths(List<Deque<V>> paths, Deque<V> visited, Set<V> targetNodes) {
+        IMemoryView<V> nodes = graph.getTargetNodes(visited.getLast());
+        // examine adjacent nodes
+        for (V node : nodes.distinctValues()) {
+            if (visited.contains(node)) {
+                continue;
+            }
+            if (targetNodes.contains(node)) {
+                visited.add(node);
+                // clone visited LinkedList
+                Deque<V> visitedClone = new LinkedList<V>(visited);
+                paths.add(visitedClone);
+                visited.removeLast();
+                break;
+            }
+        }
+
+        // in breadth-first, recursion needs to come after visiting connected nodes
+        for (V node : nodes.distinctValues()) {
+            if (visited.contains(node) || targetNodes.contains(node)) {
+                continue;
+            }
+            boolean canReachTarget = false;
+            for (V target : targetNodes) {
+                if (itc.isReachable(node, target)) {
+                    canReachTarget = true;
+                    break;
+                }
+            }
+            if (canReachTarget) {
+                visited.addLast(node);
+                getPaths(paths, visited, targetNodes);
+                visited.removeLast();
+            }
+        }
+
+        return paths;
+    }
+
+    public String printPaths(List<Deque<V>> paths) {
+        StringBuilder sb = new StringBuilder();
+        for (Deque<V> visited : paths) {
+            sb.append("Path: ");
+            for (V node : visited) {
+                sb.append(node);
+                sb.append(" --> ");
+            }
+            sb.append("\n");
+        }
+        return sb.toString();
+    }
+
+    @Override
+    public Deque<V> getPath(V sourceNode, V targetNode) {
+        // TODO optimize
+        Iterable<Deque<V>> allPaths = getAllPaths(sourceNode, targetNode);
+        Iterator<Deque<V>> pathIterator = allPaths.iterator();
+        return pathIterator.hasNext() ? pathIterator.next() : new LinkedList<V>();
+    }
+
+    @Override
+    public Iterable<Deque<V>> getShortestPaths(V sourceNode, V targetNode) {
+        // TODO optimize
+        Iterable<Deque<V>> allPaths = getAllPaths(sourceNode, targetNode);
+        List<Deque<V>> shortestPaths = new ArrayList<Deque<V>>();
+        int shortestPathLength = -1;
+        for (Deque<V> path : allPaths) {
+            int pathLength = path.size();
+            if (shortestPathLength == -1 || pathLength < shortestPathLength) {
+                shortestPaths.clear();
+                shortestPathLength = pathLength;
+            }
+            if (pathLength == shortestPathLength) {
+                shortestPaths.add(path);
+            }
+        }
+        return shortestPaths;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/Edge.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/Edge.java
new file mode 100644
index 00000000..862c99b3
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/Edge.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.alg.misc;
+
+public class Edge<V> {
+    private V source;
+    private V target;
+
+    public Edge(V source, V target) {
+        super();
+        this.source = source;
+        this.target = target;
+    }
+
+    public V getSource() {
+        return source;
+    }
+
+    public void setSource(V source) {
+        this.source = source;
+    }
+
+    public V getTarget() {
+        return target;
+    }
+
+    public void setTarget(V target) {
+        this.target = target;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/GraphHelper.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/GraphHelper.java
new file mode 100644
index 00000000..b79e4d45
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/GraphHelper.java
@@ -0,0 +1,169 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.itc.alg.misc;
+
+import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalGraphDataSource;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
+
+import java.util.*;
+import java.util.Map.Entry;
+
+/**
+ * Utility class for graph related operations.
+ *
+ * @author Tamas Szabo
+ */
+public class GraphHelper {
+
+    private GraphHelper() {/*Utility class constructor*/}
+
+    /**
+     * Returns the subgraph from the given {@link IBiDirectionalGraphDataSource} which contains the given set of nodes.
+     *
+     * @param nodesInSubGraph
+     *            the nodes that are present in the subgraph
+     * @param graphDataSource
+     *            the graph data source for the original graph
+     * @return the subgraph associated to the given nodes
+     */
+    public static <V> Graph<V> getSubGraph(Collection<V> nodesInSubGraph,
+            IBiDirectionalGraphDataSource<V> graphDataSource) {
+        Graph<V> g = new Graph<V>();
+        if (nodesInSubGraph != null) {
+            for (V node : nodesInSubGraph) {
+                g.insertNode(node);
+            }
+
+            for (V node : nodesInSubGraph) {
+                IMemoryView<V> sources = graphDataSource.getSourceNodes(node);
+                for (Entry<V, Integer> entry : sources.entriesWithMultiplicities()) {
+                    for (int i = 0; i < entry.getValue(); i++) {
+                        V s = entry.getKey();
+                        if (nodesInSubGraph.contains(s)) {
+                            g.insertEdge(s, node);
+                        }
+                    }
+                }
+            }
+        }
+
+        return g;
+    }
+
+    /**
+     * Constructs a path between source and target in the given graph. Both the {@link IGraphDataSource} and the set of
+     * nodes are used, this way it is possible to construct a path in a given subgraph.
+     *
+     * The returned {@link List} contains the nodes along the path (this means that there is an edge in the graph
+     * between two consecutive nodes). A self loop (one edge) is indicated with the source node being present two times
+     * in the returned {@link List}.
+     *
+     * @param source
+     *            the source node
+     * @param target
+     *            the target node
+     * @param nodesInGraph
+     *            the nodes that are present in the subgraph
+     * @param graphDataSource
+     *            the graph data source
+     * @return the path between the two nodes
+     */
+    public static <V> List<V> constructPath(V source, V target, Set<V> nodesInGraph,
+            IGraphDataSource<V> graphDataSource) {
+        Set<V> visitedNodes = new HashSet<V>();
+        List<V> path = new ArrayList<V>();
+
+        visitedNodes.add(source);
+        path.add(source);
+        V act = source;
+
+        // if source and target are the same node
+        if (source.equals(target) && graphDataSource.getTargetNodes(source).containsNonZero(target)) {
+            // the node will be present in the path two times
+            path.add(source);
+            return path;
+        } else {
+            while (act != null) {
+                V nextNode = getNextNodeToVisit(act, graphDataSource, nodesInGraph, visitedNodes);
+                if (nextNode == null && path.size() > 1) {
+                    // needs to backtrack along path
+                    // remove the last element in the path because we can't go
+                    // anywhere from there
+                    path.remove(path.size() - 1);
+                    while (nextNode == null && path.size() > 0) {
+                        V lastPathElement = path.get(path.size() - 1);
+                        nextNode = getNextNodeToVisit(lastPathElement, graphDataSource, nodesInGraph, visitedNodes);
+                        if (nextNode == null) {
+                            path.remove(path.size() - 1);
+                        }
+                    }
+                }
+
+                if (nextNode != null) {
+                    visitedNodes.add(nextNode);
+                    path.add(nextNode);
+                    if (nextNode.equals(target)) {
+                        return path;
+                    }
+                }
+                act = nextNode;
+            }
+            return null;
+        }
+    }
+
+    private static <V> V getNextNodeToVisit(V act, IGraphDataSource<V> graphDataSource, Set<V> nodesInSubGraph,
+            Set<V> visitedNodes) {
+        IMemoryView<V> targetNodes = graphDataSource.getTargetNodes(act);
+        for (Entry<V, Integer> entry : targetNodes.entriesWithMultiplicities()) {
+            for (int i = 0; i < entry.getValue(); i++) {
+                V node = entry.getKey();
+                if (nodesInSubGraph.contains(node) && !visitedNodes.contains(node)) {
+                    return node;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns the number of self-loop edges for the given node.
+     *
+     * @param node
+     *            the node
+     * @param graphDataSource
+     *            the graph data source
+     * @return the number of self-loop edges
+     */
+    public static <V> int getEdgeCount(V node, IGraphDataSource<V> graphDataSource) {
+        return getEdgeCount(node, node, graphDataSource);
+    }
+
+    /**
+     * Returns the number of edges between the given source and target nodes.
+     *
+     * @param source
+     *            the source node
+     * @param target
+     *            the target node
+     * @param graphDataSource
+     *            the graph data source
+     * @return the number of parallel edges between the two nodes
+     */
+    public static <V> int getEdgeCount(V source, V target, IGraphDataSource<V> graphDataSource) {
+        Integer count = graphDataSource.getTargetNodes(source).getCount(target);
+        if (count == null) {
+            return 0;
+        } else {
+            return count;
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/IGraphPathFinder.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/IGraphPathFinder.java
new file mode 100644
index 00000000..624f9f7d
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/IGraphPathFinder.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Abel Hegedus, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.itc.alg.misc;
+
+import java.util.Deque;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.rete.itc.igraph.ITcDataSource;
+
+/**
+ * The path finder provides methods for retrieving paths in a graph between a source node and one or more target nodes.
+ * Use {@link ITcDataSource#getPathFinder()} for instantiating.
+ *
+ * @author Abel Hegedus
+ *
+ * @param <V> the node type of the graph
+ */
+public interface IGraphPathFinder<V> {
+
+    /**
+     * Returns an arbitrary path from the source node to the target node (if such exists). If there is no path
+     * between them, an empty collection is returned.
+     *
+     * @param sourceNode the source node of the path
+     * @param targetNode the target node of the path
+     * @return the path from the source to the target, or empty collection if target is not reachable from source.
+     */
+    Deque<V> getPath(V sourceNode, V targetNode);
+
+    /**
+     * Returns the collection of shortest paths from the source node to the target node (if such exists). If there is no path
+     * between them, an empty collection is returned.
+     *
+     * @param sourceNode the source node of the path
+     * @param targetNode the target node of the path
+     * @return the collection of shortest paths from the source to the target, or empty collection if target is not reachable from source.
+     */
+    Iterable<Deque<V>> getShortestPaths(V sourceNode, V targetNode);
+
+    /**
+     * Returns the collection of paths from the source node to the target node (if such exists). If there is no path
+     * between them, an empty collection is returned.
+     *
+     * @param sourceNode the source node of the path
+     * @param targetNode the target node of the path
+     * @return the collection of paths from the source to the target, or empty collection if target is not reachable from source.
+     */
+    Iterable<Deque<V>> getAllPaths(V sourceNode, V targetNode);
+
+    /**
+     * Returns the collection of paths from the source node to any of the target nodes (if such exists). If there is no path
+     * between them, an empty collection is returned.
+     *
+     * @param sourceNode the source node of the path
+     * @param targetNodes the set of target nodes of the paths
+     * @return the collection of paths from the source to any of the targets, or empty collection if neither target is reachable from source.
+     */
+    Iterable<Deque<V>> getAllPathsToTargets(V sourceNode, Set<V> targetNodes);
+
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/ITcRelation.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/ITcRelation.java
new file mode 100644
index 00000000..9fd85ae1
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/ITcRelation.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.alg.misc;
+
+import java.util.Set;
+
+public interface ITcRelation<V> {
+
+    /**
+     * Returns the starting nodes from a transitive closure relation.
+     *
+     * @return the set of starting nodes
+     */
+    public Set<V> getTupleStarts();
+
+    /**
+     * Returns the set of nodes that are reachable from the given node.
+     *
+     * @param start
+     *            the starting node
+     * @return the set of reachable nodes
+     */
+    public Set<V> getTupleEnds(V start);
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/Tuple.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/Tuple.java
new file mode 100644
index 00000000..84c79dcf
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/Tuple.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.alg.misc;
+
+public class Tuple<V> {
+
+    private V source;
+    private V target;
+
+    public Tuple(V source, V target) {
+        super();
+        this.source = source;
+        this.target = target;
+    }
+
+    public V getSource() {
+        return source;
+    }
+
+    public void setSource(V source) {
+        this.source = source;
+    }
+
+    public V getTarget() {
+        return target;
+    }
+
+    public void setTarget(V target) {
+        this.target = target;
+    }
+
+    @Override
+    public String toString() {
+        return "(" + source.toString() + "," + target.toString() + ")";
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o instanceof Tuple) {
+            Tuple<?> t = (Tuple<?>) o;
+
+            if (t.getSource().equals(this.source) && t.getTarget().equals(this.target)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return source.hashCode() + target.hashCode();
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/bfs/BFS.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/bfs/BFS.java
new file mode 100644
index 00000000..22ce8962
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/bfs/BFS.java
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.alg.misc.bfs;
+
+import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalGraphDataSource;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
+
+import java.util.*;
+
+public class BFS<V> {
+
+    private BFS() {/*Utility class constructor*/}
+
+    /**
+     * Performs a breadth first search on the given graph to determine whether source is reachable from target.
+     *
+     * @param <V>
+     *            the type parameter of the nodes in the graph
+     * @param source
+     *            the source node
+     * @param target
+     *            the target node
+     * @param graph
+     *            the graph data source
+     * @return true if source is reachable from target, false otherwise
+     */
+    public static <V> boolean isReachable(V source, V target, IGraphDataSource<V> graph) {
+        Deque<V> nodeQueue = new ArrayDeque<V>();
+        Set<V> visited = new HashSet<V>();
+
+        nodeQueue.add(source);
+        visited.add(source);
+
+        boolean ret = _isReachable(target, graph, nodeQueue, visited);
+        return ret;
+    }
+
+    private static <V> boolean _isReachable(V target, IGraphDataSource<V> graph, Deque<V> nodeQueue, Set<V> visited) {
+
+        while (!nodeQueue.isEmpty()) {
+            V node = nodeQueue.removeFirst();
+            for (V t : graph.getTargetNodes(node).distinctValues()){
+                if (t.equals(target)) {
+                    return true;
+                }
+                if (!visited.contains(t)) {
+                    visited.add(t);
+                    nodeQueue.addLast(t);
+                }
+            }
+        }
+        return false;
+    }
+
+    public static <V> Set<V> reachableSources(IBiDirectionalGraphDataSource<V> graph, V target) {
+        Set<V> retSet = new HashSet<V>();
+        retSet.add(target);
+        Deque<V> nodeQueue = new ArrayDeque<V>();
+        nodeQueue.add(target);
+
+        _reachableSources(graph, nodeQueue, retSet);
+
+        return retSet;
+    }
+
+    private static <V> void _reachableSources(IBiDirectionalGraphDataSource<V> graph, Deque<V> nodeQueue,
+            Set<V> retSet) {
+        while (!nodeQueue.isEmpty()) {
+            V node = nodeQueue.removeFirst();
+            for (V _node : graph.getSourceNodes(node).distinctValues()) {
+                if (!retSet.contains(_node)) {
+                    retSet.add(_node);
+                    nodeQueue.addLast(_node);
+                }
+            }
+        }
+    }
+
+    public static <V> Set<V> reachableTargets(IGraphDataSource<V> graph, V source) {
+        Set<V> retSet = new HashSet<V>();
+        retSet.add(source);
+        Deque<V> nodeQueue = new ArrayDeque<V>();
+        nodeQueue.add(source);
+
+        _reachableTargets(graph, nodeQueue, retSet);
+
+        return retSet;
+    }
+
+    private static <V> void _reachableTargets(IGraphDataSource<V> graph, Deque<V> nodeQueue, Set<V> retSet) {
+        while (!nodeQueue.isEmpty()) {
+            V node = nodeQueue.removeFirst();
+
+            for (V _node : graph.getTargetNodes(node).distinctValues()) {
+
+                if (!retSet.contains(_node)) {
+                    retSet.add(_node);
+                    nodeQueue.addLast(_node);
+                }
+            }
+        }
+    }
+
+    /**
+     * Performs a breadth first search on the given graph and collects all the nodes along the path from source to
+     * target if such path exists.
+     *
+     * @param <V>
+     *            the type parameter of the nodes in the graph
+     * @param source
+     *            the source node
+     * @param target
+     *            the target node
+     * @param graph
+     *            the graph data source
+     * @return the set of nodes along the path
+     */
+    public static <V> Set<V> collectNodesAlongPath(V source, V target, IGraphDataSource<V> graph) {
+        Set<V> path = new HashSet<V>();
+        _collectNodesAlongPath(source, target, graph, path);
+        return path;
+    }
+
+    private static <V> boolean _collectNodesAlongPath(V node, V target, IGraphDataSource<V> graph, Set<V> path) {
+
+        boolean res = false;
+
+        // end recursion
+        if (node.equals(target)) {
+            path.add(node);
+            return true;
+        } else {
+            for (V _nodeT : graph.getTargetNodes(node).distinctValues()) {
+                res = (_collectNodesAlongPath(_nodeT, target, graph, path)) || res;
+            }
+            if (res)
+                path.add(node);
+            return res;
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/PKAlg.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/PKAlg.java
new file mode 100644
index 00000000..892d048e
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/PKAlg.java
@@ -0,0 +1,179 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.alg.misc.scc;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalGraphDataSource;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalWrapper;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphObserver;
+
+public class PKAlg<V> implements IGraphObserver<V> {
+
+    /**
+     * Maps the nodes to their indicies.
+     */
+    private Map<V, Integer> node2index;
+    private Map<Integer, V> index2node;
+    private Map<V, Boolean> node2mark;
+
+    /**
+     * Maps the index of a node to the index in the topsort.
+     */
+    private Map<Integer, Integer> index2topsort;
+    private Map<Integer, Integer> topsort2index;
+
+    /**
+     * Index associated to the inserted nodes (incrementing with every insertion).
+     */
+    private int index;
+
+    /**
+     * Index within the topsort for the target node when edge insertion occurs.
+     */
+    private int lower_bound;
+
+    /**
+     * Index within the topsort for the source node when edge insertion occurs.
+     */
+    private int upper_bound;
+
+    private List<V> RF;
+    private List<V> RB;
+    private IBiDirectionalGraphDataSource<V> gds;
+
+    public PKAlg(IGraphDataSource<V> gds) {
+        if (gds instanceof IBiDirectionalGraphDataSource<?>) {
+            this.gds = (IBiDirectionalGraphDataSource<V>) gds;
+        } else {
+            this.gds = new IBiDirectionalWrapper<V>(gds);
+        }
+
+        node2mark = new HashMap<V, Boolean>();
+        node2index = new HashMap<V, Integer>();
+        index2node = new HashMap<Integer, V>();
+        index2topsort = new HashMap<Integer, Integer>();
+        topsort2index = new HashMap<Integer, Integer>();
+        index = 0;
+
+        gds.attachObserver(this);
+    }
+
+    @Override
+    public void edgeInserted(V source, V target) {
+
+        RF = new ArrayList<V>();
+        RB = new ArrayList<V>();
+
+        lower_bound = index2topsort.get(node2index.get(target));
+        upper_bound = index2topsort.get(node2index.get(source));
+
+        if (lower_bound < upper_bound) {
+            dfsForward(target);
+            dfsBackward(source);
+            reorder();
+        }
+    }
+
+    private List<Integer> getIndicies(List<V> list) {
+        List<Integer> indicies = new ArrayList<Integer>();
+
+        for (V n : list)
+            indicies.add(index2topsort.get(node2index.get(n)));
+
+        return indicies;
+    }
+
+    private void reorder() {
+
+        Collections.reverse(RB);
+
+        // azon csomopontok indexei amelyek sorrendje nem jo
+        List<Integer> L = getIndicies(RF);
+        L.addAll(getIndicies(RB));
+        Collections.sort(L);
+
+        for (int i = 0; i < RB.size(); i++) {
+            index2topsort.put(node2index.get(RB.get(i)), L.get(i));
+            topsort2index.put(L.get(i), node2index.get(RB.get(i)));
+        }
+
+        for (int i = 0; i < RF.size(); i++) {
+            index2topsort.put(node2index.get(RF.get(i)), L.get(i + RB.size()));
+            topsort2index.put(L.get(i + RB.size()), node2index.get(RF.get(i)));
+        }
+    }
+
+    @SuppressWarnings("unused")
+    private List<V> getTopSort() {
+        List<V> topsort = new ArrayList<V>();
+
+        for (int i : topsort2index.values()) {
+            topsort.add(index2node.get(i));
+        }
+
+        return topsort;
+    }
+
+    private void dfsBackward(V node) {
+        node2mark.put(node, true);
+        RB.add(node);
+
+        for (V sn : gds.getSourceNodes(node).distinctValues()) {
+            int top_id = index2topsort.get(node2index.get(sn));
+
+            if (!node2mark.get(sn) && lower_bound < top_id)
+                dfsBackward(sn);
+        }
+    }
+
+    private void dfsForward(V node) {
+        node2mark.put(node, true);
+        RF.add(node);
+
+        for (V tn : gds.getTargetNodes(node).distinctValues()) {
+            int top_id = index2topsort.get(node2index.get(tn));
+
+            if (top_id == upper_bound)
+                System.out.println("!!!Cycle detected!!!");
+            else if (!node2mark.get(tn) && top_id < upper_bound)
+                dfsForward(tn);
+        }
+    }
+
+    @Override
+    public void edgeDeleted(V source, V target) {
+        // Edge deletion does not affect topsort
+    }
+
+    @Override
+    public void nodeInserted(V n) {
+        node2mark.put(n, false);
+        node2index.put(n, index);
+        index2node.put(index, n);
+        index2topsort.put(index, index);
+        topsort2index.put(index, index);
+        index++;
+    }
+
+    @Override
+    public void nodeDeleted(V n) {
+        node2mark.remove(n);
+        int node_id = node2index.remove(n);
+        index2node.remove(node_id);
+        int top_id = index2topsort.remove(node_id);
+        topsort2index.remove(top_id);
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCC.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCC.java
new file mode 100644
index 00000000..de070839
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCC.java
@@ -0,0 +1,143 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.alg.misc.scc;
+
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
+
+import java.util.*;
+
+/**
+ * Efficient algorithms to compute the Strongly Connected Components in a directed graph.
+ *
+ * @author Tamas Szabo
+ *
+ * @param <V>
+ *            the type parameter of the nodes in the graph
+ */
+public class SCC<V> {
+
+    private SCC() {/*Utility class constructor*/}
+
+    public static long sccId = 0;
+
+    /**
+     * Computes the SCCs for the given graph and returns them as a multiset. (Iterative version of Tarjan's algorithm)
+     *
+     * @param g
+     *            the directed graph data source
+     * @return the set of SCCs
+     */
+    public static <V> SCCResult<V> computeSCC(IGraphDataSource<V> g) {
+        int index = 0;
+        Set<Set<V>> ret = new HashSet<Set<V>>();
+
+        // stores the lowlink and index information for the given node
+        Map<V, SCCProperty> nodeMap = CollectionsFactory.createMap();
+
+        // stores all target nodes of a given node - the list will be modified
+        Map<V, Set<V>> targetNodeMap = CollectionsFactory.createMap();
+
+        // stores those target nodes for a given node which have not been visited
+        Map<V, Set<V>> notVisitedMap = CollectionsFactory.createMap();
+
+        // stores the nodes during the traversal
+        Deque<V> nodeStack = new ArrayDeque<V>();
+
+        // stores the nodes which belong to an scc (there can be many sccs in the stack at the same time)
+        Deque<V> sccStack = new  ArrayDeque<V>();
+
+        boolean sink = false, finishedTraversal = true;
+
+        // initialize all nodes with 0 index and 0 lowlink
+        Set<V> allNodes = g.getAllNodes();
+        for (V n : allNodes) {
+            nodeMap.put(n, new SCCProperty(0, 0));
+        }
+
+        for (V n : allNodes) {
+            // if the node has not been visited yet
+            if (nodeMap.get(n).getIndex() == 0) {
+                nodeStack.push(n);
+
+                while (!nodeStack.isEmpty()) {
+                    V currentNode = nodeStack.peekLast();
+                    sink = false;
+                    finishedTraversal = false;
+                    SCCProperty prop = nodeMap.get(currentNode);
+
+                    if (nodeMap.get(currentNode).getIndex() == 0) {
+                        index++;
+                        sccStack.addLast(currentNode);
+                        prop.setIndex(index);
+                        prop.setLowlink(index);
+
+                        notVisitedMap.put(currentNode, new HashSet<V>());
+
+                        // storing the target nodes of the actual node
+                        if (g.getTargetNodes(currentNode) != null) {
+                            Set<V> targets = g.getTargetNodes(currentNode).distinctValues();
+                            targetNodeMap.put(currentNode, CollectionsFactory.createSet(targets));
+                        }
+                    }
+
+                    if (targetNodeMap.get(currentNode) != null) {
+
+                        // remove node from stack, the exploration of its children has finished
+                        if (targetNodeMap.get(currentNode).size() == 0) {
+                            targetNodeMap.remove(currentNode);
+
+                            nodeStack.removeLast();
+
+                            for (V targetNode : g.getTargetNodes(currentNode).distinctValues()) {
+                                if (notVisitedMap.get(currentNode).contains(targetNode)) {
+                                    prop.setLowlink(Math.min(prop.getLowlink(), nodeMap.get(targetNode).getLowlink()));
+                                } else if (sccStack.contains(targetNode)) {
+                                    prop.setLowlink(Math.min(prop.getLowlink(), nodeMap.get(targetNode).getIndex()));
+                                }
+                            }
+
+                            finishedTraversal = true;
+                        } else {
+                            V targetNode = targetNodeMap.get(currentNode).iterator().next();
+                            targetNodeMap.get(currentNode).remove(targetNode);
+                            // if the targetNode has not yet been visited push it to the stack
+                            // and mark it in the notVisitedMap
+                            if (nodeMap.get(targetNode).getIndex() == 0) {
+                                notVisitedMap.get(currentNode).add(targetNode);
+                                nodeStack.addLast(targetNode);
+                            }
+                        }
+                    }
+                    // if currentNode has no target nodes
+                    else {
+                        nodeStack.removeLast();
+                        sink = true;
+                    }
+
+                    // create scc if node is a sink or an scc has been found
+                    if ((sink || finishedTraversal) && (prop.getLowlink() == prop.getIndex())) {
+                        Set<V> sc = new HashSet<V>();
+                        V targetNode = null;
+
+                        do {
+                            targetNode = sccStack.removeLast();
+                            sc.add(targetNode);
+                        } while (!targetNode.equals(currentNode));
+
+                        ret.add(sc);
+                    }
+                }
+            }
+        }
+
+        return new SCCResult<V>(ret, g);
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCCProperty.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCCProperty.java
new file mode 100644
index 00000000..51ee834e
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCCProperty.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.alg.misc.scc;
+
+public class SCCProperty {
+    private int index;
+    private int lowlink;
+
+    public SCCProperty(int index, int lowlink) {
+        super();
+        this.index = index;
+        this.lowlink = lowlink;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    public int getLowlink() {
+        return lowlink;
+    }
+
+    public void setLowlink(int lowlink) {
+        this.lowlink = lowlink;
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCCResult.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCCResult.java
new file mode 100644
index 00000000..2e511fd6
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/scc/SCCResult.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.alg.misc.scc;
+
+import java.util.Map.Entry;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
+
+public class SCCResult<V> {
+
+    private Set<Set<V>> sccs;
+    private IGraphDataSource<V> gds;
+
+    public SCCResult(Set<Set<V>> sccs, IGraphDataSource<V> gds) {
+        this.sccs = sccs;
+        this.gds = gds;
+    }
+
+    public Set<Set<V>> getSccs() {
+        return sccs;
+    }
+
+    public int getSCCCount() {
+        return sccs.size();
+    }
+
+    public double getAverageNodeCount() {
+        double a = 0;
+
+        for (Set<V> s : sccs) {
+            a += s.size();
+        }
+
+        return a / sccs.size();
+    }
+
+    public double getAverageEdgeCount() {
+        long edgeSum = 0;
+
+        for (Set<V> scc : sccs) {
+            for (V source : scc) {
+                for (Entry<V, Integer> entry : gds.getTargetNodes(source).entriesWithMultiplicities()) {
+                    if (scc.contains(entry.getKey())) {
+                        edgeSum += entry.getValue();
+                    }
+                }
+            }
+        }
+
+        return (double) edgeSum / (double) sccs.size();
+    }
+
+    public int getBiggestSCCSize() {
+        int max = 0;
+
+        for (Set<V> scc : sccs) {
+            if (scc.size() > max)
+                max = scc.size();
+        }
+
+        return max;
+    }
+
+    public long getSumOfSquares() {
+        long sum = 0;
+
+        for (Set<V> scc : sccs) {
+            sum += scc.size() * scc.size();
+        }
+
+        return sum;
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/topsort/TopologicalSorting.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/topsort/TopologicalSorting.java
new file mode 100644
index 00000000..89be6804
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/misc/topsort/TopologicalSorting.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.alg.misc.topsort;
+
+import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
+
+import java.util.*;
+
+/**
+ * @since 1.6
+ */
+public class TopologicalSorting {
+
+    private TopologicalSorting() {/*Utility class constructor*/}
+
+    private static final class Pair<T> {
+        public T element;
+        public boolean isParent;
+
+        public Pair(final T element, final boolean isParent) {
+            this.element = element;
+            this.isParent = isParent;
+        }
+    }
+
+    /**
+     * Returns a topological ordering for the given graph data source.
+     * Output format: if there is an a -> b (transitive) reachability, then node <code>a</code> will come before node <code>b</code> in the resulting list.
+     *
+     * @param gds the graph data source
+     * @return a topological ordering
+     */
+    public static <T> List<T> compute(final IGraphDataSource<T> gds) {
+        final Set<T> visited = new HashSet<T>();
+        final LinkedList<T> result = new LinkedList<T>();
+        final Deque<Pair<T>> dfsStack = new ArrayDeque<Pair<T>>();
+
+        for (final T node : gds.getAllNodes()) {
+            if (!visited.contains(node)) {
+                dfsStack.addLast(new Pair<T>(node, false));
+            }
+
+            while (!dfsStack.isEmpty()) {
+                final Pair<T> head = dfsStack.removeLast();
+                final T source = head.element;
+
+                if (head.isParent) {
+                    // we have already seen source, push it to the resulting stack
+                    result.addFirst(source);
+                } else {
+                    // first time we see source, continue with its children
+                    visited.add(source);
+                    dfsStack.addLast(new Pair<T>(source, true));
+
+                    for (final T target : gds.getTargetNodes(source).distinctValues()) {
+                        if (!visited.contains(target)) {
+                            dfsStack.addLast(new Pair<T>(target, false));
+                        }
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/RepresentativeElectionAlgorithm.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/RepresentativeElectionAlgorithm.java
new file mode 100644
index 00000000..794dabc0
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/RepresentativeElectionAlgorithm.java
@@ -0,0 +1,174 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.viatra.runtime.rete.itc.alg.representative;
+
+import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphObserver;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public abstract class RepresentativeElectionAlgorithm implements IGraphObserver<Object> {
+        protected final Graph<Object> graph;
+        protected final Map<Object, Object> representatives = new HashMap<>();
+        protected final Map<Object, Set<Object>> components = new HashMap<>();
+        private RepresentativeObserver observer;
+
+        protected RepresentativeElectionAlgorithm(Graph<Object> graph) {
+                this.graph = graph;
+                initializeComponents();
+                graph.attachObserver(this);
+        }
+
+        protected abstract void initializeComponents();
+
+        protected void initializeSet(Set<Object> set) {
+                var iterator = set.iterator();
+                if (!iterator.hasNext()) {
+                        // Set is empty.
+                        return;
+                }
+                var representative = iterator.next();
+                for (var node : set) {
+                        var oldRepresentative = representatives.put(node, representative);
+                        if (oldRepresentative != null && !representative.equals(oldRepresentative)) {
+                                throw new IllegalStateException("Node %s is already in a set represented by %s, cannot add it to %s"
+                                                .formatted(node, oldRepresentative, set));
+                        }
+                }
+                components.put(representative, set);
+        }
+
+        protected void merge(Set<Object> toMerge) {
+                if (toMerge.isEmpty()) {
+                        return;
+                }
+                var representativesToMerge = new HashSet<>();
+                Object bestRepresentative = null;
+                Set<Object> bestSet = null;
+                for (var object : toMerge) {
+                        var representative = getRepresentative(object);
+                        if (representativesToMerge.add(representative)) {
+                                var component = getComponent(representative);
+                                if (bestSet == null || bestSet.size() < component.size()) {
+                                        bestRepresentative = representative;
+                                        bestSet = component;
+                                }
+                        }
+                }
+                if (bestRepresentative == null) {
+                        throw new AssertionError("Could not determine best representative");
+                }
+                for (var representative : representativesToMerge) {
+                        if (!bestRepresentative.equals(representative)) {
+                                components.remove(representative);
+                        }
+                }
+                components.put(bestRepresentative, toMerge);
+                for (var object : toMerge) {
+                        var previousRepresentative = representatives.put(object, bestRepresentative);
+                        if (!bestSet.contains(object)) {
+                                notifyToObservers(object, previousRepresentative, bestRepresentative);
+                        }
+                }
+        }
+
+        protected void merge(Object leftRepresentative, Object rightRepresentative) {
+                if (leftRepresentative.equals(rightRepresentative)) {
+                        return;
+                }
+                var leftSet = getComponent(leftRepresentative);
+                var rightSet = getComponent(rightRepresentative);
+                if (leftSet.size() < rightSet.size()) {
+                        merge(rightRepresentative, rightSet, leftRepresentative, leftSet);
+                } else {
+                        merge(leftRepresentative, leftSet, rightRepresentative, rightSet);
+                }
+        }
+
+        private void merge(Object preservedRepresentative, Set<Object> preservedSet, Object removedRepresentative,
+                                           Set<Object> removedSet) {
+                components.remove(removedRepresentative);
+                for (var node : removedSet) {
+                        representatives.put(node, preservedRepresentative);
+                        preservedSet.add(node);
+                        notifyToObservers(node, removedRepresentative, preservedRepresentative);
+                }
+        }
+
+        protected void assignNewRepresentative(Object oldRepresentative, Set<Object> set) {
+                var iterator = set.iterator();
+                if (!iterator.hasNext()) {
+                        return;
+                }
+                var newRepresentative = iterator.next();
+                components.put(newRepresentative, set);
+                for (var node : set) {
+                        var oldRepresentativeOfNode = representatives.put(node, newRepresentative);
+                        if (!oldRepresentative.equals(oldRepresentativeOfNode)) {
+                                throw new IllegalArgumentException("Node %s was not represented by %s but by %s"
+                                                .formatted(node, oldRepresentative, oldRepresentativeOfNode));
+                        }
+                        notifyToObservers(node, oldRepresentative, newRepresentative);
+                }
+        }
+
+        public void setObserver(RepresentativeObserver observer) {
+                this.observer = observer;
+        }
+
+        public Map<Object, Set<Object>> getComponents() {
+                return components;
+        }
+
+        public Object getRepresentative(Object node) {
+                return representatives.get(node);
+        }
+
+        public Set<Object> getComponent(Object representative) {
+                return components.get(representative);
+        }
+
+        public void dispose() {
+                graph.detachObserver(this);
+        }
+
+        @Override
+        public void nodeInserted(Object n) {
+                var component = new HashSet<>(1);
+                component.add(n);
+                initializeSet(component);
+                notifyToObservers(n, n, Direction.INSERT);
+        }
+
+        @Override
+        public void nodeDeleted(Object n) {
+                var representative = representatives.remove(n);
+                if (!representative.equals(n)) {
+                        throw new IllegalStateException("Trying to delete node with dangling edges");
+                }
+                components.remove(representative);
+                notifyToObservers(n, representative, Direction.DELETE);
+        }
+
+        protected void notifyToObservers(Object node, Object oldRepresentative, Object newRepresentative) {
+                notifyToObservers(node, oldRepresentative, Direction.DELETE);
+                notifyToObservers(node, newRepresentative, Direction.INSERT);
+        }
+
+        protected void notifyToObservers(Object node, Object representative, Direction direction) {
+                if (observer != null) {
+                        observer.tupleChanged(node, representative, direction);
+                }
+        }
+
+        public interface Factory {
+                RepresentativeElectionAlgorithm create(Graph<Object> graph);
+        }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/RepresentativeObserver.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/RepresentativeObserver.java
new file mode 100644
index 00000000..6b772fa8
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/RepresentativeObserver.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.viatra.runtime.rete.itc.alg.representative;
+
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+
+public interface RepresentativeObserver {
+        void tupleChanged(Object node, Object representative, Direction direction);
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/StronglyConnectedComponentAlgorithm.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/StronglyConnectedComponentAlgorithm.java
new file mode 100644
index 00000000..0463301b
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/StronglyConnectedComponentAlgorithm.java
@@ -0,0 +1,69 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.viatra.runtime.rete.itc.alg.representative;
+
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.GraphHelper;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.bfs.BFS;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.scc.SCC;
+import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
+
+import java.util.Collection;
+import java.util.Set;
+
+public class StronglyConnectedComponentAlgorithm extends RepresentativeElectionAlgorithm {
+        public StronglyConnectedComponentAlgorithm(Graph<Object> graph) {
+                super(graph);
+        }
+
+        @Override
+        protected void initializeComponents() {
+                var computedSCCs = SCC.computeSCC(graph).getSccs();
+                for (var computedSCC : computedSCCs) {
+                        initializeSet(computedSCC);
+                }
+        }
+
+        @Override
+        public void edgeInserted(Object source, Object target) {
+                var sourceRoot = getRepresentative(source);
+                var targetRoot = getRepresentative(target);
+                if (sourceRoot.equals(targetRoot)) {
+                        // New edge does not change strongly connected components.
+                        return;
+                }
+                if (BFS.isReachable(target, source, graph)) {
+                        var sources = BFS.reachableSources(graph, target);
+                        var targets = BFS.reachableTargets(graph, source);
+                        sources.retainAll(targets);
+                        merge(sources);
+                }
+        }
+
+        @Override
+        public void edgeDeleted(Object source, Object target) {
+                var sourceRoot = getRepresentative(source);
+                var targetRoot = getRepresentative(target);
+                if (!sourceRoot.equals(targetRoot)) {
+                        // New edge does not change strongly connected components.
+                        return;
+                }
+                var component = GraphHelper.getSubGraph(getComponent(sourceRoot), graph);
+                if (!BFS.isReachable(source, target, component)) {
+                        var newSCCs = SCC.computeSCC(component).getSccs();
+                        split(sourceRoot, newSCCs);
+                }
+        }
+
+        private void split(Object preservedRepresentative, Collection<? extends Set<Object>> sets) {
+                for (var set : sets) {
+                        if (set.contains(preservedRepresentative)) {
+                                components.put(preservedRepresentative, set);
+                        } else {
+                                assignNewRepresentative(preservedRepresentative, set);
+                        }
+                }
+        }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/WeaklyConnectedComponentAlgorithm.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/WeaklyConnectedComponentAlgorithm.java
new file mode 100644
index 00000000..704f0235
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/representative/WeaklyConnectedComponentAlgorithm.java
@@ -0,0 +1,85 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.viatra.runtime.rete.itc.alg.representative;
+
+import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
+
+import java.util.ArrayDeque;
+import java.util.HashSet;
+import java.util.Set;
+
+public class WeaklyConnectedComponentAlgorithm extends RepresentativeElectionAlgorithm {
+        public WeaklyConnectedComponentAlgorithm(Graph<Object> graph) {
+                super(graph);
+        }
+
+        @Override
+        protected void initializeComponents() {
+                for (var node : graph.getAllNodes()) {
+                        if (representatives.containsKey(node)) {
+                                continue;
+                        }
+                        var reachable = getReachableNodes(node);
+                        initializeSet(reachable);
+                }
+        }
+
+        @Override
+        public void edgeInserted(Object source, Object target) {
+                var sourceRoot = getRepresentative(source);
+                var targetRoot = getRepresentative(target);
+                merge(sourceRoot, targetRoot);
+        }
+
+        @Override
+        public void edgeDeleted(Object source, Object target) {
+                var sourceRoot = getRepresentative(source);
+                var targetRoot = getRepresentative(target);
+                if (!sourceRoot.equals(targetRoot)) {
+                        throw new IllegalArgumentException("Trying to remove edge not in graph");
+                }
+                var targetReachable = getReachableNodes(target);
+                if (!targetReachable.contains(source)) {
+                        split(sourceRoot, targetReachable);
+                }
+        }
+
+        private void split(Object sourceRepresentative, Set<Object> targetReachable) {
+                var sourceComponent = getComponent(sourceRepresentative);
+                sourceComponent.removeAll(targetReachable);
+                if (targetReachable.contains(sourceRepresentative)) {
+                        components.put(sourceRepresentative, targetReachable);
+                        assignNewRepresentative(sourceRepresentative, sourceComponent);
+                } else {
+                        assignNewRepresentative(sourceRepresentative, targetReachable);
+                }
+        }
+
+        private Set<Object> getReachableNodes(Object source) {
+                var retSet = new HashSet<>();
+                retSet.add(source);
+                var nodeQueue = new ArrayDeque<>();
+                nodeQueue.addLast(source);
+
+                while (!nodeQueue.isEmpty()) {
+                        var node = nodeQueue.removeFirst();
+                        for (var neighbor : graph.getTargetNodes(node).distinctValues()) {
+                                if (!retSet.contains(neighbor)) {
+                                        retSet.add(neighbor);
+                                        nodeQueue.addLast(neighbor);
+                                }
+                        }
+                        for (var neighbor : graph.getSourceNodes(node).distinctValues()) {
+                                if (!retSet.contains(neighbor)) {
+                                        retSet.add(neighbor);
+                                        nodeQueue.addLast(neighbor);
+                                }
+                        }
+                }
+
+                return retSet;
+        }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/util/CollectionHelper.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/util/CollectionHelper.java
new file mode 100644
index 00000000..6655be6d
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/alg/util/CollectionHelper.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.itc.alg.util;
+
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+
+import java.util.Set;
+
+/**
+ * @author Tamas Szabo
+ *
+ */
+public class CollectionHelper {
+
+    private CollectionHelper() {/*Utility class constructor*/}
+
+    /**
+     * Returns the intersection of two sets. It calls {@link Set#retainAll(java.util.Collection)} but returns a new set
+     * containing the elements of the intersection.
+     *
+     * @param set1
+     *            the first set (can be null, interpreted as empty)
+     * @param set2
+     *            the second set (can be null, interpreted as empty)
+     * @return the intersection of the sets
+     * @since 1.7
+     */
+    public static <V> Set<V> intersection(Set<V> set1, Set<V> set2) {
+        if (set1 == null || set2 == null)
+            return CollectionsFactory.createSet();
+
+        Set<V> intersection = CollectionsFactory.createSet(set1);
+        intersection.retainAll(set2);
+        return intersection;
+    }
+
+
+    /**
+     * Returns the difference of two sets (S1\S2). It calls {@link Set#removeAll(java.util.Collection)} but returns a
+     * new set containing the elements of the difference.
+     *
+     * @param set1
+     *            the first set (can be null, interpreted as empty)
+     * @param set2
+     *            the second set (can be null, interpreted as empty)
+     * @return the difference of the sets
+     * @since 1.7
+     */
+    public static <V> Set<V> difference(Set<V> set1, Set<V> set2) {
+        if (set1 == null)
+            return CollectionsFactory.createSet();
+
+        Set<V> difference = CollectionsFactory.createSet(set1);
+        if (set2 != null) difference.removeAll(set2);
+        return difference;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/graphimpl/DotGenerator.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/graphimpl/DotGenerator.java
new file mode 100644
index 00000000..f7f6b5ed
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/graphimpl/DotGenerator.java
@@ -0,0 +1,160 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.itc.graphimpl;
+
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.scc.SCC;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.scc.SCCResult;
+import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+/**
+ * This class contains utility methods to generate dot representations for {@link Graph} instances.
+ *
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public class DotGenerator {
+
+    private static final String[] colors = new String[] { "yellow", "blue", "red", "green", "gray", "cyan" };
+
+    private DotGenerator() {
+
+    }
+
+    /**
+     * Generates the dot representation for the given graph.
+     *
+     * @param graph
+     *            the graph
+     * @param colorSCCs
+     *            specifies if the strongly connected components with size greater than shall be colored
+     * @param nameFunction
+     *            use this function to provide custom names to nodes, null if the default toString shall be used
+     * @param colorFunction
+     *            use this function to provide custom color to nodes, null if the default white color shall be used
+     * @param edgeFunction
+     *            use this function to provide custom edge labels, null if no edge label shall be printed
+     * @return the dot representation as a string
+     */
+    public static <V> String generateDot(final Graph<V> graph, final boolean colorSCCs,
+            final Function<V, String> nameFunction, final Function<V, String> colorFunction,
+            final Function<V, Function<V, String>> edgeFunction) {
+        final Map<V, String> colorMap = new HashMap<V, String>();
+
+        if (colorSCCs) {
+            final SCCResult<V> result = SCC.computeSCC(graph);
+            final Set<Set<V>> sccs = result.getSccs();
+
+            int i = 0;
+            for (final Set<V> scc : sccs) {
+                if (scc.size() > 1) {
+                    for (final V node : scc) {
+                        final String color = colorMap.get(node);
+                        if (color == null) {
+                            colorMap.put(node, colors[i % colors.length]);
+                        } else {
+                            colorMap.put(node, colorMap.get(node) + ":" + colors[i % colors.length]);
+                        }
+                    }
+                    i++;
+                }
+            }
+
+            // if a node has no color yet, then make it white
+            for (final V node : graph.getAllNodes()) {
+                if (!colorMap.containsKey(node)) {
+                    colorMap.put(node, "white");
+                }
+            }
+        } else {
+            for (final V node : graph.getAllNodes()) {
+                colorMap.put(node, "white");
+            }
+        }
+
+        if (colorFunction != null) {
+            for (final V node : graph.getAllNodes()) {
+                colorMap.put(node, colorFunction.apply(node));
+            }
+        }
+
+        final StringBuilder builder = new StringBuilder();
+        builder.append("digraph g {\n");
+
+        for (final V node : graph.getAllNodes()) {
+            final String nodePresentation = nameFunction == null ? node.toString() : nameFunction.apply(node);
+            builder.append("\"" + nodePresentation + "\"");
+            builder.append("[style=filled,fillcolor=" + colorMap.get(node) + "]");
+            builder.append(";\n");
+        }
+
+        for (final V source : graph.getAllNodes()) {
+            final IMemoryView<V> targets = graph.getTargetNodes(source);
+            if (!targets.isEmpty()) {
+                final String sourcePresentation = nameFunction == null ? source.toString() : nameFunction.apply(source);
+                for (final V target : targets.distinctValues()) {
+                    String edgeLabel = null;
+                    if (edgeFunction != null) {
+                        final Function<V, String> v1 = edgeFunction.apply(source);
+                        if (v1 != null) {
+                            edgeLabel = v1.apply(target);
+                        }
+                    }
+
+                    final String targetPresentation = nameFunction == null ? target.toString()
+                            : nameFunction.apply(target);
+
+                    builder.append("\"" + sourcePresentation + "\" -> \"" + targetPresentation + "\"");
+                    if (edgeLabel != null) {
+                        builder.append("[label=\"" + edgeLabel + "\"]");
+                    }
+                    builder.append(";\n");
+                }
+            }
+        }
+
+        builder.append("}");
+        return builder.toString();
+    }
+
+    /**
+     * Generates the dot representation for the given graph. No special pretty printing customization will be applied.
+     *
+     * @param graph
+     *            the graph
+     * @return the dot representation as a string
+     */
+    public static <V> String generateDot(final Graph<V> graph) {
+        return generateDot(graph, false, null, null, null);
+    }
+
+    /**
+     * Returns a simple name shortener function that can be used in the graphviz visualization to help with readability.
+     * WARNING: if you shorten the name of the {@link Node}s too much, the visualization may become incorrect because
+     * grahpviz will treat different nodes as the same if their shortened names are the same.
+     *
+     * @param maxLength
+     *            the maximum length of the text that is kept from the toString of the objects in the graph
+     * @return the shrunk toString value
+     */
+    public static <V> Function<V, String> getNameShortener(final int maxLength) {
+        return new Function<V, String>() {
+            @Override
+            public String apply(final V obj) {
+                final String value = obj.toString();
+                return value.substring(0, Math.min(value.length(), maxLength));
+            }
+        };
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/graphimpl/Graph.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/graphimpl/Graph.java
new file mode 100644
index 00000000..91604cb2
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/graphimpl/Graph.java
@@ -0,0 +1,185 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.graphimpl;
+
+import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphDataSource;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IGraphObserver;
+import tools.refinery.viatra.runtime.rete.itc.igraph.IBiDirectionalGraphDataSource;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+public class Graph<V> implements IGraphDataSource<V>, IBiDirectionalGraphDataSource<V> {
+
+    // source -> target -> count
+    private IMultiLookup<V, V> outgoingEdges;
+    // target -> source -> count
+    private IMultiLookup<V, V> incomingEdges;
+
+    private Set<V> nodes;
+
+    private List<IGraphObserver<V>> observers;
+
+    public Graph() {
+        outgoingEdges = CollectionsFactory.createMultiLookup(Object.class, MemoryType.MULTISETS, Object.class);
+        incomingEdges = CollectionsFactory.createMultiLookup(Object.class, MemoryType.MULTISETS, Object.class);
+        nodes = CollectionsFactory.createSet();
+        observers = CollectionsFactory.createObserverList();
+    }
+
+    public void insertEdge(V source, V target) {
+        outgoingEdges.addPair(source, target);
+        incomingEdges.addPair(target, source);
+
+        for (IGraphObserver<V> go : observers) {
+            go.edgeInserted(source, target);
+        }
+    }
+
+    /**
+     * No-op if trying to delete edge that does not exist
+     *
+     * @since 2.0
+     * @see #deleteEdgeIfExists(Object, Object)
+     */
+    public void deleteEdgeIfExists(V source, V target) {
+        boolean containedEdge = outgoingEdges.lookupOrEmpty(source).containsNonZero(target);
+        if (containedEdge) {
+            deleteEdgeThatExists(source, target);
+        }
+    }
+
+    /**
+     * @throws IllegalStateException
+     *             if trying to delete edge that does not exist
+     * @since 2.0
+     * @see #deleteEdgeIfExists(Object, Object)
+     */
+    public void deleteEdgeThatExists(V source, V target) {
+        outgoingEdges.removePair(source, target);
+        incomingEdges.removePair(target, source);
+        for (IGraphObserver<V> go : observers) {
+            go.edgeDeleted(source, target);
+        }
+    }
+
+    /**
+     * @deprecated use explicitly {@link #deleteEdgeThatExists(Object, Object)} or
+     *             {@link #deleteEdgeIfExists(Object, Object)} instead. To preserve backwards compatibility, this method
+     *             delegates to the latter.
+     *
+     */
+    @Deprecated
+    public void deleteEdge(V source, V target) {
+        deleteEdgeIfExists(source, target);
+    }
+
+    /**
+     * Insert the given node into the graph.
+     */
+    public void insertNode(V node) {
+        if (nodes.add(node)) {
+            for (IGraphObserver<V> go : observers) {
+                go.nodeInserted(node);
+            }
+        }
+    }
+
+    /**
+     * Deletes the given node AND all of the edges going in and out from the node.
+     */
+    public void deleteNode(V node) {
+        if (nodes.remove(node)) {
+            IMemoryView<V> incomingView = incomingEdges.lookup(node);
+            if (incomingView != null) {
+                Map<V, Integer> incoming = CollectionsFactory.createMap(incomingView.asMap());
+
+                for (Entry<V, Integer> entry : incoming.entrySet()) {
+                    for (int i = 0; i < entry.getValue(); i++) {
+                        deleteEdgeThatExists(entry.getKey(), node);
+                    }
+                }
+            }
+
+            IMemoryView<V> outgoingView = outgoingEdges.lookup(node);
+            if (outgoingView != null) {
+                Map<V, Integer> outgoing = CollectionsFactory.createMap(outgoingView.asMap());
+
+                for (Entry<V, Integer> entry : outgoing.entrySet()) {
+                    for (int i = 0; i < entry.getValue(); i++) {
+                        deleteEdgeThatExists(node, entry.getKey());
+                    }
+                }
+            }
+
+            for (IGraphObserver<V> go : observers) {
+                go.nodeDeleted(node);
+            }
+        }
+    }
+
+    @Override
+    public void attachObserver(IGraphObserver<V> go) {
+        observers.add(go);
+    }
+
+    @Override
+    public void attachAsFirstObserver(IGraphObserver<V> observer) {
+        observers.add(0, observer);
+    }
+
+    @Override
+    public void detachObserver(IGraphObserver<V> go) {
+        observers.remove(go);
+    }
+
+    @Override
+    public Set<V> getAllNodes() {
+        return nodes;
+    }
+
+    @Override
+    public IMemoryView<V> getTargetNodes(V source) {
+        return outgoingEdges.lookupOrEmpty(source);
+    }
+
+    @Override
+    public IMemoryView<V> getSourceNodes(V target) {
+        return incomingEdges.lookupOrEmpty(target);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("nodes = ");
+        for (V n : getAllNodes()) {
+            sb.append(n.toString());
+            sb.append(" ");
+        }
+        sb.append(" edges = ");
+        for (V source : outgoingEdges.distinctKeys()) {
+            IMemoryView<V> targets = outgoingEdges.lookup(source);
+            for (V target : targets.distinctValues()) {
+                int count = targets.getCount(target);
+                for (int i = 0; i < count; i++) {
+                    sb.append("(" + source + "," + target + ") ");
+                }
+            }
+        }
+        return sb.toString();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IBiDirectionalGraphDataSource.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IBiDirectionalGraphDataSource.java
new file mode 100644
index 00000000..4fcaa71f
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IBiDirectionalGraphDataSource.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.igraph;
+
+import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+import tools.refinery.viatra.runtime.matchers.util.IMultiset;
+
+/**
+ * A bi-directional graph data source supports all operations that an {@link IGraphDataSource} does, but it
+ * also makes it possible to query the incoming edges of nodes, not only the outgoing edges.
+ *
+ * @author Tamas Szabo
+ *
+ * @param <V> the type of the nodes in the graph
+ */
+public interface IBiDirectionalGraphDataSource<V> extends IGraphDataSource<V> {
+
+    /**
+     * Returns the source nodes for the given target node.
+     * The returned data structure is an {@link IMultiset} because of potential parallel edges in the graph data source.
+     *
+     * The method must not return null.
+     *
+     * @param target the target node
+     * @return the multiset of source nodes
+     * @since 2.0
+     */
+    public IMemoryView<V> getSourceNodes(V target);
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IBiDirectionalWrapper.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IBiDirectionalWrapper.java
new file mode 100644
index 00000000..c4315ca2
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IBiDirectionalWrapper.java
@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.igraph;
+
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
+
+/**
+ * This class can be used to wrap an {@link IGraphDataSource} into an {@link IBiDirectionalGraphDataSource}. This class
+ * provides support for the retrieval of source nodes for a given target which is not supported by standard
+ * {@link IGraphDataSource} implementations.
+ *
+ * @author Tamas Szabo
+ *
+ * @param <V>
+ *            the type parameter of the nodes in the graph data source
+ */
+public class IBiDirectionalWrapper<V> implements IBiDirectionalGraphDataSource<V>, IGraphObserver<V> {
+
+    private IGraphDataSource<V> wrappedDataSource;
+    // target -> source -> count
+    private IMultiLookup<V, V> incomingEdges;
+
+    public IBiDirectionalWrapper(IGraphDataSource<V> gds) {
+        this.wrappedDataSource = gds;
+
+        this.incomingEdges = CollectionsFactory.createMultiLookup(
+                Object.class, MemoryType.MULTISETS, Object.class);
+
+        if (gds.getAllNodes() != null) {
+            for (V source : gds.getAllNodes()) {
+                IMemoryView<V> targets = gds.getTargetNodes(source);
+                for (V target : targets.distinctValues()) {
+                    int count = targets.getCount(target);
+                    for (int i = 0; i < count; i++) {
+                        edgeInserted(source, target);
+                    }
+                }
+            }
+        }
+
+        gds.attachAsFirstObserver(this);
+    }
+
+    @Override
+    public void attachObserver(IGraphObserver<V> observer) {
+        wrappedDataSource.attachObserver(observer);
+    }
+
+    @Override
+    public void attachAsFirstObserver(IGraphObserver<V> observer) {
+        wrappedDataSource.attachAsFirstObserver(observer);
+    }
+
+    @Override
+    public void detachObserver(IGraphObserver<V> observer) {
+        wrappedDataSource.detachObserver(observer);
+    }
+
+    @Override
+    public Set<V> getAllNodes() {
+        return wrappedDataSource.getAllNodes();
+    }
+
+    @Override
+    public IMemoryView<V> getTargetNodes(V source) {
+        return wrappedDataSource.getTargetNodes(source);
+    }
+
+    @Override
+    public IMemoryView<V> getSourceNodes(V target) {
+        return incomingEdges.lookupOrEmpty(target);
+    }
+
+    @Override
+    public void edgeInserted(V source, V target) {
+        incomingEdges.addPair(target, source);
+    }
+
+    @Override
+    public void edgeDeleted(V source, V target) {
+        incomingEdges.removePair(target, source);
+    }
+
+    @Override
+    public void nodeInserted(V n) {
+
+    }
+
+    @Override
+    public void nodeDeleted(V node) {
+
+    }
+
+    @Override
+    public String toString() {
+        return wrappedDataSource.toString();
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IGraphDataSource.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IGraphDataSource.java
new file mode 100644
index 00000000..9159a692
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IGraphDataSource.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.igraph;
+
+import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+import tools.refinery.viatra.runtime.matchers.util.IMultiset;
+
+import java.util.Set;
+
+/**
+ * The interface prescribes the set of operations that a graph data source must support.
+ * <p> Note that the old version of the interface is broken at version 1.6;
+ *  MultiSets are now presented as Maps instead of Lists.
+ *
+ * @author Tamas Szabo
+ *
+ * @param <V>
+ *            the type of the nodes in the graph
+ */
+public interface IGraphDataSource<V> {
+
+    /**
+     * Attaches a new graph observer to this graph data source. Observers will be notified in the order they have been registered.
+     *
+     * @param observer the graph observer
+     */
+    public void attachObserver(IGraphObserver<V> observer);
+
+    /**
+     * Attaches a new graph observer to this graph data source as the first one.
+     * In the notification order this observer will be the first one as long as another call to this method happens.
+     *
+     * @param observer the graph observer
+     * @since 1.6
+     */
+    public void attachAsFirstObserver(IGraphObserver<V> observer);
+
+    /**
+     * Detaches an already registered graph observer from this graph data source.
+     *
+     * @param observer the graph observer
+     */
+    public void detachObserver(IGraphObserver<V> observer);
+
+    /**
+     * Returns the complete set of nodes in the graph data source.
+     *
+     * @return the set of all nodes
+     */
+    public Set<V> getAllNodes();
+
+    /**
+     * Returns the target nodes for the given source node.
+     * The returned data structure is an {@link IMultiset} because of potential parallel edges in the graph data source.
+     *
+     * The method must not return null.
+     *
+     * @param source the source node
+     * @return the multiset of target nodes
+     * @since 2.0
+     */
+    public IMemoryView<V> getTargetNodes(V source);
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IGraphObserver.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IGraphObserver.java
new file mode 100644
index 00000000..a282216d
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/IGraphObserver.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.igraph;
+
+/**
+ * Interface GraphObserver is used to observ the changes in a graph; edge and node insertion/deleteion.
+ *
+ * @author Tamas Szabo
+ *
+ */
+public interface IGraphObserver<V> {
+
+    /**
+     * Used to notify when an edge is inserted into the graph.
+     *
+     * @param source
+     *            the source of the edge
+     * @param target
+     *            the target of the edge
+     */
+    public void edgeInserted(V source, V target);
+
+    /**
+     * Used to notify when an edge is deleted from the graph.
+     *
+     * @param source
+     *            the source of the edge
+     * @param target
+     *            the target of the edge
+     */
+    public void edgeDeleted(V source, V target);
+
+    /**
+     * Used to notify when a node is inserted into the graph.
+     *
+     * @param n
+     *            the node
+     */
+    public void nodeInserted(V n);
+
+    /**
+     * Used to notify when a node is deleted from the graph.
+     *
+     * @param n
+     *            the node
+     */
+    public void nodeDeleted(V n);
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/ITcDataSource.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/ITcDataSource.java
new file mode 100644
index 00000000..5ede600f
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/ITcDataSource.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.igraph;
+
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.IGraphPathFinder;
+
+/**
+ * This interface defines those methods that a transitive reachability data source should provide.
+ *
+ * @author Tamas Szabo
+ *
+ * @param <V>
+ *            the type parameter of the node
+ */
+public interface ITcDataSource<V> {
+
+    /**
+     * Attach a transitive closure relation observer.
+     *
+     * @param to
+     *            the observer object
+     */
+    public void attachObserver(ITcObserver<V> to);
+
+    /**
+     * Detach a transitive closure relation observer.
+     *
+     * @param to
+     *            the observer object
+     */
+    public void detachObserver(ITcObserver<V> to);
+
+    /**
+     * Returns all nodes which are reachable from the source node.
+     *
+     * @param source
+     *            the source node
+     * @return the set of target nodes
+     */
+    public Set<V> getAllReachableTargets(V source);
+
+    /**
+     * Returns all nodes from which the target node is reachable.
+     *
+     * @param target
+     *            the target node
+     * @return the set of source nodes
+     */
+    public Set<V> getAllReachableSources(V target);
+
+    /**
+     * Returns true if the target node is reachable from the source node.
+     *
+     * @param source
+     *            the source node
+     * @param target
+     *            the target node
+     * @return true if target is reachable from source, false otherwise
+     */
+    public boolean isReachable(V source, V target);
+
+    /**
+     * The returned {@link IGraphPathFinder} can be used to retrieve paths between nodes using transitive reachability.
+     *
+     * @return a path finder for the graph.
+     */
+    public IGraphPathFinder<V> getPathFinder();
+
+    /**
+     * Call this method to properly dispose the data structures of a transitive closure algorithm.
+     */
+    public void dispose();
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/ITcObserver.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/ITcObserver.java
new file mode 100644
index 00000000..74e0cb75
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/itc/igraph/ITcObserver.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.itc.igraph;
+
+/**
+ * Interface ITcObserver is used to observe the changes in a transitive closure relation; tuple insertion/deletion.
+ *
+ * @author Szabo Tamas
+ *
+ */
+public interface ITcObserver<V> {
+
+    /**
+     * Used to notify when a tuple is inserted into the transitive closure relation.
+     *
+     * @param source
+     *            the source of the tuple
+     * @param target
+     *            the target of the tuple
+     */
+    public void tupleInserted(V source, V target);
+
+    /**
+     * Used to notify when a tuple is deleted from the transitive closure relation.
+     *
+     * @param source
+     *            the source of the tuple
+     * @param target
+     *            the target of the tuple
+     */
+    public void tupleDeleted(V source, V target);
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/DRedReteBackendFactory.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/DRedReteBackendFactory.java
new file mode 100644
index 00000000..83e86fe6
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/DRedReteBackendFactory.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.matcher;
+
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+
+/**
+ * A {@link ReteBackendFactory} implementation that creates {@link ReteEngine}s that use delete and re-derive
+ * evaluation.
+ * 
+ * @author Tamas Szabo
+ * @since 2.2
+ */
+public class DRedReteBackendFactory extends ReteBackendFactory {
+
+    public static final DRedReteBackendFactory INSTANCE = new DRedReteBackendFactory();
+
+    @Override
+    public IQueryBackend create(IQueryBackendContext context) {
+        return create(context, true, null);
+    }
+
+    @Override
+    public int hashCode() {
+        return DRedReteBackendFactory.class.hashCode();
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof DRedReteBackendFactory)) {
+            return false;
+        }
+        return true;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/HintConfigurator.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/HintConfigurator.java
new file mode 100644
index 00000000..a4fa4914
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/HintConfigurator.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.matcher;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * A configurable hint provider that gathers hints for queries during runtime, and delegates defaults to an external hint provider. 
+ * 
+ * @author Gabor Bergmann
+ * @since 1.5
+ */
+class HintConfigurator implements IQueryBackendHintProvider {
+    
+    private IQueryBackendHintProvider defaultHintProvider;
+    private Map<PQuery, QueryEvaluationHint> storedHints = new HashMap<PQuery, QueryEvaluationHint>();
+
+    public HintConfigurator(IQueryBackendHintProvider defaultHintProvider) {
+        this.defaultHintProvider = defaultHintProvider;
+    }
+
+    @Override
+    public QueryEvaluationHint getQueryEvaluationHint(PQuery query) {
+        return defaultHintProvider.getQueryEvaluationHint(query).overrideBy(storedHints.get(query));
+    }
+    
+    public void storeHint(PQuery query, QueryEvaluationHint hint) {
+        QueryEvaluationHint oldHint = storedHints.get(query);
+        if (oldHint == null)
+            storedHints.put(query, hint);
+        else
+            storedHints.put(query, oldHint.overrideBy(hint));
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/IncrementalMatcherCapability.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/IncrementalMatcherCapability.java
new file mode 100644
index 00000000..4c64a1a1
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/IncrementalMatcherCapability.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.matcher;
+
+import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
+
+/**
+ * @author Grill Balázs
+ * @since 1.4
+ *
+ */
+public class IncrementalMatcherCapability implements IMatcherCapability {
+
+    @Override
+    public boolean canBeSubstitute(IMatcherCapability capability) {
+        /*
+         * TODO: for now, as we are only prepared for Rete and LS, we can assume that
+         * a matcher created with Rete can always be a substitute for a matcher created
+         * by any backend.
+         */
+        return true;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteBackendFactory.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteBackendFactory.java
new file mode 100644
index 00000000..347cabc4
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteBackendFactory.java
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.matcher;
+
+import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.rete.construction.plancompiler.ReteRecipeCompiler;
+import tools.refinery.viatra.runtime.rete.util.Options;
+
+public class ReteBackendFactory implements IQueryBackendFactory {
+    /**
+     * EXPERIMENTAL
+     */
+    protected static final int reteThreads = 0;
+
+    /**
+     * @since 2.0
+     */
+    public static final ReteBackendFactory INSTANCE = new ReteBackendFactory();
+
+    /**
+     * @deprecated Use the static {@link #INSTANCE} field instead
+     */
+    @Deprecated
+    public ReteBackendFactory() {
+    }
+
+    /**
+     * @since 1.5
+     */
+    @Override
+    public IQueryBackend create(IQueryBackendContext context) {
+        return create(context, false, null);
+    }
+
+    /**
+     * @since 2.4
+     */
+    public IQueryBackend create(IQueryBackendContext context, boolean deleteAndRederiveEvaluation,
+            TimelyConfiguration timelyConfiguration) {
+        ReteEngine engine;
+        engine = new ReteEngine(context, reteThreads, deleteAndRederiveEvaluation, timelyConfiguration);
+        IQueryBackendHintProvider hintConfiguration = engine.getHintConfiguration();
+        ReteRecipeCompiler compiler = new ReteRecipeCompiler(
+                Options.builderMethod.layoutStrategy(context, hintConfiguration), context.getLogger(),
+                context.getRuntimeContext().getMetaContext(), context.getQueryCacheContext(), hintConfiguration,
+                context.getQueryAnalyzer(), deleteAndRederiveEvaluation, timelyConfiguration);
+        engine.setCompiler(compiler);
+        return engine;
+    }
+
+    @Override
+    public Class<? extends IQueryBackend> getBackendClass() {
+        return ReteEngine.class;
+    }
+
+    @Override
+    public int hashCode() {
+        return ReteBackendFactory.class.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof ReteBackendFactory)) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @since 1.4
+     */
+    @Override
+    public IMatcherCapability calculateRequiredCapability(PQuery query, QueryEvaluationHint hint) {
+        return new IncrementalMatcherCapability();
+    }
+
+    @Override
+    public boolean isCaching() {
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteBackendFactoryProvider.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteBackendFactoryProvider.java
new file mode 100644
index 00000000..98775ab3
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteBackendFactoryProvider.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.matcher;
+
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactoryProvider;
+
+/**
+ * @since 2.0
+ *
+ */
+public class ReteBackendFactoryProvider implements IQueryBackendFactoryProvider {
+
+    @Override
+    public IQueryBackendFactory getFactory() {
+        return ReteBackendFactory.INSTANCE;
+    }
+
+    @Override
+    public boolean isSystemDefaultEngine() {
+        return true;
+    }
+
+    @Override
+    public boolean isSystemDefaultCachingBackend() {
+        return true;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteEngine.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteEngine.java
new file mode 100644
index 00000000..9bd499f4
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/ReteEngine.java
@@ -0,0 +1,579 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.matcher;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.rete.boundary.Disconnectable;
+import tools.refinery.viatra.runtime.rete.boundary.ReteBoundary;
+import tools.refinery.viatra.runtime.rete.construction.RetePatternBuildException;
+import tools.refinery.viatra.runtime.rete.construction.plancompiler.ReteRecipeCompiler;
+import tools.refinery.viatra.runtime.rete.index.Indexer;
+import tools.refinery.viatra.runtime.rete.network.Network;
+import tools.refinery.viatra.runtime.rete.network.NodeProvisioner;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
+
+/**
+ * @author Gabor Bergmann
+ *
+ */
+public class ReteEngine implements IQueryBackend {
+
+    protected Network reteNet;
+    protected final int reteThreads;
+    protected ReteBoundary boundary;
+    
+    /**
+     * @since 2.2
+     */
+    protected final boolean deleteAndRederiveEvaluation;
+    /**
+     * @since 2.4
+     */
+    protected final TimelyConfiguration timelyConfiguration;
+
+    private IQueryBackendContext context;
+    private Logger logger;
+    protected IQueryRuntimeContext runtimeContext;
+
+    protected Collection<Disconnectable> disconnectables;
+
+    protected Map<PQuery, RetePatternMatcher> matchers;
+
+    protected ReteRecipeCompiler compiler;
+
+    protected final boolean parallelExecutionEnabled; // TRUE if model manipulation can go on
+
+    private boolean disposedOrUninitialized = true;
+    
+    private HintConfigurator hintConfigurator;
+
+    /**
+     * @param context
+     *            the context of the pattern matcher, conveying all information from the outside world.
+     * @param reteThreads
+     *            the number of threads to operate the RETE network with; 0 means single-threaded operation, 1 starts an
+     *            asynchronous thread to operate the RETE net, >1 uses multiple RETE containers.
+     */
+    public ReteEngine(IQueryBackendContext context, int reteThreads) {
+        this(context, reteThreads, false, null);
+    }
+    
+    /**
+     * @since 2.4
+     */
+    public ReteEngine(IQueryBackendContext context, int reteThreads, boolean deleteAndRederiveEvaluation, TimelyConfiguration timelyConfiguration) {
+        super();
+        this.context = context;
+        this.logger = context.getLogger();
+        this.runtimeContext = context.getRuntimeContext();
+        this.reteThreads = reteThreads;
+        this.parallelExecutionEnabled = reteThreads > 0;
+        this.deleteAndRederiveEvaluation = deleteAndRederiveEvaluation;
+        this.timelyConfiguration = timelyConfiguration;
+        initEngine();
+        this.compiler = null;
+    }
+    
+    /**
+     * @since 1.6
+     */
+    public IQueryBackendContext getBackendContext() {
+        return context;
+    }
+    
+    /**
+     * @since 2.2
+     */
+    public boolean isDeleteAndRederiveEvaluation() {
+        return this.deleteAndRederiveEvaluation;
+    }
+    
+    /**
+     * @since 2.4
+     */
+    public TimelyConfiguration getTimelyConfiguration() {
+        return this.timelyConfiguration;
+    }
+
+    /**
+     * initializes engine components
+     */
+    private synchronized void initEngine() {
+        this.disposedOrUninitialized = false;
+        this.disconnectables = new LinkedList<Disconnectable>();
+        // this.caughtExceptions = new LinkedBlockingQueue<Throwable>();
+
+        
+        this.hintConfigurator = new HintConfigurator(context.getHintProvider());
+        
+        this.reteNet = new Network(reteThreads, this);
+        this.boundary = new ReteBoundary(this); // prerequisite: network
+
+        this.matchers = CollectionsFactory.createMap();
+        /* this.matchersScoped = new HashMap<PatternDescription, Map<Map<Integer,Scope>,RetePatternMatcher>>(); */
+
+        // prerequisite: network, framework, boundary, disconnectables
+        //context.subscribeBackendForUpdates(this.boundary);
+        // prerequisite: boundary, disconnectables
+//        this.traceListener = context.subscribePatternMatcherForTraceInfluences(this);
+
+    }
+    
+    @Override
+    public void flushUpdates() {
+        for (ReteContainer container : this.reteNet.getContainers()) {
+            container.deliverMessagesSingleThreaded();
+        }
+    }
+
+    /**
+     * deconstructs engine components
+     */
+    private synchronized void deconstructEngine() {
+        ensureInitialized();
+        reteNet.kill();
+
+        //context.unSubscribeBackendFromUpdates(this.boundary);
+        for (Disconnectable disc : disconnectables) {
+            disc.disconnect();
+        }
+
+        this.matchers = null;
+        this.disconnectables = null;
+
+        this.reteNet = null;
+        this.boundary = null;
+        
+        this.hintConfigurator = null;
+
+        // this.machineListener = new MachineListener(this); // prerequisite:
+        // framework, disconnectables
+//        this.traceListener = null;
+
+        this.disposedOrUninitialized = true;
+    }
+
+    /**
+     * Deconstructs the engine to get rid of it finally
+     */
+    public void killEngine() {
+        deconstructEngine();
+        // this.framework = null;
+        this.compiler = null;
+        this.logger = null;
+    }
+
+    /**
+     * Resets the engine to an after-initialization phase
+     *
+     */
+    public void reset() {
+        deconstructEngine();
+
+        initEngine();
+
+        compiler.reset();
+    }
+
+    /**
+     * Accesses the patternmatcher for a given pattern, constructs one if a matcher is not available yet.
+     *
+     * @pre: builder is set.
+     * @param query
+     *            the pattern to be matched.
+     * @return a patternmatcher object that can match occurences of the given pattern.
+     * @throws ViatraQueryRuntimeException
+     *             if construction fails.
+     */
+    public synchronized RetePatternMatcher accessMatcher(final PQuery query) {
+        ensureInitialized();
+        RetePatternMatcher matcher;
+        // String namespace = gtPattern.getNamespace().getName();
+        // String name = gtPattern.getName();
+        // String fqn = namespace + "." + name;
+        matcher = matchers.get(query);
+        if (matcher == null) {
+            constructionWrapper(() -> {
+                RecipeTraceInfo prodNode;
+                prodNode = boundary.accessProductionTrace(query);
+
+                RetePatternMatcher retePatternMatcher = new RetePatternMatcher(ReteEngine.this,
+                        prodNode);
+                retePatternMatcher.setTag(query);
+                matchers.put(query, retePatternMatcher);
+                return null;
+            });
+            matcher = matchers.get(query);
+        }
+        
+        executeDelayedCommands();
+
+        return matcher;
+    }
+
+    
+    /**
+     * Constructs RETE pattern matchers for a collection of patterns, if they are not available yet. Model traversal
+     * during the whole construction period is coalesced (which may have an effect on performance, depending on the
+     * matcher context).
+     *
+     * @pre: builder is set.
+     * @param specifications
+     *            the patterns to be matched.
+     * @throws ViatraQueryRuntimeException
+     *             if construction fails.
+     */
+    public synchronized void buildMatchersCoalesced(final Collection<PQuery> specifications) {
+        ensureInitialized();
+        constructionWrapper(() -> {
+            for (PQuery specification : specifications) {
+                boundary.accessProductionNode(specification);
+            }
+            return null;
+        });
+    }
+
+    /**
+     * @since 2.4
+     */
+    public <T> T constructionWrapper(final Callable<T> payload) {
+        T result = null;
+//              context.modelReadLock();
+//                  try {
+                if (parallelExecutionEnabled)
+                    reteNet.getStructuralChangeLock().lock();
+                try {
+                    try {
+                        result = runtimeContext.coalesceTraversals(() -> { 
+                            T innerResult = payload.call(); 
+                            this.executeDelayedCommands(); 
+                            return innerResult;
+                        });
+                    } catch (InvocationTargetException ex) {
+                        final Throwable cause = ex.getCause();
+                        if (cause instanceof RetePatternBuildException)
+                            throw (RetePatternBuildException) cause;
+                        if (cause instanceof RuntimeException)
+                            throw (RuntimeException) cause;
+                        assert (false);
+                    }
+                } finally {
+                   if (parallelExecutionEnabled)
+                        reteNet.getStructuralChangeLock().unlock();
+                   reteNet.waitForReteTermination();
+                }
+//                  } finally {
+//                      context.modelReadUnLock();
+//                  }
+            return result;
+    }
+
+    // /**
+    // * Accesses the patternmatcher for a given pattern with additional scoping, constructs one if
+    // * a matcher is not available yet.
+    // *
+    // * @param gtPattern
+    // * the pattern to be matched.
+    // * @param additionalScopeMap
+    // * additional, optional scopes for the symbolic parameters
+    // * maps the position of the symbolic parameter to its additional scope (if any)
+    // * @pre: scope.parent is non-root, i.e. this is a nontrivial constraint
+    // * use the static method RetePatternMatcher.buildAdditionalScopeMap() to create from PatternCallSignature
+    // * @return a patternmatcher object that can match occurences of the given
+    // * pattern.
+    // * @throws PatternMatcherCompileTimeException
+    // * if construction fails.
+    // */
+    // public synchronized RetePatternMatcher accessMatcherScoped(PatternDescription gtPattern, Map<Integer, Scope>
+    // additionalScopeMap)
+    // throws PatternMatcherCompileTimeException {
+    // if (additionalScopeMap.isEmpty()) return accessMatcher(gtPattern);
+    //
+    // RetePatternMatcher matcher;
+    //
+    // Map<Map<Integer, Scope>, RetePatternMatcher> scopes = matchersScoped.get(gtPattern);
+    // if (scopes == null) {
+    // scopes = new HashMap<Map<Integer, Scope>, RetePatternMatcher>();
+    // matchersScoped.put(gtPattern, scopes);
+    // }
+    //
+    // matcher = scopes.get(additionalScopeMap);
+    // if (matcher == null) {
+    // context.modelReadLock();
+    // try {
+    // reteNet.getStructuralChangeLock().lock();
+    // try {
+    // Address<? extends Production> prodNode;
+    // prodNode = boundary.accessProductionScoped(gtPattern, additionalScopeMap);
+    //
+    // matcher = new RetePatternMatcher(this, prodNode);
+    // scopes.put(additionalScopeMap, matcher);
+    // } finally {
+    // reteNet.getStructuralChangeLock().unlock();
+    // }
+    // } finally {
+    // context.modelReadUnLock();
+    // }
+    // // reteNet.flushUpdates();
+    // }
+    //
+    // return matcher;
+    // }
+
+    /**
+     * Returns an indexer that groups the contents of this Production node by their projections to a given mask.
+     * Designed to be called by a RetePatternMatcher.
+     *
+     * @param production
+     *            the production node to be indexed.
+     * @param mask
+     *            the mask that defines the projection.
+     * @return the Indexer.
+     */
+    synchronized Indexer accessProjection(RecipeTraceInfo production, TupleMask mask) {
+        ensureInitialized();
+        NodeProvisioner nodeProvisioner = reteNet.getHeadContainer().getProvisioner();
+        Indexer result = nodeProvisioner.peekProjectionIndexer(production, mask);
+        if (result == null) {
+            result = constructionWrapper(() -> 
+                nodeProvisioner.accessProjectionIndexerOnetime(production, mask)
+            );
+        }
+
+        return result;
+    }
+
+    // /**
+    // * Retrieves the patternmatcher for a given pattern fqn, returns null if
+    // the matching network hasn't been constructed yet.
+    // *
+    // * @param fqn the fully qualified name of the pattern to be matched.
+    // * @return the previously constructed patternmatcher object that can match
+    // occurences of the given pattern, or null if it doesn't exist.
+    // */
+    // public RetePatternMatcher getMatcher(String fqn)
+    // {
+    // RetePatternMatcher matcher = matchersByFqn.get(fqn);
+    // if (matcher == null)
+    // {
+    // Production prodNode = boundary.getProduction(fqn);
+    //
+    // matcher = new RetePatternMatcher(this, prodNode);
+    // matchersByFqn.put(fqn, matcher);
+    // }
+    //
+    // return matcher;
+    // }
+
+    /**
+     * @since 2.3
+     */
+    public void executeDelayedCommands() {
+        for (final ReteContainer container : this.reteNet.getContainers()) {
+            container.executeDelayedCommands();
+        }
+    }
+    
+    /**
+     * Waits until the pattern matcher is in a steady state and output can be retrieved.
+     */
+    public void settle() {
+        ensureInitialized();
+        reteNet.waitForReteTermination();
+    }
+
+    /**
+     * Waits until the pattern matcher is in a steady state and output can be retrieved. When steady state is reached, a
+     * retrieval action is executed before the steady state ceases.
+     *
+     * @param action
+     *            the action to be run when reaching the steady-state.
+     */
+    public void settle(Runnable action) {
+        ensureInitialized();
+        reteNet.waitForReteTermination(action);
+    }
+
+    // /**
+    // * @return the framework
+    // */
+    // public IFramework getFramework() {
+    // return framework.get();
+    // }
+
+    /**
+     * @return the reteNet
+     */
+    public Network getReteNet() {
+       ensureInitialized();
+       return reteNet;
+    }
+
+    /**
+     * @return the boundary
+     */
+    public ReteBoundary getBoundary() {
+        ensureInitialized();
+        return boundary;
+    }
+
+    // /**
+    // * @return the pattern matcher builder
+    // */
+    // public IRetePatternBuilder getBuilder() {
+    // return builder;
+    // }
+
+    /**
+     * @param builder
+     *            the pattern matcher builder to set
+     */
+    public void setCompiler(ReteRecipeCompiler builder) {
+        ensureInitialized();
+        this.compiler = builder;
+    }
+
+//    /**
+//     * @return the manipulationListener
+//     */
+//    public IManipulationListener getManipulationListener() {
+//      ensureInitialized();
+//       return manipulationListener;
+//    }
+
+//    /**
+//     * @return the traceListener
+//     */
+//    public IPredicateTraceListener geTraceListener() {
+//      ensureInitialized();
+//        return traceListener;
+//    }
+
+    /**
+     * @param disc
+     *            the new Disconnectable adapter.
+     */
+    public void addDisconnectable(Disconnectable disc) {
+        ensureInitialized();
+        disconnectables.add(disc);
+    }
+
+    /**
+     * @return the parallelExecutionEnabled
+     */
+    public boolean isParallelExecutionEnabled() {
+        return parallelExecutionEnabled;
+    }
+
+
+    public Logger getLogger() {
+        ensureInitialized();
+        return logger;
+    }
+
+    public IQueryRuntimeContext getRuntimeContext() {
+        ensureInitialized();
+        return runtimeContext;
+    }
+
+    public ReteRecipeCompiler getCompiler() {
+        ensureInitialized();
+       return compiler;
+    }
+
+    // /**
+    // * For internal use only: logs exceptions occurring during term evaluation inside the RETE net.
+    // * @param e
+    // */
+    // public void logEvaluatorException(Throwable e) {
+    // try {
+    // caughtExceptions.put(e);
+    // } catch (InterruptedException e1) {
+    // logEvaluatorException(e);
+    // }
+    // }
+    // /**
+    // * Polls the exceptions caught and logged during term evaluation by this RETE engine.
+    // * Recommended usage: iterate polling until null is returned.
+    // *
+    // * @return the next caught exception, or null if there are no more.
+    // */
+    // public Throwable getNextLoggedEvaluatorException() {
+    // return caughtExceptions.poll();
+    // }
+
+    void ensureInitialized() {
+        if (disposedOrUninitialized)
+            throw new IllegalStateException("Trying to use a Rete engine that has been disposed or has not yet been initialized.");
+
+    }
+    
+    @Override
+    public IQueryResultProvider getResultProvider(PQuery query)  {
+        return accessMatcher(query);
+    }
+    
+    /**
+     * @since 1.4
+     */
+    @Override
+    public IQueryResultProvider getResultProvider(PQuery query, QueryEvaluationHint hints) {
+        hintConfigurator.storeHint(query, hints);
+        return accessMatcher(query);
+    }
+
+    @Override
+    public IQueryResultProvider peekExistingResultProvider(PQuery query) {
+        ensureInitialized();
+        return matchers.get(query);
+    }
+
+    @Override
+    public void dispose() {
+        killEngine();
+    }
+    
+    @Override
+    public boolean isCaching() {
+        return true;
+    }
+
+    /**
+     * @since 1.5
+     * @noreference Internal API, subject to change
+     */
+    public IQueryBackendHintProvider getHintConfiguration() {
+        return hintConfigurator;
+    }
+
+    @Override
+    public IQueryBackendFactory getFactory() {
+        return ReteBackendFactory.INSTANCE;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/RetePatternMatcher.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/RetePatternMatcher.java
new file mode 100644
index 00000000..38fe7c2f
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/RetePatternMatcher.java
@@ -0,0 +1,463 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * Copyright (c) 2023 The Refinery Authors <https://refinery.tools>
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.matcher;
+
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.backend.IUpdateable;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.Accuracy;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.rete.index.Indexer;
+import tools.refinery.viatra.runtime.rete.index.IterableIndexer;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.ProductionNode;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.remote.Address;
+import tools.refinery.viatra.runtime.rete.single.CallbackNode;
+import tools.refinery.viatra.runtime.rete.single.TransformerNode;
+import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author Gabor Bergmann
+ *
+ */
+public class RetePatternMatcher extends TransformerNode implements IQueryResultProvider {
+
+    protected ReteEngine engine;
+    protected IQueryRuntimeContext context;
+    protected ProductionNode productionNode;
+    protected RecipeTraceInfo productionNodeTrace;
+    protected Map<String, Integer> posMapping;
+    protected Map<Object, Receiver> taggedChildren = CollectionsFactory.createMap();
+    protected boolean connected = false; // is rete-wise connected to the
+                                         // production node?
+
+    /**
+     * @param productionNode
+     *            a production node that matches this pattern without any parameter bindings
+     * @pre: Production must be local to the head container
+     */
+    public RetePatternMatcher(ReteEngine engine, RecipeTraceInfo productionNodeTrace) {
+        super(engine.getReteNet().getHeadContainer());
+        this.engine = engine;
+        this.context = engine.getRuntimeContext();
+        this.productionNodeTrace = productionNodeTrace;
+        final Address<? extends Node> productionAddress = reteContainer.getProvisioner()
+                .getOrCreateNodeByRecipe(productionNodeTrace);
+        if (!reteContainer.isLocal(productionAddress))
+            throw new IllegalArgumentException("@pre: Production must be local to the head container");
+        this.productionNode = (ProductionNode) reteContainer.resolveLocal(productionAddress);
+        this.posMapping = this.productionNode.getPosMapping();
+        this.reteContainer.getCommunicationTracker().registerDependency(this.productionNode, this);
+    }
+
+    /**
+     * @since 1.6
+     */
+    public ProductionNode getProductionNode() {
+        return productionNode;
+    }
+
+    public Tuple matchOneRandomly(Object[] inputMapping, boolean[] fixed) {
+        List<Tuple> allMatches = matchAll(inputMapping, fixed).collect(Collectors.toList());
+        if (allMatches == null || allMatches.isEmpty())
+            return null;
+        else
+            return allMatches.get((int) (Math.random() * allMatches.size()));
+    }
+
+    /**
+     * @since 2.0
+     */
+    public Stream<Tuple> matchAll(Object[] inputMapping, boolean[] fixed) {
+        // retrieving the projection
+        TupleMask mask = TupleMask.fromKeepIndicators(fixed);
+        Tuple inputSignature = mask.transform(Tuples.flatTupleOf(inputMapping));
+
+        return matchAll(mask, inputSignature);
+
+    }
+
+    /**
+     * @since 2.0
+     */
+    public Stream<Tuple> matchAll(TupleMask mask, ITuple inputSignature) {
+        AllMatchFetcher fetcher = new AllMatchFetcher(engine.accessProjection(productionNodeTrace, mask),
+                context.wrapTuple(inputSignature.toImmutable()));
+        engine.reteNet.waitForReteTermination(fetcher);
+        return fetcher.getMatches();
+
+    }
+
+    /**
+     * @since 2.0
+     */
+    public Optional<Tuple> matchOne(Object[] inputMapping, boolean[] fixed) {
+        // retrieving the projection
+        TupleMask mask = TupleMask.fromKeepIndicators(fixed);
+        Tuple inputSignature = mask.transform(Tuples.flatTupleOf(inputMapping));
+
+        return matchOne(mask, inputSignature);
+    }
+
+    /**
+     * @since 2.0
+     */
+    public Optional<Tuple> matchOne(TupleMask mask, ITuple inputSignature) {
+        SingleMatchFetcher fetcher = new SingleMatchFetcher(engine.accessProjection(productionNodeTrace, mask),
+                context.wrapTuple(inputSignature.toImmutable()));
+        engine.reteNet.waitForReteTermination(fetcher);
+        return Optional.ofNullable(fetcher.getMatch());
+    }
+
+    /**
+     * Counts the number of occurrences of the pattern that match inputMapping on positions where fixed is true.
+     *
+     * @return the number of occurrences
+     */
+    public int count(Object[] inputMapping, boolean[] fixed) {
+        TupleMask mask = TupleMask.fromKeepIndicators(fixed);
+        Tuple inputSignature = mask.transform(Tuples.flatTupleOf(inputMapping));
+
+        return count(mask, inputSignature);
+    }
+
+    /**
+     * Counts the number of occurrences of the pattern that match inputMapping on positions where fixed is true.
+     *
+     * @return the number of occurrences
+     * @since 1.7
+     */
+    public int count(TupleMask mask, ITuple inputSignature) {
+        CountFetcher fetcher = new CountFetcher(engine.accessProjection(productionNodeTrace, mask),
+                context.wrapTuple(inputSignature.toImmutable()));
+        engine.reteNet.waitForReteTermination(fetcher);
+
+        return fetcher.getCount();
+    }
+
+    /**
+     * Counts the number of distinct tuples attainable from the match set by projecting match tuples according to the given mask.
+     *
+     *
+     * @return the size of the projection
+     * @since 2.1
+     */
+    public int projectionSize(TupleMask groupMask) {
+        ProjectionSizeFetcher fetcher = new ProjectionSizeFetcher(
+                (IterableIndexer) engine.accessProjection(productionNodeTrace, groupMask));
+        engine.reteNet.waitForReteTermination(fetcher);
+
+        return fetcher.getSize();
+    }
+
+    /**
+     * Connects a new external receiver that will receive update notifications from now on. The receiver will
+     * practically connect to the production node, the added value is unwrapping the updates for external use.
+     *
+     * @param synchronize
+     *            if true, the contents of the production node will be inserted into the receiver after the connection
+     *            is established.
+     */
+    public synchronized void connect(Receiver receiver, boolean synchronize) {
+        if (!connected) { // connect to the production node as a RETE-child
+            reteContainer.connect(productionNode, this);
+            connected = true;
+        }
+        if (synchronize)
+            reteContainer.connectAndSynchronize(this, receiver);
+        else
+            reteContainer.connect(this, receiver);
+    }
+
+    /**
+     * Connects a new external receiver that will receive update notifications from now on. The receiver will
+     * practically connect to the production node, the added value is unwrapping the updates for external use.
+     *
+     * The external receiver will be disconnectable later based on its tag.
+     *
+     * @param tag
+     *            an identifier to recognize the child node by.
+     *
+     * @param synchronize
+     *            if true, the contents of the production node will be inserted into the receiver after the connection
+     *            is established.
+     *
+     */
+    public synchronized void connect(Receiver receiver, Object tag, boolean synchronize) {
+        taggedChildren.put(tag, receiver);
+        connect(receiver, synchronize);
+    }
+
+    /**
+     * Disconnects a child node.
+     */
+    public synchronized void disconnect(Receiver receiver) {
+        reteContainer.disconnect(this, receiver);
+    }
+
+    /**
+     * Disconnects the child node that was connected by specifying the given tag.
+     *
+     * @return if a child node was found registered with this tag.
+     */
+    public synchronized boolean disconnectByTag(Object tag) {
+        final Receiver receiver = taggedChildren.remove(tag);
+        final boolean found = receiver != null;
+        if (found)
+            disconnect(receiver);
+        return found;
+    }
+
+    @Override
+    protected Tuple transform(Tuple input) {
+        return context.unwrapTuple(input);
+    }
+
+    abstract class AbstractMatchFetcher implements Runnable {
+        Indexer indexer;
+        Tuple signature;
+
+        public AbstractMatchFetcher(Indexer indexer, Tuple signature) {
+            super();
+            this.indexer = indexer;
+            this.signature = signature;
+        }
+
+        @Override
+        public void run() {
+            fetch(indexer.get(signature));
+        }
+
+        protected abstract void fetch(Collection<Tuple> matches);
+
+    }
+
+    class AllMatchFetcher extends AbstractMatchFetcher {
+
+        public AllMatchFetcher(Indexer indexer, Tuple signature) {
+            super(indexer, signature);
+        }
+
+        Stream<Tuple> matches = null;
+
+        public Stream<Tuple> getMatches() {
+            return matches;
+        }
+
+        @Override
+        protected void fetch(Collection<Tuple> matches) {
+            if (matches == null)
+                this.matches = Stream.of();
+            else {
+                this.matches = matches.stream().map(context::unwrapTuple);
+            }
+
+        }
+
+    }
+
+    class SingleMatchFetcher extends AbstractMatchFetcher {
+
+        public SingleMatchFetcher(Indexer indexer, Tuple signature) {
+            super(indexer, signature);
+        }
+
+        Tuple match = null;
+
+        public Tuple getMatch() {
+            return match;
+        }
+
+        @Override
+        protected void fetch(Collection<Tuple> matches) {
+            if (matches != null && !matches.isEmpty())
+                match = context.unwrapTuple(matches.iterator().next());
+        }
+
+        // public void run() {
+        // Collection<Tuple> unscopedMatches = indexer.get(signature);
+        //
+        // // checking scopes
+        // if (unscopedMatches != null) {
+        // for (Tuple um : /* productionNode */unscopedMatches) {
+        // match = inputConnector.unwrapTuple(um);
+        // return;
+        //
+        // // Tuple ps = inputConnector.unwrapTuple(um);
+        // // boolean ok = true;
+        // // if (!ignoreScope) for (int k = 0; (k < ps.getSize()) && ok; k++) {
+        // // if (pcs[k].getParameterMode() == ParameterMode.INPUT) {
+        // // // ok = ok && (inputMapping[k]==ps.elements[k]);
+        // // // should now be true
+        // // } else // ParameterMode.OUTPUT
+        // // {
+        // // IEntity scopeParent = (IEntity) pcs[k].getParameterScope().getParent();
+        // // Integer containmentMode = pcs[k].getParameterScope().getContainmentMode();
+        // // if (containmentMode == Scope.BELOW)
+        // // ok = ok && ((IModelElement) ps.get(k)).isBelowNamespace(scopeParent);
+        // // else
+        // // /* case Scope.IN: */
+        // // ok = ok && scopeParent.equals(((IModelElement) ps.get(k)).getNamespace());
+        // // // note: getNamespace returns null instead of the
+        // // // (imaginary) modelspace root entity for top level
+        // // // elements;
+        // // // this is not a problem here as Scope.IN implies
+        // // // scopeParent != root.
+        // //
+        // // }
+        // // }
+        // //
+        // // if (ok) {
+        // // reteMatching = new ReteMatching(ps, posMapping);
+        // // return;
+        // // }
+        // }
+        // }
+        //
+        // }
+
+    }
+
+    class CountFetcher extends AbstractMatchFetcher {
+
+        public CountFetcher(Indexer indexer, Tuple signature) {
+            super(indexer, signature);
+        }
+
+        int count = 0;
+
+        public int getCount() {
+            return count;
+        }
+
+        @Override
+        protected void fetch(Collection<Tuple> matches) {
+            count = matches == null ? 0 : matches.size();
+        }
+
+    }
+
+    class ProjectionSizeFetcher implements Runnable {
+        IterableIndexer indexer;
+        int size = 0;
+
+        public ProjectionSizeFetcher(IterableIndexer indexer) {
+            super();
+            this.indexer = indexer;
+        }
+
+        @Override
+        public void run() {
+            size = indexer.getBucketCount();
+        }
+
+        public int getSize() {
+            return size;
+        }
+
+    }
+
+    private boolean[] notNull(Object[] parameters) {
+        boolean[] notNull = new boolean[parameters.length];
+        for (int i = 0; i < parameters.length; ++i)
+            notNull[i] = parameters[i] != null;
+        return notNull;
+    }
+
+
+
+    @Override
+    public boolean hasMatch(Object[] parameters) {
+        return countMatches(parameters) > 0;
+    }
+
+    @Override
+    public boolean hasMatch(TupleMask parameterSeedMask, ITuple parameters) {
+        return count(parameterSeedMask, parameters) > 0;
+    }
+
+    @Override
+    public int countMatches(Object[] parameters) {
+        return count(parameters, notNull(parameters));
+    }
+
+    @Override
+    public int countMatches(TupleMask parameterSeedMask, ITuple parameters) {
+        return count(parameterSeedMask, parameters);
+    }
+
+
+    @Override
+    public Optional<Long> estimateCardinality(TupleMask groupMask, Accuracy requiredAccuracy) {
+        return Optional.of((long)projectionSize(groupMask)); // always accurate
+    }
+
+    @Override
+    public Optional<Tuple> getOneArbitraryMatch(Object[] parameters) {
+        return matchOne(parameters, notNull(parameters));
+    }
+
+    @Override
+    public Optional<Tuple> getOneArbitraryMatch(TupleMask parameterSeedMask, ITuple parameters) {
+        return matchOne(parameterSeedMask, parameters);
+    }
+
+    @Override
+    public Stream<Tuple> getAllMatches(Object[] parameters) {
+        return matchAll(parameters, notNull(parameters));
+    }
+
+    @Override
+    public Stream<Tuple> getAllMatches(TupleMask parameterSeedMask, ITuple parameters) {
+        return matchAll(parameterSeedMask, parameters);
+    }
+
+    @Override
+    public IQueryBackend getQueryBackend() {
+        return engine;
+    }
+
+    @Override
+    public void addUpdateListener(final IUpdateable listener, final Object listenerTag, boolean fireNow) {
+        // As a listener is added as a delayed command, they should be executed to make sure everything is consistent on
+        // return, see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=562369
+        engine.constructionWrapper(() -> {
+            final CallbackNode callbackNode = new CallbackNode(this.reteContainer, listener);
+            connect(callbackNode, listenerTag, fireNow);
+            return null;
+        });
+    }
+
+    @Override
+    public void removeUpdateListener(Object listenerTag) {
+        engine.constructionWrapper(() -> {
+            disconnectByTag(listenerTag);
+            return null;
+        });
+    }
+
+        public Indexer getInternalIndexer(TupleMask mask) {
+                return engine.accessProjection(productionNodeTrace, mask);
+        }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/TimelyConfiguration.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/TimelyConfiguration.java
new file mode 100644
index 00000000..876ddc99
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/TimelyConfiguration.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.matcher;
+
+/**
+ * Configuration of timely evaluation.
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public class TimelyConfiguration {
+
+    private final AggregatorArchitecture aggregatorArchitecture;
+    private final TimelineRepresentation timelineRepresentation;
+
+    public TimelyConfiguration(final TimelineRepresentation timelineRepresentation,
+            final AggregatorArchitecture aggregatorArchitecture) {
+        this.aggregatorArchitecture = aggregatorArchitecture;
+        this.timelineRepresentation = timelineRepresentation;
+    }
+
+    public AggregatorArchitecture getAggregatorArchitecture() {
+        return aggregatorArchitecture;
+    }
+
+    public TimelineRepresentation getTimelineRepresentation() {
+        return timelineRepresentation;
+    }
+
+    public enum AggregatorArchitecture {
+        /**
+         * Aggregands are copied over from lower timestamps to higher timestamps.  
+         */
+        PARALLEL,
+        
+        /**
+         * Aggregands are only present at the timestamp where they are inserted at. 
+         * Only aggregate results are pushed towards higher timestamps during folding. 
+         */
+        SEQUENTIAL
+    }
+
+    public enum TimelineRepresentation {
+        /**
+         * Only the first moment (timestamp) of appearance is maintained per tuple.  
+         */
+        FIRST_ONLY,
+        
+        /**
+         * Complete timeline (series of appearance & disappearance) is maintained per tuple.  
+         */
+        FAITHFUL
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/TimelyReteBackendFactory.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/TimelyReteBackendFactory.java
new file mode 100644
index 00000000..2777f169
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/matcher/TimelyReteBackendFactory.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.matcher;
+
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.AggregatorArchitecture;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.TimelineRepresentation;
+
+/**
+ * A {@link ReteBackendFactory} implementation that creates {@link ReteEngine}s that use non-scattered timely
+ * evaluation.
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public class TimelyReteBackendFactory extends ReteBackendFactory {
+
+    private final TimelyConfiguration configuration;
+    
+    public static final TimelyReteBackendFactory FIRST_ONLY_SEQUENTIAL = new TimelyReteBackendFactory(
+            new TimelyConfiguration(TimelineRepresentation.FIRST_ONLY, AggregatorArchitecture.SEQUENTIAL));
+    public static final TimelyReteBackendFactory FIRST_ONLY_PARALLEL = new TimelyReteBackendFactory(
+            new TimelyConfiguration(TimelineRepresentation.FIRST_ONLY, AggregatorArchitecture.PARALLEL));
+    public static final TimelyReteBackendFactory FAITHFUL_SEQUENTIAL = new TimelyReteBackendFactory(
+            new TimelyConfiguration(TimelineRepresentation.FAITHFUL, AggregatorArchitecture.SEQUENTIAL));
+    public static final TimelyReteBackendFactory FAITHFUL_PARALLEL = new TimelyReteBackendFactory(
+            new TimelyConfiguration(TimelineRepresentation.FAITHFUL, AggregatorArchitecture.PARALLEL));    
+    
+    public TimelyReteBackendFactory(final TimelyConfiguration configuration) {
+        this.configuration = configuration;
+    }
+
+    @Override
+    public IQueryBackend create(final IQueryBackendContext context) {
+        return create(context, false, configuration);
+    }
+
+    @Override
+    public int hashCode() {
+        return TimelyReteBackendFactory.class.hashCode();
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof TimelyReteBackendFactory)) {
+            return false;
+        }
+        return true;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/Bag.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/Bag.java
new file mode 100644
index 00000000..4aef0f96
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/Bag.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.misc;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ *         A bag is a container that tuples can be dumped into. Does NOT propagate updates! Optimized for small contents
+ *         size OR positive updates only.
+ */
+public class Bag extends SimpleReceiver {
+
+    public Collection<Tuple> contents;
+
+    public Bag(ReteContainer reteContainer) {
+        super(reteContainer);
+        contents = new LinkedList<Tuple>();
+    }
+
+    @Override
+    public void update(Direction direction, Tuple updateElement, Timestamp timestamp) {
+        if (direction == Direction.INSERT)
+            contents.add(updateElement);
+        else
+            contents.remove(updateElement);
+    }
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/ConstantNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/ConstantNode.java
new file mode 100644
index 00000000..980d3eee
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/ConstantNode.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.misc;
+
+import java.util.Collection;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.StandardNode;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * Node that always contains a single constant Tuple
+ * 
+ * @author Gabor Bergmann
+ */
+public class ConstantNode extends StandardNode {
+
+    protected Tuple constant;
+
+    /**
+     * @param constant
+     *            will be wrapped using {@link IQueryRuntimeContext#wrapTuple(Tuple)}
+     */
+    public ConstantNode(ReteContainer reteContainer, Tuple constant) {
+        super(reteContainer);
+        this.constant = reteContainer.getNetwork().getEngine().getRuntimeContext().wrapTuple(constant);
+    }
+
+    @Override
+    public void pullInto(Collection<Tuple> collector, boolean flush) {
+        collector.add(constant);
+    }
+
+    @Override
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        collector.put(constant, Timestamp.INSERT_AT_ZERO_TIMELINE);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/DefaultDeltaMonitor.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/DefaultDeltaMonitor.java
new file mode 100644
index 00000000..efba3117
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/DefaultDeltaMonitor.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.misc;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.rete.network.Network;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+
+/**
+ * Default configuration for DeltaMonitor.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public class DefaultDeltaMonitor extends DeltaMonitor<Tuple> {
+
+    /**
+     * @param reteContainer
+     */
+    public DefaultDeltaMonitor(ReteContainer reteContainer) {
+        super(reteContainer);
+    }
+
+    /**
+     * @param network
+     */
+    public DefaultDeltaMonitor(Network network) {
+        super(network.getHeadContainer());
+    }
+
+    @Override
+    public Tuple statelessConvert(Tuple tuple) {
+        return tuple;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/DeltaMonitor.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/DeltaMonitor.java
new file mode 100644
index 00000000..82b6ecda
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/DeltaMonitor.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.misc;
+
+import java.util.Collection;
+import java.util.LinkedHashSet;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Clearable;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * A monitoring object that connects to the rete network as a receiver to reflect changes since an arbitrary state
+ * acknowledged by the client. Match tuples are represented by a type MatchType.
+ * 
+ * <p>
+ * <b>Usage</b>. If a new matching is found, it appears in the matchFoundEvents collection, and disappears when that
+ * particular matching cannot be found anymore. If the event of finding a match has been processed by the client, it can
+ * be removed manually. In this case, when a previously found matching is lost, the Tuple will appear in the
+ * matchLostEvents collection, and disappear upon finding the same matching again. "Matching lost" events can also be
+ * acknowledged by removing a Tuple from the collection. If the matching is found once again, it will return to
+ * matchFoundEvents.
+ * 
+ * <p>
+ * <b>Technical notes</b>. Does NOT propagate updates!
+ * 
+ * By overriding statelessConvert(), results can be stored to a MatchType. MatchType must provide equals() and
+ * hashCode() reflecting its contents. The default implementation (DefaultDeltaMonitor) uses Tuple as MatchType.
+ * 
+ * By overriding statelessFilter(), some tuples can be filtered.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public abstract class DeltaMonitor<MatchType> extends SimpleReceiver implements Clearable {
+
+    /**
+     * matches that are newly found
+     */
+    public Collection<MatchType> matchFoundEvents;
+    /**
+     * matches that are newly lost
+     */
+    public Collection<MatchType> matchLostEvents;
+
+    /**
+     * @param reteContainer
+     */
+    public DeltaMonitor(ReteContainer reteContainer) {
+        super(reteContainer);
+        matchFoundEvents = new LinkedHashSet<MatchType>();
+        matchLostEvents = new LinkedHashSet<MatchType>();
+        reteContainer.registerClearable(this);
+    }
+
+    // /**
+    // * Build a delta monitor into the head container of the network.
+    // *
+    // * @param network
+    // */
+    // public DeltaMonitor(Network network) {
+    // this(network.getHeadContainer());
+    // }
+
+    /**
+     * Override this method to provide a lightweight, stateless filter on the tuples
+     * 
+     * @param tuple
+     *            the occurrence that is to be filtered
+     * @return true if this tuple should be monitored, false if ignored
+     */
+    public boolean statelessFilter(Tuple tuple) {
+        return true;
+    }
+
+    public abstract MatchType statelessConvert(Tuple tuple);
+
+    @Override
+    public void update(Direction direction, Tuple updateElement, Timestamp timestamp) {
+        if (statelessFilter(updateElement)) {
+            MatchType match = statelessConvert(updateElement);
+            if (direction == Direction.INSERT) {
+                if (!matchLostEvents.remove(match)) // either had before but
+                                                    // lost
+                    matchFoundEvents.add(match); // or brand-new
+            } else // revoke
+            {
+                if (!matchFoundEvents.remove(match)) // either never found
+                                                     // in the first
+                                                     // place
+                    matchLostEvents.add(match); // or newly lost
+            }
+        }
+    }
+
+    @Override
+    public void clear() {
+        matchFoundEvents.clear();
+        matchLostEvents.clear();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/SimpleReceiver.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/SimpleReceiver.java
new file mode 100644
index 00000000..dcf9ae78
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/misc/SimpleReceiver.java
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.misc;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import tools.refinery.viatra.runtime.rete.network.BaseNode;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
+import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+
+/**
+ * @author Bergmann Gabor
+ * 
+ */
+public abstract class SimpleReceiver extends BaseNode implements Receiver {
+
+    protected Supplier parent = null;
+    /**
+     * @since 1.6
+     */
+    protected final Mailbox mailbox;
+    
+    /**
+     * @param reteContainer
+     */
+    public SimpleReceiver(ReteContainer reteContainer) {
+        super(reteContainer);
+        mailbox = instantiateMailbox();
+        reteContainer.registerClearable(mailbox);
+    }
+
+    /**
+     * Instantiates the {@link Mailbox} of this receiver.
+     * Subclasses may override this method to provide their own mailbox implementation.
+     * 
+     * @return the mailbox
+     * @since 2.0
+     */
+    protected Mailbox instantiateMailbox() {
+        if (this.reteContainer.isTimelyEvaluation()) {
+            return new TimelyMailbox(this, this.reteContainer);
+        } else {
+            return new BehaviorChangingMailbox(this, this.reteContainer);
+        }
+    }
+    
+    @Override
+    public Mailbox getMailbox() {
+        return this.mailbox;
+    }
+    
+    @Override
+    public void appendParent(Supplier supplier) {
+        if (parent == null)
+            parent = supplier;
+        else
+            throw new UnsupportedOperationException("Illegal RETE edge: " + this + " already has a parent (" + parent
+                    + ") and cannot connect to additional parent (" + supplier
+                    + ") as it is not a Uniqueness Enforcer Node. ");
+    }
+
+    @Override
+    public void removeParent(Supplier supplier) {
+        if (parent == supplier)
+            parent = null;
+        else
+            throw new IllegalArgumentException("Illegal RETE edge removal: the parent of " + this + " is not "
+                    + supplier);
+    }
+
+    @Override
+    public Collection<Supplier> getParents() {
+        if (parent == null)
+            return Collections.emptySet();
+        else
+            return Collections.singleton(parent);
+    }
+
+    /**
+     * Disconnects this node from the network. Can be called publicly.
+     * 
+     * @pre: child nodes, if any, must already be disconnected.
+     */
+    public void disconnectFromNetwork() {
+        if (parent != null)
+            reteContainer.disconnect(parent, this);
+    }
+    
+    @Override
+    public void assignTraceInfo(TraceInfo traceInfo) {
+        super.assignTraceInfo(traceInfo);
+        if (traceInfo.propagateFromStandardNodeToSupplierParent())
+            if (parent != null)
+                parent.acceptPropagatedTraceInfo(traceInfo);
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/BaseNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/BaseNode.java
new file mode 100644
index 00000000..2469d6bd
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/BaseNode.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.TreeSet;
+
+import tools.refinery.viatra.runtime.rete.traceability.PatternTraceInfo;
+import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+
+/**
+ * Base implementation for a Rete node.
+ * 
+ * @author Bergmann Gabor
+ * 
+ */
+public abstract class BaseNode implements Node {
+
+    protected ReteContainer reteContainer;
+    protected long nodeId;
+    protected Object tag;
+    protected Set<TraceInfo> traceInfos;
+
+    /**
+     * @param reteContainer
+     *            the container to create this node in
+     */
+    public BaseNode(ReteContainer reteContainer) {
+        super();
+        this.reteContainer = reteContainer;
+        this.nodeId = reteContainer.registerNode(this);
+        this.traceInfos = new HashSet<TraceInfo>();
+    }
+
+    @Override
+    public String toString() {
+        if (tag != null)
+            return toStringCore() + "->" + getTraceInfoPatternsEnumerated() + "{" + tag.toString() + "}";
+        else
+            return toStringCore() + "->" + getTraceInfoPatternsEnumerated();
+    }
+
+    /**
+     * clients should override this to append before the tag / trace indicators
+     */
+    protected String toStringCore() {
+        return "[" + nodeId + "]" + getClass().getSimpleName();
+    }
+
+    @Override
+    public ReteContainer getContainer() {
+        return reteContainer;
+    }
+
+    @Override
+    public long getNodeId() {
+        return nodeId;
+    }
+
+    @Override
+    public Object getTag() {
+        return tag;
+    }
+
+    @Override
+    public void setTag(Object tag) {
+        this.tag = tag;
+    }
+        
+    @Override
+    public Set<TraceInfo> getTraceInfos() {
+        return Collections.unmodifiableSet(traceInfos);
+    }
+    
+    @Override
+    public void assignTraceInfo(TraceInfo traceInfo) {
+        traceInfos.add(traceInfo);
+        traceInfo.assignNode(this);
+    }
+    
+    @Override
+    public void acceptPropagatedTraceInfo(TraceInfo traceInfo) {
+        assignTraceInfo(traceInfo);
+    }
+    
+    /**
+     * Descendants should use this in e.g. logging
+     */
+    protected String getTraceInfoPatternsEnumerated() {
+        TreeSet<String> patternNames = new TreeSet<String>();
+        for (TraceInfo trInfo : traceInfos) {
+            if (trInfo instanceof PatternTraceInfo) {
+                final String pName = ((PatternTraceInfo) trInfo).getPatternName();
+                patternNames.add(pName);
+            }
+        }
+        return patternNames.toString();
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ConnectionFactory.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ConnectionFactory.java
new file mode 100644
index 00000000..b261d19d
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ConnectionFactory.java
@@ -0,0 +1,171 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * Copyright (c) 2023 The Refinery Authors <https://refinery.tools>
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.rete.aggregation.IndexerBasedAggregatorNode;
+import tools.refinery.viatra.runtime.rete.boundary.InputConnector;
+import tools.refinery.viatra.runtime.rete.eval.RelationEvaluatorNode;
+import tools.refinery.viatra.runtime.rete.index.DualInputNode;
+import tools.refinery.viatra.runtime.rete.index.Indexer;
+import tools.refinery.viatra.runtime.rete.index.IterableIndexer;
+import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
+import tools.refinery.viatra.runtime.rete.recipes.*;
+import tools.refinery.viatra.runtime.rete.remote.Address;
+import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Class responsible for connecting freshly instantiating Rete nodes to their parents.
+ *
+ * @author Bergmann Gabor
+ *
+ */
+class ConnectionFactory {
+    ReteContainer reteContainer;
+
+    public ConnectionFactory(ReteContainer reteContainer) {
+        super();
+        this.reteContainer = reteContainer;
+    }
+
+    // TODO move to node implementation instead?
+    private boolean isStateful(ReteNodeRecipe recipe) {
+        return recipe instanceof ProjectionIndexerRecipe || recipe instanceof IndexerBasedAggregatorRecipe
+                || recipe instanceof SingleColumnAggregatorRecipe || recipe instanceof ExpressionEnforcerRecipe
+                || recipe instanceof TransitiveClosureRecipe || recipe instanceof ProductionRecipe
+                || recipe instanceof UniquenessEnforcerRecipe || recipe instanceof RelationEvaluationRecipe;
+
+    }
+
+    /**
+     * PRE: nodes for parent recipes must already be created and registered
+     * <p>
+     * PRE: must not be an input node (for which {@link InputConnector} is responsible)
+     */
+    public void connectToParents(RecipeTraceInfo recipeTrace, Node freshNode) {
+        final ReteNodeRecipe recipe = recipeTrace.getRecipe();
+        if (recipe instanceof ConstantRecipe) {
+            // NO-OP
+        } else if (recipe instanceof InputRecipe) {
+            throw new IllegalArgumentException(
+                    ConnectionFactory.class.getSimpleName() + " not intended for input connection: " + recipe);
+        } else if (recipe instanceof SingleParentNodeRecipe) {
+            final Receiver receiver = (Receiver) freshNode;
+            ReteNodeRecipe parentRecipe = ((SingleParentNodeRecipe) recipe).getParent();
+            connectToParent(recipe, receiver, parentRecipe);
+        } else if (recipe instanceof RelationEvaluationRecipe) {
+            List<ReteNodeRecipe> parentRecipes = ((MultiParentNodeRecipe) recipe).getParents();
+            List<Supplier> parentSuppliers = new ArrayList<Supplier>();
+            for (final ReteNodeRecipe parentRecipe : parentRecipes) {
+                parentSuppliers.add(getSupplierForRecipe(parentRecipe));
+            }
+            ((RelationEvaluatorNode) freshNode).connectToParents(parentSuppliers);
+        } else if (recipe instanceof BetaRecipe) {
+            final DualInputNode beta = (DualInputNode) freshNode;
+            final ArrayList<RecipeTraceInfo> parentTraces = new ArrayList<RecipeTraceInfo>(
+                    recipeTrace.getParentRecipeTraces());
+            Slots slots = avoidActiveNodeConflict(parentTraces.get(0), parentTraces.get(1));
+            beta.connectToIndexers(slots.primary, slots.secondary);
+        } else if (recipe instanceof IndexerBasedAggregatorRecipe) {
+            final IndexerBasedAggregatorNode aggregator = (IndexerBasedAggregatorNode) freshNode;
+            final IndexerBasedAggregatorRecipe aggregatorRecipe = (IndexerBasedAggregatorRecipe) recipe;
+            aggregator.initializeWith((ProjectionIndexer) resolveIndexer(aggregatorRecipe.getParent()));
+        } else if (recipe instanceof MultiParentNodeRecipe) {
+            final Receiver receiver = (Receiver) freshNode;
+            List<ReteNodeRecipe> parentRecipes = ((MultiParentNodeRecipe) recipe).getParents();
+            for (ReteNodeRecipe parentRecipe : parentRecipes) {
+                connectToParent(recipe, receiver, parentRecipe);
+            }
+        }
+    }
+
+    private Indexer resolveIndexer(final IndexerRecipe indexerRecipe) {
+        final Address<? extends Node> address = reteContainer.getNetwork().getExistingNodeByRecipe(indexerRecipe);
+        return (Indexer) reteContainer.resolveLocal(address);
+    }
+
+    private void connectToParent(ReteNodeRecipe recipe, Receiver freshNode, ReteNodeRecipe parentRecipe) {
+        final Supplier parentSupplier = getSupplierForRecipe(parentRecipe);
+
+        // special synch
+        if (freshNode instanceof ReinitializedNode) {
+            Collection<Tuple> tuples = new ArrayList<Tuple>();
+            parentSupplier.pullInto(tuples, true);
+            ((ReinitializedNode) freshNode).reinitializeWith(tuples);
+            reteContainer.connect(parentSupplier, freshNode);
+        } else { // default case
+            // stateless nodes do not have to be synced with contents UNLESS they already have children (recursive
+            // corner case)
+            if (isStateful(recipe)
+                    || ((freshNode instanceof Supplier) && !((Supplier) freshNode).getReceivers().isEmpty())) {
+                reteContainer.connectAndSynchronize(parentSupplier, freshNode);
+            } else {
+                // stateless node, no synch
+                reteContainer.connect(parentSupplier, freshNode);
+            }
+        }
+    }
+
+    private Supplier getSupplierForRecipe(ReteNodeRecipe recipe) {
+        @SuppressWarnings("unchecked")
+        final Address<? extends Supplier> parentAddress = (Address<? extends Supplier>) reteContainer.getNetwork()
+                .getExistingNodeByRecipe(recipe);
+        final Supplier supplier = reteContainer.getProvisioner().asSupplier(parentAddress);
+        return supplier;
+    }
+
+    /**
+     * If two indexers share their active node, joining them via DualInputNode is error-prone. Exception: coincidence of
+     * the two indexers is supported.
+     *
+     * @return a replacement for the secondary Indexers, if needed
+     */
+    private Slots avoidActiveNodeConflict(final RecipeTraceInfo primarySlot, final RecipeTraceInfo secondarySlot) {
+        Slots result = new Slots() {
+            {
+                primary = (IterableIndexer) resolveIndexer((ProjectionIndexerRecipe) primarySlot.getRecipe());
+                secondary = resolveIndexer((IndexerRecipe) secondarySlot.getRecipe());
+            }
+        };
+        if (activeNodeConflict(result.primary, result.secondary))
+            if (result.secondary instanceof IterableIndexer)
+                result.secondary = resolveActiveIndexer(secondarySlot);
+            else
+                result.primary = (IterableIndexer) resolveActiveIndexer(primarySlot);
+        return result;
+    }
+
+    private Indexer resolveActiveIndexer(final RecipeTraceInfo inactiveIndexerTrace) {
+        final RecipeTraceInfo activeIndexerTrace = reteContainer.getProvisioner()
+                .accessActiveIndexer(inactiveIndexerTrace);
+        reteContainer.getProvisioner().getOrCreateNodeByRecipe(activeIndexerTrace);
+        return resolveIndexer((ProjectionIndexerRecipe) activeIndexerTrace.getRecipe());
+    }
+
+    private static class Slots {
+        IterableIndexer primary;
+        Indexer secondary;
+    }
+
+    /**
+     * If two indexers share their active node, joining them via DualInputNode is error-prone. Exception: coincidence of
+     * the two indexers is supported.
+     *
+     * @return true if there is a conflict of active nodes.
+     */
+    private boolean activeNodeConflict(Indexer primarySlot, Indexer secondarySlot) {
+        return !primarySlot.equals(secondarySlot) && primarySlot.getActiveNode().equals(secondarySlot.getActiveNode());
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/IGroupable.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/IGroupable.java
new file mode 100644
index 00000000..c22b06d8
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/IGroupable.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network;
+
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+
+/**
+ * @author Gabor Bergmann
+ * @since 1.7
+ */
+public interface IGroupable {
+
+    /**
+     * @return the current group of the mailbox
+     * @since 1.7
+     */
+    CommunicationGroup getCurrentGroup();
+
+    /**
+     * Sets the current group of the mailbox
+     * @since 1.7
+     */
+    void setCurrentGroup(CommunicationGroup group);
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Network.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Network.java
new file mode 100644
index 00000000..64f59ff3
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Network.java
@@ -0,0 +1,408 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.network;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.boundary.InputConnector;
+import tools.refinery.viatra.runtime.rete.matcher.ReteEngine;
+import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+import tools.refinery.viatra.runtime.rete.remote.Address;
+import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
+import tools.refinery.viatra.runtime.rete.util.Options;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+public class Network {
+    final int threads;
+
+    protected ArrayList<ReteContainer> containers;
+    ReteContainer headContainer;
+    private int firstContainer = 0;
+    private int nextContainer = 0;
+
+    // the following fields exist only if threads > 0
+    protected Map<ReteContainer, Long> globalTerminationCriteria = null;
+    protected Map<ReteContainer, Long> reportedClocks = null;
+    protected Lock updateLock = null; // grab during normal update operations
+    protected Lock structuralChangeLock = null; // grab if the network structure
+                                                // is to
+    // be changed
+
+    // Knowledge of the outside world
+    private ReteEngine engine;
+    protected NodeFactory nodeFactory;
+    protected InputConnector inputConnector;
+
+    // Node and recipe administration
+    // incl. addresses for existing nodes by recipe (where available)
+    // Maintained by NodeProvisioner of each container
+    Map<ReteNodeRecipe, Address<? extends Node>> nodesByRecipe = CollectionsFactory.createMap();
+    Set<RecipeTraceInfo> recipeTraces = CollectionsFactory.createSet();
+
+    /**
+     * @throws IllegalStateException
+     *             if no node has been constructed for the recipe
+     */
+    public synchronized Address<? extends Node> getExistingNodeByRecipe(ReteNodeRecipe recipe) {
+        final Address<? extends Node> node = nodesByRecipe.get(recipe);
+        if (node == null)
+            throw new IllegalStateException(String.format("Rete node for recipe %s not constructed yet.", recipe));
+        return node;
+    }
+
+    /**
+     * @return null if no node has been constructed for the recipe
+     */
+    public synchronized Address<? extends Node> getNodeByRecipeIfExists(ReteNodeRecipe recipe) {
+        final Address<? extends Node> node = nodesByRecipe.get(recipe);
+        return node;
+    }
+
+    /**
+     * @param threads
+     *            the number of threads to operate the network with; 0 means single-threaded operation, 1 starts an
+     *            asynchronous thread to operate the RETE net, >1 uses multiple RETE containers.
+     */
+    public Network(int threads, ReteEngine engine) {
+        super();
+        this.threads = threads;
+        this.engine = engine;
+        this.inputConnector = new InputConnector(this);
+        this.nodeFactory = new NodeFactory(engine.getLogger());
+
+        containers = new ArrayList<ReteContainer>();
+        firstContainer = (threads > 1) ? Options.firstFreeContainer : 0; // NOPMD
+        nextContainer = firstContainer;
+
+        if (threads > 0) {
+            globalTerminationCriteria = CollectionsFactory.createMap();
+            reportedClocks = CollectionsFactory.createMap();
+            ReadWriteLock rwl = new ReentrantReadWriteLock();
+            updateLock = rwl.readLock();
+            structuralChangeLock = rwl.writeLock();
+            for (int i = 0; i < threads; ++i)
+                containers.add(new ReteContainer(this, true));
+        } else
+            containers.add(new ReteContainer(this, false));
+
+        headContainer = containers.get(0);
+    }
+
+    /**
+     * Kills this Network along with all containers and message consumption cycles.
+     */
+    public void kill() {
+        for (ReteContainer container : containers) {
+            container.kill();
+        }
+        containers.clear();
+    }
+
+    /**
+     * Returns the head container, that is guaranteed to reside in the same JVM as the Network object.
+     */
+    public ReteContainer getHeadContainer() {
+        return headContainer;
+    }
+
+    /**
+     * Returns the next container in round-robin fashion. Configurable not to yield head container.
+     */
+    public ReteContainer getNextContainer() {
+        if (nextContainer >= containers.size())
+            nextContainer = firstContainer;
+        return containers.get(nextContainer++);
+    }
+
+    /**
+     * Internal message delivery method.
+     * 
+     * @pre threads > 0
+     */
+    private void sendUpdate(Address<? extends Receiver> receiver, Direction direction, Tuple updateElement) {
+        ReteContainer affectedContainer = receiver.getContainer();
+        synchronized (globalTerminationCriteria) {
+            long newCriterion = affectedContainer.sendUpdateToLocalAddress(receiver, direction, updateElement);
+            terminationCriterion(affectedContainer, newCriterion);
+        }
+    }
+
+    /**
+     * Internal message delivery method for single-threaded operation
+     * 
+     * @pre threads == 0
+     */
+    private void sendUpdateSingleThreaded(Address<? extends Receiver> receiver, Direction direction,
+            Tuple updateElement) {
+        ReteContainer affectedContainer = receiver.getContainer();
+        affectedContainer.sendUpdateToLocalAddressSingleThreaded(receiver, direction, updateElement);
+    }
+
+    /**
+     * Internal message delivery method.
+     * 
+     * @pre threads > 0
+     */
+    private void sendUpdates(Address<? extends Receiver> receiver, Direction direction,
+            Collection<Tuple> updateElements) {
+        if (updateElements.isEmpty())
+            return;
+        ReteContainer affectedContainer = receiver.getContainer();
+        synchronized (globalTerminationCriteria) {
+            long newCriterion = affectedContainer.sendUpdatesToLocalAddress(receiver, direction, updateElements);
+            terminationCriterion(affectedContainer, newCriterion);
+        }
+    }
+
+    /**
+     * Sends an update message to the receiver node, indicating a newly found or lost partial matching. The node may
+     * reside in any of the containers associated with this network. To be called from a user thread during normal
+     * operation, NOT during construction.
+     * 
+     * @since 2.4
+     */
+    public void sendExternalUpdate(Address<? extends Receiver> receiver, Direction direction, Tuple updateElement) {
+        if (threads > 0) {
+            try {
+                updateLock.lock();
+                sendUpdate(receiver, direction, updateElement);
+            } finally {
+                updateLock.unlock();
+            }
+        } else {
+            sendUpdateSingleThreaded(receiver, direction, updateElement);
+            // getHeadContainer().
+        }
+    }
+
+    /**
+     * Sends an update message to the receiver node, indicating a newly found or lost partial matching. The node may
+     * reside in any of the containers associated with this network. To be called from a user thread during
+     * construction.
+     * 
+     * @pre: structuralChangeLock MUST be grabbed by the sequence (but not necessarily this thread, as the sequence may
+     *       span through network calls, that's why it's not enforced here )
+     * 
+     * @return the value of the target container's clock at the time when the message was accepted into its message
+     *         queue
+     * @since 2.4
+     */
+    public void sendConstructionUpdate(Address<? extends Receiver> receiver, Direction direction, Tuple updateElement) {
+        // structuralChangeLock.lock();
+        if (threads > 0)
+            sendUpdate(receiver, direction, updateElement);
+        else
+            receiver.getContainer().sendUpdateToLocalAddressSingleThreaded(receiver, direction, updateElement);
+        // structuralChangeLock.unlock();
+    }
+
+    /**
+     * Sends multiple update messages atomically to the receiver node, indicating a newly found or lost partial
+     * matching. The node may reside in any of the containers associated with this network. To be called from a user
+     * thread during construction.
+     * 
+     * @pre: structuralChangeLock MUST be grabbed by the sequence (but not necessarily this thread, as the sequence may
+     *       span through network calls, that's why it's not enforced here )
+     * 
+     * @since 2.4
+     */
+    public void sendConstructionUpdates(Address<? extends Receiver> receiver, Direction direction,
+            Collection<Tuple> updateElements) {
+        // structuralChangeLock.lock();
+        if (threads > 0)
+            sendUpdates(receiver, direction, updateElements);
+        else
+            receiver.getContainer().sendUpdatesToLocalAddressSingleThreaded(receiver, direction, updateElements);
+        // structuralChangeLock.unlock();
+    }
+
+    /**
+     * Establishes connection between a supplier and a receiver node, regardless which container they are in. Not to be
+     * called remotely, because this method enforces the structural lock.
+     * 
+     * @param supplier
+     * @param receiver
+     * @param synchronise
+     *            indicates whether the receiver should be synchronised to the current contents of the supplier
+     */
+    public void connectRemoteNodes(Address<? extends Supplier> supplier, Address<? extends Receiver> receiver,
+            boolean synchronise) {
+        try {
+            if (threads > 0)
+                structuralChangeLock.lock();
+            receiver.getContainer().connectRemoteNodes(supplier, receiver, synchronise);
+        } finally {
+            if (threads > 0)
+                structuralChangeLock.unlock();
+        }
+    }
+
+    /**
+     * Severs connection between a supplier and a receiver node, regardless which container they are in. Not to be
+     * called remotely, because this method enforces the structural lock.
+     * 
+     * @param supplier
+     * @param receiver
+     * @param desynchronise
+     *            indicates whether the current contents of the supplier should be subtracted from the receiver
+     */
+    public void disconnectRemoteNodes(Address<? extends Supplier> supplier, Address<? extends Receiver> receiver,
+            boolean desynchronise) {
+        try {
+            if (threads > 0)
+                structuralChangeLock.lock();
+            receiver.getContainer().disconnectRemoteNodes(supplier, receiver, desynchronise);
+        } finally {
+            if (threads > 0)
+                structuralChangeLock.unlock();
+        }
+    }
+
+    /**
+     * Containers use this method to report whenever they run out of messages in their queue.
+     * 
+     * To be called from the thread of the reporting container.
+     * 
+     * @pre threads > 0.
+     * @param reportingContainer
+     *            the container reporting the emptiness of its message queue.
+     * @param clock
+     *            the value of the container's clock when reporting.
+     * @param localTerminationCriteria
+     *            the latest clock values this container has received from other containers since the last time it
+     *            reported termination.
+     */
+    void reportLocalUpdateTermination(ReteContainer reportingContainer, long clock,
+            Map<ReteContainer, Long> localTerminationCriteria) {
+        synchronized (globalTerminationCriteria) {
+            for (Entry<ReteContainer, Long> criterion : localTerminationCriteria.entrySet()) {
+                terminationCriterion(criterion.getKey(), criterion.getValue());
+            }
+
+            reportedClocks.put(reportingContainer, clock);
+            Long criterion = globalTerminationCriteria.get(reportingContainer);
+            if (criterion != null && criterion < clock)
+                globalTerminationCriteria.remove(reportingContainer);
+
+            if (globalTerminationCriteria.isEmpty())
+                globalTerminationCriteria.notifyAll();
+        }
+    }
+
+    /**
+     * @pre threads > 0
+     */
+    private void terminationCriterion(ReteContainer affectedContainer, long newCriterion) {
+        synchronized (globalTerminationCriteria) {
+            Long oldCriterion = globalTerminationCriteria.get(affectedContainer);
+            Long oldClock = reportedClocks.get(affectedContainer);
+            long relevantClock = oldClock == null ? 0 : oldClock;
+            if ((relevantClock <= newCriterion) && (oldCriterion == null || oldCriterion < newCriterion)) {
+                globalTerminationCriteria.put(affectedContainer, newCriterion);
+            }
+        }
+    }
+
+    /**
+     * Waits until all rete update operations are settled in all containers. Returns immediately, if no updates are
+     * pending.
+     * 
+     * To be called from any user thread.
+     */
+    public void waitForReteTermination() {
+        if (threads > 0) {
+            synchronized (globalTerminationCriteria) {
+                while (!globalTerminationCriteria.isEmpty()) {
+                    try {
+                        globalTerminationCriteria.wait();
+                    } catch (InterruptedException e) {
+
+                    }
+                }
+            }
+        } else
+            headContainer.deliverMessagesSingleThreaded();
+    }
+
+    /**
+     * Waits to execute action until all rete update operations are settled in all containers. Runs action and returns
+     * immediately, if no updates are pending. The given action is guaranteed to be run when the terminated state still
+     * persists.
+     * 
+     * @param action
+     *            the action to be run when reaching the steady-state.
+     * 
+     *            To be called from any user thread.
+     */
+    public void waitForReteTermination(Runnable action) {
+        if (threads > 0) {
+            synchronized (globalTerminationCriteria) {
+                while (!globalTerminationCriteria.isEmpty()) {
+                    try {
+                        globalTerminationCriteria.wait();
+                    } catch (InterruptedException e) {
+
+                    }
+                }
+                action.run();
+            }
+        } else {
+            headContainer.deliverMessagesSingleThreaded();
+            action.run();
+        }
+
+    }
+
+    /**
+     * @return an unmodifiable set of known recipe traces
+     */
+    public Set<RecipeTraceInfo> getRecipeTraces() {
+        return Collections.unmodifiableSet(recipeTraces);
+    }
+
+    /**
+     * @return an unmodifiable list of containers
+     */
+    public List<ReteContainer> getContainers() {
+        return Collections.unmodifiableList(containers);
+    }
+
+    public Lock getStructuralChangeLock() {
+        return structuralChangeLock;
+    }
+
+    public NodeFactory getNodeFactory() {
+        return nodeFactory;
+    }
+
+    public InputConnector getInputConnector() {
+        return inputConnector;
+    }
+
+    public ReteEngine getEngine() {
+        return engine;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NetworkStructureChangeSensitiveNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NetworkStructureChangeSensitiveNode.java
new file mode 100644
index 00000000..c6ba34c4
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NetworkStructureChangeSensitiveNode.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network;
+
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+
+/**
+ * {@link Node}s implementing this interface are sensitive to changes in the dependency graph maintained by the
+ * {@link CommunicationTracker}. The {@link CommunicationTracker} notifies these nodes whenever the SCC of this node is
+ * affected by changes to the dependency graph. Depending on whether this node is contained in a recursive group or not,
+ * it may behave differently, and the {@link NetworkStructureChangeSensitiveNode#networkStructureChanged()} method can
+ * be used to perform changes in behavior.
+ * 
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public interface NetworkStructureChangeSensitiveNode extends Node {
+
+    /**
+     * At the time of the invocation, the dependency graph has already been updated.
+     */
+    public void networkStructureChanged();
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Node.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Node.java
new file mode 100644
index 00000000..e8ab615a
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Node.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.network;
+
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+
+/**
+ * A node of a rete network, should be uniquely identified by network and nodeId. NodeId can be requested by registering
+ * at the Network on construction.
+ * 
+ * @author Gabor Bergmann
+ */
+public interface Node {
+    /**
+     * @return the network this node belongs to.
+     */
+    ReteContainer getContainer();
+
+    /**
+     * @return the identifier unique to this node within the network.
+     */
+    long getNodeId();
+
+    /**
+     * Assigns a descriptive tag to the node
+     */
+    void setTag(Object tag);
+
+    /**
+     * @return the tag of the node
+     */
+    Object getTag();
+    
+    /**
+     * @return unmodifiable view of the list of traceability infos assigned to this node
+     */
+    Set<TraceInfo> getTraceInfos();
+    
+    /**
+     * assigns new traceability info to this node
+     */
+    void assignTraceInfo(TraceInfo traceInfo);
+    /**
+     * accepts traceability info propagated to this node
+     */
+    void acceptPropagatedTraceInfo(TraceInfo traceInfo);
+    
+    default CommunicationTracker getCommunicationTracker() {
+        return getContainer().getCommunicationTracker();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NodeFactory.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NodeFactory.java
new file mode 100644
index 00000000..3e4ea4e0
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NodeFactory.java
@@ -0,0 +1,376 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * Copyright (c) 2023 The Refinery Authors <https://refinery.tools>
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EMap;
+import tools.refinery.viatra.runtime.rete.itc.alg.representative.RepresentativeElectionAlgorithm;
+import tools.refinery.viatra.runtime.rete.itc.alg.representative.StronglyConnectedComponentAlgorithm;
+import tools.refinery.viatra.runtime.rete.itc.alg.representative.WeaklyConnectedComponentAlgorithm;
+import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
+import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.viatra.runtime.matchers.psystem.IRelationEvaluator;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.rete.aggregation.ColumnAggregatorNode;
+import tools.refinery.viatra.runtime.rete.aggregation.CountNode;
+import tools.refinery.viatra.runtime.rete.aggregation.IAggregatorNode;
+import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode;
+import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode;
+import tools.refinery.viatra.runtime.rete.aggregation.timely.FirstOnlyParallelTimelyColumnAggregatorNode;
+import tools.refinery.viatra.runtime.rete.aggregation.timely.FirstOnlySequentialTimelyColumnAggregatorNode;
+import tools.refinery.viatra.runtime.rete.boundary.ExternalInputEnumeratorNode;
+import tools.refinery.viatra.runtime.rete.boundary.ExternalInputStatelessFilterNode;
+import tools.refinery.viatra.runtime.rete.eval.EvaluatorCore;
+import tools.refinery.viatra.runtime.rete.eval.MemorylessEvaluatorNode;
+import tools.refinery.viatra.runtime.rete.eval.OutputCachingEvaluatorNode;
+import tools.refinery.viatra.runtime.rete.eval.RelationEvaluatorNode;
+import tools.refinery.viatra.runtime.rete.index.ExistenceNode;
+import tools.refinery.viatra.runtime.rete.index.Indexer;
+import tools.refinery.viatra.runtime.rete.index.JoinNode;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.AggregatorArchitecture;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.TimelineRepresentation;
+import tools.refinery.viatra.runtime.rete.misc.ConstantNode;
+import tools.refinery.viatra.runtime.rete.recipes.*;
+import tools.refinery.viatra.runtime.rete.single.*;
+import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Factory for instantiating Rete nodes. The created nodes are not connected to the network yet.
+ *
+ * @author Bergmann Gabor
+ *
+ */
+class NodeFactory {
+    Logger logger;
+
+    public NodeFactory(Logger logger) {
+        super();
+        this.logger = logger;
+    }
+
+    /**
+     * PRE: parent node must already be created
+     */
+    public Indexer createIndexer(ReteContainer reteContainer, IndexerRecipe recipe, Supplier parentNode,
+            TraceInfo... traces) {
+
+        if (recipe instanceof ProjectionIndexerRecipe) {
+            return parentNode.constructIndex(toMask(recipe.getMask()), traces);
+            // already traced
+        } else if (recipe instanceof AggregatorIndexerRecipe) {
+            int indexOfAggregateResult = recipe.getParent().getArity();
+            int resultPosition = recipe.getMask().getSourceIndices().lastIndexOf(indexOfAggregateResult);
+
+            IAggregatorNode aggregatorNode = (IAggregatorNode) parentNode;
+            final Indexer result = (resultPosition == -1) ? aggregatorNode.getAggregatorOuterIndexer()
+                    : aggregatorNode.getAggregatorOuterIdentityIndexer(resultPosition);
+
+            for (TraceInfo traceInfo : traces)
+                result.assignTraceInfo(traceInfo);
+            return result;
+        } else
+            throw new IllegalArgumentException("Unkown Indexer recipe: " + recipe);
+    }
+
+    /**
+     * PRE: recipe is not an indexer recipe.
+     */
+    public Supplier createNode(ReteContainer reteContainer, ReteNodeRecipe recipe, TraceInfo... traces) {
+        if (recipe instanceof IndexerRecipe)
+            throw new IllegalArgumentException("Indexers are not created by NodeFactory: " + recipe);
+
+        Supplier result = instantiateNodeDispatch(reteContainer, recipe);
+        for (TraceInfo traceInfo : traces)
+            result.assignTraceInfo(traceInfo);
+        return result;
+    }
+
+    private Supplier instantiateNodeDispatch(ReteContainer reteContainer, ReteNodeRecipe recipe) {
+
+        // Parentless
+
+        if (recipe instanceof ConstantRecipe)
+            return instantiateNode(reteContainer, (ConstantRecipe) recipe);
+        if (recipe instanceof InputRecipe)
+            return instantiateNode(reteContainer, (InputRecipe) recipe);
+
+        // SingleParentNodeRecipe
+
+        // if (recipe instanceof ProjectionIndexer)
+        // return instantiateNode((ProjectionIndexer)recipe);
+        if (recipe instanceof InputFilterRecipe)
+            return instantiateNode(reteContainer, (InputFilterRecipe) recipe);
+        if (recipe instanceof InequalityFilterRecipe)
+            return instantiateNode(reteContainer, (InequalityFilterRecipe) recipe);
+        if (recipe instanceof EqualityFilterRecipe)
+            return instantiateNode(reteContainer, (EqualityFilterRecipe) recipe);
+        if (recipe instanceof TransparentRecipe)
+            return instantiateNode(reteContainer, (TransparentRecipe) recipe);
+        if (recipe instanceof TrimmerRecipe)
+            return instantiateNode(reteContainer, (TrimmerRecipe) recipe);
+        if (recipe instanceof TransitiveClosureRecipe)
+            return instantiateNode(reteContainer, (TransitiveClosureRecipe) recipe);
+                if (recipe instanceof RepresentativeElectionRecipe)
+                        return instantiateNode(reteContainer, (RepresentativeElectionRecipe) recipe);
+        if (recipe instanceof RelationEvaluationRecipe)
+            return instantiateNode(reteContainer, (RelationEvaluationRecipe) recipe);
+        if (recipe instanceof ExpressionEnforcerRecipe)
+            return instantiateNode(reteContainer, (ExpressionEnforcerRecipe) recipe);
+        if (recipe instanceof CountAggregatorRecipe)
+            return instantiateNode(reteContainer, (CountAggregatorRecipe) recipe);
+        if (recipe instanceof SingleColumnAggregatorRecipe)
+            return instantiateNode(reteContainer, (SingleColumnAggregatorRecipe) recipe);
+        if (recipe instanceof DiscriminatorDispatcherRecipe)
+            return instantiateNode(reteContainer, (DiscriminatorDispatcherRecipe) recipe);
+        if (recipe instanceof DiscriminatorBucketRecipe)
+            return instantiateNode(reteContainer, (DiscriminatorBucketRecipe) recipe);
+
+        // MultiParentNodeRecipe
+        if (recipe instanceof UniquenessEnforcerRecipe)
+            return instantiateNode(reteContainer, (UniquenessEnforcerRecipe) recipe);
+        if (recipe instanceof ProductionRecipe)
+            return instantiateNode(reteContainer, (ProductionRecipe) recipe);
+
+        // BetaNodeRecipe
+        if (recipe instanceof JoinRecipe)
+            return instantiateNode(reteContainer, (JoinRecipe) recipe);
+        if (recipe instanceof SemiJoinRecipe)
+            return instantiateNode(reteContainer, (SemiJoinRecipe) recipe);
+        if (recipe instanceof AntiJoinRecipe)
+            return instantiateNode(reteContainer, (AntiJoinRecipe) recipe);
+
+        // ... else
+        throw new IllegalArgumentException("Unsupported recipe type: " + recipe);
+    }
+
+    // INSTANTIATION for recipe types
+
+    private Supplier instantiateNode(ReteContainer reteContainer, InputRecipe recipe) {
+        return new ExternalInputEnumeratorNode(reteContainer);
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, InputFilterRecipe recipe) {
+        return new ExternalInputStatelessFilterNode(reteContainer, toMaskOrNull(recipe.getMask()));
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, CountAggregatorRecipe recipe) {
+        return new CountNode(reteContainer);
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, TransparentRecipe recipe) {
+        return new TransparentNode(reteContainer);
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, ExpressionEnforcerRecipe recipe) {
+        final IExpressionEvaluator evaluator = toIExpressionEvaluator(recipe.getExpression());
+        final Map<String, Integer> posMapping = toStringIndexMap(recipe.getMappedIndices());
+        final int sourceTupleWidth = recipe.getParent().getArity();
+        EvaluatorCore core = null;
+        if (recipe instanceof CheckRecipe) {
+            core = new EvaluatorCore.PredicateEvaluatorCore(logger, evaluator, posMapping, sourceTupleWidth);
+        } else if (recipe instanceof EvalRecipe) {
+            final boolean isUnwinding = ((EvalRecipe) recipe).isUnwinding();
+            core = new EvaluatorCore.FunctionEvaluatorCore(logger, evaluator, posMapping, sourceTupleWidth, isUnwinding);
+        } else {
+            throw new IllegalArgumentException("Unhandled expression enforcer recipe: " + recipe.getClass() + "!");
+        }
+        if (recipe.isCacheOutput()) {
+            return new OutputCachingEvaluatorNode(reteContainer, core);
+        } else {
+            return new MemorylessEvaluatorNode(reteContainer, core);
+        }
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    private Supplier instantiateNode(ReteContainer reteContainer, SingleColumnAggregatorRecipe recipe) {
+        final IMultisetAggregationOperator operator = recipe.getMultisetAggregationOperator();
+        TupleMask coreMask = null;
+        if (recipe.getOptionalMonotonicityInfo() != null) {
+            coreMask = toMask(recipe.getOptionalMonotonicityInfo().getCoreMask());
+        } else {
+            coreMask = toMask(recipe.getGroupByMask());
+        }
+
+        if (reteContainer.isTimelyEvaluation()) {
+            final TimelyConfiguration timelyConfiguration = reteContainer.getTimelyConfiguration();
+            final AggregatorArchitecture aggregatorArchitecture = timelyConfiguration.getAggregatorArchitecture();
+            final TimelineRepresentation timelineRepresentation = timelyConfiguration.getTimelineRepresentation();
+
+            TupleMask posetMask = null;
+
+            if (recipe.getOptionalMonotonicityInfo() != null) {
+                posetMask = toMask(recipe.getOptionalMonotonicityInfo().getPosetMask());
+            } else {
+                final int aggregatedColumn = recipe.getAggregableIndex();
+                posetMask = TupleMask.selectSingle(aggregatedColumn, coreMask.sourceWidth);
+            }
+
+            if (timelineRepresentation == TimelineRepresentation.FIRST_ONLY
+                    && aggregatorArchitecture == AggregatorArchitecture.SEQUENTIAL) {
+                return new FirstOnlySequentialTimelyColumnAggregatorNode(reteContainer, operator, coreMask, posetMask);
+            } else if (timelineRepresentation == TimelineRepresentation.FIRST_ONLY
+                    && aggregatorArchitecture == AggregatorArchitecture.PARALLEL) {
+                return new FirstOnlyParallelTimelyColumnAggregatorNode(reteContainer, operator, coreMask, posetMask);
+            } else if (timelineRepresentation == TimelineRepresentation.FAITHFUL
+                    && aggregatorArchitecture == AggregatorArchitecture.SEQUENTIAL) {
+                return new FaithfulSequentialTimelyColumnAggregatorNode(reteContainer, operator, coreMask, posetMask);
+            } else if (timelineRepresentation == TimelineRepresentation.FAITHFUL
+                    && aggregatorArchitecture == AggregatorArchitecture.PARALLEL) {
+                return new FaithfulParallelTimelyColumnAggregatorNode(reteContainer, operator, coreMask, posetMask);
+            } else {
+                throw new IllegalArgumentException("Unsupported timely configuration!");
+            }
+        } else if (recipe.isDeleteRederiveEvaluation() && recipe.getOptionalMonotonicityInfo() != null) {
+            final TupleMask posetMask = toMask(recipe.getOptionalMonotonicityInfo().getPosetMask());
+            final IPosetComparator posetComparator = (IPosetComparator) recipe.getOptionalMonotonicityInfo()
+                    .getPosetComparator();
+            return new ColumnAggregatorNode(reteContainer, operator, recipe.isDeleteRederiveEvaluation(), coreMask,
+                    posetMask, posetComparator);
+        } else {
+            final int aggregatedColumn = recipe.getAggregableIndex();
+            return new ColumnAggregatorNode(reteContainer, operator, coreMask, aggregatedColumn);
+        }
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, TransitiveClosureRecipe recipe) {
+        return new TransitiveClosureNode(reteContainer);
+    }
+
+        private Supplier instantiateNode(ReteContainer reteContainer, RepresentativeElectionRecipe recipe) {
+                RepresentativeElectionAlgorithm.Factory algorithmFactory = switch (recipe.getConnectivity()) {
+                        case STRONG -> StronglyConnectedComponentAlgorithm::new;
+                        case WEAK -> WeaklyConnectedComponentAlgorithm::new;
+                };
+                return new RepresentativeElectionNode(reteContainer, algorithmFactory);
+        }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, RelationEvaluationRecipe recipe) {
+        return new RelationEvaluatorNode(reteContainer, toIRelationEvaluator(recipe.getEvaluator()));
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, ProductionRecipe recipe) {
+        if (reteContainer.isTimelyEvaluation()) {
+            return new TimelyProductionNode(reteContainer, toStringIndexMap(recipe.getMappedIndices()));
+        } else if (recipe.isDeleteRederiveEvaluation() && recipe.getOptionalMonotonicityInfo() != null) {
+            TupleMask coreMask = toMask(recipe.getOptionalMonotonicityInfo().getCoreMask());
+            TupleMask posetMask = toMask(recipe.getOptionalMonotonicityInfo().getPosetMask());
+            IPosetComparator posetComparator = (IPosetComparator) recipe.getOptionalMonotonicityInfo()
+                    .getPosetComparator();
+            return new DefaultProductionNode(reteContainer, toStringIndexMap(recipe.getMappedIndices()),
+                    recipe.isDeleteRederiveEvaluation(), coreMask, posetMask, posetComparator);
+        } else {
+            return new DefaultProductionNode(reteContainer, toStringIndexMap(recipe.getMappedIndices()),
+                    recipe.isDeleteRederiveEvaluation());
+        }
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, UniquenessEnforcerRecipe recipe) {
+        if (reteContainer.isTimelyEvaluation()) {
+            return new TimelyUniquenessEnforcerNode(reteContainer, recipe.getArity());
+        } else if (recipe.isDeleteRederiveEvaluation() && recipe.getOptionalMonotonicityInfo() != null) {
+            TupleMask coreMask = toMask(recipe.getOptionalMonotonicityInfo().getCoreMask());
+            TupleMask posetMask = toMask(recipe.getOptionalMonotonicityInfo().getPosetMask());
+            IPosetComparator posetComparator = (IPosetComparator) recipe.getOptionalMonotonicityInfo()
+                    .getPosetComparator();
+            return new UniquenessEnforcerNode(reteContainer, recipe.getArity(), recipe.isDeleteRederiveEvaluation(),
+                    coreMask, posetMask, posetComparator);
+        } else {
+            return new UniquenessEnforcerNode(reteContainer, recipe.getArity(), recipe.isDeleteRederiveEvaluation());
+        }
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, ConstantRecipe recipe) {
+        final List<Object> constantValues = recipe.getConstantValues();
+        final Object[] constantArray = constantValues.toArray(new Object[constantValues.size()]);
+        return new ConstantNode(reteContainer, Tuples.flatTupleOf(constantArray));
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, DiscriminatorBucketRecipe recipe) {
+        return new DiscriminatorBucketNode(reteContainer, recipe.getBucketKey());
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, DiscriminatorDispatcherRecipe recipe) {
+        return new DiscriminatorDispatcherNode(reteContainer, recipe.getDiscriminationColumnIndex());
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, TrimmerRecipe recipe) {
+        return new TrimmerNode(reteContainer, toMask(recipe.getMask()));
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, InequalityFilterRecipe recipe) {
+        Tunnel result = new InequalityFilterNode(reteContainer, recipe.getSubject(),
+                TupleMask.fromSelectedIndices(recipe.getParent().getArity(), recipe.getInequals()));
+        return result;
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, EqualityFilterRecipe recipe) {
+        final int[] equalIndices = TupleMask.integersToIntArray(recipe.getIndices());
+        return new EqualityFilterNode(reteContainer, equalIndices);
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, AntiJoinRecipe recipe) {
+        return new ExistenceNode(reteContainer, true);
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, SemiJoinRecipe recipe) {
+        return new ExistenceNode(reteContainer, false);
+    }
+
+    private Supplier instantiateNode(ReteContainer reteContainer, JoinRecipe recipe) {
+        return new JoinNode(reteContainer, toMask(recipe.getRightParentComplementaryMask()));
+    }
+
+    // HELPERS
+
+    private IExpressionEvaluator toIExpressionEvaluator(ExpressionDefinition expressionDefinition) {
+        final Object evaluator = expressionDefinition.getEvaluator();
+        if (evaluator instanceof IExpressionEvaluator) {
+            return (IExpressionEvaluator) evaluator;
+        }
+        throw new IllegalArgumentException("No runtime support for expression evaluator: " + evaluator);
+    }
+
+    private IRelationEvaluator toIRelationEvaluator(ExpressionDefinition expressionDefinition) {
+        final Object evaluator = expressionDefinition.getEvaluator();
+        if (evaluator instanceof IRelationEvaluator) {
+            return (IRelationEvaluator) evaluator;
+        }
+        throw new IllegalArgumentException("No runtime support for relation evaluator: " + evaluator);
+    }
+
+    private Map<String, Integer> toStringIndexMap(final EMap<String, Integer> mappedIndices) {
+        final HashMap<String, Integer> result = new HashMap<String, Integer>();
+        for (java.util.Map.Entry<String, Integer> entry : mappedIndices) {
+            result.put(entry.getKey(), entry.getValue());
+        }
+        return result;
+    }
+
+    /** Mask can be null */
+    private TupleMask toMaskOrNull(Mask mask) {
+        if (mask == null)
+            return null;
+        else
+            return toMask(mask);
+    }
+
+    /** Mask is non-null. */
+    private TupleMask toMask(Mask mask) {
+        return TupleMask.fromSelectedIndices(mask.getSourceArity(), mask.getSourceIndices());
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NodeProvisioner.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NodeProvisioner.java
new file mode 100644
index 00000000..9121fc44
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/NodeProvisioner.java
@@ -0,0 +1,346 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.network;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.rete.boundary.InputConnector;
+import tools.refinery.viatra.runtime.rete.construction.plancompiler.CompilerHelper;
+import tools.refinery.viatra.runtime.rete.index.Indexer;
+import tools.refinery.viatra.runtime.rete.index.OnetimeIndexer;
+import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
+import tools.refinery.viatra.runtime.rete.network.delayed.DelayedConnectCommand;
+import tools.refinery.viatra.runtime.rete.recipes.*;
+import tools.refinery.viatra.runtime.rete.recipes.helper.RecipeRecognizer;
+import tools.refinery.viatra.runtime.rete.recipes.helper.RecipesHelper;
+import tools.refinery.viatra.runtime.rete.remote.Address;
+import tools.refinery.viatra.runtime.rete.remote.RemoteReceiver;
+import tools.refinery.viatra.runtime.rete.remote.RemoteSupplier;
+import tools.refinery.viatra.runtime.rete.traceability.ActiveNodeConflictTrace;
+import tools.refinery.viatra.runtime.rete.traceability.RecipeTraceInfo;
+import tools.refinery.viatra.runtime.rete.traceability.UserRequestTrace;
+import tools.refinery.viatra.runtime.rete.util.Options;
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Stores the internal parts of a rete network. Nodes are stored according to type and parameters.
+ *
+ * @author Gabor Bergmann
+ */
+public class NodeProvisioner {
+
+    // boolean activeStorage = true;
+
+    ReteContainer reteContainer;
+    NodeFactory nodeFactory;
+    ConnectionFactory connectionFactory;
+    InputConnector inputConnector;
+    IQueryRuntimeContext runtimeContext;
+
+    // TODO as recipe?
+    Map<Supplier, RemoteReceiver> remoteReceivers = CollectionsFactory.createMap();
+    Map<Address<? extends Supplier>, RemoteSupplier> remoteSuppliers = CollectionsFactory.createMap();
+
+    private RecipeRecognizer recognizer;
+
+    /**
+     * PRE: NodeFactory, ConnectionFactory must exist
+     *
+     * @param reteContainer
+     *            the ReteNet whose interior is to be mapped.
+     */
+    public NodeProvisioner(ReteContainer reteContainer) {
+        super();
+        this.reteContainer = reteContainer;
+        this.nodeFactory = reteContainer.getNodeFactory();
+        this.connectionFactory = reteContainer.getConnectionFactory();
+        this.inputConnector = reteContainer.getInputConnectionFactory();
+        runtimeContext = reteContainer.getNetwork().getEngine().getRuntimeContext();
+        recognizer = new RecipeRecognizer(runtimeContext);
+    }
+
+    public synchronized Address<? extends Node> getOrCreateNodeByRecipe(RecipeTraceInfo recipeTrace) {
+        ReteNodeRecipe recipe = recipeTrace.getRecipe();
+        Address<? extends Node> result = getNodesByRecipe().get(recipe);
+        if (result != null) {
+            // NODE ALREADY CONSTRUCTED FOR RECIPE, only needs to add trace
+            if (getRecipeTraces().add(recipeTrace))
+                result.getNodeCache().assignTraceInfo(recipeTrace);
+        } else {
+            // No node for this recipe object - but equivalent recipes still
+            // reusable
+            ReteNodeRecipe canonicalRecipe = recognizer.canonicalizeRecipe(recipe);
+            if (canonicalRecipe != recipe) {
+                // FOUND EQUIVALENT RECIPE
+                result = getNodesByRecipe().get(canonicalRecipe);
+                if (result != null) {
+                    // NODE ALREADY CONSTRUCTED FOR EQUIVALENT RECIPE
+                    recipeTrace.shadowWithEquivalentRecipe(canonicalRecipe);
+                    getNodesByRecipe().put(recipe, result);
+                    if (getRecipeTraces().add(recipeTrace))
+                        result.getNodeCache().assignTraceInfo(recipeTrace);
+                    // Bug 491922: ensure that recipe shadowing propagates to
+                    // parent traces
+                    // note that if equivalentRecipes() becomes more
+                    // sophisticated
+                    // and considers recipes with different parents, this might
+                    // have to be changed
+                    ensureParents(recipeTrace);
+                } else {
+                    // CONSTRUCTION IN PROGRESS FOR EQUIVALENT RECIPE
+                    if (recipe instanceof IndexerRecipe) {
+                        // this is allowed for indexers;
+                        // go on with the construction, as the same indexer node
+                        // will be obtained anyways
+                    } else {
+                        throw new IllegalStateException(
+                                "This should not happen: " + "non-indexer nodes are are supposed to be constructed "
+                                        + "as soon as they are designated as canonical recipes");
+                    }
+                }
+            }
+            if (result == null) {
+                // MUST INSTANTIATE NEW NODE FOR RECIPE
+                final Node freshNode = instantiateNodeForRecipe(recipeTrace, recipe);
+                result = reteContainer.makeAddress(freshNode);
+            }
+        }
+        return result;
+    }
+
+    private Set<RecipeTraceInfo> getRecipeTraces() {
+        return reteContainer.network.recipeTraces;
+    }
+
+    private Node instantiateNodeForRecipe(RecipeTraceInfo recipeTrace, final ReteNodeRecipe recipe) {
+        this.getRecipeTraces().add(recipeTrace);
+        if (recipe instanceof IndexerRecipe) {
+
+            // INSTANTIATE AND HOOK UP
+            // (cannot delay hooking up, because parent determines indexer
+            // implementation)
+            ensureParents(recipeTrace);
+            final ReteNodeRecipe parentRecipe = recipeTrace.getParentRecipeTraces().iterator().next().getRecipe();
+            final Indexer result = nodeFactory.createIndexer(reteContainer, (IndexerRecipe) recipe,
+                    asSupplier(
+                            (Address<? extends Supplier>) reteContainer.network.getExistingNodeByRecipe(parentRecipe)),
+                    recipeTrace);
+
+            // REMEMBER
+            if (Options.nodeSharingOption != Options.NodeSharingOption.NEVER) {
+                getNodesByRecipe().put(recipe, reteContainer.makeAddress(result));
+            }
+
+            return result;
+        } else {
+
+            // INSTANTIATE
+            Node result = nodeFactory.createNode(reteContainer, recipe, recipeTrace);
+
+            // REMEMBER
+            if (Options.nodeSharingOption == Options.NodeSharingOption.ALL) {
+                getNodesByRecipe().put(recipe, reteContainer.makeAddress(result));
+            }
+
+            // HOOK UP
+            // (recursion-tolerant due to this delayed order of initialization)
+            if (recipe instanceof InputRecipe) {
+                inputConnector.connectInput((InputRecipe) recipe, result);
+            } else {
+                if (recipe instanceof InputFilterRecipe)
+                    inputConnector.connectInputFilter((InputFilterRecipe) recipe, result);
+                ensureParents(recipeTrace);
+                connectionFactory.connectToParents(recipeTrace, result);
+            }
+            return result;
+        }
+    }
+
+    private Map<ReteNodeRecipe, Address<? extends Node>> getNodesByRecipe() {
+        return reteContainer.network.nodesByRecipe;
+    }
+
+    private void ensureParents(RecipeTraceInfo recipeTrace) {
+        for (RecipeTraceInfo parentTrace : recipeTrace.getParentRecipeTraces()) {
+            getOrCreateNodeByRecipe(parentTrace);
+        }
+    }
+
+    //// Remoting - TODO eliminate?
+
+    synchronized RemoteReceiver accessRemoteReceiver(Address<? extends Supplier> address) {
+        throw new UnsupportedOperationException("Multi-container Rete not supported yet");
+        // if (!reteContainer.isLocal(address))
+        // return
+        // address.getContainer().getProvisioner().accessRemoteReceiver(address);
+        // Supplier localSupplier = reteContainer.resolveLocal(address);
+        // RemoteReceiver result = remoteReceivers.get(localSupplier);
+        // if (result == null) {
+        // result = new RemoteReceiver(reteContainer);
+        // reteContainer.connect(localSupplier, result); // stateless node, no
+        // // synch required
+        //
+        // if (Options.nodeSharingOption != Options.NodeSharingOption.NEVER)
+        // remoteReceivers.put(localSupplier, result);
+        // }
+        // return result;
+    }
+
+    /**
+     * @pre: address is NOT local
+     */
+    synchronized RemoteSupplier accessRemoteSupplier(Address<? extends Supplier> address) {
+        throw new UnsupportedOperationException("Multi-container Rete not supported yet");
+        // RemoteSupplier result = remoteSuppliers.get(address);
+        // if (result == null) {
+        // result = new RemoteSupplier(reteContainer,
+        // address.getContainer().getProvisioner()
+        // .accessRemoteReceiver(address));
+        // // network.connectAndSynchronize(supplier, result);
+        //
+        // if (Options.nodeSharingOption != Options.NodeSharingOption.NEVER)
+        // remoteSuppliers.put(address, result);
+        // }
+        // return result;
+    }
+
+    /**
+     * The powerful method for accessing any (supplier) Address as a local supplier.
+     */
+    public Supplier asSupplier(Address<? extends Supplier> address) {
+        if (!reteContainer.isLocal(address))
+            return accessRemoteSupplier(address);
+        else
+            return reteContainer.resolveLocal(address);
+    }
+
+    /** the composite key tuple is formed as (RecipeTraceInfo, TupleMask) */
+    private Map<Tuple, UserRequestTrace> projectionIndexerUserRequests = CollectionsFactory.createMap();
+
+    // local version
+    // TODO remove?
+    public synchronized ProjectionIndexer accessProjectionIndexer(RecipeTraceInfo productionTrace, TupleMask mask) {
+        Tuple tableKey = Tuples.staticArityFlatTupleOf(productionTrace, mask);
+        UserRequestTrace indexerTrace = projectionIndexerUserRequests.computeIfAbsent(tableKey, k -> {
+            final ProjectionIndexerRecipe projectionIndexerRecipe = projectionIndexerRecipe(
+                    productionTrace, mask);
+            return new UserRequestTrace(projectionIndexerRecipe, productionTrace);
+        });
+        final Address<? extends Node> address = getOrCreateNodeByRecipe(indexerTrace);
+        return (ProjectionIndexer) reteContainer.resolveLocal(address);
+    }
+
+    // local version
+    public synchronized ProjectionIndexer accessProjectionIndexerOnetime(RecipeTraceInfo supplierTrace,
+            TupleMask mask) {
+        if (Options.nodeSharingOption != Options.NodeSharingOption.NEVER)
+            return accessProjectionIndexer(supplierTrace, mask);
+
+        final Address<? extends Node> supplierAddress = getOrCreateNodeByRecipe(supplierTrace);
+        Supplier supplier = (Supplier) reteContainer.resolveLocal(supplierAddress);
+
+        OnetimeIndexer result = new OnetimeIndexer(reteContainer, mask);
+        reteContainer.getDelayedCommandQueue().add(new DelayedConnectCommand(supplier, result, reteContainer));
+
+        return result;
+    }
+
+    // local, read-only version
+    public synchronized ProjectionIndexer peekProjectionIndexer(RecipeTraceInfo supplierTrace, TupleMask mask) {
+        final Address<? extends Node> address = getNodesByRecipe().get(projectionIndexerRecipe(supplierTrace, mask));
+        return address == null ? null : (ProjectionIndexer) reteContainer.resolveLocal(address);
+    }
+
+    private ProjectionIndexerRecipe projectionIndexerRecipe(
+            RecipeTraceInfo parentTrace, TupleMask mask) {
+        final ReteNodeRecipe parentRecipe = parentTrace.getRecipe();
+        Tuple tableKey = Tuples.staticArityFlatTupleOf(parentRecipe, mask);
+        ProjectionIndexerRecipe projectionIndexerRecipe = resultSeedRecipes.computeIfAbsent(tableKey, k ->
+            RecipesHelper.projectionIndexerRecipe(parentRecipe, CompilerHelper.toRecipeMask(mask))
+        );
+        return projectionIndexerRecipe;
+    }
+
+    /** the composite key tuple is formed as (ReteNodeRecipe, TupleMask) */
+    private Map<Tuple, ProjectionIndexerRecipe> resultSeedRecipes = CollectionsFactory.createMap();
+
+    // public synchronized Address<? extends Supplier>
+    // accessValueBinderFilterNode(
+    // Address<? extends Supplier> supplierAddress, int bindingIndex, Object
+    // bindingValue) {
+    // Supplier supplier = asSupplier(supplierAddress);
+    // Object[] paramsArray = { supplier.getNodeId(), bindingIndex, bindingValue
+    // };
+    // Tuple params = new FlatTuple(paramsArray);
+    // ValueBinderFilterNode result = valueBinderFilters.get(params);
+    // if (result == null) {
+    // result = new ValueBinderFilterNode(reteContainer, bindingIndex,
+    // bindingValue);
+    // reteContainer.connect(supplier, result); // stateless node, no synch
+    // // required
+    //
+    // if (Options.nodeSharingOption == Options.NodeSharingOption.ALL)
+    // valueBinderFilters.put(params, result);
+    // }
+    // return reteContainer.makeAddress(result);
+    // }
+
+    /**
+     * Returns a copy of the given indexer that is an active node by itself (created if does not exist). (Convention:
+     * attached with same mask to a transparent node that is attached to parent node.) Node is created if it does not
+     * exist yet.
+     *
+     * @return an identical but active indexer
+     */
+    // TODO rethink traceability
+    RecipeTraceInfo accessActiveIndexer(RecipeTraceInfo inactiveIndexerRecipeTrace) {
+        final RecipeTraceInfo parentRecipeTrace = inactiveIndexerRecipeTrace.getParentRecipeTraces().iterator().next();
+        final ProjectionIndexerRecipe inactiveIndexerRecipe = (ProjectionIndexerRecipe) inactiveIndexerRecipeTrace
+                .getRecipe();
+
+        final TransparentRecipe transparentRecipe = RecipesFactory.eINSTANCE.createTransparentRecipe();
+        transparentRecipe.setParent(parentRecipeTrace.getRecipe());
+        final ActiveNodeConflictTrace transparentRecipeTrace = new ActiveNodeConflictTrace(transparentRecipe,
+                parentRecipeTrace, inactiveIndexerRecipeTrace);
+
+        final ProjectionIndexerRecipe activeIndexerRecipe = RecipesFactory.eINSTANCE
+                .createProjectionIndexerRecipe();
+        activeIndexerRecipe.setParent(transparentRecipe);
+        activeIndexerRecipe.setMask(inactiveIndexerRecipe.getMask());
+        final ActiveNodeConflictTrace activeIndexerRecipeTrace = new ActiveNodeConflictTrace(activeIndexerRecipe,
+                transparentRecipeTrace, inactiveIndexerRecipeTrace);
+
+        return activeIndexerRecipeTrace;
+    }
+
+    // /**
+    // * @param parent
+    // * @return
+    // */
+    // private TransparentNode accessTransparentNodeInternal(Supplier parent) {
+    // nodeFactory.
+    // return null;
+    // }
+
+    // public synchronized void registerSpecializedProjectionIndexer(Node node,
+    // ProjectionIndexer indexer) {
+    // if (Options.nodeSharingOption != Options.NodeSharingOption.NEVER) {
+    // Object[] paramsArray = { node.getNodeId(), indexer.getMask() };
+    // Tuple params = new FlatTuple(paramsArray);
+    // projectionIndexers.put(params, indexer);
+    // }
+    // }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/PosetAwareReceiver.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/PosetAwareReceiver.java
new file mode 100644
index 00000000..1eaa18e7
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/PosetAwareReceiver.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network;
+
+import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+
+/**
+ * @author Tamas Szabo
+ * @since 2.0
+ */
+public interface PosetAwareReceiver extends Receiver {
+
+    public TupleMask getCoreMask();
+    
+    public TupleMask getPosetMask();
+    
+    public IPosetComparator getPosetComparator();
+    
+    /**
+     * Updates the receiver with a newly found or lost partial matching also providing information 
+     * whether the update is a monotone change or not. 
+     * 
+     * @param direction the direction of the update
+     * @param update the update tuple 
+     * @param monotone true if the update is monotone, false otherwise
+     * @since 2.4
+     */
+    public void updateWithPosetInfo(Direction direction, Tuple update, boolean monotone);
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ProductionNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ProductionNode.java
new file mode 100644
index 00000000..211194c0
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ProductionNode.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.network;
+
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * Interface intended for nodes containing complete matches.
+ *
+ * @author Gabor Bergmann
+ */
+public interface ProductionNode extends Tunnel, Iterable<Tuple> {
+
+    /**
+     * @return the position mapping of this particular pattern that maps members of the tuple type to their positions
+     */
+    Map<String, Integer> getPosMapping();
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Receiver.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Receiver.java
new file mode 100644
index 00000000..3dc9aad7
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Receiver.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.network;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+
+/**
+ * ALL METHODS: FOR INTERNAL USE ONLY; ONLY INVOKE FROM {@link ReteContainer}
+ * 
+ * @author Gabor Bergmann
+ * @noimplement This interface is not intended to be implemented by external clients.
+ */
+public interface Receiver extends Node {
+
+    /**
+     * Updates the receiver with a newly found or lost partial matching.
+     * 
+     * @since 2.4
+     */
+    public void update(final Direction direction, final Tuple updateElement, final Timestamp timestamp);
+
+    /**
+     * Updates the receiver in batch style with a collection of updates. The input collection consists of pairs in the
+     * form (t, c) where t is an update tuple and c is the count. The count can also be negative, and it specifies how
+     * many times the tuple t gets deleted or inserted. The default implementation of this method simply calls
+     * {@link #update(Direction, Tuple, Timestamp)} individually for all updates.
+     * 
+     * @since 2.8
+     */
+    public default void batchUpdate(final Collection<Map.Entry<Tuple, Integer>> updates, final Timestamp timestamp) {
+        for (final Entry<Tuple, Integer> entry : updates) {
+            int count = entry.getValue();
+
+            Direction direction;
+            if (count < 0) {
+                direction = Direction.DELETE;
+                count = -count;
+            } else {
+                direction = Direction.INSERT;
+            }
+
+            for (int i = 0; i < count; i++) {
+                update(direction, entry.getKey(), timestamp);
+            }
+        }
+    }
+
+    /**
+     * Returns the {@link Mailbox} of this receiver.
+     * 
+     * @return the mailbox
+     * @since 2.0
+     */
+    public Mailbox getMailbox();
+
+    /**
+     * appends a parent that will continuously send insert and revoke updates to this supplier
+     */
+    void appendParent(final Supplier supplier);
+
+    /**
+     * removes a parent
+     */
+    void removeParent(final Supplier supplier);
+
+    /**
+     * access active parent
+     */
+    Collection<Supplier> getParents();
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/RederivableNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/RederivableNode.java
new file mode 100644
index 00000000..cae78d37
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/RederivableNode.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network;
+
+/**
+ * A rederivable node can potentially re-derive tuples after the Rete network has finished the delivery of messages.  
+ * 
+ * @author Tamas Szabo
+ * @since 1.6
+ */
+public interface RederivableNode extends Node, IGroupable {
+
+    /**
+     * The method is called by the {@link ReteContainer} to re-derive tuples after the normal messages have been 
+     * delivered and consumed. The re-derivation process may trigger the creation and delivery of further messages 
+     * and further re-derivation rounds.  
+     */
+    public void rederiveOne();
+    
+    /**
+     * Returns true if this node actually runs in DRed mode (not necessarily). 
+     * 
+     * @return true if the node is operating in DRed mode
+     * @since 2.0
+     */
+    public boolean isInDRedMode();
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ReinitializedNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ReinitializedNode.java
new file mode 100644
index 00000000..09bff29e
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ReinitializedNode.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.viatra.runtime.rete.network;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+import java.util.Collection;
+
+public interface ReinitializedNode {
+        void reinitializeWith(Collection<Tuple> tuples);
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ReteContainer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ReteContainer.java
new file mode 100644
index 00000000..79e0526d
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/ReteContainer.java
@@ -0,0 +1,729 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * Copyright (c) 2023 The Refinery Authors <https://refinery.tools>
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.network;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.CancellationToken;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Clearable;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.boundary.InputConnector;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.communication.timeless.TimelessCommunicationTracker;
+import tools.refinery.viatra.runtime.rete.network.communication.timely.TimelyCommunicationTracker;
+import tools.refinery.viatra.runtime.rete.network.delayed.DelayedCommand;
+import tools.refinery.viatra.runtime.rete.network.delayed.DelayedConnectCommand;
+import tools.refinery.viatra.runtime.rete.network.delayed.DelayedDisconnectCommand;
+import tools.refinery.viatra.runtime.rete.remote.Address;
+import tools.refinery.viatra.runtime.rete.single.SingleInputNode;
+import tools.refinery.viatra.runtime.rete.single.TrimmerNode;
+import tools.refinery.viatra.runtime.rete.util.Options;
+
+import java.util.*;
+import java.util.function.Function;
+
+/**
+ * @author Gabor Bergmann
+ *
+ *         Mutexes: externalMessageLock - enlisting messages into and retrieving from the external message queue
+ * @since 2.2
+ */
+public final class ReteContainer {
+
+    protected Thread consumerThread = null;
+    protected boolean killed = false;
+
+    protected Network network;
+
+    protected LinkedList<Clearable> clearables;
+    protected Map<Long, Node> nodesById;
+    protected long nextId = 0;
+
+    protected ConnectionFactory connectionFactory;
+    protected NodeProvisioner nodeProvisioner;
+
+    protected Deque<UpdateMessage> internalMessageQueue = new ArrayDeque<UpdateMessage>();
+    protected/* volatile */Deque<UpdateMessage> externalMessageQueue = new ArrayDeque<UpdateMessage>();
+    protected Object externalMessageLock = new Object();
+    protected Long clock = 1L; // even: steady state, odd: active queue; access
+                               // ONLY with messageQueue locked!
+    protected Map<ReteContainer, Long> terminationCriteria = null;
+    protected final Logger logger;
+    protected final CommunicationTracker tracker;
+
+    protected final IQueryBackendContext backendContext;
+
+    protected Set<DelayedCommand> delayedCommandQueue;
+    protected Set<DelayedCommand> delayedCommandBuffer;
+    protected boolean executingDelayedCommands;
+
+    protected final TimelyConfiguration timelyConfiguration;
+
+        private final CancellationToken cancellationToken;
+
+    /**
+     * @param threaded
+     *            false if operating in a single-threaded environment
+     */
+    public ReteContainer(Network network, boolean threaded) {
+        super();
+        this.network = network;
+        this.backendContext = network.getEngine().getBackendContext();
+        this.timelyConfiguration = network.getEngine().getTimelyConfiguration();
+                cancellationToken = backendContext.getRuntimeContext().getCancellationToken();
+
+        this.delayedCommandQueue = new LinkedHashSet<DelayedCommand>();
+        this.delayedCommandBuffer = new LinkedHashSet<DelayedCommand>();
+        this.executingDelayedCommands = false;
+
+        if (this.isTimelyEvaluation()) {
+            this.tracker = new TimelyCommunicationTracker(this.getTimelyConfiguration());
+        } else {
+            this.tracker = new TimelessCommunicationTracker();
+        }
+
+        this.nodesById = CollectionsFactory.createMap();
+        this.clearables = new LinkedList<Clearable>();
+        this.logger = network.getEngine().getLogger();
+
+        this.connectionFactory = new ConnectionFactory(this);
+        this.nodeProvisioner = new NodeProvisioner(this);
+
+        if (threaded) {
+            this.terminationCriteria = CollectionsFactory.createMap();
+            this.consumerThread = new Thread("Rete thread of " + ReteContainer.super.toString()) {
+                @Override
+                public void run() {
+                    messageConsumptionCycle();
+                }
+            };
+            this.consumerThread.start();
+        }
+    }
+
+    /**
+     * @since 2.4
+     */
+    public boolean isTimelyEvaluation() {
+        return this.timelyConfiguration != null;
+    }
+
+    /**
+     * @since 2.4
+     */
+    public TimelyConfiguration getTimelyConfiguration() {
+        return this.timelyConfiguration;
+    }
+
+    /**
+     * @since 1.6
+     * @return the communication graph of the nodes, incl. message scheduling
+     */
+    public CommunicationTracker getCommunicationTracker() {
+        return tracker;
+    }
+
+    /**
+     * Stops this container. To be called by Network.kill()
+     */
+    public void kill() {
+        killed = true;
+        if (consumerThread != null)
+            consumerThread.interrupt();
+    }
+
+    /**
+     * Establishes connection between a supplier and a receiver node, regardless which container they are in. Assumption
+     * is that this container is the home of the receiver, but it is not strictly necessary.
+     *
+     * @param synchronise
+     *            indicates whether the receiver should be synchronised to the current contents of the supplier
+     */
+    public void connectRemoteNodes(Address<? extends Supplier> supplier, Address<? extends Receiver> receiver,
+            boolean synchronise) {
+        if (!isLocal(receiver))
+            receiver.getContainer().connectRemoteNodes(supplier, receiver, synchronise);
+        else {
+            Receiver child = resolveLocal(receiver);
+            connectRemoteSupplier(supplier, child, synchronise);
+        }
+    }
+
+    /**
+     * Severs connection between a supplier and a receiver node, regardless which container they are in. Assumption is
+     * that this container is the home of the receiver, but it is not strictly necessary.
+     *
+     * @param desynchronise
+     *            indicates whether the current contents of the supplier should be subtracted from the receiver
+     */
+    public void disconnectRemoteNodes(Address<? extends Supplier> supplier, Address<? extends Receiver> receiver,
+            boolean desynchronise) {
+        if (!isLocal(receiver))
+            receiver.getContainer().disconnectRemoteNodes(supplier, receiver, desynchronise);
+        else {
+            Receiver child = resolveLocal(receiver);
+            disconnectRemoteSupplier(supplier, child, desynchronise);
+        }
+    }
+
+    /**
+     * Establishes connection between a remote supplier and a local receiver node.
+     *
+     * @param synchronise
+     *            indicates whether the receiver should be synchronised to the current contents of the supplier
+     */
+    public void connectRemoteSupplier(Address<? extends Supplier> supplier, Receiver receiver, boolean synchronise) {
+        Supplier parent = nodeProvisioner.asSupplier(supplier);
+        if (synchronise)
+            connectAndSynchronize(parent, receiver);
+        else
+            connect(parent, receiver);
+    }
+
+    /**
+     * Severs connection between a remote supplier and a local receiver node.
+     *
+     * @param desynchronise
+     *            indicates whether the current contents of the supplier should be subtracted from the receiver
+     */
+    public void disconnectRemoteSupplier(Address<? extends Supplier> supplier, Receiver receiver,
+            boolean desynchronise) {
+        Supplier parent = nodeProvisioner.asSupplier(supplier);
+        if (desynchronise)
+            disconnectAndDesynchronize(parent, receiver);
+        else
+            disconnect(parent, receiver);
+    }
+
+    /**
+     * Connects a receiver to a supplier
+     */
+    public void connect(Supplier supplier, Receiver receiver) {
+        supplier.appendChild(receiver);
+        receiver.appendParent(supplier);
+        tracker.registerDependency(supplier, receiver);
+    }
+
+    /**
+     * Disconnects a receiver from a supplier
+     */
+    public void disconnect(Supplier supplier, Receiver receiver) {
+        supplier.removeChild(receiver);
+        receiver.removeParent(supplier);
+        tracker.unregisterDependency(supplier, receiver);
+    }
+
+    /**
+     * @since 2.3
+     */
+    public boolean isExecutingDelayedCommands() {
+        return this.executingDelayedCommands;
+    }
+
+    /**
+     * @since 2.3
+     */
+    public Set<DelayedCommand> getDelayedCommandQueue() {
+        if (this.executingDelayedCommands) {
+            return this.delayedCommandBuffer;
+        } else {
+            return this.delayedCommandQueue;
+        }
+    }
+
+    /**
+     * Connects a receiver to a remote supplier, and synchronizes it to the current contents of the supplier
+     */
+    public void connectAndSynchronize(Supplier supplier, Receiver receiver) {
+        supplier.appendChild(receiver);
+        receiver.appendParent(supplier);
+        tracker.registerDependency(supplier, receiver);
+        getDelayedCommandQueue().add(new DelayedConnectCommand(supplier, receiver, this));
+    }
+
+    /**
+     * Disconnects a receiver from a supplier
+     */
+    public void disconnectAndDesynchronize(Supplier supplier, Receiver receiver) {
+        final boolean wasInSameSCC = this.isTimelyEvaluation() && this.tracker.areInSameGroup(supplier, receiver);
+        supplier.removeChild(receiver);
+        receiver.removeParent(supplier);
+        tracker.unregisterDependency(supplier, receiver);
+        getDelayedCommandQueue().add(new DelayedDisconnectCommand(supplier, receiver, this, wasInSameSCC));
+    }
+
+    /**
+     * @since 2.3
+     */
+    public void executeDelayedCommands() {
+        if (!this.delayedCommandQueue.isEmpty()) {
+            flushUpdates();
+            this.executingDelayedCommands = true;
+            for (final DelayedCommand command : this.delayedCommandQueue) {
+                command.run();
+            }
+            this.delayedCommandQueue = this.delayedCommandBuffer;
+            this.delayedCommandBuffer = new LinkedHashSet<DelayedCommand>();
+            flushUpdates();
+            this.executingDelayedCommands = false;
+        }
+    }
+
+    /**
+     * Sends an update message to the receiver node, indicating a newly found or lost partial matching. The receiver is
+     * indicated by the Address. Designed to be called by the Network, DO NOT use in any other way. @pre:
+     * address.container == this, e.g. address MUST be local
+     *
+     * @return the value of the container's clock at the time when the message was accepted into the local message queue
+     */
+    long sendUpdateToLocalAddress(Address<? extends Receiver> address, Direction direction, Tuple updateElement) {
+        long timestamp;
+        Receiver receiver = resolveLocal(address);
+        UpdateMessage message = new UpdateMessage(receiver, direction, updateElement);
+        synchronized (externalMessageLock) {
+            externalMessageQueue.add(message);
+            timestamp = clock;
+            externalMessageLock.notifyAll();
+        }
+
+        return timestamp;
+
+    }
+
+    /**
+     * Sends multiple update messages atomically to the receiver node, indicating a newly found or lost partial
+     * matching. The receiver is indicated by the Address. Designed to be called by the Network, DO NOT use in any other
+     * way. @pre: address.container == this, e.g. address MUST be local @pre: updateElements is nonempty!
+     *
+     * @return the value of the container's clock at the time when the message was accepted into the local message queue
+     */
+    long sendUpdatesToLocalAddress(Address<? extends Receiver> address, Direction direction,
+            Collection<Tuple> updateElements) {
+
+        long timestamp;
+        Receiver receiver = resolveLocal(address);
+        // UpdateMessage message = new UpdateMessage(receiver, direction,
+        // updateElement);
+        synchronized (externalMessageLock) {
+            for (Tuple ps : updateElements)
+                externalMessageQueue.add(new UpdateMessage(receiver, direction, ps));
+            // messageQueue.add(new UpdateMessage(resolveLocal(address),
+            // direction, updateElement));
+            // this.sendUpdateInternal(resolveLocal(address), direction,
+            // updateElement);
+            timestamp = clock;
+            externalMessageLock.notifyAll();
+        }
+
+        return timestamp;
+    }
+
+    /**
+     * Sends an update message to the receiver node, indicating a newly found or lost partial matching. The receiver is
+     * indicated by the Address. Designed to be called by the Network in single-threaded operation, DO NOT use in any
+     * other way.
+     */
+    void sendUpdateToLocalAddressSingleThreaded(Address<? extends Receiver> address, Direction direction,
+            Tuple updateElement) {
+        Receiver receiver = resolveLocal(address);
+        UpdateMessage message = new UpdateMessage(receiver, direction, updateElement);
+        internalMessageQueue.add(message);
+    }
+
+    /**
+     * Sends multiple update messages to the receiver node, indicating a newly found or lost partial matching. The
+     * receiver is indicated by the Address. Designed to be called by the Network in single-threaded operation, DO NOT
+     * use in any other way.
+     *
+     * @pre: address.container == this, e.g. address MUST be local
+     */
+    void sendUpdatesToLocalAddressSingleThreaded(Address<? extends Receiver> address, Direction direction,
+            Collection<Tuple> updateElements) {
+        Receiver receiver = resolveLocal(address);
+        for (Tuple ps : updateElements)
+            internalMessageQueue.add(new UpdateMessage(receiver, direction, ps));
+    }
+
+    /**
+     * Sends an update message to a node in a different container. The receiver is indicated by the Address. Designed to
+     * be called by RemoteReceivers, DO NOT use in any other way.
+     *
+     * @since 2.4
+     */
+    public void sendUpdateToRemoteAddress(Address<? extends Receiver> address, Direction direction,
+            Tuple updateElement) {
+        ReteContainer otherContainer = address.getContainer();
+        long otherClock = otherContainer.sendUpdateToLocalAddress(address, direction, updateElement);
+        // Long criterion = terminationCriteria.get(otherContainer);
+        // if (criterion==null || otherClock > criterion)
+        terminationCriteria.put(otherContainer, otherClock);
+    }
+
+    /**
+     * Finalises all update sequences and returns. To be called from user threads (e.g. network construction).
+     */
+    public void flushUpdates() {
+        network.waitForReteTermination();
+        // synchronized (messageQueue)
+        // {
+        // while (!messageQueue.isEmpty())
+        // {
+        // try {
+        // UpdateMessage message = messageQueue.take();
+        // message.receiver.update(message.direction, message.updateElement);
+        // } catch (InterruptedException e) {}
+        // }
+        // }
+    }
+
+    /**
+     * Retrieves a safe copy of the contents of a supplier.
+     *
+     * <p> Note that there may be multiple copies of a Tuple in case of a {@link TrimmerNode}, so the result is not always a set.
+     *
+     * @param flush if true, a flush is performed before pulling the contents
+     * @since 2.3
+     */
+    public Collection<Tuple> pullContents(final Supplier supplier, final boolean flush) {
+        if (flush) {
+            flushUpdates();
+        }
+        final Collection<Tuple> collector = new ArrayList<Tuple>();
+        supplier.pullInto(collector, flush);
+        return collector;
+    }
+
+    /**
+     * @since 2.4
+     */
+    public Map<Tuple, Timeline<Timestamp>> pullContentsWithTimeline(final Supplier supplier, final boolean flush) {
+        if (flush) {
+            flushUpdates();
+        }
+        final Map<Tuple, Timeline<Timestamp>> collector = CollectionsFactory.createMap();
+        supplier.pullIntoWithTimeline(collector, flush);
+        return collector;
+    }
+
+    /**
+     * Retrieves the contents of a SingleInputNode's parentage.
+     *
+     * @since 2.3
+     */
+    public Collection<Tuple> pullPropagatedContents(final SingleInputNode supplier, final boolean flush) {
+        if (flush) {
+            flushUpdates();
+        }
+        final Collection<Tuple> collector = new LinkedList<Tuple>();
+        supplier.propagatePullInto(collector, flush);
+        return collector;
+    }
+
+    /**
+     * Retrieves the timestamp-aware contents of a SingleInputNode's parentage.
+     *
+     * @since 2.3
+     */
+    public Map<Tuple, Timeline<Timestamp>> pullPropagatedContentsWithTimestamp(final SingleInputNode supplier,
+            final boolean flush) {
+        if (flush) {
+            flushUpdates();
+        }
+        final Map<Tuple, Timeline<Timestamp>> collector = CollectionsFactory.createMap();
+        supplier.propagatePullIntoWithTimestamp(collector, flush);
+        return collector;
+    }
+
+    /**
+     * Retrieves the contents of a supplier for a remote caller. Assumption is that this container is the home of the
+     * supplier, but it is not strictly necessary.
+     *
+     * @param supplier
+     *            the address of the supplier to be pulled.
+     * @since 2.3
+     */
+    public Collection<Tuple> remotePull(Address<? extends Supplier> supplier, boolean flush) {
+        if (!isLocal(supplier))
+            return supplier.getContainer().remotePull(supplier, flush);
+        return pullContents(resolveLocal(supplier), flush);
+    }
+
+    /**
+     * Proxies for the getPosMapping() of Production nodes. Retrieves the posmapping of a remote or local Production to
+     * a remote or local caller.
+     */
+    public Map<String, Integer> remotePosMapping(Address<? extends ProductionNode> production) {
+        if (!isLocal(production))
+            return production.getContainer().remotePosMapping(production);
+        return resolveLocal(production).getPosMapping();
+    }
+
+    /**
+     * Continually consumes update messages. Should be run on a dedicated thread.
+     */
+    void messageConsumptionCycle() {
+        while (!killed) // deliver messages on and on and on....
+        {
+            long incrementedClock = 0;
+            UpdateMessage message = null;
+
+            if (!internalMessageQueue.isEmpty()) // take internal messages first
+                message = internalMessageQueue.removeFirst();
+            else
+                // no internal message, take an incoming message
+                synchronized (externalMessageLock) { // no sleeping allowed,
+                                                     // because external
+                                                     // queue is locked for
+                                                     // precise clocking of
+                                                     // termination point!
+                    if (!externalMessageQueue.isEmpty()) { // if external queue
+                                                           // is non-empty,
+                                                           // retrieve the next
+                                                           // message instantly
+                        message = takeExternalMessage();
+                    } else { // if external queue is found empty (and this is
+                             // the first time in a row)
+                        incrementedClock = ++clock; // local termination point
+                        // synchronized(clock){incrementedClock = ++clock;}
+                    }
+                }
+
+            if (message == null) // both queues were empty
+            {
+                localUpdateTermination(incrementedClock); // report local
+                                                          // termination point
+                while (message == null) // wait for a message while external
+                                        // queue is still empty
+                {
+                    synchronized (externalMessageLock) {
+                        while (externalMessageQueue.isEmpty()) {
+                            try {
+                                externalMessageLock.wait();
+                            } catch (InterruptedException e) {
+                                if (killed)
+                                    return;
+                            }
+                        }
+                        message = takeExternalMessage();
+                    }
+
+                }
+            }
+
+            // now we have a message to deliver
+            // NOTE: this method is not compatible with differential dataflow
+            message.receiver.update(message.direction, message.updateElement, Timestamp.ZERO);
+        }
+    }
+
+    /**
+     * @since 1.6
+     */
+    public static final Function<Node, String> NAME_MAPPER = input -> input.toString().substring(0,
+            Math.min(30, input.toString().length()));
+
+    /**
+     * Sends out all pending messages to their receivers. The delivery is governed by the communication tracker.
+     *
+     * @since 1.6
+     */
+    public void deliverMessagesSingleThreaded() {
+        if (!backendContext.areUpdatesDelayed()) {
+            if (Options.MONITOR_VIOLATION_OF_RETE_NODEGROUP_TOPOLOGICAL_SORTING) {
+                // known unreachable; enable for debugging only
+
+                CommunicationGroup lastGroup = null;
+                Set<CommunicationGroup> seenInThisCycle = new HashSet<>();
+
+                while (!tracker.isEmpty()) {
+                    final CommunicationGroup group = tracker.getAndRemoveFirstGroup();
+
+                    /**
+                     * The current group does not violate the communication schema iff (1) it was not seen before OR (2)
+                     * the last one that was seen is exactly the same as the current one this can happen if the group
+                     * was added back because of in-group message passing
+                     */
+                    boolean okGroup = (group == lastGroup) || seenInThisCycle.add(group);
+
+                    if (!okGroup) {
+                        logger.error(
+                                "[INTERNAL ERROR] Violation of communication schema! The communication component with representative "
+                                        + group.getRepresentative() + " has already been processed!");
+                    }
+
+                    group.deliverMessages();
+
+                    lastGroup = group;
+                }
+
+            } else {
+                while (!tracker.isEmpty()) {
+                    final CommunicationGroup group = tracker.getAndRemoveFirstGroup();
+                    group.deliverMessages();
+                }
+            }
+        }
+    }
+
+    private void localUpdateTermination(long incrementedClock) {
+        network.reportLocalUpdateTermination(this, incrementedClock, terminationCriteria);
+        terminationCriteria.clear();
+
+        // synchronized(clock){++clock;} // +1 incrementing for parity and easy
+        // comparison
+    }
+
+    // @pre: externalMessageQueue synchronized && nonempty
+    private UpdateMessage takeExternalMessage() {
+        UpdateMessage message = externalMessageQueue.removeFirst();
+        if (!externalMessageQueue.isEmpty()) { // copy the whole queue over
+                                               // for speedup
+            Deque<UpdateMessage> temp = externalMessageQueue;
+            externalMessageQueue = internalMessageQueue;
+            internalMessageQueue = temp;
+        }
+        return message;
+    }
+
+    /**
+     * Provides an external address for the selected node.
+     *
+     * @pre node belongs to this container.
+     */
+    public <N extends Node> Address<N> makeAddress(N node) {
+        return new Address<N>(node);
+    }
+
+    /**
+     * Checks whether a certain address points to a node at this container.
+     */
+    public boolean isLocal(Address<? extends Node> address) {
+        return address.getContainer() == this;
+    }
+
+    /**
+     * Returns an addressed node at this container.
+     *
+     * @pre: address.container == this, e.g. address MUST be local
+     * @throws IllegalArgumentException
+     *             if address is non-local
+     */
+    @SuppressWarnings("unchecked")
+    public <N extends Node> N resolveLocal(Address<N> address) {
+        if (this != address.getContainer())
+            throw new IllegalArgumentException(String.format("Address %s non-local at container %s", address, this));
+
+        N cached = address.getNodeCache();
+        if (cached != null)
+            return cached;
+        else {
+            N node = (N) nodesById.get(address.getNodeId());
+            address.setNodeCache(node);
+            return node;
+        }
+    }
+
+    /**
+     * Registers a node into the rete network (should be called by constructor). Every node MUST be registered by its
+     * constructor.
+     *
+     * @return the unique nodeId issued to the node.
+     */
+    public long registerNode(Node n) {
+        long id = nextId++;
+        nodesById.put(id, n);
+        return id;
+    }
+
+    /**
+     * Unregisters a node from the rete network. Do NOT call if node is still connected to other Nodes, or Adressed or
+     * otherwise referenced.
+     */
+    public void unregisterNode(Node n) {
+        nodesById.remove(n.getNodeId());
+    }
+
+    /**
+     * Registers a pattern memory into the rete network. Every memory MUST be registered by its owner node.
+     */
+    public void registerClearable(Clearable c) {
+        clearables.addFirst(c);
+    }
+
+    /**
+     * Unregisters a pattern memory from the rete network.
+     */
+    public void unregisterClearable(Clearable c) {
+        clearables.remove(c);
+    }
+
+    /**
+     * Clears all memory contents in the network. Reverts to initial state.
+     */
+    public void clearAll() {
+        for (Clearable c : clearables) {
+            c.clear();
+        }
+    }
+
+    public NodeFactory getNodeFactory() {
+        return network.getNodeFactory();
+    }
+
+    public ConnectionFactory getConnectionFactory() {
+        return connectionFactory;
+    }
+
+    public NodeProvisioner getProvisioner() {
+        return nodeProvisioner;
+    }
+
+    public Network getNetwork() {
+        return network;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        String separator = System.getProperty("line.separator");
+        sb.append(super.toString() + "[[[" + separator);
+        java.util.List<Long> keys = new java.util.ArrayList<Long>(nodesById.keySet());
+        java.util.Collections.sort(keys);
+        for (Long key : keys) {
+            sb.append(key + " -> " + nodesById.get(key) + separator);
+        }
+        sb.append("]]] of " + network);
+        return sb.toString();
+    }
+
+    /**
+     * Access all the Rete nodes inside this container.
+     *
+     * @return the collection of {@link Node} instances
+     */
+    public Collection<Node> getAllNodes() {
+        return nodesById.values();
+    }
+
+    public InputConnector getInputConnectionFactory() {
+        return network.getInputConnector();
+    }
+
+        public void checkCancelled() {
+                cancellationToken.checkCancelled();
+        }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/StandardNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/StandardNode.java
new file mode 100644
index 00000000..7dc7c4bc
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/StandardNode.java
@@ -0,0 +1,123 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * Copyright (c) 2023 The Refinery Authors <https://refinery.tools>
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.network;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.index.GenericProjectionIndexer;
+import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Base implementation for a supplier node.
+ *
+ * @author Gabor Bergmann
+ *
+ */
+public abstract class StandardNode extends BaseNode implements Supplier, NetworkStructureChangeSensitiveNode {
+    protected final List<Receiver> children = CollectionsFactory.createObserverList();
+    /**
+     * @since 2.2
+     */
+    protected final List<Mailbox> childMailboxes = CollectionsFactory.createObserverList();
+
+    public StandardNode(final ReteContainer reteContainer) {
+        super(reteContainer);
+    }
+
+    /**
+     * @since 2.4
+     */
+    protected void propagateUpdate(final Direction direction, final Tuple updateElement, final Timestamp timestamp) {
+                reteContainer.checkCancelled();
+        for (final Mailbox childMailbox : childMailboxes) {
+            childMailbox.postMessage(direction, updateElement, timestamp);
+        }
+    }
+
+    @Override
+    public void appendChild(final Receiver receiver) {
+        children.add(receiver);
+        childMailboxes.add(this.getCommunicationTracker().proxifyMailbox(this, receiver.getMailbox()));
+    }
+
+    @Override
+    public void removeChild(final Receiver receiver) {
+        children.remove(receiver);
+        Mailbox mailboxToRemove = null;
+        for (final Mailbox mailbox : childMailboxes) {
+            if (mailbox.getReceiver() == receiver) {
+                mailboxToRemove = mailbox;
+                break;
+            }
+        }
+        assert mailboxToRemove != null;
+        childMailboxes.remove(mailboxToRemove);
+    }
+
+    @Override
+    public void networkStructureChanged() {
+        childMailboxes.clear();
+        for (final Receiver receiver : children) {
+            childMailboxes.add(this.getCommunicationTracker().proxifyMailbox(this, receiver.getMailbox()));
+        }
+    }
+
+    @Override
+    public Collection<Receiver> getReceivers() {
+        return children;
+    }
+
+    /**
+     * @since 2.2
+     */
+    public Collection<Mailbox> getChildMailboxes() {
+        return this.childMailboxes;
+    }
+
+    @Override
+    public Set<Tuple> getPulledContents(final boolean flush) {
+        final HashSet<Tuple> results = new HashSet<Tuple>();
+        pullInto(results, flush);
+        return results;
+    }
+
+    @Override
+    public ProjectionIndexer constructIndex(final TupleMask mask, final TraceInfo... traces) {
+        final GenericProjectionIndexer indexer = new GenericProjectionIndexer(reteContainer, mask);
+        for (final TraceInfo traceInfo : traces) {
+            indexer.assignTraceInfo(traceInfo);
+        }
+        reteContainer.connectAndSynchronize(this, indexer);
+        return indexer;
+    }
+
+    /**
+     * @since 1.6
+     */
+    protected void issueError(final String message, final Exception ex) {
+        if (ex == null) {
+            this.reteContainer.getNetwork().getEngine().getLogger().error(message);
+        } else {
+            this.reteContainer.getNetwork().getEngine().getLogger().error(message, ex);
+        }
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Supplier.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Supplier.java
new file mode 100644
index 00000000..1917a7cf
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Supplier.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.network;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.single.TrimmerNode;
+import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ *         A supplier is an object that can propagate insert or revoke events towards receivers.
+ */
+public interface Supplier extends Node {
+
+    /**
+     * Pulls the contents of this object in this particular moment into a target collection. 
+     * 
+     * @param flush if true, flushing of messages is allowed during the pull, otherwise flushing is not allowed
+     * @since 2.3
+     */
+    public void pullInto(Collection<Tuple> collector, boolean flush);
+    
+    /**
+     * @since 2.4
+     */
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush);
+    
+    /**
+     * Returns the contents of this object in this particular moment. 
+     * For memoryless nodes, this may involve a costly recomputation of contents.
+     * 
+     * The result is returned as a Set, even when it has multiplicities (at the output of {@link TrimmerNode}).
+     * 
+     *  <p> Intended mainly for debug purposes; therefore flushing is performed only if explicitly requested
+     *  During runtime, flushing may be preferred; see {@link ReteContainer#pullContents(Supplier)}
+     * @since 2.3
+     */
+    public Set<Tuple> getPulledContents(boolean flush);
+    
+    default public Set<Tuple> getPulledContents() {
+        return getPulledContents(true);
+    }
+
+    /**
+     * appends a receiver that will continously receive insert and revoke updates from this supplier
+     */
+    void appendChild(Receiver receiver);
+
+    /**
+     * removes a receiver
+     */
+    void removeChild(Receiver receiver);
+
+    /**
+     * Instantiates (or reuses, depending on implementation) an index according to the given mask. 
+     * 
+     * Intended for internal use; clients should invoke through Library instead to enable reusing.
+     */
+    ProjectionIndexer constructIndex(TupleMask mask, TraceInfo... traces);
+
+    /**
+     * lists receivers
+     */
+    Collection<Receiver> getReceivers();
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Tunnel.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Tunnel.java
new file mode 100644
index 00000000..f238f47b
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/Tunnel.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.network;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ *         A Tunnel is an interface into which elments can be instered and from which productions can be extracted.
+ */
+public interface Tunnel extends Supplier, Receiver {
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/UpdateMessage.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/UpdateMessage.java
new file mode 100644
index 00000000..1334a3a9
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/UpdateMessage.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.network;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+
+class UpdateMessage {
+    public Receiver receiver;
+    public Direction direction;
+    public Tuple updateElement;
+
+    public UpdateMessage(Receiver receiver, Direction direction, Tuple updateElement) {
+        this.receiver = receiver;
+        this.direction = direction;
+        this.updateElement = updateElement;
+    }
+
+    @Override
+    public String toString() {
+        return "M." + direction + ": " + updateElement + " -> " + receiver;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/CommunicationGroup.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/CommunicationGroup.java
new file mode 100644
index 00000000..8cedeb11
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/CommunicationGroup.java
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication;
+
+import java.util.Collection;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+
+/**
+ * A communication group represents a set of nodes in the communication graph that form a strongly connected component.
+ * 
+ * @author Tamas Szabo
+ * @since 1.6
+ */
+public abstract class CommunicationGroup implements Comparable<CommunicationGroup> {
+
+    public static final String UNSUPPORTED_MESSAGE_KIND = "Unsupported message kind ";
+
+    /**
+     * Marker for the {@link CommunicationTracker}
+     */
+    public boolean isEnqueued = false;
+
+    protected final Node representative;
+
+    /**
+     * May be changed during bumping in {@link CommunicationTracker.registerDependency}
+     */
+    protected int identifier;
+
+    /**
+     * @since 1.7
+     */
+    protected final CommunicationTracker tracker;
+
+    /**
+     * @since 1.7
+     */
+    public CommunicationGroup(final CommunicationTracker tracker, final Node representative, final int identifier) {
+        this.tracker = tracker;
+        this.representative = representative;
+        this.identifier = identifier;
+    }
+
+    public abstract void deliverMessages();
+
+    public Node getRepresentative() {
+        return representative;
+    }
+
+    public abstract boolean isEmpty();
+
+    /**
+     * @since 2.0
+     */
+    public abstract void notifyLostAllMessages(final Mailbox mailbox, final MessageSelector kind);
+
+    /**
+     * @since 2.0
+     */
+    public abstract void notifyHasMessage(final Mailbox mailbox, final MessageSelector kind);
+
+    public abstract Map<MessageSelector, Collection<Mailbox>> getMailboxes();
+
+    public abstract boolean isRecursive();
+
+    @Override
+    public int hashCode() {
+        return this.identifier;
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName() + " " + this.identifier + " - representative: " + this.representative
+                + " - isEmpty: " + isEmpty();
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (obj == null || this.getClass() != obj.getClass()) {
+            return false;
+        } else if (this == obj) {
+            return true;
+        } else {
+            final CommunicationGroup that = (CommunicationGroup) obj;
+            return this.identifier == that.identifier;
+        }
+    }
+
+    @Override
+    public int compareTo(final CommunicationGroup that) {
+        return this.identifier - that.identifier;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/CommunicationTracker.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/CommunicationTracker.java
new file mode 100644
index 00000000..d244e644
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/CommunicationTracker.java
@@ -0,0 +1,467 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.PriorityQueue;
+import java.util.Queue;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.rete.itc.alg.incscc.IncSCCAlg;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.topsort.TopologicalSorting;
+import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.rete.aggregation.IAggregatorNode;
+import tools.refinery.viatra.runtime.rete.boundary.ExternalInputEnumeratorNode;
+import tools.refinery.viatra.runtime.rete.eval.RelationEvaluatorNode;
+import tools.refinery.viatra.runtime.rete.index.DualInputNode;
+import tools.refinery.viatra.runtime.rete.index.ExistenceNode;
+import tools.refinery.viatra.runtime.rete.index.Indexer;
+import tools.refinery.viatra.runtime.rete.index.IndexerListener;
+import tools.refinery.viatra.runtime.rete.index.IterableIndexer;
+import tools.refinery.viatra.runtime.rete.index.SpecializedProjectionIndexer;
+import tools.refinery.viatra.runtime.rete.network.IGroupable;
+import tools.refinery.viatra.runtime.rete.network.NetworkStructureChangeSensitiveNode;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.ProductionNode;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.timely.TimelyIndexerListenerProxy;
+import tools.refinery.viatra.runtime.rete.network.communication.timely.TimelyMailboxProxy;
+import tools.refinery.viatra.runtime.rete.network.mailbox.FallThroughCapableMailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.viatra.runtime.rete.single.TransitiveClosureNode;
+import tools.refinery.viatra.runtime.rete.single.TrimmerNode;
+
+/**
+ * An instance of this class is associated with every {@link ReteContainer}. The tracker serves two purposes: <br>
+ * (1) It allows RETE nodes to register their communication dependencies on-the-fly. These dependencies can be
+ * registered or unregistered when nodes are disposed of. <br>
+ * (2) It allows RETE nodes to register their mailboxes as dirty, that is, they can tell the tracker that they have
+ * something to send to other nodes in the network. The tracker is then responsible for ordering these messages (more
+ * precisely, the mailboxes that contain the messages) for the associated {@link ReteContainer}. The ordering is
+ * governed by the strongly connected components in the dependency network and follows a topological sorting scheme;
+ * those mailboxes will be emptied first whose owner nodes do not depend on other undelivered messages.
+ *
+ * @author Tamas Szabo
+ * @since 1.6
+ *
+ */
+public abstract class CommunicationTracker {
+
+    /**
+     * The minimum group id assigned so far
+     */
+    protected int minGroupId;
+
+    /**
+     * The maximum group id assigned so far
+     */
+    protected int maxGroupId;
+
+    /**
+     * The dependency graph of the communications in the RETE network
+     */
+    protected final Graph<Node> dependencyGraph;
+
+    /**
+     * Incremental SCC information about the dependency graph
+     */
+    protected final IncSCCAlg<Node> sccInformationProvider;
+
+    /**
+     * Precomputed node -> communication group map
+     */
+    protected final Map<Node, CommunicationGroup> groupMap;
+
+    /**
+     * Priority queue of active communication groups
+     */
+    protected final Queue<CommunicationGroup> groupQueue;
+
+    // groups should have a simple integer flag which represents its position in a priority queue
+    // priority queue only contains the ACTIVE groups
+
+    public CommunicationTracker() {
+        this.dependencyGraph = new Graph<Node>();
+        this.sccInformationProvider = new IncSCCAlg<Node>(this.dependencyGraph);
+        this.groupQueue = new PriorityQueue<CommunicationGroup>();
+        this.groupMap = new HashMap<Node, CommunicationGroup>();
+    }
+
+    public Graph<Node> getDependencyGraph() {
+        return dependencyGraph;
+    }
+
+    public CommunicationGroup getGroup(final Node node) {
+        return this.groupMap.get(node);
+    }
+
+    private void precomputeGroups() {
+        groupMap.clear();
+
+        // reconstruct group map from dependency graph
+        final Graph<Node> reducedGraph = sccInformationProvider.getReducedGraph();
+        final List<Node> representatives = TopologicalSorting.compute(reducedGraph);
+
+        for (int i = 0; i < representatives.size(); i++) { // groups for SCC representatives
+            final Node representative = representatives.get(i);
+            createAndStoreGroup(representative, i);
+        }
+
+        minGroupId = 0;
+        maxGroupId = representatives.size() - 1;
+
+        for (final Node node : dependencyGraph.getAllNodes()) { // extend group map to the rest of nodes
+            final Node representative = sccInformationProvider.getRepresentative(node);
+            final CommunicationGroup group = groupMap.get(representative);
+            if (representative != node) {
+                addToGroup(node, group);
+            }
+        }
+
+        for (final Node node : dependencyGraph.getAllNodes()) {
+            // set fall-through flags of default mailboxes
+            precomputeFallThroughFlag(node);
+            // perform further tracker-specific post-processing
+            postProcessNode(node);
+        }
+
+        // reconstruct new queue contents based on new group map
+        if (!groupQueue.isEmpty()) {
+            final Set<CommunicationGroup> oldActiveGroups = new HashSet<CommunicationGroup>(groupQueue);
+            groupQueue.clear();
+            reconstructQueueContents(oldActiveGroups);
+        }
+
+        // post process the groups
+        for (final CommunicationGroup group : groupMap.values()) {
+            postProcessGroup(group);
+        }
+    }
+
+    /**
+     * This method is responsible for reconstructing the active queue contents after the network structure has changed.
+     * It it defined as abstract because the reconstruction logic is specific to each {@link CommunicationTracker}.
+     * @since 2.4
+     */
+    protected abstract void reconstructQueueContents(final Set<CommunicationGroup> oldActiveGroups);
+
+    private void addToGroup(final Node node, final CommunicationGroup group) {
+        groupMap.put(node, group);
+        if (node instanceof Receiver) {
+            ((Receiver) node).getMailbox().setCurrentGroup(group);
+            if (node instanceof IGroupable) {
+                ((IGroupable) node).setCurrentGroup(group);
+            }
+        }
+    }
+
+    /**
+     * Depends on the groups, as well as the parent nodes of the argument, so recomputation is needed if these change
+     */
+    private void precomputeFallThroughFlag(final Node node) {
+        CommunicationGroup group = groupMap.get(node);
+        if (node instanceof Receiver) {
+            IGroupable mailbox = ((Receiver) node).getMailbox();
+            if (mailbox instanceof FallThroughCapableMailbox) {
+                Set<Node> directParents = dependencyGraph.getSourceNodes(node).distinctValues();
+                // decide between using quick&cheap fall-through, or allowing for update cancellation
+                boolean fallThrough =
+                        // disallow fallthrough: updates at production nodes should cancel, if they can be trimmed or
+                        // disjunctive
+                        (!(node instanceof ProductionNode && ( // it is a production node...
+                        // with more than one parent
+                        directParents.size() > 0 ||
+                        // or true trimming in its sole parent
+                                directParents.size() == 1 && trueTrimming(directParents.iterator().next())))) &&
+                        // disallow fallthrough: external updates should be stored (if updates are delayed)
+                                (!(node instanceof ExternalInputEnumeratorNode)) &&
+                        // disallow fallthrough: RelationEvaluatorNode needs to be notified in batch-style, and the batching is done by the mailbox
+                        // however, it is not the RelationEvaluatorNode itself that is interesting here, as that indirectly uses the BatchingReceiver
+                        // so we need to disable fall-through for the BatchingReceiver
+                                (!(node instanceof RelationEvaluatorNode.BatchingReceiver));
+                // do additional checks
+                if (fallThrough) {
+                    // recursive parent groups generate excess updates that should be cancelled after delete&rederive
+                    // phases
+                    // aggregator and transitive closure parent nodes also generate excess updates that should be
+                    // cancelled
+                    directParentLoop: for (Node directParent : directParents) {
+                        Set<Node> parentsToCheck = new HashSet<>();
+                        // check the case where a direct parent is the reason for mailbox usage
+                        parentsToCheck.add(directParent);
+                        // check the case where an indirect parent (join slot) is the reason for mailbox usage
+                        if (directParent instanceof DualInputNode) {
+                            // in case of existence join (typically antijoin), a mailbox should allow
+                            // an insertion and deletion (at the secondary slot) to cancel each other out
+                            if (directParent instanceof ExistenceNode) {
+                                fallThrough = false;
+                                break directParentLoop;
+                            }
+                            // in beta nodes, indexer slots (or their active nodes) are considered indirect parents
+                            DualInputNode dualInput = (DualInputNode) directParent;
+                            IterableIndexer primarySlot = dualInput.getPrimarySlot();
+                            if (primarySlot != null)
+                                parentsToCheck.add(primarySlot.getActiveNode());
+                            Indexer secondarySlot = dualInput.getSecondarySlot();
+                            if (secondarySlot != null)
+                                parentsToCheck.add(secondarySlot.getActiveNode());
+                        }
+                        for (Node parent : parentsToCheck) {
+                            CommunicationGroup parentGroup = groupMap.get(parent);
+                            if ( // parent is in a different, recursive group
+                            (group != parentGroup && parentGroup.isRecursive()) ||
+                            // node and parent within the same recursive group, and...
+                                    (group == parentGroup && group.isRecursive() && (
+                                    // parent is a transitive closure or aggregator node, or a trimmer
+                                    // allow trimmed or disjunctive tuple updates to cancel each other
+                                    (parent instanceof TransitiveClosureNode) || (parent instanceof IAggregatorNode)
+                                            || trueTrimming(parent)))) {
+                                fallThrough = false;
+                                break directParentLoop;
+                            }
+                        }
+                    }
+                }
+                // overwrite fallthrough flag with newly computed value
+                ((FallThroughCapableMailbox) mailbox).setFallThrough(fallThrough);
+            }
+        }
+    }
+
+    /**
+     * A trimmer node that actually eliminates some columns (not just reorders)
+     */
+    private boolean trueTrimming(Node node) {
+        if (node instanceof TrimmerNode) {
+            TupleMask mask = ((TrimmerNode) node).getMask();
+            return (mask.indices.length != mask.sourceWidth);
+        }
+        return false;
+    }
+
+    public void activateUnenqueued(final CommunicationGroup group) {
+        groupQueue.add(group);
+        group.isEnqueued = true;
+    }
+
+    public void deactivate(final CommunicationGroup group) {
+        groupQueue.remove(group);
+        group.isEnqueued = false;
+    }
+
+    public CommunicationGroup getAndRemoveFirstGroup() {
+        final CommunicationGroup group = groupQueue.poll();
+        group.isEnqueued = false;
+        return group;
+    }
+
+    public boolean isEmpty() {
+        return groupQueue.isEmpty();
+    }
+
+    protected abstract CommunicationGroup createGroup(final Node representative, final int index);
+
+    protected CommunicationGroup createAndStoreGroup(final Node representative, final int index) {
+        final CommunicationGroup group = createGroup(representative, index);
+        addToGroup(representative, group);
+        return group;
+    }
+
+    /**
+     * Registers the dependency that the target {@link Node} depends on the source {@link Node}. In other words, source
+     * may send messages to target in the RETE network. If the dependency edge is already present, this method call is a
+     * noop.
+     *
+     * @param source
+     *            the source node
+     * @param target
+     *            the target node
+     */
+    public void registerDependency(final Node source, final Node target) {
+        // nodes can be immediately inserted, if they already exist in the graph, this is a noop
+        dependencyGraph.insertNode(source);
+        dependencyGraph.insertNode(target);
+
+        if (!this.dependencyGraph.getTargetNodes(source).containsNonZero(target)) {
+
+            // query all these information before the actual edge insertion
+            // because SCCs may be unified during the process
+            final Node sourceRepresentative = sccInformationProvider.getRepresentative(source);
+            final Node targetRepresentative = sccInformationProvider.getRepresentative(target);
+            final boolean targetHadOutgoingEdges = sccInformationProvider.hasOutgoingEdges(targetRepresentative);
+
+            // insert the edge
+            dependencyGraph.insertEdge(source, target);
+
+            // create groups if they do not yet exist
+            CommunicationGroup sourceGroup = groupMap.get(sourceRepresentative);
+            if (sourceGroup == null) {
+                // create on-demand with the next smaller group id
+                sourceGroup = createAndStoreGroup(sourceRepresentative, --minGroupId);
+            }
+            final int sourceIndex = sourceGroup.identifier;
+
+            CommunicationGroup targetGroup = groupMap.get(targetRepresentative);
+            if (targetGroup == null) {
+                // create on-demand with the next larger group id
+                targetGroup = createAndStoreGroup(targetRepresentative, ++maxGroupId);
+            }
+            final int targetIndex = targetGroup.identifier;
+
+            if (sourceIndex <= targetIndex) {
+                // indices obey current topological ordering
+                refreshFallThroughFlag(target);
+                postProcessNode(source);
+                postProcessNode(target);
+                postProcessGroup(sourceGroup);
+                if (sourceGroup != targetGroup) {
+                    postProcessGroup(targetGroup);
+                }
+            } else if (sourceIndex > targetIndex && !targetHadOutgoingEdges) {
+                // indices violate current topological ordering, but we can simply bump the target index
+                final boolean wasEnqueued = targetGroup.isEnqueued;
+                if (wasEnqueued) {
+                    groupQueue.remove(targetGroup);
+                }
+                targetGroup.identifier = ++maxGroupId;
+                if (wasEnqueued) {
+                    groupQueue.add(targetGroup);
+                }
+
+                refreshFallThroughFlag(target);
+                postProcessNode(source);
+                postProcessNode(target);
+                postProcessGroup(sourceGroup);
+                postProcessGroup(targetGroup);
+            } else {
+                // needs a full re-computation because of more complex change
+                precomputeGroups();
+            }
+        }
+    }
+
+    /**
+     * Returns true if the given {@link Node} is in a recursive {@link CommunicationGroup}, false otherwise.
+     */
+    public boolean isInRecursiveGroup(final Node node) {
+        final CommunicationGroup group = this.getGroup(node);
+        if (group == null) {
+            return false;
+        } else {
+            return group.isRecursive();
+        }
+    }
+
+    /**
+     * Returns true if the given two {@link Node}s are in the same {@link CommunicationGroup}.
+     */
+    public boolean areInSameGroup(final Node left, final Node right) {
+        final CommunicationGroup leftGroup = this.getGroup(left);
+        final CommunicationGroup rightGroup = this.getGroup(right);
+        return leftGroup != null && leftGroup == rightGroup;
+    }
+
+    /**
+     * Unregisters a dependency between source and target.
+     *
+     * @param source
+     *            the source node
+     * @param target
+     *            the target node
+     */
+    public void unregisterDependency(final Node source, final Node target) {
+        // delete the edge first, and then query the SCC info provider
+        this.dependencyGraph.deleteEdgeIfExists(source, target);
+
+        final Node sourceRepresentative = sccInformationProvider.getRepresentative(source);
+        final Node targetRepresentative = sccInformationProvider.getRepresentative(target);
+
+        // if they are still in the same SCC,
+        // then this deletion did not affect the SCCs,
+        // and it is sufficient to recompute affected fall-through flags;
+        // otherwise, we need a new pre-computation for the groupMap and groupQueue
+        if (sourceRepresentative.equals(targetRepresentative)) {
+            // this deletion could not have affected the split flags
+            refreshFallThroughFlag(target);
+            postProcessNode(source);
+            postProcessNode(target);
+        } else {
+            // preComputeGroups takes care of the split flag maintenance
+            precomputeGroups();
+        }
+    }
+
+    /**
+     * Refresh fall-through flags if dependencies change for given target, but no SCC change
+     */
+    private void refreshFallThroughFlag(final Node target) {
+        precomputeFallThroughFlag(target);
+        if (target instanceof DualInputNode) {
+            for (final Node indirectTarget : dependencyGraph.getTargetNodes(target).distinctValues()) {
+                precomputeFallThroughFlag(indirectTarget);
+            }
+        }
+    }
+
+    /**
+     * Returns true if the given source-target edge in the communication network acts as a recursion cut point.
+     * The current implementation considers edges leading into {@link ProductionNode}s as cut point iff
+     * both source and target belong to the same group.
+     *
+     * @param source the source node
+     * @param target the target node
+     * @return true if the edge is a cut point, false otherwise
+     * @since 2.4
+     */
+    protected boolean isRecursionCutPoint(final Node source, final Node target) {
+        final Node effectiveSource = source instanceof SpecializedProjectionIndexer
+                ? ((SpecializedProjectionIndexer) source).getActiveNode()
+                : source;
+        final CommunicationGroup sourceGroup = this.getGroup(effectiveSource);
+        final CommunicationGroup targetGroup = this.getGroup(target);
+        return sourceGroup != null && sourceGroup == targetGroup && target instanceof ProductionNode;
+    }
+
+    /**
+     * This hook allows concrete tracker implementations to perform tracker-specific post processing on nodes (cf.
+     * {@link NetworkStructureChangeSensitiveNode} and {@link BehaviorChangingMailbox}). At the time of the invocation,
+     * the network topology has already been updated.
+     */
+    protected abstract void postProcessNode(final Node node);
+
+    /**
+     * This hook allows concrete tracker implementations to perform tracker-specific post processing on groups. At the
+     * time of the invocation, the network topology has already been updated.
+     * @since 2.4
+     */
+    protected abstract void postProcessGroup(final CommunicationGroup group);
+
+    /**
+     * Creates a proxy for the given {@link Mailbox} for the given requester {@link Node}. The proxy creation is
+     * {@link CommunicationTracker}-specific and depends on the identity of the requester. This method is primarily used
+     * to create {@link TimelyMailboxProxy}s depending on the network topology. There is no guarantee that the same
+     * proxy instance is returned when this method is called multiple times with the same arguments.
+     */
+    public abstract Mailbox proxifyMailbox(final Node requester, final Mailbox original);
+
+    /**
+     * Creates a proxy for the given {@link IndexerListener} for the given requester {@link Node}. The proxy creation is
+     * {@link CommunicationTracker}-specific and depends on the identity of the requester. This method is primarily used
+     * to create {@link TimelyIndexerListenerProxy}s depending on the network topology. There is no guarantee that the
+     * same proxy instance is returned when this method is called multiple times with the same arguments.
+     */
+    public abstract IndexerListener proxifyIndexerListener(final Node requester, final IndexerListener original);
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/MessageSelector.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/MessageSelector.java
new file mode 100644
index 00000000..e1a61693
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/MessageSelector.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication;
+
+/**
+ * Subclasses of this interface represent meta data of update messages in Rete. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public interface MessageSelector {
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/NodeComparator.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/NodeComparator.java
new file mode 100644
index 00000000..27779352
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/NodeComparator.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication;
+
+import java.util.Comparator;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.rete.network.Node;
+
+/**
+ * @since 2.4
+ */
+public class NodeComparator implements Comparator<Node> {
+
+    protected final Map<Node, Integer> nodeMap;
+
+    public NodeComparator(final Map<Node, Integer> nodeMap) {
+        this.nodeMap = nodeMap;
+    }
+
+    @Override
+    public int compare(final Node left, final Node right) {
+        return this.nodeMap.get(left) - this.nodeMap.get(right);
+    }
+    
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/PhasedSelector.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/PhasedSelector.java
new file mode 100644
index 00000000..41cd8cd3
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/PhasedSelector.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication;
+
+/**
+ * A default message selector that can be used to associate phases to messages. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public enum PhasedSelector implements MessageSelector {
+    
+    /**
+     * No special distinguishing feature
+     */
+    DEFAULT,
+    
+    /**
+     * Inserts and delete-insert monotone change pairs
+     */
+    MONOTONE,
+    
+    /**
+     * Deletes
+     */
+    ANTI_MONOTONE
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/Timestamp.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/Timestamp.java
new file mode 100644
index 00000000..a50a63a8
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/Timestamp.java
@@ -0,0 +1,124 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication;
+
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timelines;
+
+/**
+ * A timestamp associated with update messages in timely evaluation.
+ * 
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public class Timestamp implements Comparable<Timestamp>, MessageSelector {
+
+    protected final int value;
+    public static final Timestamp ZERO = new Timestamp(0);
+    /**
+     * @since 2.4
+     */
+    public static final Timeline<Timestamp> INSERT_AT_ZERO_TIMELINE = Timelines.createFrom(Timestamp.ZERO);
+
+    public Timestamp(final int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public Timestamp max(final Timestamp that) {
+        if (this.value >= that.value) {
+            return this;
+        } else {
+            return that;
+        }
+    }
+    
+    /**
+     * @since 2.4
+     */
+    public Timestamp min(final Timestamp that) {
+        if (this.value <= that.value) {
+            return this;
+        } else {
+            return that;
+        }
+    }
+
+    @Override
+    public int compareTo(final Timestamp that) {
+        return this.value - that.value;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (obj == null || !(obj instanceof Timestamp)) {
+            return false;
+        } else {
+            return this.value == ((Timestamp) obj).value;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return this.value;
+    }
+
+    @Override
+    public String toString() {
+        return Integer.toString(this.value);
+    }
+    
+    /**
+     * A {@link Map} implementation that associates the zero timestamp with every key. There is no suppor for
+     * {@link Map#entrySet()} due to performance reasons.
+     * 
+     * @author Tamas Szabo
+     */
+    public static final class AllZeroMap<T> extends AbstractMap<T, Timeline<Timestamp>> {
+
+        private final Collection<T> wrapped;
+
+        public AllZeroMap(Set<T> wrapped) {
+            this.wrapped = wrapped;
+        }
+
+        @Override
+        public Set<Entry<T, Timeline<Timestamp>>> entrySet() {
+            throw new UnsupportedOperationException("Use the combination of keySet() and get()!");
+        }
+
+        /**
+         * @since 2.4
+         */
+        @Override
+        public Timeline<Timestamp> get(final Object key) {
+            return INSERT_AT_ZERO_TIMELINE;
+        }
+
+        @Override
+        public Set<T> keySet() {
+            return (Set<T>) this.wrapped;
+        }
+
+        @Override
+        public String toString() {
+            return this.getClass().getSimpleName() + ": " + this.keySet().toString();
+        }
+
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/RecursiveCommunicationGroup.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/RecursiveCommunicationGroup.java
new file mode 100644
index 00000000..d8260384
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/RecursiveCommunicationGroup.java
@@ -0,0 +1,164 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication.timeless;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.RederivableNode;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
+import tools.refinery.viatra.runtime.rete.network.communication.PhasedSelector;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+
+/**
+ * A communication group representing either a single node where the
+ * node is a monotonicity aware one or a set of nodes that form an SCC. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public class RecursiveCommunicationGroup extends CommunicationGroup {
+
+    private final Set<Mailbox> antiMonotoneMailboxes;
+    private final Set<Mailbox> monotoneMailboxes;
+    private final Set<Mailbox> defaultMailboxes;
+    private final Set<RederivableNode> rederivables;
+    private boolean currentlyDelivering;
+
+    /**
+     * @since 1.7
+     */
+    public RecursiveCommunicationGroup(final CommunicationTracker tracker, final Node representative, final int identifier) {
+        super(tracker, representative, identifier);
+        this.antiMonotoneMailboxes = CollectionsFactory.createSet();
+        this.monotoneMailboxes = CollectionsFactory.createSet();
+        this.defaultMailboxes = CollectionsFactory.createSet();
+        this.rederivables = new LinkedHashSet<RederivableNode>();
+        this.currentlyDelivering = false;
+    }
+
+    @Override
+    public void deliverMessages() {
+        this.currentlyDelivering = true;
+        
+        // ANTI-MONOTONE PHASE
+        while (!this.antiMonotoneMailboxes.isEmpty() || !this.defaultMailboxes.isEmpty()) {
+            while (!this.antiMonotoneMailboxes.isEmpty()) {
+                final Mailbox mailbox = this.antiMonotoneMailboxes.iterator().next();
+                this.antiMonotoneMailboxes.remove(mailbox);
+                mailbox.deliverAll(PhasedSelector.ANTI_MONOTONE);
+            }
+            while (!this.defaultMailboxes.isEmpty()) {
+                final Mailbox mailbox = this.defaultMailboxes.iterator().next();
+                this.defaultMailboxes.remove(mailbox);
+                mailbox.deliverAll(PhasedSelector.DEFAULT);
+            }
+        }
+
+        // REDERIVE PHASE
+        while (!this.rederivables.isEmpty()) {
+            // re-derivable nodes take care of their unregistration!!
+            final RederivableNode node = this.rederivables.iterator().next();
+            node.rederiveOne();
+        }
+
+        // MONOTONE PHASE
+        while (!this.monotoneMailboxes.isEmpty() || !this.defaultMailboxes.isEmpty()) {
+            while (!this.monotoneMailboxes.isEmpty()) {
+                final Mailbox mailbox = this.monotoneMailboxes.iterator().next();
+                this.monotoneMailboxes.remove(mailbox);
+                mailbox.deliverAll(PhasedSelector.MONOTONE);
+            }
+            while (!this.defaultMailboxes.isEmpty()) {
+                final Mailbox mailbox = this.defaultMailboxes.iterator().next();
+                this.defaultMailboxes.remove(mailbox);
+                mailbox.deliverAll(PhasedSelector.DEFAULT);
+            }
+        }
+        
+        this.currentlyDelivering = false;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.rederivables.isEmpty() && this.antiMonotoneMailboxes.isEmpty()
+                && this.monotoneMailboxes.isEmpty() && this.defaultMailboxes.isEmpty();
+    }
+
+    @Override
+    public void notifyHasMessage(final Mailbox mailbox, final MessageSelector kind) {
+        final Collection<Mailbox> mailboxes = getMailboxContainer(kind);
+        mailboxes.add(mailbox);
+        if (!this.isEnqueued && !this.currentlyDelivering) {
+            this.tracker.activateUnenqueued(this);
+        }
+    }
+
+    @Override
+    public void notifyLostAllMessages(final Mailbox mailbox, final MessageSelector kind) {
+        final Collection<Mailbox> mailboxes = getMailboxContainer(kind);
+        mailboxes.remove(mailbox);
+        if (isEmpty()) {
+            this.tracker.deactivate(this);
+        }
+    }
+
+    private Collection<Mailbox> getMailboxContainer(final MessageSelector kind) {
+        if (kind == PhasedSelector.ANTI_MONOTONE) {
+            return this.antiMonotoneMailboxes;
+        } else if (kind == PhasedSelector.MONOTONE) {
+            return this.monotoneMailboxes;
+        } else if (kind == PhasedSelector.DEFAULT) {
+            return this.defaultMailboxes;
+        } else {
+            throw new IllegalArgumentException(UNSUPPORTED_MESSAGE_KIND + kind);
+        }
+    }
+
+    public void addRederivable(final RederivableNode node) {
+        this.rederivables.add(node);
+        if (!this.isEnqueued) {
+            this.tracker.activateUnenqueued(this);
+        }
+    }
+
+    public void removeRederivable(final RederivableNode node) {
+        this.rederivables.remove(node);
+        if (isEmpty()) {
+            this.tracker.deactivate(this);
+        }
+    }
+
+    public Collection<RederivableNode> getRederivables() {
+        return this.rederivables;
+    }
+
+    @Override
+    public Map<MessageSelector, Collection<Mailbox>> getMailboxes() {
+        Map<PhasedSelector, Collection<Mailbox>> map = new EnumMap<>(PhasedSelector.class);
+        map.put(PhasedSelector.ANTI_MONOTONE, antiMonotoneMailboxes);
+        map.put(PhasedSelector.MONOTONE, monotoneMailboxes);
+        map.put(PhasedSelector.DEFAULT, defaultMailboxes);
+        return Collections.unmodifiableMap(map);
+    }
+    
+    @Override
+    public boolean isRecursive() {
+        return true;
+    }
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/SingletonCommunicationGroup.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/SingletonCommunicationGroup.java
new file mode 100644
index 00000000..c51c7dbf
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/SingletonCommunicationGroup.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication.timeless;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
+import tools.refinery.viatra.runtime.rete.network.communication.PhasedSelector;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+
+/**
+ * A communication group containing only a single node with a single default
+ * mailbox.
+ * 
+ * @author Tamas Szabo
+ * @since 1.6
+ */
+public class SingletonCommunicationGroup extends CommunicationGroup {
+    
+    private Mailbox mailbox;
+
+    /**
+     * @since 1.7
+     */
+    public SingletonCommunicationGroup(final CommunicationTracker tracker, final Node representative, final int identifier) {
+        super(tracker, representative, identifier);
+    }
+
+    @Override
+    public void deliverMessages() {
+        this.mailbox.deliverAll(PhasedSelector.DEFAULT);
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.mailbox == null;
+    }
+
+    @Override
+    public void notifyHasMessage(final Mailbox mailbox, final MessageSelector kind) {
+        if (kind == PhasedSelector.DEFAULT) {
+            this.mailbox = mailbox;
+            if (!this.isEnqueued) {
+                this.tracker.activateUnenqueued(this);
+            }
+        } else {
+            throw new IllegalArgumentException(UNSUPPORTED_MESSAGE_KIND + kind);
+        }
+    }
+
+    @Override
+    public void notifyLostAllMessages(final Mailbox mailbox, final MessageSelector kind) {
+        if (kind == PhasedSelector.DEFAULT) {
+            this.mailbox = null;
+            this.tracker.deactivate(this);
+        } else {
+            throw new IllegalArgumentException(UNSUPPORTED_MESSAGE_KIND + kind);
+        }
+    }
+
+    @Override
+    public Map<MessageSelector, Collection<Mailbox>> getMailboxes() {
+        if (mailbox != null) {
+            return Collections.singletonMap(PhasedSelector.DEFAULT, Collections.singleton(mailbox));
+        } else {
+            return Collections.emptyMap();
+        }
+    }
+
+    @Override
+    public boolean isRecursive() {
+        return false;
+    }
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/TimelessCommunicationTracker.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/TimelessCommunicationTracker.java
new file mode 100644
index 00000000..1c18c1cd
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timeless/TimelessCommunicationTracker.java
@@ -0,0 +1,149 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication.timeless;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import tools.refinery.viatra.runtime.rete.index.DualInputNode;
+import tools.refinery.viatra.runtime.rete.index.Indexer;
+import tools.refinery.viatra.runtime.rete.index.IndexerListener;
+import tools.refinery.viatra.runtime.rete.index.IterableIndexer;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.RederivableNode;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+
+/**
+ * Timeless implementation of the communication tracker.
+ * 
+ * @author Tamas Szabo
+ * @since 2.2
+ */
+public class TimelessCommunicationTracker extends CommunicationTracker {
+
+    @Override
+    protected CommunicationGroup createGroup(Node representative, int index) {
+        final boolean isSingleton = this.sccInformationProvider.sccs.getPartition(representative).size() == 1;
+        final boolean isReceiver = representative instanceof Receiver;
+        final boolean isPosetIndifferent = isReceiver
+                && ((Receiver) representative).getMailbox() instanceof BehaviorChangingMailbox;
+        final boolean isSingletonInDRedMode = isSingleton && (representative instanceof RederivableNode)
+                && ((RederivableNode) representative).isInDRedMode();
+
+        CommunicationGroup group = null;
+        // we can only use a singleton group iff
+        // (1) the SCC has one node AND
+        // (2) either we have a poset-indifferent mailbox OR the node is not even a receiver AND
+        // (3) the node does not run in DRed mode in a singleton group
+        if (isSingleton && (isPosetIndifferent || !isReceiver) && !isSingletonInDRedMode) {
+            group = new SingletonCommunicationGroup(this, representative, index);
+        } else {
+            group = new RecursiveCommunicationGroup(this, representative, index);
+        }
+
+        return group;
+    }
+
+    @Override
+    protected void reconstructQueueContents(final Set<CommunicationGroup> oldActiveGroups) {
+        for (final CommunicationGroup oldGroup : oldActiveGroups) {
+            for (final Entry<MessageSelector, Collection<Mailbox>> entry : oldGroup.getMailboxes().entrySet()) {
+                for (final Mailbox mailbox : entry.getValue()) {
+                    final CommunicationGroup newGroup = this.groupMap.get(mailbox.getReceiver());
+                    newGroup.notifyHasMessage(mailbox, entry.getKey());
+                }
+            }
+
+            if (oldGroup instanceof RecursiveCommunicationGroup) {
+                for (final RederivableNode node : ((RecursiveCommunicationGroup) oldGroup).getRederivables()) {
+                    final CommunicationGroup newGroup = this.groupMap.get(node);
+                    if (!(newGroup instanceof RecursiveCommunicationGroup)) {
+                        throw new IllegalStateException("The new group must also be recursive! " + newGroup);
+                    }
+                    ((RecursiveCommunicationGroup) newGroup).addRederivable(node);
+                }
+            }
+        }
+    }
+
+    @Override
+    public Mailbox proxifyMailbox(final Node requester, final Mailbox original) {
+        return original;
+    }
+
+    @Override
+    public IndexerListener proxifyIndexerListener(final Node requester, final IndexerListener original) {
+        return original;
+    }
+
+    @Override
+    protected void postProcessNode(final Node node) {
+        if (node instanceof Receiver) {
+            final Mailbox mailbox = ((Receiver) node).getMailbox();
+            if (mailbox instanceof BehaviorChangingMailbox) {
+                final CommunicationGroup group = this.groupMap.get(node);
+                final Set<Node> sccNodes = this.sccInformationProvider.sccs.getPartition(node);
+                // a default mailbox must split its messages iff
+                // (1) its receiver is in a recursive group and
+                final boolean c1 = group.isRecursive();
+                // (2) its receiver is at the SCC boundary of that group
+                final boolean c2 = isAtSCCBoundary(node);
+                // (3) its group consists of more than one node
+                final boolean c3 = sccNodes.size() > 1;
+                ((BehaviorChangingMailbox) mailbox).setSplitFlag(c1 && c2 && c3);
+            }
+        }
+    }
+    
+    @Override
+    protected void postProcessGroup(final CommunicationGroup group) {
+        
+    }
+
+    /**
+     * @since 2.0
+     */
+    private boolean isAtSCCBoundary(final Node node) {
+        final CommunicationGroup ownGroup = this.groupMap.get(node);
+        assert ownGroup != null;
+        for (final Node source : this.dependencyGraph.getSourceNodes(node).distinctValues()) {
+            final Set<Node> sourcesToCheck = new HashSet<Node>();
+            sourcesToCheck.add(source);
+            // DualInputNodes must be checked additionally because they do not use a mailbox directly.
+            // It can happen that their indexers actually belong to other SCCs.
+            if (source instanceof DualInputNode) {
+                final DualInputNode dualInput = (DualInputNode) source;
+                final IterableIndexer primarySlot = dualInput.getPrimarySlot();
+                if (primarySlot != null) {
+                    sourcesToCheck.add(primarySlot.getActiveNode());
+                }
+                final Indexer secondarySlot = dualInput.getSecondarySlot();
+                if (secondarySlot != null) {
+                    sourcesToCheck.add(secondarySlot.getActiveNode());
+                }
+            }
+            for (final Node current : sourcesToCheck) {
+                final CommunicationGroup otherGroup = this.groupMap.get(current);
+                assert otherGroup != null;
+                if (!ownGroup.equals(otherGroup)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/ResumableNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/ResumableNode.java
new file mode 100644
index 00000000..8097bd91
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/ResumableNode.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication.timely;
+
+import tools.refinery.viatra.runtime.rete.network.IGroupable;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * {@link Node}s that implement this interface can resume folding of their states when instructed during timely evaluation. 
+ * 
+ * @since 2.3
+ * @author Tamas Szabo
+ */
+public interface ResumableNode extends Node, IGroupable {
+    
+    /**
+     * When called, the folding of the state shall be resumed at the given timestamp. The resumable is expected to
+     * do a folding step at the given timestamp only. Afterwards, folding shall be interrupted, even if there is more
+     * folding to do towards higher timestamps.
+     */
+    public void resumeAt(final Timestamp timestamp);
+
+    /**
+     * Returns the smallest timestamp where lazy folding shall be resumed, or null if there is no more folding to do in this
+     * resumable.
+     */
+    public Timestamp getResumableTimestamp();
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyCommunicationGroup.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyCommunicationGroup.java
new file mode 100644
index 00000000..0394d92c
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyCommunicationGroup.java
@@ -0,0 +1,171 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication.timely;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
+import tools.refinery.viatra.runtime.rete.util.Options;
+
+/**
+ * A timely communication group implementation. {@link TimelyMailbox}es and {@link LazyFoldingNode}s are ordered in the
+ * increasing order of timestamps.
+ * 
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public class TimelyCommunicationGroup extends CommunicationGroup {
+
+    private final boolean isSingleton;
+    private final TreeMap<Timestamp, Set<Mailbox>> mailboxQueue;
+    // may be null - only used in the scattered case where we need to take care of mailboxes and resumables too
+    private Comparator<Node> nodeComparator;
+    private boolean currentlyDelivering;
+    private Timestamp currentlyDeliveredTimestamp;
+
+    public TimelyCommunicationGroup(final TimelyCommunicationTracker tracker, final Node representative,
+            final int identifier, final boolean isSingleton) {
+        super(tracker, representative, identifier);
+        this.isSingleton = isSingleton;
+        this.mailboxQueue = CollectionsFactory.createTreeMap();
+        this.currentlyDelivering = false;
+    }
+
+    /**
+     * Sets the {@link Comparator} to be used to order the {@link Mailbox}es at a given {@link Timestamp} in the mailbox
+     * queue. Additionally, reorders already queued {@link Mailbox}es to reflect the new comparator. The comparator may
+     * be null, in this case, no set ordering will be enforced among the {@link Mailbox}es.
+     */
+    public void setComparatorAndReorderMailboxes(final Comparator<Node> nodeComparator) {
+        this.nodeComparator = nodeComparator;
+        if (!this.mailboxQueue.isEmpty()) {
+            final HashMap<Timestamp, Set<Mailbox>> queueCopy = new HashMap<Timestamp, Set<Mailbox>>(this.mailboxQueue);
+            this.mailboxQueue.clear();
+            for (final Entry<Timestamp, Set<Mailbox>> entry : queueCopy.entrySet()) {
+                for (final Mailbox mailbox : entry.getValue()) {
+                    this.notifyHasMessage(mailbox, entry.getKey());
+                }
+            }
+        }
+    }
+
+    @Override
+    public void deliverMessages() {
+        this.currentlyDelivering = true;
+        while (!this.mailboxQueue.isEmpty()) {
+            // care must be taken here how we iterate over the mailboxes
+            // it is not okay to loop over the mailboxes at once because a mailbox may disappear from the collection as
+            // a result of delivering messages from another mailboxes under the same timestamp
+            // because of this, it is crucial that we pick the mailboxes one by one
+            final Entry<Timestamp, Set<Mailbox>> entry = this.mailboxQueue.firstEntry();
+            final Timestamp timestamp = entry.getKey();
+            final Set<Mailbox> mailboxes = entry.getValue();
+            final Mailbox mailbox = mailboxes.iterator().next();
+            mailboxes.remove(mailbox);
+            if (mailboxes.isEmpty()) {
+                this.mailboxQueue.pollFirstEntry();
+            }
+            assert mailbox instanceof TimelyMailbox;
+            /* debug */ this.currentlyDeliveredTimestamp = timestamp;
+            mailbox.deliverAll(timestamp);
+            /* debug */ this.currentlyDeliveredTimestamp = null;
+        }
+        this.currentlyDelivering = false;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.mailboxQueue.isEmpty();
+    }
+
+    @Override
+    public void notifyHasMessage(final Mailbox mailbox, MessageSelector kind) {
+        if (kind instanceof Timestamp) {
+            final Timestamp timestamp = (Timestamp) kind;
+            if (Options.MONITOR_VIOLATION_OF_DIFFERENTIAL_DATAFLOW_TIMESTAMPS) {
+                if (timestamp.compareTo(this.currentlyDeliveredTimestamp) < 0) {
+                    final Logger logger = this.representative.getContainer().getNetwork().getEngine().getLogger();
+                    logger.error(
+                            "[INTERNAL ERROR] Violation of differential dataflow communication schema! The communication component with representative "
+                                    + this.representative + " observed decreasing timestamp during message delivery!");
+                }
+            }
+            final Set<Mailbox> mailboxes = this.mailboxQueue.computeIfAbsent(timestamp, k -> {
+                if (this.nodeComparator == null) {
+                    return CollectionsFactory.createSet();
+                } else {
+                    return new TreeSet<Mailbox>(new Comparator<Mailbox>() {
+                        @Override
+                        public int compare(final Mailbox left, final Mailbox right) {
+                            return nodeComparator.compare(left.getReceiver(), right.getReceiver());
+                        }
+                    });
+                }
+            });
+            mailboxes.add(mailbox);
+            if (!this.isEnqueued && !this.currentlyDelivering) {
+                this.tracker.activateUnenqueued(this);
+            }
+        } else {
+            throw new IllegalArgumentException(UNSUPPORTED_MESSAGE_KIND + kind);
+        }
+    }
+
+    @Override
+    public void notifyLostAllMessages(final Mailbox mailbox, final MessageSelector kind) {
+        if (kind instanceof Timestamp) {
+            final Timestamp timestamp = (Timestamp) kind;
+            this.mailboxQueue.compute(timestamp, (k, v) -> {
+                if (v == null) {
+                    throw new IllegalStateException("No mailboxes registered at timestamp " + timestamp + "!");
+                }
+                if (!v.remove(mailbox)) {
+                    throw new IllegalStateException(
+                            "The mailbox " + mailbox + " was not registered at timestamp " + timestamp + "!");
+                }
+                if (v.isEmpty()) {
+                    return null;
+                } else {
+                    return v;
+                }
+            });
+            if (this.mailboxQueue.isEmpty()) {
+                this.tracker.deactivate(this);
+            }
+        } else {
+            throw new IllegalArgumentException(UNSUPPORTED_MESSAGE_KIND + kind);
+        }
+    }
+
+    @Override
+    public Map<MessageSelector, Collection<Mailbox>> getMailboxes() {
+        return Collections.unmodifiableMap(this.mailboxQueue);
+    }
+
+    @Override
+    public boolean isRecursive() {
+        return !this.isSingleton;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyCommunicationTracker.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyCommunicationTracker.java
new file mode 100644
index 00000000..79179880
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyCommunicationTracker.java
@@ -0,0 +1,216 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication.timely;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.function.Function;
+
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.topsort.TopologicalSorting;
+import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.rete.index.IndexerListener;
+import tools.refinery.viatra.runtime.rete.index.SpecializedProjectionIndexer;
+import tools.refinery.viatra.runtime.rete.index.SpecializedProjectionIndexer.ListenerSubscription;
+import tools.refinery.viatra.runtime.rete.index.StandardIndexer;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.TimelineRepresentation;
+import tools.refinery.viatra.runtime.rete.network.NetworkStructureChangeSensitiveNode;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.ProductionNode;
+import tools.refinery.viatra.runtime.rete.network.StandardNode;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
+import tools.refinery.viatra.runtime.rete.network.communication.NodeComparator;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.single.DiscriminatorDispatcherNode;
+
+/**
+ * Timely (DDF) implementation of the {@link CommunicationTracker}.
+ *
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public class TimelyCommunicationTracker extends CommunicationTracker {
+
+    protected final TimelyConfiguration configuration;
+
+    public TimelyCommunicationTracker(final TimelyConfiguration configuration) {
+        this.configuration = configuration;
+    }
+
+    @Override
+    protected CommunicationGroup createGroup(final Node representative, final int index) {
+        final boolean isSingleton = this.sccInformationProvider.sccs.getPartition(representative).size() == 1;
+        return new TimelyCommunicationGroup(this, representative, index, isSingleton);
+    }
+
+    @Override
+    protected void reconstructQueueContents(final Set<CommunicationGroup> oldActiveGroups) {
+        for (final CommunicationGroup oldGroup : oldActiveGroups) {
+            for (final Entry<MessageSelector, Collection<Mailbox>> entry : oldGroup.getMailboxes().entrySet()) {
+                for (final Mailbox mailbox : entry.getValue()) {
+                    final CommunicationGroup newGroup = this.groupMap.get(mailbox.getReceiver());
+                    newGroup.notifyHasMessage(mailbox, entry.getKey());
+                }
+            }
+        }
+    }
+
+    @Override
+    public Mailbox proxifyMailbox(final Node requester, final Mailbox original) {
+        final Mailbox mailboxToProxify = (original instanceof TimelyMailboxProxy)
+                ? ((TimelyMailboxProxy) original).getWrappedMailbox()
+                : original;
+        final TimestampTransformation preprocessor = getPreprocessor(requester, mailboxToProxify.getReceiver());
+        if (preprocessor == null) {
+            return mailboxToProxify;
+        } else {
+            return new TimelyMailboxProxy(mailboxToProxify, preprocessor);
+        }
+    }
+
+    @Override
+    public IndexerListener proxifyIndexerListener(final Node requester, final IndexerListener original) {
+        final IndexerListener listenerToProxify = (original instanceof TimelyIndexerListenerProxy)
+                ? ((TimelyIndexerListenerProxy) original).getWrappedIndexerListener()
+                : original;
+        final TimestampTransformation preprocessor = getPreprocessor(requester, listenerToProxify.getOwner());
+        if (preprocessor == null) {
+            return listenerToProxify;
+        } else {
+            return new TimelyIndexerListenerProxy(listenerToProxify, preprocessor);
+        }
+    }
+
+    protected TimestampTransformation getPreprocessor(final Node source, final Node target) {
+        final Node effectiveSource = source instanceof SpecializedProjectionIndexer
+                ? ((SpecializedProjectionIndexer) source).getActiveNode()
+                : source;
+        final CommunicationGroup sourceGroup = this.getGroup(effectiveSource);
+        final CommunicationGroup targetGroup = this.getGroup(target);
+
+        if (sourceGroup != null && targetGroup != null) {
+            // during RETE construction, the groups may be still null
+            if (sourceGroup != targetGroup && sourceGroup.isRecursive()) {
+                // targetGroup is a successor SCC of sourceGroup
+                // and sourceGroup is a recursive SCC
+                // then we need to zero out the timestamps
+                return TimestampTransformation.RESET;
+            }
+            if (sourceGroup == targetGroup && target instanceof ProductionNode) {
+                // if requester and receiver are in the same SCC
+                // and receiver is a production node
+                // then we need to increment the timestamps
+                return TimestampTransformation.INCREMENT;
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    protected void postProcessNode(final Node node) {
+        if (node instanceof NetworkStructureChangeSensitiveNode) {
+            ((NetworkStructureChangeSensitiveNode) node).networkStructureChanged();
+        }
+    }
+
+    @Override
+    protected void postProcessGroup(final CommunicationGroup group) {
+        if (this.configuration.getTimelineRepresentation() == TimelineRepresentation.FAITHFUL) {
+            final Node representative = group.getRepresentative();
+            final Set<Node> groupMembers = this.sccInformationProvider.sccs.getPartition(representative);
+            if (groupMembers.size() > 1) {
+                final Graph<Node> graph = new Graph<Node>();
+
+                for (final Node node : groupMembers) {
+                    graph.insertNode(node);
+                }
+
+                for (final Node source : groupMembers) {
+                    for (final Node target : this.dependencyGraph.getTargetNodes(source)) {
+                        // (1) the edge is not a recursion cut point
+                        // (2) the edge is within this group
+                        if (!this.isRecursionCutPoint(source, target) && groupMembers.contains(target)) {
+                            graph.insertEdge(source, target);
+                        }
+                    }
+                }
+
+                final List<Node> orderedNodes = TopologicalSorting.compute(graph);
+                final Map<Node, Integer> nodeMap = CollectionsFactory.createMap();
+                int identifier = 0;
+                for (final Node orderedNode : orderedNodes) {
+                    nodeMap.put(orderedNode, identifier++);
+                }
+
+                ((TimelyCommunicationGroup) group).setComparatorAndReorderMailboxes(new NodeComparator(nodeMap));
+            }
+        }
+    }
+
+    /**
+     * This static field is used for debug purposes in the DotGenerator.
+     */
+    public static final Function<Node, Function<Node, String>> EDGE_LABEL_FUNCTION = new Function<Node, Function<Node, String>>() {
+
+        @Override
+        public Function<Node, String> apply(final Node source) {
+            return new Function<Node, String>() {
+                @Override
+                public String apply(final Node target) {
+                    if (source instanceof SpecializedProjectionIndexer) {
+                        final Collection<ListenerSubscription> subscriptions = ((SpecializedProjectionIndexer) source)
+                                .getSubscriptions();
+                        for (final ListenerSubscription subscription : subscriptions) {
+                            if (subscription.getListener().getOwner() == target
+                                    && subscription.getListener() instanceof TimelyIndexerListenerProxy) {
+                                return ((TimelyIndexerListenerProxy) subscription.getListener()).preprocessor
+                                        .toString();
+                            }
+                        }
+                    }
+                    if (source instanceof StandardIndexer) {
+                        final Collection<IndexerListener> listeners = ((StandardIndexer) source).getListeners();
+                        for (final IndexerListener listener : listeners) {
+                            if (listener.getOwner() == target && listener instanceof TimelyIndexerListenerProxy) {
+                                return ((TimelyIndexerListenerProxy) listener).preprocessor.toString();
+                            }
+                        }
+                    }
+                    if (source instanceof StandardNode) {
+                        final Collection<Mailbox> mailboxes = ((StandardNode) source).getChildMailboxes();
+                        for (final Mailbox mailbox : mailboxes) {
+                            if (mailbox.getReceiver() == target && mailbox instanceof TimelyMailboxProxy) {
+                                return ((TimelyMailboxProxy) mailbox).preprocessor.toString();
+                            }
+                        }
+                    }
+                    if (source instanceof DiscriminatorDispatcherNode) {
+                        final Collection<Mailbox> mailboxes = ((DiscriminatorDispatcherNode) source)
+                                .getBucketMailboxes().values();
+                        for (final Mailbox mailbox : mailboxes) {
+                            if (mailbox.getReceiver() == target && mailbox instanceof TimelyMailboxProxy) {
+                                return ((TimelyMailboxProxy) mailbox).preprocessor.toString();
+                            }
+                        }
+                    }
+                    return null;
+                }
+            };
+        }
+
+    };
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyIndexerListenerProxy.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyIndexerListenerProxy.java
new file mode 100644
index 00000000..e8fbf84e
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyIndexerListenerProxy.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication.timely;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.viatra.runtime.rete.index.IndexerListener;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.ProductionNode;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * A timely proxy for another {@link IndexerListener}, which performs some preprocessing 
+ * on the differential timestamps before passing it on to the real recipient. 
+ * <p>
+ * These proxies are used on edges leading into {@link ProductionNode}s. Because {@link ProductionNode}s 
+ * never ask back the indexer for its contents, there is no need to also apply the proxy on that direction. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public class TimelyIndexerListenerProxy implements IndexerListener {
+
+    protected final TimestampTransformation preprocessor;
+    protected final IndexerListener wrapped;
+
+    public TimelyIndexerListenerProxy(final IndexerListener wrapped,
+            final TimestampTransformation preprocessor) {
+        Preconditions.checkArgument(!(wrapped instanceof TimelyIndexerListenerProxy), "Proxy in a proxy is not allowed!");
+        this.wrapped = wrapped;
+        this.preprocessor = preprocessor;
+    }
+    
+    public IndexerListener getWrappedIndexerListener() {
+        return wrapped;
+    }
+
+    @Override
+    public Node getOwner() {
+        return this.wrapped.getOwner();
+    }
+
+    @Override
+    public void notifyIndexerUpdate(final Direction direction, final Tuple updateElement, final Tuple signature,
+            final boolean change, final Timestamp timestamp) {
+        this.wrapped.notifyIndexerUpdate(direction, updateElement, signature, change, preprocessor.process(timestamp));
+    }
+
+    @Override
+    public String toString() {
+        return this.preprocessor.toString() + "_PROXY -> " + this.wrapped.toString();
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (obj == null || obj.getClass() != this.getClass()) {
+            return false;
+        } else if (obj == this) {
+            return true;
+        } else {
+            final TimelyIndexerListenerProxy that = (TimelyIndexerListenerProxy) obj;
+            return this.wrapped.equals(that.wrapped) && this.preprocessor == that.preprocessor;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 1;
+        hash = hash * 17 + this.wrapped.hashCode();
+        hash = hash * 31 + this.preprocessor.hashCode();
+        return hash;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyMailboxProxy.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyMailboxProxy.java
new file mode 100644
index 00000000..550bfbeb
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimelyMailboxProxy.java
@@ -0,0 +1,102 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication.timely;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+
+/**
+ * A timely proxy for another {@link Mailbox}, which performs some preprocessing 
+ * on the differential timestamps before passing it on to the real recipient. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public class TimelyMailboxProxy implements Mailbox {
+
+    protected final TimestampTransformation preprocessor;
+    protected final Mailbox wrapped;
+
+    public TimelyMailboxProxy(final Mailbox wrapped, final TimestampTransformation preprocessor) {
+        Preconditions.checkArgument(!(wrapped instanceof TimelyMailboxProxy), "Proxy in a proxy is not allowed!");
+        this.wrapped = wrapped;
+        this.preprocessor = preprocessor;
+    }
+    
+    public Mailbox getWrappedMailbox() {
+        return wrapped;
+    }
+
+    @Override
+    public void postMessage(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        this.wrapped.postMessage(direction, update, preprocessor.process(timestamp));
+    }
+
+    @Override
+    public String toString() {
+        return this.preprocessor.toString() + "_PROXY -> " + this.wrapped.toString();
+    }
+
+    @Override
+    public void clear() {
+        this.wrapped.clear();
+    }
+
+    @Override
+    public void deliverAll(final MessageSelector selector) {
+        this.wrapped.deliverAll(selector);
+    }
+
+    @Override
+    public CommunicationGroup getCurrentGroup() {
+        return this.wrapped.getCurrentGroup();
+    }
+
+    @Override
+    public void setCurrentGroup(final CommunicationGroup group) {
+        this.wrapped.setCurrentGroup(group);
+    }
+
+    @Override
+    public Receiver getReceiver() {
+        return this.wrapped.getReceiver();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.wrapped.isEmpty();
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (obj == null || obj.getClass() != this.getClass()) {
+            return false;
+        } else if (obj == this) {
+            return true;
+        } else {
+            final TimelyMailboxProxy that = (TimelyMailboxProxy) obj;
+            return this.wrapped.equals(that.wrapped) && this.preprocessor == that.preprocessor;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 1;
+        hash = hash * 17 + this.wrapped.hashCode();
+        hash = hash * 31 + this.preprocessor.hashCode();
+        return hash;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimestampTransformation.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimestampTransformation.java
new file mode 100644
index 00000000..8929eb5c
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/communication/timely/TimestampTransformation.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.communication.timely;
+
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * Values of this enum perform different kind of preprocessing on {@link Timestamp}s. 
+ * This is used on edges leading in and out from {@link Node}s in recursive {@link TimelyCommunicationGroup}s. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public enum TimestampTransformation {
+
+    INCREMENT {
+        @Override
+        public Timestamp process(final Timestamp timestamp) {
+            return new Timestamp(timestamp.getValue() + 1);
+        }
+        
+        @Override
+        public String toString() {
+            return "INCREMENT";
+        }
+    },
+    RESET {
+        @Override
+        public Timestamp process(final Timestamp timestamp) {
+            return Timestamp.ZERO;
+        }
+        
+        @Override
+        public String toString() {
+            return "RESET";
+        }
+    };
+
+    public abstract Timestamp process(final Timestamp timestamp);
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedCommand.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedCommand.java
new file mode 100644
index 00000000..d6312671
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedCommand.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.delayed;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.Signed;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.Network;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+
+/**
+ * Instances of this class are responsible for initializing a {@link Receiver} with the contents of a {@link Supplier}.
+ * However, due to the dynamic nature of the Rete {@link Network} and to the fact that certain {@link Node}s in the
+ * {@link Network} are sensitive to the shape of the {@link Network}, the commands must be delayed until the
+ * construction of the {@link Network} has stabilized.
+ * 
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public abstract class DelayedCommand implements Runnable {
+
+    protected final Supplier supplier;
+    protected final Receiver receiver;
+    protected final Direction direction;
+    protected final ReteContainer container;
+
+    public DelayedCommand(final Supplier supplier, final Receiver receiver, final Direction direction,
+            final ReteContainer container) {
+        this.supplier = supplier;
+        this.receiver = receiver;
+        this.direction = direction;
+        this.container = container;
+    }
+
+    @Override
+    public void run() {
+        final CommunicationTracker tracker = this.container.getCommunicationTracker();
+        final Mailbox mailbox = tracker.proxifyMailbox(this.supplier, this.receiver.getMailbox());
+
+        if (this.isTimestampAware()) {
+            final Map<Tuple, Timeline<Timestamp>> contents = this.container.pullContentsWithTimeline(this.supplier,
+                    false);
+            for (final Entry<Tuple, Timeline<Timestamp>> entry : contents.entrySet()) {
+                for (final Signed<Timestamp> change : entry.getValue().asChangeSequence()) {
+                    mailbox.postMessage(change.getDirection().multiply(this.direction), entry.getKey(),
+                            change.getPayload());
+                }
+            }
+        } else {
+            final Collection<Tuple> contents = this.container.pullContents(this.supplier, false);
+            for (final Tuple tuple : contents) {
+                mailbox.postMessage(this.direction, tuple, Timestamp.ZERO);
+            }
+        }
+    }
+
+    @Override
+    public String toString() {
+        return this.supplier + " -> " + this.receiver.toString();
+    }
+
+    protected abstract boolean isTimestampAware();
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedConnectCommand.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedConnectCommand.java
new file mode 100644
index 00000000..1bfdbec6
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedConnectCommand.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.delayed;
+
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+
+public class DelayedConnectCommand extends DelayedCommand {
+
+    public DelayedConnectCommand(final Supplier supplier, final Receiver receiver, final ReteContainer container) {
+        super(supplier, receiver, Direction.INSERT, container);
+    }
+
+    @Override
+    protected boolean isTimestampAware() {
+        return this.container.isTimelyEvaluation() && this.container.getCommunicationTracker().areInSameGroup(this.supplier, this.receiver);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedDisconnectCommand.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedDisconnectCommand.java
new file mode 100644
index 00000000..5825a971
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/delayed/DelayedDisconnectCommand.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.delayed;
+
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+
+public class DelayedDisconnectCommand extends DelayedCommand {
+
+    protected final boolean wasInSameSCC;
+    
+    public DelayedDisconnectCommand(final Supplier supplier, final Receiver receiver, final ReteContainer container, final boolean wasInSameSCC) {
+        super(supplier, receiver, Direction.DELETE, container);
+        this.wasInSameSCC = wasInSameSCC;
+    }
+    
+    @Override
+    protected boolean isTimestampAware() {
+        return this.wasInSameSCC;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/DefaultMessageIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/DefaultMessageIndexer.java
new file mode 100644
index 00000000..da9bc47e
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/DefaultMessageIndexer.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.indexer;
+
+import java.util.Collections;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+
+/**
+ * @author Tamas Szabo
+ * @since 2.0
+ */
+public class DefaultMessageIndexer implements MessageIndexer {
+
+        protected final Map<Tuple, Integer> indexer;
+
+        public DefaultMessageIndexer() {
+                this.indexer = CollectionsFactory.createMap();
+        }
+
+        public Map<Tuple, Integer> getTuples() {
+                return Collections.unmodifiableMap(this.indexer);
+        }
+
+        @Override
+        public int getCount(final Tuple update) {
+                final Integer count = getTuples().get(update);
+                if (count == null) {
+                        return 0;
+                } else {
+                        return count;
+                }
+        }
+
+        @Override
+        public void insert(final Tuple update) {
+                update(update, 1);
+        }
+
+        @Override
+        public void delete(final Tuple update) {
+                update(update, -1);
+        }
+
+        @Override
+        public void update(final Tuple update, final int delta) {
+                final Integer oldCount = this.indexer.get(update);
+                final int newCount = (oldCount == null ? 0 : oldCount) + delta;
+                if (newCount == 0) {
+                        this.indexer.remove(update);
+                } else {
+                        this.indexer.put(update, newCount);
+                }
+        }
+
+        @Override
+        public boolean isEmpty() {
+                return this.indexer.isEmpty();
+        }
+
+        @Override
+        public void clear() {
+                this.indexer.clear();
+        }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/GroupBasedMessageIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/GroupBasedMessageIndexer.java
new file mode 100644
index 00000000..80271252
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/GroupBasedMessageIndexer.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.indexer;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+
+/**
+ * @author Tamas Szabo
+ * @since 2.0
+ */
+public class GroupBasedMessageIndexer implements MessageIndexer {
+
+        protected final Map<Tuple, DefaultMessageIndexer> indexer;
+        protected final TupleMask groupMask;
+
+        public GroupBasedMessageIndexer(final TupleMask groupMask) {
+                this.indexer = CollectionsFactory.createMap();
+                this.groupMask = groupMask;
+        }
+
+        public Map<Tuple, Integer> getTuplesByGroup(final Tuple group) {
+                final DefaultMessageIndexer values = this.indexer.get(group);
+                if (values == null) {
+                        return Collections.emptyMap();
+                } else {
+                        return Collections.unmodifiableMap(values.getTuples());
+                }
+        }
+
+        @Override
+        public int getCount(final Tuple update) {
+                final Tuple group = this.groupMask.transform(update);
+                final Integer count = getTuplesByGroup(group).get(update);
+                if (count == null) {
+                        return 0;
+                } else {
+                        return count;
+                }
+        }
+
+        public Set<Tuple> getGroups() {
+                return Collections.unmodifiableSet(this.indexer.keySet());
+        }
+
+        @Override
+        public void insert(final Tuple update) {
+                update(update, 1);
+        }
+
+        @Override
+        public void delete(final Tuple update) {
+                update(update, -1);
+        }
+
+        @Override
+        public void update(final Tuple update, final int delta) {
+                final Tuple group = this.groupMask.transform(update);
+                DefaultMessageIndexer valueIndexer = this.indexer.get(group);
+
+                if (valueIndexer == null) {
+                        valueIndexer = new DefaultMessageIndexer();
+                        this.indexer.put(group, valueIndexer);
+                }
+
+                valueIndexer.update(update, delta);
+
+                // it may happen that the indexer becomes empty as a result of the update
+                if (valueIndexer.isEmpty()) {
+                        this.indexer.remove(group);
+                }
+        }
+
+        @Override
+        public boolean isEmpty() {
+                return this.indexer.isEmpty();
+        }
+
+        @Override
+        public void clear() {
+                this.indexer.clear();
+        }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/MessageIndexer.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/MessageIndexer.java
new file mode 100644
index 00000000..271aaa44
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/indexer/MessageIndexer.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.indexer;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Clearable;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+
+/**
+ * A message indexer is used by {@link Mailbox}es to index their contents. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.0
+ */
+public interface MessageIndexer extends Clearable {
+        
+        public void insert(final Tuple update);
+
+        public void delete(final Tuple update);
+
+        public void update(final Tuple update, final int delta);
+        
+        public boolean isEmpty();
+        
+        public int getCount(final Tuple update);
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/AdaptableMailbox.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/AdaptableMailbox.java
new file mode 100644
index 00000000..99097f56
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/AdaptableMailbox.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.mailbox;
+
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+import tools.refinery.viatra.runtime.rete.network.communication.timely.TimelyMailboxProxy;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+
+/**
+ * An adaptable mailbox can be wrapped by another mailbox to act in behalf of that. The significance of the adaptation
+ * is that the adaptee will notify the {@link CommunicationTracker} about updates by promoting the adapter itself.
+ * Adaptable mailboxes are used by the {@link BehaviorChangingMailbox}. 
+ * 
+ * Compare this with {@link TimelyMailboxProxy}. That one also wraps another mailbox in order to 
+ * perform preprocessing on the messages sent to the original recipient. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.0
+ */
+public interface AdaptableMailbox extends Mailbox {
+
+    public Mailbox getAdapter();
+
+    public void setAdapter(final Mailbox adapter);
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/FallThroughCapableMailbox.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/FallThroughCapableMailbox.java
new file mode 100644
index 00000000..8797e254
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/FallThroughCapableMailbox.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.mailbox;
+
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+
+/**
+ * A fall through capable mailbox can directly call the update method of its {@link Receiver} instead of using the
+ * standard post-deliver mailbox semantics. If the fall through flag is set to true, the mailbox uses direct delivery,
+ * otherwise it operates in the original behavior. The fall through operation is preferable whenever applicable because
+ * it improves performance. The fall through flag is controlled by the {@link CommunicationTracker} based on the
+ * receiver node type and network topology.
+ * 
+ * @author Tamas Szabo
+ * @since 2.2
+ */
+public interface FallThroughCapableMailbox extends Mailbox {
+
+    public boolean isFallThrough();
+
+    public void setFallThrough(final boolean fallThrough);
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/Mailbox.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/Mailbox.java
new file mode 100644
index 00000000..05005974
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/Mailbox.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.mailbox;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Clearable;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.IGroupable;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * A mailbox is associated with every {@link Receiver}. Messages can be sent to a {@link Receiver} by posting them into
+ * the mailbox. Different mailbox implementations may differ in the way how they deliver the posted messages.
+ * 
+ * @author Tamas Szabo
+ * @since 2.0
+ *
+ */
+public interface Mailbox extends Clearable, IGroupable {
+
+    /**
+     * Posts a new message to this mailbox.
+     * 
+     * @param direction
+     *            the direction of the update
+     * @param update
+     *            the update element
+     * @since 2.4
+     */
+    public void postMessage(final Direction direction, final Tuple update, final Timestamp timestamp);
+
+    /**
+     * Delivers all messages according to the given selector from this mailbox. The selector can also be null. In this case, no
+     * special separation is expected between the messages.
+     * 
+     * @param selector the message selector
+     */
+    public void deliverAll(final MessageSelector selector);
+
+    /**
+     * Returns the {@link Receiver} of this mailbox.
+     * 
+     * @return the receiver
+     */
+    public Receiver getReceiver();
+
+    /**
+     * Returns the {@link CommunicationGroup} of the receiver of this mailbox.
+     * 
+     * @return the communication group
+     */
+    public CommunicationGroup getCurrentGroup();
+
+    /**
+     * Sets the {@link CommunicationGroup} that the receiver of this mailbox is associated with.
+     * 
+     * @param group
+     *            the communication group
+     */
+    public void setCurrentGroup(final CommunicationGroup group);
+
+    /**
+     * Returns true if this mailbox is empty.
+     * 
+     * @return
+     */
+    public boolean isEmpty();
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/MessageIndexerFactory.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/MessageIndexerFactory.java
new file mode 100644
index 00000000..2c5255fb
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/MessageIndexerFactory.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.mailbox;
+
+import tools.refinery.viatra.runtime.rete.network.indexer.MessageIndexer;
+
+/**
+ * A factory used to create message indexers for {@link Mailbox}es.
+ * 
+ * @author Tamas Szabo
+ * @since 2.0
+ */
+public interface MessageIndexerFactory<I extends MessageIndexer> {
+
+    public I create();
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/AbstractUpdateSplittingMailbox.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/AbstractUpdateSplittingMailbox.java
new file mode 100644
index 00000000..1e1ada71
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/AbstractUpdateSplittingMailbox.java
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.mailbox.timeless;
+
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.indexer.MessageIndexer;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.MessageIndexerFactory;
+
+/**
+ * An abstract mailbox implementation that is capable of splitting update messages based on some form of monotonicity
+ * (anti-monotone and monotone). The monotonicity is either defined by the less or equal operator of a poset or, it can
+ * be the standard subset ordering among sets of tuples.
+ * 
+ * @author Tamas Szabo
+ * @since 2.0
+ *
+ */
+public abstract class AbstractUpdateSplittingMailbox<IndexerType extends MessageIndexer, ReceiverType extends Receiver> implements Mailbox {
+
+    protected IndexerType monotoneQueue;
+    protected IndexerType antiMonotoneQueue;
+    protected IndexerType monotoneBuffer;
+    protected IndexerType antiMonotoneBuffer;
+    protected boolean deliveringMonotone;
+    protected boolean deliveringAntiMonotone;
+    protected final ReceiverType receiver;
+    protected final ReteContainer container;
+    protected CommunicationGroup group;
+
+    public AbstractUpdateSplittingMailbox(final ReceiverType receiver, final ReteContainer container,
+            final MessageIndexerFactory<IndexerType> factory) {
+        this.receiver = receiver;
+        this.container = container;
+        this.monotoneQueue = factory.create();
+        this.antiMonotoneQueue = factory.create();
+        this.monotoneBuffer = factory.create();
+        this.antiMonotoneBuffer = factory.create();
+        this.deliveringMonotone = false;
+        this.deliveringAntiMonotone = false;
+    }
+
+    protected void swapAndClearMonotone() {
+        final IndexerType tmp = this.monotoneQueue;
+        this.monotoneQueue = this.monotoneBuffer;
+        this.monotoneBuffer = tmp;
+        this.monotoneBuffer.clear();
+    }
+
+    protected void swapAndClearAntiMonotone() {
+        final IndexerType tmp = this.antiMonotoneQueue;
+        this.antiMonotoneQueue = this.antiMonotoneBuffer;
+        this.antiMonotoneBuffer = tmp;
+        this.antiMonotoneBuffer.clear();
+    }
+
+    protected IndexerType getActiveMonotoneQueue() {
+        if (this.deliveringMonotone) {
+            return this.monotoneBuffer;
+        } else {
+            return this.monotoneQueue;
+        }
+    }
+
+    protected IndexerType getActiveAntiMonotoneQueue() {
+        if (this.deliveringAntiMonotone) {
+            return this.antiMonotoneBuffer;
+        } else {
+            return this.antiMonotoneQueue;
+        }
+    }
+
+    @Override
+    public ReceiverType getReceiver() {
+        return this.receiver;
+    }
+
+    @Override
+    public void clear() {
+        this.monotoneQueue.clear();
+        this.antiMonotoneQueue.clear();
+        this.monotoneBuffer.clear();
+        this.antiMonotoneBuffer.clear();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.getActiveMonotoneQueue().isEmpty() && this.getActiveAntiMonotoneQueue().isEmpty();
+    }
+
+    @Override
+    public CommunicationGroup getCurrentGroup() {
+        return this.group;
+    }
+
+    @Override
+    public void setCurrentGroup(final CommunicationGroup group) {
+        this.group = group;
+    }
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/BehaviorChangingMailbox.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/BehaviorChangingMailbox.java
new file mode 100644
index 00000000..fe822d7c
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/BehaviorChangingMailbox.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.mailbox.timeless;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.communication.timeless.TimelessCommunicationTracker;
+import tools.refinery.viatra.runtime.rete.network.mailbox.AdaptableMailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.FallThroughCapableMailbox;
+
+/**
+ * This mailbox changes its behavior based on the position of its {@link Receiver} in the network topology. 
+ * It either behaves as a {@link DefaultMailbox} or as an {@link UpdateSplittingMailbox}. The decision is made by the
+ * {@link CommunicationTracker}, see {@link TimelessCommunicationTracker#postProcessNode(Node)} for more details.
+ * 
+ * @author Tamas Szabo
+ */
+public class BehaviorChangingMailbox implements FallThroughCapableMailbox {
+
+    protected boolean fallThrough;
+    protected boolean split;
+    protected AdaptableMailbox wrapped;
+    protected final Receiver receiver;
+    protected final ReteContainer container;
+    protected CommunicationGroup group;
+
+    public BehaviorChangingMailbox(final Receiver receiver, final ReteContainer container) {
+        this.fallThrough = false;
+        this.split = false;
+        this.receiver = receiver;
+        this.container = container;
+        this.wrapped = new DefaultMailbox(receiver, container);
+        this.wrapped.setAdapter(this);
+    }
+
+    @Override
+    public void postMessage(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        if (this.fallThrough && !this.container.isExecutingDelayedCommands()) {
+            // disable fall through while we are in the middle of executing delayed construction commands
+            this.receiver.update(direction, update, timestamp);
+        } else {
+            this.wrapped.postMessage(direction, update, timestamp);
+        }
+    }
+
+    @Override
+    public void deliverAll(final MessageSelector kind) {
+        this.wrapped.deliverAll(kind);
+    }
+
+    @Override
+    public String toString() {
+        return "A_MBOX -> " + this.wrapped;
+    }
+
+    public void setSplitFlag(final boolean splitValue) {
+        if (this.split != splitValue) {
+            assert isEmpty();
+            if (splitValue) {
+                this.wrapped = new UpdateSplittingMailbox(this.receiver, this.container);
+            } else {
+                this.wrapped = new DefaultMailbox(this.receiver, this.container);
+            }
+            this.wrapped.setAdapter(this);
+            this.split = splitValue;
+        }
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.wrapped.isEmpty();
+    }
+
+    @Override
+    public void clear() {
+        this.wrapped.clear();
+    }
+
+    @Override
+    public Receiver getReceiver() {
+        return this.receiver;
+    }
+    
+    @Override
+    public CommunicationGroup getCurrentGroup() {
+        return this.group;
+    }
+
+    @Override
+    public void setCurrentGroup(final CommunicationGroup group) {
+        this.group = group;
+    }
+
+    @Override
+    public boolean isFallThrough() {
+        return this.fallThrough;
+    }
+    
+    @Override
+    public void setFallThrough(final boolean fallThrough) {
+        this.fallThrough = fallThrough;
+    }
+    
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/DefaultMailbox.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/DefaultMailbox.java
new file mode 100644
index 00000000..baf7270f
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/DefaultMailbox.java
@@ -0,0 +1,163 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.mailbox.timeless;
+
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
+import tools.refinery.viatra.runtime.rete.network.communication.PhasedSelector;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.mailbox.AdaptableMailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+
+/**
+ * Default mailbox implementation.
+ * <p>
+ * Usually, the mailbox performs counting of messages so that they can cancel each other out. However, if marked as a
+ * fall-through mailbox, than update messages are delivered directly to the receiver node to reduce overhead.
+ *
+ * @author Tamas Szabo
+ * @since 2.0
+ */
+public class DefaultMailbox implements AdaptableMailbox {
+
+    private static int SIZE_TRESHOLD = 127;
+
+    protected Map<Tuple, Integer> queue;
+    protected Map<Tuple, Integer> buffer;
+    protected final Receiver receiver;
+    protected final ReteContainer container;
+    protected boolean delivering;
+    protected Mailbox adapter;
+    protected CommunicationGroup group;
+
+    public DefaultMailbox(final Receiver receiver, final ReteContainer container) {
+        this.receiver = receiver;
+        this.container = container;
+        this.queue = CollectionsFactory.createMap();
+        this.buffer = CollectionsFactory.createMap();
+        this.adapter = this;
+    }
+
+    protected Map<Tuple, Integer> getActiveQueue() {
+        if (this.delivering) {
+            return this.buffer;
+        } else {
+            return this.queue;
+        }
+    }
+
+    @Override
+    public Mailbox getAdapter() {
+        return this.adapter;
+    }
+
+    @Override
+    public void setAdapter(final Mailbox adapter) {
+        this.adapter = adapter;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return getActiveQueue().isEmpty();
+    }
+
+    @Override
+    public void postMessage(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        final Map<Tuple, Integer> activeQueue = getActiveQueue();
+        final boolean wasEmpty = activeQueue.isEmpty();
+
+        boolean significantChange = false;
+        Integer count = activeQueue.get(update);
+        if (count == null) {
+            count = 0;
+            significantChange = true;
+        }
+
+        if (direction == Direction.DELETE) {
+            count--;
+        } else {
+            count++;
+        }
+
+        if (count == 0) {
+            activeQueue.remove(update);
+            significantChange = true;
+        } else {
+            activeQueue.put(update, count);
+        }
+
+        if (significantChange) {
+            final Mailbox targetMailbox = this.adapter;
+            final CommunicationGroup targetGroup = this.adapter.getCurrentGroup();
+
+            if (wasEmpty) {
+                targetGroup.notifyHasMessage(targetMailbox, PhasedSelector.DEFAULT);
+            } else if (activeQueue.isEmpty()) {
+                targetGroup.notifyLostAllMessages(targetMailbox, PhasedSelector.DEFAULT);
+            }
+        }
+    }
+
+    @Override
+    public void deliverAll(final MessageSelector kind) {
+        if (kind == PhasedSelector.DEFAULT) {
+            // use the buffer during delivering so that there is a clear
+            // separation between the stages
+            this.delivering = true;
+            this.receiver.batchUpdate(this.queue.entrySet(), Timestamp.ZERO);
+            this.delivering = false;
+
+            if (queue.size() > SIZE_TRESHOLD) {
+                this.queue = this.buffer;
+                this.buffer = CollectionsFactory.createMap();
+            } else {
+                this.queue.clear();
+                final Map<Tuple, Integer> tmpQueue = this.queue;
+                this.queue = this.buffer;
+                this.buffer = tmpQueue;
+            }
+        } else {
+            throw new IllegalArgumentException("Unsupported message kind " + kind);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "D_MBOX (" + this.receiver + ") " + this.getActiveQueue();
+    }
+
+    @Override
+    public Receiver getReceiver() {
+        return this.receiver;
+    }
+
+    @Override
+    public void clear() {
+        this.queue.clear();
+        this.buffer.clear();
+    }
+
+    @Override
+    public CommunicationGroup getCurrentGroup() {
+        return this.group;
+    }
+
+    @Override
+    public void setCurrentGroup(final CommunicationGroup group) {
+        this.group = group;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/PosetAwareMailbox.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/PosetAwareMailbox.java
new file mode 100644
index 00000000..50d19882
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/PosetAwareMailbox.java
@@ -0,0 +1,218 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.mailbox.timeless;
+
+import java.util.HashSet;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.PosetAwareReceiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
+import tools.refinery.viatra.runtime.rete.network.communication.PhasedSelector;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.indexer.GroupBasedMessageIndexer;
+
+/**
+ * A monotonicity aware mailbox implementation. The mailbox uses an {@link IPosetComparator} to identify if a pair of
+ * REVOKE - INSERT updates represent a monotone change pair. The mailbox is used by {@link PosetAwareReceiver}s.
+ * 
+ * @author Tamas Szabo
+ * @since 2.0
+ */
+public class PosetAwareMailbox extends AbstractUpdateSplittingMailbox<GroupBasedMessageIndexer, PosetAwareReceiver> {
+
+    protected final TupleMask groupMask;
+
+    public PosetAwareMailbox(final PosetAwareReceiver receiver, final ReteContainer container) {
+        super(receiver, container, () -> new GroupBasedMessageIndexer(receiver.getCoreMask()));
+        this.groupMask = receiver.getCoreMask();
+    }
+
+    @Override
+    public void postMessage(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        final GroupBasedMessageIndexer monotoneQueue = getActiveMonotoneQueue();
+        final GroupBasedMessageIndexer antiMonotoneQueue = getActiveAntiMonotoneQueue();
+        final boolean wasPresentAsMonotone = monotoneQueue.getCount(update) != 0;
+        final boolean wasPresentAsAntiMonotone = antiMonotoneQueue.getCount(update) != 0;
+        final TupleMask coreMask = this.receiver.getCoreMask();
+
+        // it cannot happen that it was present in both
+        assert !(wasPresentAsMonotone && wasPresentAsAntiMonotone);
+
+        if (direction == Direction.INSERT) {
+            if (wasPresentAsAntiMonotone) {
+                // it was an anti-monotone one before
+                antiMonotoneQueue.insert(update);
+            } else {
+                // it was a monotone one before or did not exist at all
+                monotoneQueue.insert(update);
+
+                // if it was not present in the monotone queue before, then
+                // we need to check whether it makes REVOKE updates monotone
+                if (!wasPresentAsMonotone) {
+                    final Set<Tuple> counterParts = tryFindCounterPart(update, false, true);
+                    for (final Tuple counterPart : counterParts) {
+                        final int count = antiMonotoneQueue.getCount(counterPart);
+                        assert count < 0;
+                        antiMonotoneQueue.update(counterPart, -count);
+                        monotoneQueue.update(counterPart, count);
+                    }
+                }
+            }
+        } else {
+            if (wasPresentAsAntiMonotone) {
+                // it was an anti-monotone one before
+                antiMonotoneQueue.delete(update);
+            } else if (wasPresentAsMonotone) {
+                // it was a monotone one before
+                monotoneQueue.delete(update);
+
+                // and we need to check whether the monotone REVOKE updates
+                // still have a reinforcing counterpart
+                final Set<Tuple> candidates = new HashSet<Tuple>();
+                final Tuple key = coreMask.transform(update);
+                for (final Entry<Tuple, Integer> entry : monotoneQueue.getTuplesByGroup(key).entrySet()) {
+                    if (entry.getValue() < 0) {
+                        final Tuple candidate = entry.getKey();
+                        final Set<Tuple> counterParts = tryFindCounterPart(candidate, true, false);
+                        if (counterParts.isEmpty()) {
+                            // all of them are gone
+                            candidates.add(candidate);
+                        }
+                    }
+                }
+
+                // move the candidates from the monotone queue to the
+                // anti-monotone queue because they do not have a
+                // counterpart anymore
+                for (final Tuple candidate : candidates) {
+                    final int count = monotoneQueue.getCount(candidate);
+                    assert count < 0;
+                    monotoneQueue.update(candidate, -count);
+                    antiMonotoneQueue.update(candidate, count);
+                }
+            } else {
+                // it did not exist before
+                final Set<Tuple> counterParts = tryFindCounterPart(update, true, false);
+                if (counterParts.isEmpty()) {
+                    // there is no tuple that would make this update monotone
+                    antiMonotoneQueue.delete(update);
+                } else {
+                    // there is a reinforcing counterpart
+                    monotoneQueue.delete(update);
+                }
+            }
+        }
+
+        if (antiMonotoneQueue.isEmpty()) {
+            this.group.notifyLostAllMessages(this, PhasedSelector.ANTI_MONOTONE);
+        } else {
+            this.group.notifyHasMessage(this, PhasedSelector.ANTI_MONOTONE);
+        }
+
+        if (monotoneQueue.isEmpty()) {
+            this.group.notifyLostAllMessages(this, PhasedSelector.MONOTONE);
+        } else {
+            this.group.notifyHasMessage(this, PhasedSelector.MONOTONE);
+        }
+    }
+
+    protected Set<Tuple> tryFindCounterPart(final Tuple first, final boolean findPositiveCounterPart,
+            final boolean findAllCounterParts) {
+        final GroupBasedMessageIndexer monotoneQueue = getActiveMonotoneQueue();
+        final GroupBasedMessageIndexer antiMonotoneQueue = getActiveAntiMonotoneQueue();
+        final TupleMask coreMask = this.receiver.getCoreMask();
+        final TupleMask posetMask = this.receiver.getPosetMask();
+        final IPosetComparator posetComparator = this.receiver.getPosetComparator();
+        final Set<Tuple> result = CollectionsFactory.createSet();
+        final Tuple firstKey = coreMask.transform(first);
+        final Tuple firstValue = posetMask.transform(first);
+
+        if (findPositiveCounterPart) {
+            for (final Entry<Tuple, Integer> entry : monotoneQueue.getTuplesByGroup(firstKey).entrySet()) {
+                final Tuple secondValue = posetMask.transform(entry.getKey());
+                if (entry.getValue() > 0 && posetComparator.isLessOrEqual(firstValue, secondValue)) {
+                    result.add(entry.getKey());
+                    if (!findAllCounterParts) {
+                        return result;
+                    }
+                }
+            }
+        } else {
+            for (final Entry<Tuple, Integer> entry : antiMonotoneQueue.getTuplesByGroup(firstKey).entrySet()) {
+                final Tuple secondValue = posetMask.transform(entry.getKey());
+                if (posetComparator.isLessOrEqual(secondValue, firstValue)) {
+                    result.add(entry.getKey());
+                    if (!findAllCounterParts) {
+                        return result;
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
+    @Override
+    public void deliverAll(final MessageSelector kind) {
+        if (kind == PhasedSelector.ANTI_MONOTONE) {
+            // use the buffer during delivering so that there is a clear
+            // separation between the stages
+            this.deliveringAntiMonotone = true;
+
+            for (final Tuple group : this.antiMonotoneQueue.getGroups()) {
+                for (final Entry<Tuple, Integer> entry : this.antiMonotoneQueue.getTuplesByGroup(group).entrySet()) {
+                    final Tuple update = entry.getKey();
+                    final int count = entry.getValue();
+                    assert count < 0;
+                    for (int i = 0; i < Math.abs(count); i++) {
+                        this.receiver.updateWithPosetInfo(Direction.DELETE, update, false);
+                    }
+                }
+            }
+
+            this.deliveringAntiMonotone = false;
+            swapAndClearAntiMonotone();
+        } else if (kind == PhasedSelector.MONOTONE) {
+            // use the buffer during delivering so that there is a clear
+            // separation between the stages
+            this.deliveringMonotone = true;
+
+            for (final Tuple group : this.monotoneQueue.getGroups()) {
+                for (final Entry<Tuple, Integer> entry : this.monotoneQueue.getTuplesByGroup(group).entrySet()) {
+                    final Tuple update = entry.getKey();
+                    final int count = entry.getValue();
+                    assert count != 0;
+                    final Direction direction = count < 0 ? Direction.DELETE : Direction.INSERT;
+                    for (int i = 0; i < Math.abs(count); i++) {
+                        this.receiver.updateWithPosetInfo(direction, update, true);
+                    }
+                }
+            }
+
+            this.deliveringMonotone = false;
+            swapAndClearMonotone();
+        } else {
+            throw new IllegalArgumentException("Unsupported message kind " + kind);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "PA_MBOX (" + this.receiver + ") " + this.getActiveMonotoneQueue() + " "
+                + this.getActiveAntiMonotoneQueue();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/UpdateSplittingMailbox.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/UpdateSplittingMailbox.java
new file mode 100644
index 00000000..afa155b2
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/UpdateSplittingMailbox.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.mailbox.timeless;
+
+import java.util.Map.Entry;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
+import tools.refinery.viatra.runtime.rete.network.communication.PhasedSelector;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.indexer.DefaultMessageIndexer;
+import tools.refinery.viatra.runtime.rete.network.mailbox.AdaptableMailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+
+/**
+ * A mailbox implementation that splits updates messages according to the standard subset ordering into anti-monotonic
+ * (deletions) and monotonic (insertions) updates.
+ * 
+ * @author Tamas Szabo
+ * @since 2.0
+ */
+public class UpdateSplittingMailbox extends AbstractUpdateSplittingMailbox<DefaultMessageIndexer, Receiver>
+        implements AdaptableMailbox {
+
+    protected Mailbox adapter;
+
+    public UpdateSplittingMailbox(final Receiver receiver, final ReteContainer container) {
+        super(receiver, container, DefaultMessageIndexer::new);
+        this.adapter = this;
+    }
+
+    @Override
+    public Mailbox getAdapter() {
+        return this.adapter;
+    }
+
+    @Override
+    public void setAdapter(final Mailbox adapter) {
+        this.adapter = adapter;
+    }
+
+    @Override
+    public void postMessage(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        final DefaultMessageIndexer monotoneQueue = getActiveMonotoneQueue();
+        final DefaultMessageIndexer antiMonotoneQueue = getActiveAntiMonotoneQueue();
+        final boolean wasPresentAsMonotone = monotoneQueue.getCount(update) != 0;
+        final boolean wasPresentAsAntiMonotone = antiMonotoneQueue.getCount(update) != 0;
+
+        // it cannot happen that it was present in both
+        assert !(wasPresentAsMonotone && wasPresentAsAntiMonotone);
+
+        if (direction == Direction.INSERT) {
+            if (wasPresentAsAntiMonotone) {
+                // it was an anti-monotone one before
+                antiMonotoneQueue.insert(update);
+            } else {
+                // it was a monotone one before or did not exist at all
+                monotoneQueue.insert(update);
+            }
+        } else {
+            if (wasPresentAsMonotone) {
+                // it was a monotone one before
+                monotoneQueue.delete(update);
+            } else {
+                // it was an anti-monotone one before or did not exist at all
+                antiMonotoneQueue.delete(update);
+            }
+        }
+
+        final Mailbox targetMailbox = this.adapter;
+        final CommunicationGroup targetGroup = this.adapter.getCurrentGroup();
+
+        if (antiMonotoneQueue.isEmpty()) {
+            targetGroup.notifyLostAllMessages(targetMailbox, PhasedSelector.ANTI_MONOTONE);
+        } else {
+            targetGroup.notifyHasMessage(targetMailbox, PhasedSelector.ANTI_MONOTONE);
+        }
+
+        if (monotoneQueue.isEmpty()) {
+            targetGroup.notifyLostAllMessages(targetMailbox, PhasedSelector.MONOTONE);
+        } else {
+            targetGroup.notifyHasMessage(targetMailbox, PhasedSelector.MONOTONE);
+        }
+    }
+
+    @Override
+    public void deliverAll(final MessageSelector kind) {
+        if (kind == PhasedSelector.ANTI_MONOTONE) {
+            // deliver anti-monotone
+            this.deliveringAntiMonotone = true;
+            for (final Entry<Tuple, Integer> entry : this.antiMonotoneQueue.getTuples().entrySet()) {
+                final Tuple update = entry.getKey();
+                final int count = entry.getValue();
+                assert count < 0;
+                for (int i = 0; i < Math.abs(count); i++) {
+                    this.receiver.update(Direction.DELETE, update, Timestamp.ZERO);
+                }
+            }
+            this.deliveringAntiMonotone = false;
+            swapAndClearAntiMonotone();
+        } else if (kind == PhasedSelector.MONOTONE) {
+            // deliver monotone
+            this.deliveringMonotone = true;
+            for (final Entry<Tuple, Integer> entry : this.monotoneQueue.getTuples().entrySet()) {
+                final Tuple update = entry.getKey();
+                final int count = entry.getValue();
+                assert count > 0;
+                for (int i = 0; i < count; i++) {
+                    this.receiver.update(Direction.INSERT, update, Timestamp.ZERO);
+                }
+            }
+            this.deliveringMonotone = false;
+            swapAndClearMonotone();
+        } else {
+            throw new IllegalArgumentException("Unsupported message kind " + kind);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "US_MBOX (" + this.receiver + ") " + this.getActiveMonotoneQueue() + " "
+                + this.getActiveAntiMonotoneQueue();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timely/TimelyMailbox.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timely/TimelyMailbox.java
new file mode 100644
index 00000000..bf3b8e14
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timely/TimelyMailbox.java
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.network.mailbox.timely;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.TimelineRepresentation;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.MessageSelector;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+
+public class TimelyMailbox implements Mailbox {
+
+    protected TreeMap<Timestamp, Map<Tuple, Integer>> queue;
+    protected final Receiver receiver;
+    protected final ReteContainer container;
+    protected CommunicationGroup group;
+    protected boolean fallThrough;
+
+    public TimelyMailbox(final Receiver receiver, final ReteContainer container) {
+        this.receiver = receiver;
+        this.container = container;
+        this.queue = CollectionsFactory.createTreeMap();
+    }
+
+    protected TreeMap<Timestamp, Map<Tuple, Integer>> getActiveQueue() {
+        return this.queue;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return getActiveQueue().isEmpty();
+    }
+
+    @Override
+    public void postMessage(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        final TreeMap<Timestamp, Map<Tuple, Integer>> activeQueue = getActiveQueue();
+
+        Map<Tuple, Integer> tupleMap = activeQueue.get(timestamp);
+        final boolean wasEmpty = tupleMap == null;
+        boolean significantChange = false;
+
+        if (tupleMap == null) {
+            tupleMap = CollectionsFactory.createMap();
+            activeQueue.put(timestamp, tupleMap);
+            significantChange = true;
+        }
+
+        Integer count = tupleMap.get(update);
+        if (count == null) {
+            count = 0;
+            significantChange = true;
+        }
+
+        if (direction == Direction.DELETE) {
+            count--;
+        } else {
+            count++;
+        }
+
+        if (count == 0) {
+            tupleMap.remove(update);
+            if (tupleMap.isEmpty()) {
+                activeQueue.remove(timestamp);
+            }
+            significantChange = true;
+        } else {
+            tupleMap.put(update, count);
+        }
+
+        if (significantChange) {
+            if (wasEmpty) {
+                this.group.notifyHasMessage(this, timestamp);
+            } else if (tupleMap.isEmpty()) {
+                final Timestamp resumableTimestamp = (this.receiver instanceof ResumableNode)
+                        ? ((ResumableNode) this.receiver).getResumableTimestamp()
+                        : null;
+                // check if there is folding left to do before unsubscribing just based on the message queue being empty
+                if (resumableTimestamp == null || resumableTimestamp.compareTo(timestamp) != 0) {
+                    this.group.notifyLostAllMessages(this, timestamp);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void deliverAll(final MessageSelector selector) {
+        if (selector instanceof Timestamp) {
+            final Timestamp timestamp = (Timestamp) selector;
+            // REMOVE the tuples associated with the selector, dont just query them
+            final Map<Tuple, Integer> tupleMap = this.queue.remove(timestamp);
+
+            // tupleMap may be empty if we only have lazy folding to do
+            if (tupleMap != null) {
+                this.receiver.batchUpdate(tupleMap.entrySet(), timestamp);
+            }
+
+            if (this.container.getTimelyConfiguration()
+                    .getTimelineRepresentation() == TimelineRepresentation.FAITHFUL) {
+                // (1) either normal delivery, which ended up being a lazy folding state
+                // (2) and/or lazy folding needs to be resumed
+                if (this.receiver instanceof ResumableNode) {
+                    ((ResumableNode) this.receiver).resumeAt(timestamp);
+                }
+            }
+        } else {
+            throw new IllegalArgumentException("Unsupported message selector " + selector);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "DDF_MBOX (" + this.receiver + ") " + this.getActiveQueue();
+    }
+
+    @Override
+    public Receiver getReceiver() {
+        return this.receiver;
+    }
+
+    @Override
+    public void clear() {
+        this.queue.clear();
+    }
+
+    @Override
+    public CommunicationGroup getCurrentGroup() {
+        return this.group;
+    }
+
+    @Override
+    public void setCurrentGroup(final CommunicationGroup group) {
+        this.group = group;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/Address.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/Address.java
new file mode 100644
index 00000000..2fed3225
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/Address.java
@@ -0,0 +1,125 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.remote;
+
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+
+/**
+ * Remote identifier of a node of type T.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public class Address<T extends Node> {
+    ReteContainer container;
+    Long nodeId;
+    /**
+     * Feel free to leave null e.g. if node is in a separate JVM.
+     */
+    T nodeCache;
+
+    /**
+     * Address of local node (use only for containers in the same VM!)
+     */
+    public static <N extends Node> Address<N> of(N node) {
+        return new Address<N>(node);
+    }
+
+    /**
+     * General constructor.
+     * 
+     * @param container
+     * @param nodeId
+     */
+    public Address(ReteContainer container, Long nodeId) {
+        super();
+        this.container = container;
+        this.nodeId = nodeId;
+    }
+
+    /**
+     * Local-only constructor. (use only for containers in the same VM!)
+     * 
+     * @param node
+     *            the node to address
+     */
+    public Address(T node) {
+        super();
+        this.nodeCache = node;
+        this.container = node.getContainer();
+        this.nodeId = node.getNodeId();
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((container == null) ? 0 : container.hashCode());
+        result = prime * result + ((nodeId == null) ? 0 : nodeId.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (!(obj instanceof Address<?>))
+            return false;
+        final Address<?> other = (Address<?>) obj;
+        if (container == null) {
+            if (other.container != null)
+                return false;
+        } else if (!container.equals(other.container))
+            return false;
+        if (nodeId == null) {
+            if (other.nodeId != null)
+                return false;
+        } else if (!nodeId.equals(other.nodeId))
+            return false;
+        return true;
+    }
+
+    public ReteContainer getContainer() {
+        return container;
+    }
+
+    public void setContainer(ReteContainer container) {
+        this.container = container;
+    }
+
+    public Long getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(Long nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public T getNodeCache() {
+        return nodeCache;
+    }
+
+    public void setNodeCache(T nodeCache) {
+        this.nodeCache = nodeCache;
+    }
+
+    @Override
+    public String toString() {
+        if (nodeCache == null)
+            return "A(" + nodeId + " @ " + container + ")";
+        else
+            return "A(" + nodeCache + ")";
+
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/RemoteReceiver.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/RemoteReceiver.java
new file mode 100644
index 00000000..f7d267af
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/RemoteReceiver.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.remote;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.single.SingleInputNode;
+
+/**
+ * This node delivers updates to a remote recipient; no updates are propagated further in this network.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public class RemoteReceiver extends SingleInputNode {
+
+    List<Address<? extends Receiver>> targets;
+
+    public RemoteReceiver(ReteContainer reteContainer) {
+        super(reteContainer);
+        targets = new ArrayList<Address<? extends Receiver>>();
+    }
+
+    public void addTarget(Address<? extends Receiver> target) {
+        targets.add(target);
+    }
+
+    @Override
+    public void pullInto(Collection<Tuple> collector, boolean flush) {
+        propagatePullInto(collector, flush);
+    }
+    
+    @Override
+    public void pullIntoWithTimeline(Map<Tuple, Timeline<Timestamp>> collector, boolean flush) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Collection<Tuple> remotePull(boolean flush) {
+        return reteContainer.pullContents(this, flush);
+    }
+
+    public void update(Direction direction, Tuple updateElement, Timestamp timestamp) {
+        for (Address<? extends Receiver> ad : targets)
+            reteContainer.sendUpdateToRemoteAddress(ad, direction, updateElement);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/RemoteSupplier.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/RemoteSupplier.java
new file mode 100644
index 00000000..cbe4d177
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/remote/RemoteSupplier.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.remote;
+
+import java.util.Collection;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.single.SingleInputNode;
+
+/**
+ * This node receives updates from a remote supplier; no local updates are expected.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public class RemoteSupplier extends SingleInputNode {
+
+    RemoteReceiver counterpart;
+
+    public RemoteSupplier(ReteContainer reteContainer, RemoteReceiver counterpart) {
+        super(reteContainer);
+        this.counterpart = counterpart;
+        counterpart.addTarget(reteContainer.makeAddress(this));
+    }
+
+    @Override
+    public void pullInto(Collection<Tuple> collector, boolean flush) {
+        Collection<Tuple> pulled = counterpart.remotePull(flush);
+        collector.addAll(pulled);
+    }
+
+    @Override
+    public void pullIntoWithTimeline(Map<Tuple, Timeline<Timestamp>> collector, boolean flush) {
+        throw new UnsupportedOperationException();
+    }
+    
+    @Override
+    public void update(Direction direction, Tuple updateElement, Timestamp timestamp) {
+        propagateUpdate(direction, updateElement, timestamp);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/AbstractUniquenessEnforcerNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/AbstractUniquenessEnforcerNode.java
new file mode 100644
index 00000000..e92ce63f
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/AbstractUniquenessEnforcerNode.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.single;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
+import tools.refinery.viatra.runtime.rete.index.SpecializedProjectionIndexer.ListenerSubscription;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.StandardNode;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.Tunnel;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+import tools.refinery.viatra.runtime.rete.util.Options;
+
+/**
+ * Ensures that no identical copies get to the output. Only one replica of each pattern substitution may traverse this
+ * node. There are both timeless and timely implementations.
+ * 
+ * @author Gabor Bergmann
+ * @author Tamas Szabo
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ * @noextend This class is not intended to be subclassed by clients.
+ * @since 2.2
+ */
+public abstract class AbstractUniquenessEnforcerNode extends StandardNode implements Tunnel {
+
+    protected final Collection<Supplier> parents;
+    protected ProjectionIndexer memoryNullIndexer;
+    protected ProjectionIndexer memoryIdentityIndexer;
+    protected final int tupleWidth;
+    // MUST BE INSTANTIATED IN THE CONCRETE SUBCLASSES AFTER ALL FIELDS ARE SET 
+    protected Mailbox mailbox;
+    protected final TupleMask nullMask;
+    protected final TupleMask identityMask;
+    protected final List<ListenerSubscription> specializedListeners;
+
+    public AbstractUniquenessEnforcerNode(final ReteContainer reteContainer, final int tupleWidth) {
+        super(reteContainer);
+        this.parents = new ArrayList<Supplier>();
+        this.specializedListeners = new ArrayList<ListenerSubscription>();
+        this.tupleWidth = tupleWidth;
+        this.nullMask = TupleMask.linear(0, tupleWidth);
+        this.identityMask = TupleMask.identity(tupleWidth);
+    }
+
+    protected abstract Mailbox instantiateMailbox();
+
+    @Override
+    public Mailbox getMailbox() {
+        return this.mailbox;
+    }
+    
+    /**
+     * @since 2.8
+     */
+    public abstract Set<Tuple> getTuples();
+
+    /**
+     * @since 2.4
+     */
+    protected void propagate(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        // See Bug 518434
+        // trivial (non-active) indexers must be updated before other listeners
+        // so that if they are joined against each other, trivial indexers lookups
+        // will be consistent with their notifications;
+        // also, their subscriptions must share a single order
+        for (final ListenerSubscription subscription : specializedListeners) {
+            subscription.propagate(direction, update, timestamp);
+        }
+        propagateUpdate(direction, update, timestamp);
+    }
+
+    @Override
+    public ProjectionIndexer constructIndex(final TupleMask mask, final TraceInfo... traces) {
+        if (Options.employTrivialIndexers) {
+            if (nullMask.equals(mask)) {
+                final ProjectionIndexer indexer = getNullIndexer();
+                for (final TraceInfo traceInfo : traces) {
+                    indexer.assignTraceInfo(traceInfo);
+                }
+                return indexer;
+            }
+            if (identityMask.equals(mask)) {
+                final ProjectionIndexer indexer = getIdentityIndexer();
+                for (final TraceInfo traceInfo : traces) {
+                    indexer.assignTraceInfo(traceInfo);
+                }
+                return indexer;
+            }
+        }
+        return super.constructIndex(mask, traces);
+    }
+
+    public abstract ProjectionIndexer getNullIndexer();
+
+    public abstract ProjectionIndexer getIdentityIndexer();
+
+    @Override
+    public void appendParent(final Supplier supplier) {
+        parents.add(supplier);
+    }
+
+    @Override
+    public void removeParent(final Supplier supplier) {
+        parents.remove(supplier);
+    }
+
+    @Override
+    public Collection<Supplier> getParents() {
+        return parents;
+    }
+
+    @Override
+    public void assignTraceInfo(final TraceInfo traceInfo) {
+        super.assignTraceInfo(traceInfo);
+        if (traceInfo.propagateFromStandardNodeToSupplierParent()) {
+            for (final Supplier parent : parents) {
+                parent.acceptPropagatedTraceInfo(traceInfo);
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/CallbackNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/CallbackNode.java
new file mode 100644
index 00000000..c68036b5
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/CallbackNode.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.single;
+
+import tools.refinery.viatra.runtime.matchers.backend.IUpdateable;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.rete.misc.SimpleReceiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * @author Bergmann Gabor
+ * 
+ */
+public class CallbackNode extends SimpleReceiver {
+
+    IUpdateable updateable;
+
+    public CallbackNode(ReteContainer reteContainer, IUpdateable updateable) 
+    {
+        super(reteContainer);
+        this.updateable = updateable;
+    }
+
+    @Override
+    public void update(Direction direction, Tuple updateElement, Timestamp timestamp) {
+        updateable.update(updateElement, direction == Direction.INSERT);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DefaultProductionNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DefaultProductionNode.java
new file mode 100644
index 00000000..eca8bc17
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DefaultProductionNode.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.single;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.rete.network.ProductionNode;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.traceability.CompiledQuery;
+import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+
+/**
+ * Default implementation of the Production node, based on UniquenessEnforcerNode
+ *
+ * @author Gabor Bergmann
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class DefaultProductionNode extends UniquenessEnforcerNode implements ProductionNode {
+
+    protected final Map<String, Integer> posMapping;
+
+    /**
+     * @since 1.6
+     */
+    public DefaultProductionNode(final ReteContainer reteContainer, final Map<String, Integer> posMapping,
+            final boolean deleteRederiveEvaluation) {
+        this(reteContainer, posMapping, deleteRederiveEvaluation, null, null, null);
+    }
+
+    /**
+     * @since 1.6
+     */
+    public DefaultProductionNode(final ReteContainer reteContainer, final Map<String, Integer> posMapping,
+            final boolean deleteRederiveEvaluation, final TupleMask coreMask, final TupleMask posetMask,
+            final IPosetComparator posetComparator) {
+        super(reteContainer, posMapping.size(), deleteRederiveEvaluation, coreMask, posetMask, posetComparator);
+        this.posMapping = posMapping;
+    }
+
+    @Override
+    public Map<String, Integer> getPosMapping() {
+        return posMapping;
+    }
+
+    @Override
+    public Iterator<Tuple> iterator() {
+        return memory.iterator();
+    }
+
+    @Override
+    public void acceptPropagatedTraceInfo(final TraceInfo traceInfo) {
+        if (traceInfo.propagateToProductionNodeParentAlso()) {
+            super.acceptPropagatedTraceInfo(traceInfo);
+        }
+    }
+
+    @Override
+    public String toString() {
+        for (final TraceInfo traceInfo : this.traceInfos) {
+            if (traceInfo instanceof CompiledQuery) {
+                final String patternName = ((CompiledQuery) traceInfo).getPatternName();
+                return String.format(this.getClass().getName() + "<%s>=%s", patternName, super.toString());
+            }
+        }
+        return super.toString();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DiscriminatorBucketNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DiscriminatorBucketNode.java
new file mode 100644
index 00000000..803bab20
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DiscriminatorBucketNode.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.single;
+
+import java.util.Collection;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * A bucket holds a filtered set of tuples of its parent {@link DiscriminatorDispatcherNode}. 
+ * Exactly those that have the given bucket key at their discrimination column.
+ * 
+ * <p> During operation, tuple contents and bucket keys have already been wrapped using {@link IQueryRuntimeContext#wrapElement(Object)}
+ * 
+ * @author Gabor Bergmann
+ * @since 1.5
+ */
+public class DiscriminatorBucketNode extends SingleInputNode {
+
+    private Object bucketKey;
+
+    /**
+     * @param bucketKey will be wrapped using {@link IQueryRuntimeContext#wrapElement(Object)}
+
+     */
+    public DiscriminatorBucketNode(ReteContainer reteContainer, Object bucketKey) {
+        super(reteContainer);
+        this.bucketKey = reteContainer.getNetwork().getEngine().getRuntimeContext().wrapElement(bucketKey);
+    }
+
+    @Override
+    public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+       if (parent != null) {
+           getDispatcher().pullIntoFiltered(collector, bucketKey, flush);
+       }
+    }
+    
+    @Override
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        if (parent != null) {
+            getDispatcher().pullIntoWithTimestampFiltered(collector, bucketKey, flush);
+        }
+    }
+
+    @Override
+    public void update(Direction direction, Tuple updateElement, Timestamp timestamp) {
+        propagateUpdate(direction, updateElement, timestamp);
+    }
+
+    public Object getBucketKey() {
+        return bucketKey;
+    }
+    
+    @Override
+    public void appendParent(Supplier supplier) {
+        if (! (supplier instanceof DiscriminatorDispatcherNode))
+            throw new IllegalArgumentException();
+        super.appendParent(supplier);
+    }
+    
+    public DiscriminatorDispatcherNode getDispatcher() {
+        return (DiscriminatorDispatcherNode) parent;
+    }
+    
+    @Override
+    protected String toStringCore() {
+        return String.format("%s<%s=='%s'>", 
+                super.toStringCore(), 
+                (getDispatcher() == null) ? "?" : getDispatcher().getDiscriminationColumnIndex(), 
+                bucketKey);
+    }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DiscriminatorDispatcherNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DiscriminatorDispatcherNode.java
new file mode 100644
index 00000000..a8e11fcd
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/DiscriminatorDispatcherNode.java
@@ -0,0 +1,154 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.single;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.NetworkStructureChangeSensitiveNode;
+import tools.refinery.viatra.runtime.rete.network.Receiver;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+
+/**
+ * Node that sends tuples off to different buckets (attached as children of type {@link DiscriminatorBucketNode}), based
+ * on the value of a given column.
+ * 
+ * <p>
+ * Tuple contents and bucket keys have already been wrapped using {@link IQueryRuntimeContext#wrapElement(Object)}
+ * 
+ * @author Gabor Bergmann
+ * @since 1.5
+ */
+public class DiscriminatorDispatcherNode extends SingleInputNode implements NetworkStructureChangeSensitiveNode {
+
+    private int discriminationColumnIndex;
+    private Map<Object, DiscriminatorBucketNode> buckets = new HashMap<>();
+    private Map<Object, Mailbox> bucketMailboxes = new HashMap<>();
+
+    /**
+     * @param reteContainer
+     */
+    public DiscriminatorDispatcherNode(ReteContainer reteContainer, int discriminationColumnIndex) {
+        super(reteContainer);
+        this.discriminationColumnIndex = discriminationColumnIndex;
+    }
+
+    @Override
+    public void update(Direction direction, Tuple updateElement, Timestamp timestamp) {
+        Object dispatchKey = updateElement.get(discriminationColumnIndex);
+        Mailbox bucketMailBox = bucketMailboxes.get(dispatchKey);
+        if (bucketMailBox != null) {
+            bucketMailBox.postMessage(direction, updateElement, timestamp);
+        }
+    }
+
+    public int getDiscriminationColumnIndex() {
+        return discriminationColumnIndex;
+    }
+
+    @Override
+    public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+        propagatePullInto(collector, flush);
+    }
+
+    @Override
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        propagatePullIntoWithTimestamp(collector, flush);
+    }
+
+    /**
+     * @since 2.3
+     */
+    public void pullIntoFiltered(final Collection<Tuple> collector, final Object bucketKey, final boolean flush) {
+        final ArrayList<Tuple> unfiltered = new ArrayList<Tuple>();
+        propagatePullInto(unfiltered, flush);
+        for (Tuple tuple : unfiltered) {
+            if (bucketKey.equals(tuple.get(discriminationColumnIndex))) {
+                collector.add(tuple);
+            }
+        }
+    }
+
+    /**
+     * @since 2.3
+     */
+    public void pullIntoWithTimestampFiltered(final Map<Tuple, Timeline<Timestamp>> collector, final Object bucketKey,
+            final boolean flush) {
+        final Map<Tuple, Timeline<Timestamp>> unfiltered = CollectionsFactory.createMap();
+        propagatePullIntoWithTimestamp(unfiltered, flush);
+        for (final Entry<Tuple, Timeline<Timestamp>> entry : unfiltered.entrySet()) {
+            if (bucketKey.equals(entry.getKey().get(discriminationColumnIndex))) {
+                collector.put(entry.getKey(), entry.getValue());
+            }
+        }
+    }
+
+    @Override
+    public void appendChild(Receiver receiver) {
+        super.appendChild(receiver);
+        if (receiver instanceof DiscriminatorBucketNode) {
+            DiscriminatorBucketNode bucket = (DiscriminatorBucketNode) receiver;
+            Object bucketKey = bucket.getBucketKey();
+            DiscriminatorBucketNode old = buckets.put(bucketKey, bucket);
+            if (old != null) {
+                throw new IllegalStateException();
+            }
+            bucketMailboxes.put(bucketKey, this.getCommunicationTracker().proxifyMailbox(this, bucket.getMailbox()));
+        }
+    }
+
+    /**
+     * @since 2.2
+     */
+    public Map<Object, Mailbox> getBucketMailboxes() {
+        return this.bucketMailboxes;
+    }
+
+    @Override
+    public void networkStructureChanged() {
+        bucketMailboxes.clear();
+        for (Receiver receiver : children) {
+            if (receiver instanceof DiscriminatorBucketNode) {
+                DiscriminatorBucketNode bucket = (DiscriminatorBucketNode) receiver;
+                Object bucketKey = bucket.getBucketKey();
+                bucketMailboxes.put(bucketKey,
+                        this.getCommunicationTracker().proxifyMailbox(this, bucket.getMailbox()));
+            }
+        }
+    }
+
+    @Override
+    public void removeChild(Receiver receiver) {
+        super.removeChild(receiver);
+        if (receiver instanceof DiscriminatorBucketNode) {
+            DiscriminatorBucketNode bucket = (DiscriminatorBucketNode) receiver;
+            Object bucketKey = bucket.getBucketKey();
+            DiscriminatorBucketNode old = buckets.remove(bucketKey);
+            if (old != bucket)
+                throw new IllegalStateException();
+            bucketMailboxes.remove(bucketKey);
+        }
+    }
+
+    @Override
+    protected String toStringCore() {
+        return super.toStringCore() + '<' + discriminationColumnIndex + '>';
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/EqualityFilterNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/EqualityFilterNode.java
new file mode 100644
index 00000000..014c2016
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/EqualityFilterNode.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.single;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+
+public class EqualityFilterNode extends FilterNode {
+
+    int[] indices;
+    int first;
+
+    /**
+     * @param reteContainer
+     * @param indices
+     *            indices of the Tuple that should hold equal values
+     */
+    public EqualityFilterNode(ReteContainer reteContainer, int[] indices) {
+        super(reteContainer);
+        this.indices = indices;
+        first = indices[0];
+    }
+
+    @Override
+    public boolean check(Tuple ps) {
+        Object firstElement = ps.get(first);
+        for (int i = 1 /* first is omitted */; i < indices.length; i++) {
+            if (!ps.get(indices[i]).equals(firstElement))
+                return false;
+        }
+        return true;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/FilterNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/FilterNode.java
new file mode 100644
index 00000000..f66f1715
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/FilterNode.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.single;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * This node implements a simple filter. A stateless abstract check() predicate determines whether a matching is allowed
+ * to pass.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public abstract class FilterNode extends SingleInputNode {
+
+    public FilterNode(final ReteContainer reteContainer) {
+        super(reteContainer);
+    }
+
+    /**
+     * Abstract filtering predicate. Expected to be stateless.
+     * 
+     * @param ps
+     *            the matching to be checked.
+     * @return true if and only if the parameter matching is allowed to pass through this node.
+     */
+    public abstract boolean check(final Tuple ps);
+
+    @Override
+    public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+        for (final Tuple ps : this.reteContainer.pullPropagatedContents(this, flush)) {
+            if (check(ps)) {
+                collector.add(ps);
+            }
+        }
+    }
+    
+    @Override
+    public void pullIntoWithTimeline(Map<Tuple, Timeline<Timestamp>> collector, boolean flush) {
+        for (final Entry<Tuple, Timeline<Timestamp>> entry : this.reteContainer.pullPropagatedContentsWithTimestamp(this, flush).entrySet()) {
+            if (check(entry.getKey())) {
+                collector.put(entry.getKey(), entry.getValue());
+            }
+        }
+    }
+
+    @Override
+    public void update(final Direction direction, final Tuple updateElement, final Timestamp timestamp) {
+        if (check(updateElement)) {
+            propagateUpdate(direction, updateElement, timestamp);
+        }
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/InequalityFilterNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/InequalityFilterNode.java
new file mode 100644
index 00000000..8dd3e949
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/InequalityFilterNode.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.single;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+
+/**
+ * This node filters patterns according to equalities and inequalities of elements. The 'subject' element is asserted to
+ * be different from the elements given by the inequalityMask.
+ * 
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public class InequalityFilterNode extends FilterNode {
+
+    int subjectIndex;
+    TupleMask inequalityMask;
+
+    /**
+     * @param reteContainer
+     * @param subject
+     *            the index of the element that should be compared.
+     * @param inequalityMask
+     *            the indices of elements that should be different from the subjectIndex.
+     */
+    public InequalityFilterNode(ReteContainer reteContainer, int subject, TupleMask inequalityMask) {
+        super(reteContainer);
+        this.subjectIndex = subject;
+        this.inequalityMask = inequalityMask;
+    }
+
+    @Override
+    public boolean check(Tuple ps) {
+        Object subject = ps.get(subjectIndex);
+        for (int ineq : inequalityMask.indices) {
+            if (subject.equals(ps.get(ineq)))
+                return false;
+        }
+        return true;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/RepresentativeElectionNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/RepresentativeElectionNode.java
new file mode 100644
index 00000000..95018c4f
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/RepresentativeElectionNode.java
@@ -0,0 +1,125 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Gabor Bergmann, Istvan Rath and Daniel Varro
+ * Copyright (c) 2023 The Refinery Authors <https://refinery.tools/>
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.single;
+
+import tools.refinery.viatra.runtime.rete.itc.alg.representative.RepresentativeElectionAlgorithm;
+import tools.refinery.viatra.runtime.rete.itc.alg.representative.RepresentativeObserver;
+import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.Clearable;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.ReinitializedNode;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+import java.util.Collection;
+import java.util.Map;
+
+public class RepresentativeElectionNode extends SingleInputNode implements Clearable, RepresentativeObserver,
+                ReinitializedNode {
+        private final RepresentativeElectionAlgorithm.Factory algorithmFactory;
+        private Graph<Object> graph;
+        private RepresentativeElectionAlgorithm algorithm;
+
+        public RepresentativeElectionNode(ReteContainer reteContainer,
+                                                                          RepresentativeElectionAlgorithm.Factory algorithmFactory) {
+                super(reteContainer);
+                this.algorithmFactory = algorithmFactory;
+                graph = new Graph<>();
+                algorithm = algorithmFactory.create(graph);
+                algorithm.setObserver(this);
+                reteContainer.registerClearable(this);
+        }
+
+        @Override
+        public void networkStructureChanged() {
+                if (reteContainer.isTimelyEvaluation() && reteContainer.getCommunicationTracker().isInRecursiveGroup(this)) {
+                        throw new IllegalStateException(this + " cannot be used in recursive differential dataflow evaluation!");
+                }
+                super.networkStructureChanged();
+        }
+
+        @Override
+        public void reinitializeWith(Collection<Tuple> tuples) {
+                algorithm.dispose();
+                graph = new Graph<>();
+                for (var tuple : tuples) {
+                        insertEdge(tuple.get(0), tuple.get(1));
+                }
+                algorithm = algorithmFactory.create(graph);
+                algorithm.setObserver(this);
+        }
+
+        @Override
+        public void tupleChanged(Object source, Object representative, Direction direction) {
+                var tuple = Tuples.staticArityFlatTupleOf(source, representative);
+                propagateUpdate(direction, tuple, Timestamp.ZERO);
+        }
+
+        @Override
+        public void clear() {
+                algorithm.dispose();
+                graph = new Graph<>();
+                algorithm = algorithmFactory.create(graph);
+        }
+
+        @Override
+        public void update(Direction direction, Tuple updateElement, Timestamp timestamp) {
+                var source = updateElement.get(0);
+                var target = updateElement.get(1);
+                switch (direction) {
+                case INSERT -> insertEdge(source, target);
+                case DELETE -> deleteEdge(source, target);
+                default -> throw new IllegalArgumentException("Unknown direction: " + direction);
+                }
+        }
+
+        private void insertEdge(Object source, Object target) {
+                graph.insertNode(source);
+                graph.insertNode(target);
+                graph.insertEdge(source, target);
+        }
+
+        private void deleteEdge(Object source, Object target) {
+                graph.deleteEdgeIfExists(source, target);
+                if (isIsolated(source)) {
+                        graph.deleteNode(source);
+                }
+                if (!source.equals(target) && isIsolated(target)) {
+                        graph.deleteNode(target);
+                }
+        }
+
+        private boolean isIsolated(Object node) {
+                return graph.getTargetNodes(node).isEmpty() && graph.getSourceNodes(node).isEmpty();
+        }
+
+        @Override
+        public void pullInto(Collection<Tuple> collector, boolean flush) {
+                for (var entry : algorithm.getComponents().entrySet()) {
+                        var representative = entry.getKey();
+                        for (var node : entry.getValue()) {
+                                collector.add(Tuples.staticArityFlatTupleOf(node, representative));
+                        }
+                }
+        }
+
+        @Override
+        public void pullIntoWithTimeline(Map<Tuple, Timeline<Timestamp>> collector, boolean flush) {
+                // Use all zero timestamps because this node cannot be used in recursive groups anyway.
+                for (var entry : algorithm.getComponents().entrySet()) {
+                        var representative = entry.getKey();
+                        for (var node : entry.getValue()) {
+                                collector.put(Tuples.staticArityFlatTupleOf(node, representative), Timestamp.INSERT_AT_ZERO_TIMELINE);
+                        }
+                }
+        }
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/SingleInputNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/SingleInputNode.java
new file mode 100644
index 00000000..99fc45b2
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/SingleInputNode.java
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.single;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.StandardNode;
+import tools.refinery.viatra.runtime.rete.network.Supplier;
+import tools.refinery.viatra.runtime.rete.network.Tunnel;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationTracker;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
+import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+public abstract class SingleInputNode extends StandardNode implements Tunnel {
+
+    protected Supplier parent;
+    /**
+     * @since 1.6
+     */
+    protected Mailbox mailbox;
+    
+    public SingleInputNode(ReteContainer reteContainer) {
+        super(reteContainer);
+        mailbox = instantiateMailbox();
+        reteContainer.registerClearable(mailbox);
+        parent = null;
+    }
+    
+    /**
+     * Instantiates the {@link Mailbox} of this receiver.
+     * Subclasses may override this method to provide their own mailbox implementation.
+     * 
+     * @return the mailbox
+     * @since 2.0
+     */
+    protected Mailbox instantiateMailbox() {
+        if (this.reteContainer.isTimelyEvaluation()) {
+            return new TimelyMailbox(this, this.reteContainer);
+        } else {            
+            return new BehaviorChangingMailbox(this, this.reteContainer);
+        }
+    }
+    
+    @Override
+    public CommunicationTracker getCommunicationTracker() {
+        return this.reteContainer.getCommunicationTracker();
+    }
+    
+    @Override
+    public Mailbox getMailbox() {
+        return this.mailbox;
+    }
+
+    @Override
+    public void appendParent(Supplier supplier) {
+        if (parent == null)
+            parent = supplier;
+        else
+            throw new UnsupportedOperationException("Illegal RETE edge: " + this + " already has a parent (" + parent
+                    + ") and cannot connect to additional parent (" + supplier
+                    + ") as it is not a Uniqueness Enforcer Node. ");
+    }
+
+    @Override
+    public void removeParent(Supplier supplier) {
+        if (parent == supplier)
+            parent = null;
+        else
+            throw new IllegalArgumentException("Illegal RETE edge removal: the parent of " + this + " is not "
+                    + supplier);
+    }
+
+    /**
+     * To be called by derived classes and ReteContainer.
+     */
+    public void propagatePullInto(final Collection<Tuple> collector, final boolean flush) {
+        if (parent != null) {
+            parent.pullInto(collector, flush);
+        }
+    }
+    
+    /**
+     * To be called by derived classes and ReteContainer.
+     */
+    public void propagatePullIntoWithTimestamp(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        if (parent != null) {
+            parent.pullIntoWithTimeline(collector, flush);
+        }
+    }
+
+    @Override
+    public Collection<Supplier> getParents() {
+        if (parent == null)
+            return Collections.emptySet();
+        else
+            return Collections.singleton(parent);
+    }
+    
+    @Override
+    public void assignTraceInfo(TraceInfo traceInfo) {
+        super.assignTraceInfo(traceInfo);
+        if (traceInfo.propagateFromStandardNodeToSupplierParent())
+            if (parent != null)
+                parent.acceptPropagatedTraceInfo(traceInfo);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TimelyProductionNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TimelyProductionNode.java
new file mode 100644
index 00000000..82640948
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TimelyProductionNode.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.single;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.rete.network.ProductionNode;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.traceability.CompiledQuery;
+import tools.refinery.viatra.runtime.rete.traceability.TraceInfo;
+/**
+ * Differential dataflow implementation of the Production node, based on {@link TimelyUniquenessEnforcerNode}.
+ *
+ * @author Tamas Szabo
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ * @since 2.3
+ */
+public class TimelyProductionNode extends TimelyUniquenessEnforcerNode implements ProductionNode {
+
+    protected final Map<String, Integer> posMapping;
+
+    public TimelyProductionNode(final ReteContainer reteContainer, final Map<String, Integer> posMapping) {
+        super(reteContainer, posMapping.size());
+        this.posMapping = posMapping;
+    }
+
+    @Override
+    public Map<String, Integer> getPosMapping() {
+        return this.posMapping;
+    }
+
+    @Override
+    public Iterator<Tuple> iterator() {
+        return this.memory.keySet().iterator();
+    }
+
+    @Override
+    public void acceptPropagatedTraceInfo(final TraceInfo traceInfo) {
+        if (traceInfo.propagateToProductionNodeParentAlso()) {
+            super.acceptPropagatedTraceInfo(traceInfo);
+        }
+    }
+
+    @Override
+    public String toString() {
+        for (final TraceInfo traceInfo : this.traceInfos) {
+            if (traceInfo instanceof CompiledQuery) {
+                final String patternName = ((CompiledQuery) traceInfo).getPatternName();
+                return String.format(this.getClass().getName() + "<%s>=%s", patternName, super.toString());
+            }
+        }
+        return super.toString();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TimelyUniquenessEnforcerNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TimelyUniquenessEnforcerNode.java
new file mode 100644
index 00000000..4c4b4fc0
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TimelyUniquenessEnforcerNode.java
@@ -0,0 +1,161 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.single;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.Signed;
+import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
+import tools.refinery.viatra.runtime.rete.index.timely.TimelyMemoryIdentityIndexer;
+import tools.refinery.viatra.runtime.rete.index.timely.TimelyMemoryNullIndexer;
+import tools.refinery.viatra.runtime.rete.matcher.TimelyConfiguration.TimelineRepresentation;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timely.TimelyMailbox;
+
+/**
+ * Timely uniqueness enforcer node implementation.
+ * 
+ * @author Tamas Szabo
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ * @noextend This class is not intended to be subclassed by clients.
+ * @since 2.4
+ */
+public class TimelyUniquenessEnforcerNode extends AbstractUniquenessEnforcerNode implements ResumableNode {
+
+    protected final TimelyMemory<Timestamp> memory;
+    /**
+     * @since 2.4
+     */
+    protected CommunicationGroup group;
+
+    public TimelyUniquenessEnforcerNode(final ReteContainer container, final int tupleWidth) {
+        super(container, tupleWidth);
+        this.memory = new TimelyMemory<Timestamp>(
+                container.getTimelyConfiguration().getTimelineRepresentation() == TimelineRepresentation.FAITHFUL);
+        container.registerClearable(this.memory);
+        this.mailbox = instantiateMailbox();
+        container.registerClearable(this.mailbox);
+    }
+
+    protected Mailbox instantiateMailbox() {
+        return new TimelyMailbox(this, this.reteContainer);
+    }
+
+    @Override
+    public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+        for (final Tuple tuple : this.memory.getTuplesAtInfinity()) {
+            collector.add(tuple);
+        }
+    }
+
+    @Override
+    public CommunicationGroup getCurrentGroup() {
+        return this.group;
+    }
+
+    @Override
+    public void setCurrentGroup(final CommunicationGroup group) {
+        this.group = group;
+    }
+
+    @Override
+    public Set<Tuple> getTuples() {
+        return this.memory.getTuplesAtInfinity();
+    }
+
+    /**
+     * @since 2.4
+     */
+    @Override
+    public Timestamp getResumableTimestamp() {
+        return this.memory.getResumableTimestamp();
+    }
+
+    /**
+     * @since 2.4
+     */
+    @Override
+    public void resumeAt(final Timestamp timestamp) {
+        final Map<Tuple, Diff<Timestamp>> diffMap = this.memory.resumeAt(timestamp);
+        for (final Entry<Tuple, Diff<Timestamp>> entry : diffMap.entrySet()) {
+            for (final Signed<Timestamp> signed : entry.getValue()) {
+                propagate(signed.getDirection(), entry.getKey(), signed.getPayload());
+            }
+        }
+        final Timestamp nextTimestamp = this.memory.getResumableTimestamp();
+        if (nextTimestamp != null) {
+            this.group.notifyHasMessage(this.mailbox, nextTimestamp);
+        }
+    }
+
+    @Override
+    public void update(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        Diff<Timestamp> resultDiff = null;
+        if (direction == Direction.INSERT) {
+            resultDiff = this.memory.put(update, timestamp);
+        } else {
+            try {
+                resultDiff = this.memory.remove(update, timestamp);
+            } catch (final IllegalStateException e) {
+                issueError("[INTERNAL ERROR] Duplicate deletion of " + update + " was detected in "
+                        + this.getClass().getName() + " " + this + " for pattern(s) "
+                        + getTraceInfoPatternsEnumerated(), e);
+                // diff will remain unset in case of the exception, it is time to return
+                return;
+            }
+        }
+
+        for (final Signed<Timestamp> signed : resultDiff) {
+            propagate(signed.getDirection(), update, signed.getPayload());
+        }
+    }
+
+    @Override
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        collector.putAll(this.memory.asMap());
+    }
+
+    @Override
+    public ProjectionIndexer getNullIndexer() {
+        if (this.memoryNullIndexer == null) {
+            this.memoryNullIndexer = new TimelyMemoryNullIndexer(this.reteContainer, this.tupleWidth, this.memory, this,
+                    this, this.specializedListeners);
+            this.getCommunicationTracker().registerDependency(this, this.memoryNullIndexer);
+        }
+        return this.memoryNullIndexer;
+    }
+
+    @Override
+    public ProjectionIndexer getIdentityIndexer() {
+        if (this.memoryIdentityIndexer == null) {
+            this.memoryIdentityIndexer = new TimelyMemoryIdentityIndexer(this.reteContainer, this.tupleWidth,
+                    this.memory, this, this, this.specializedListeners);
+            this.getCommunicationTracker().registerDependency(this, this.memoryIdentityIndexer);
+        }
+        return this.memoryIdentityIndexer;
+    }
+
+    @Override
+    public void networkStructureChanged() {
+        super.networkStructureChanged();
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransformerNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransformerNode.java
new file mode 100644
index 00000000..24750656
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransformerNode.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.single;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+public abstract class TransformerNode extends SingleInputNode {
+
+    public TransformerNode(final ReteContainer reteContainer) {
+        super(reteContainer);
+    }
+
+    protected abstract Tuple transform(final Tuple input);
+
+    @Override
+    public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+        for (Tuple ps : reteContainer.pullPropagatedContents(this, flush)) {
+            collector.add(transform(ps));
+        }
+    }
+    
+    @Override
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        for (final Entry<Tuple, Timeline<Timestamp>> entry : reteContainer.pullPropagatedContentsWithTimestamp(this, flush).entrySet()) {
+            collector.put(transform(entry.getKey()), entry.getValue());
+        }
+    }
+
+    @Override
+    public void update(final Direction direction, final Tuple updateElement, final Timestamp timestamp) {
+        propagateUpdate(direction, transform(updateElement), timestamp);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransitiveClosureNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransitiveClosureNode.java
new file mode 100644
index 00000000..fdda4ef4
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransitiveClosureNode.java
@@ -0,0 +1,147 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Gabor Bergmann, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.single;
+
+import tools.refinery.viatra.runtime.rete.itc.alg.incscc.IncSCCAlg;
+import tools.refinery.viatra.runtime.rete.itc.alg.misc.Tuple;
+import tools.refinery.viatra.runtime.rete.itc.graphimpl.Graph;
+import tools.refinery.viatra.runtime.rete.itc.igraph.ITcDataSource;
+import tools.refinery.viatra.runtime.rete.itc.igraph.ITcObserver;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.Clearable;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.NetworkStructureChangeSensitiveNode;
+import tools.refinery.viatra.runtime.rete.network.ReinitializedNode;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * This class represents a transitive closure node in the Rete net.
+ * <p>
+ * This node must not be used in recursive {@link CommunicationGroup}s.
+ *
+ * @author Gabor Bergmann
+ *
+ */
+public class TransitiveClosureNode extends SingleInputNode
+        implements Clearable, ITcObserver<Object>, NetworkStructureChangeSensitiveNode, ReinitializedNode {
+
+    private Graph<Object> graphDataSource;
+    private ITcDataSource<Object> transitiveClosureAlgorithm;
+
+    /**
+     * Create a new transitive closure rete node.
+     *
+     * Client may optionally call {@link #reinitializeWith(Collection)} before using the node, instead of inserting the
+     * initial set of tuples one by one.
+     *
+     * @param reteContainer
+     *            the rete container of the node
+     */
+    public TransitiveClosureNode(ReteContainer reteContainer) {
+        super(reteContainer);
+        graphDataSource = new Graph<Object>();
+        transitiveClosureAlgorithm = new IncSCCAlg<Object>(graphDataSource);
+        transitiveClosureAlgorithm.attachObserver(this);
+        reteContainer.registerClearable(this);
+    }
+
+    @Override
+    public void networkStructureChanged() {
+        if (this.reteContainer.isTimelyEvaluation() && this.reteContainer.getCommunicationTracker().isInRecursiveGroup(this)) {
+            throw new IllegalStateException(this.toString() + " cannot be used in recursive differential dataflow evaluation!");
+        }
+        super.networkStructureChanged();
+    }
+
+    /**
+     * Initializes the graph data source with the given collection of tuples.
+     *
+     * @param tuples
+     *            the initial collection of tuples
+     */
+        @Override
+    public void reinitializeWith(Collection<tools.refinery.viatra.runtime.matchers.tuple.Tuple> tuples) {
+        clear();
+
+        for (tools.refinery.viatra.runtime.matchers.tuple.Tuple t : tuples) {
+            graphDataSource.insertNode(t.get(0));
+            graphDataSource.insertNode(t.get(1));
+            graphDataSource.insertEdge(t.get(0), t.get(1));
+        }
+        transitiveClosureAlgorithm.attachObserver(this);
+    }
+
+    @Override
+    public void pullInto(final Collection<tools.refinery.viatra.runtime.matchers.tuple.Tuple> collector, final boolean flush) {
+        for (final Tuple<Object> tuple : ((IncSCCAlg<Object>) transitiveClosureAlgorithm).getTcRelation()) {
+            collector.add(Tuples.staticArityFlatTupleOf(tuple.getSource(), tuple.getTarget()));
+        }
+    }
+
+    @Override
+    public void pullIntoWithTimeline(
+            final Map<tools.refinery.viatra.runtime.matchers.tuple.Tuple, Timeline<Timestamp>> collector,
+            final boolean flush) {
+        // use all zero timestamps because this node cannot be used in recursive groups anyway
+        for (final Tuple<Object> tuple : ((IncSCCAlg<Object>) transitiveClosureAlgorithm).getTcRelation()) {
+            collector.put(Tuples.staticArityFlatTupleOf(tuple.getSource(), tuple.getTarget()), Timestamp.INSERT_AT_ZERO_TIMELINE);
+        }
+    }
+
+    @Override
+    public void update(Direction direction, tools.refinery.viatra.runtime.matchers.tuple.Tuple updateElement,
+            Timestamp timestamp) {
+        if (updateElement.getSize() == 2) {
+            Object source = updateElement.get(0);
+            Object target = updateElement.get(1);
+
+            if (direction == Direction.INSERT) {
+                graphDataSource.insertNode(source);
+                graphDataSource.insertNode(target);
+                graphDataSource.insertEdge(source, target);
+            }
+            if (direction == Direction.DELETE) {
+                graphDataSource.deleteEdgeIfExists(source, target);
+
+                if (((IncSCCAlg<Object>) transitiveClosureAlgorithm).isIsolated(source)) {
+                    graphDataSource.deleteNode(source);
+                }
+                if (!source.equals(target) && ((IncSCCAlg<Object>) transitiveClosureAlgorithm).isIsolated(target)) {
+                    graphDataSource.deleteNode(target);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void clear() {
+        transitiveClosureAlgorithm.dispose();
+        graphDataSource = new Graph<Object>();
+        transitiveClosureAlgorithm = new IncSCCAlg<Object>(graphDataSource);
+    }
+
+    @Override
+    public void tupleInserted(Object source, Object target) {
+        tools.refinery.viatra.runtime.matchers.tuple.Tuple tuple = Tuples.staticArityFlatTupleOf(source, target);
+        propagateUpdate(Direction.INSERT, tuple, Timestamp.ZERO);
+    }
+
+    @Override
+    public void tupleDeleted(Object source, Object target) {
+        tools.refinery.viatra.runtime.matchers.tuple.Tuple tuple = Tuples.staticArityFlatTupleOf(source, target);
+        propagateUpdate(Direction.DELETE, tuple, Timestamp.ZERO);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransparentNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransparentNode.java
new file mode 100644
index 00000000..6c21a966
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TransparentNode.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.single;
+
+import java.util.Collection;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+
+/**
+ * Simply propagates everything. Might be used to join or fork.
+ * 
+ * @author Gabor Bergmann
+ */
+public class TransparentNode extends SingleInputNode {
+
+    public TransparentNode(final ReteContainer reteContainer) {
+        super(reteContainer);
+    }
+
+    @Override
+    public void update(final Direction direction, final Tuple updateElement, final Timestamp timestamp) {
+        propagateUpdate(direction, updateElement, timestamp);
+
+    }
+
+    @Override
+    public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+        propagatePullInto(collector, flush);
+    }
+
+    @Override
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        propagatePullIntoWithTimestamp(collector, flush);
+    }
+    
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TrimmerNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TrimmerNode.java
new file mode 100644
index 00000000..8a72138c
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/TrimmerNode.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.single;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+
+/**
+ * Trims the matchings as specified by a mask.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public class TrimmerNode extends TransformerNode {
+
+    protected TupleMask mask;
+
+    /**
+     * @param reteContainer
+     * @param mask
+     *            The mask used to trim substitutions.
+     */
+    public TrimmerNode(ReteContainer reteContainer, TupleMask mask) {
+        super(reteContainer);
+        this.mask = mask;
+    }
+
+    public TrimmerNode(ReteContainer reteContainer) {
+        super(reteContainer);
+        this.mask = null;
+    }
+
+    /**
+     * @return the mask
+     */
+    public TupleMask getMask() {
+        return mask;
+    }
+
+    /**
+     * @param mask
+     *            the mask to set
+     */
+    public void setMask(TupleMask mask) {
+        this.mask = mask;
+    }
+
+    @Override
+    protected Tuple transform(Tuple input) {
+        return mask.transform(input);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/UniquenessEnforcerNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/UniquenessEnforcerNode.java
new file mode 100644
index 00000000..5bfde248
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/UniquenessEnforcerNode.java
@@ -0,0 +1,321 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann, Tamas Szabo and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.single;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IPosetComparator;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.IMultiset;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.rete.index.MemoryIdentityIndexer;
+import tools.refinery.viatra.runtime.rete.index.MemoryNullIndexer;
+import tools.refinery.viatra.runtime.rete.index.ProjectionIndexer;
+import tools.refinery.viatra.runtime.rete.network.PosetAwareReceiver;
+import tools.refinery.viatra.runtime.rete.network.RederivableNode;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+import tools.refinery.viatra.runtime.rete.network.communication.CommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
+import tools.refinery.viatra.runtime.rete.network.communication.timeless.RecursiveCommunicationGroup;
+import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.BehaviorChangingMailbox;
+import tools.refinery.viatra.runtime.rete.network.mailbox.timeless.PosetAwareMailbox;
+
+/**
+ * Timeless uniqueness enforcer node implementation.
+ * <p>
+ * The node is capable of operating in the delete and re-derive mode. In this mode, it is also possible to equip the
+ * node with an {@link IPosetComparator} to identify monotone changes; thus, ensuring that a fix-point can be reached
+ * during the evaluation.
+ * 
+ * @author Gabor Bergmann
+ * @author Tamas Szabo
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class UniquenessEnforcerNode extends AbstractUniquenessEnforcerNode
+        implements RederivableNode, PosetAwareReceiver {
+
+    protected IMultiset<Tuple> memory;
+    /**
+     * @since 1.6
+     */
+    protected IMultiset<Tuple> rederivableMemory;
+    /**
+     * @since 1.6
+     */
+    protected boolean deleteRederiveEvaluation;
+
+    /**
+     * @since 1.7
+     */
+    protected CommunicationGroup currentGroup;
+
+    public UniquenessEnforcerNode(final ReteContainer reteContainer, final int tupleWidth) {
+        this(reteContainer, tupleWidth, false);
+    }
+
+    /**
+     * OPTIONAL ELEMENT - ONLY PRESENT IF MONOTONICITY INFO WAS AVAILABLE
+     * 
+     * @since 1.6
+     */
+    protected final TupleMask coreMask;
+    /**
+     * OPTIONAL ELEMENTS - ONLY PRESENT IF MONOTONICITY INFO WAS AVAILABLE
+     * 
+     * @since 1.6
+     */
+    protected final TupleMask posetMask;
+    /**
+     * OPTIONAL ELEMENTS - ONLY PRESENT IF MONOTONICITY INFO WAS AVAILABLE
+     * 
+     * @since 1.6
+     */
+    protected final IPosetComparator posetComparator;
+
+    /**
+     * @since 1.6
+     */
+    public UniquenessEnforcerNode(final ReteContainer reteContainer, final int tupleWidth,
+            final boolean deleteRederiveEvaluation) {
+        this(reteContainer, tupleWidth, deleteRederiveEvaluation, null, null, null);
+    }
+
+    /**
+     * @since 1.6
+     */
+    public UniquenessEnforcerNode(final ReteContainer reteContainer, final int tupleWidth,
+            final boolean deleteRederiveEvaluation, final TupleMask coreMask, final TupleMask posetMask,
+            final IPosetComparator posetComparator) {
+        super(reteContainer, tupleWidth);
+        this.memory = CollectionsFactory.createMultiset();
+        this.rederivableMemory = CollectionsFactory.createMultiset();
+        reteContainer.registerClearable(this.memory);
+        reteContainer.registerClearable(this.rederivableMemory);
+        this.deleteRederiveEvaluation = deleteRederiveEvaluation;
+        this.coreMask = coreMask;
+        this.posetMask = posetMask;
+        this.posetComparator = posetComparator;
+        this.mailbox = instantiateMailbox();
+        reteContainer.registerClearable(this.mailbox);
+    }
+    
+    @Override
+    public void pullInto(final Collection<Tuple> collector, final boolean flush) {
+        for (final Tuple tuple : this.memory.distinctValues()) {
+            collector.add(tuple);
+        }
+    }
+    
+    /**
+     * @since 2.8
+     */
+    @Override
+    public Set<Tuple> getTuples() {
+        return this.memory.distinctValues();
+    }
+
+    @Override
+    public boolean isInDRedMode() {
+        return this.deleteRederiveEvaluation;
+    }
+
+    @Override
+    public TupleMask getCoreMask() {
+        return coreMask;
+    }
+
+    @Override
+    public TupleMask getPosetMask() {
+        return posetMask;
+    }
+
+    @Override
+    public IPosetComparator getPosetComparator() {
+        return posetComparator;
+    }
+
+    @Override
+    public void pullIntoWithTimeline(final Map<Tuple, Timeline<Timestamp>> collector, final boolean flush) {
+        throw new UnsupportedOperationException("Use the timely version of this node!");
+    }
+
+    /**
+     * @since 2.0
+     */
+    protected Mailbox instantiateMailbox() {
+        if (coreMask != null && posetMask != null && posetComparator != null) {
+            return new PosetAwareMailbox(this, this.reteContainer);
+        } else {
+            return new BehaviorChangingMailbox(this, this.reteContainer);
+        }
+    }
+
+    @Override
+    public void update(final Direction direction, final Tuple update, final Timestamp timestamp) {
+        updateWithPosetInfo(direction, update, false);
+    }
+
+    @Override
+    public void updateWithPosetInfo(final Direction direction, final Tuple update, final boolean monotone) {
+        if (this.deleteRederiveEvaluation) {
+            if (updateWithDeleteAndRederive(direction, update, monotone)) {
+                propagate(direction, update, Timestamp.ZERO);
+            }
+        } else {
+            if (updateDefault(direction, update)) {
+                propagate(direction, update, Timestamp.ZERO);
+            }
+        }
+    }
+
+    /**
+     * @since 2.4
+     */
+    protected boolean updateWithDeleteAndRederive(final Direction direction, final Tuple update,
+            final boolean monotone) {
+        boolean propagate = false;
+
+        final int memoryCount = memory.getCount(update);
+        final int rederivableCount = rederivableMemory.getCount(update);
+
+        if (direction == Direction.INSERT) {
+            // INSERT
+            if (rederivableCount != 0) {
+                // the tuple is in the re-derivable memory
+                rederivableMemory.addOne(update);
+                if (rederivableMemory.isEmpty()) {
+                    // there is nothing left to be re-derived
+                    // this can happen if the INSERT cancelled out a DELETE
+                    ((RecursiveCommunicationGroup) currentGroup).removeRederivable(this);
+                }
+            } else {
+                // the tuple is in the main memory
+                propagate = memory.addOne(update);
+            }
+        } else {
+            // DELETE
+            if (rederivableCount != 0) {
+                // the tuple is in the re-derivable memory
+                if (memoryCount != 0) {
+                    issueError("[INTERNAL ERROR] Inconsistent state for " + update
+                            + " because it is present both in the main and re-derivable memory in the UniquenessEnforcerNode "
+                            + this + " for pattern(s) " + getTraceInfoPatternsEnumerated(), null);
+                }
+
+                try {
+                    rederivableMemory.removeOne(update);
+                } catch (final IllegalStateException ex) {
+                    issueError(
+                            "[INTERNAL ERROR] Duplicate deletion of " + update + " was detected in UniquenessEnforcer "
+                                    + this + " for pattern(s) " + getTraceInfoPatternsEnumerated(),
+                            ex);
+                }
+                if (rederivableMemory.isEmpty()) {
+                    // there is nothing left to be re-derived
+                    ((RecursiveCommunicationGroup) currentGroup).removeRederivable(this);
+                }
+            } else {
+                // the tuple is in the main memory
+                if (monotone) {
+                    propagate = memory.removeOne(update);
+                } else {
+                    final int count = memoryCount - 1;
+                    if (count > 0) {
+                        if (rederivableMemory.isEmpty()) {
+                            // there is now something to be re-derived
+                            ((RecursiveCommunicationGroup) currentGroup).addRederivable(this);
+                        }
+                        rederivableMemory.addPositive(update, count);
+                    }
+                    memory.clearAllOf(update);
+                    propagate = true;
+                }
+            }
+        }
+
+        return propagate;
+    }
+
+    /**
+     * @since 2.4
+     */
+    protected boolean updateDefault(final Direction direction, final Tuple update) {
+        boolean propagate = false;
+        if (direction == Direction.INSERT) {
+            // INSERT
+            propagate = memory.addOne(update);
+        } else {
+            // DELETE
+            try {
+                propagate = memory.removeOne(update);
+            } catch (final IllegalStateException ex) {
+                propagate = false;
+                issueError("[INTERNAL ERROR] Duplicate deletion of " + update + " was detected in "
+                        + this.getClass().getName() + " " + this + " for pattern(s) "
+                        + getTraceInfoPatternsEnumerated(), ex);
+            }
+        }
+        return propagate;
+    }
+
+    /**
+     * @since 1.6
+     */
+    @Override
+    public void rederiveOne() {
+        final Tuple update = rederivableMemory.iterator().next();
+        final int count = rederivableMemory.getCount(update);
+        rederivableMemory.clearAllOf(update);
+        memory.addPositive(update, count);
+        // if there is no other re-derivable tuple, then unregister the node itself
+        if (this.rederivableMemory.isEmpty()) {
+            ((RecursiveCommunicationGroup) currentGroup).removeRederivable(this);
+        }
+        propagate(Direction.INSERT, update, Timestamp.ZERO);
+    }
+
+    @Override
+    public ProjectionIndexer getNullIndexer() {
+        if (this.memoryNullIndexer == null) {
+            this.memoryNullIndexer = new MemoryNullIndexer(this.reteContainer, this.tupleWidth,
+                    this.memory.distinctValues(), this, this, this.specializedListeners);
+            this.getCommunicationTracker().registerDependency(this, this.memoryNullIndexer);
+        }
+        return this.memoryNullIndexer;
+    }
+
+    @Override
+    public ProjectionIndexer getIdentityIndexer() {
+        if (this.memoryIdentityIndexer == null) {
+            this.memoryIdentityIndexer = new MemoryIdentityIndexer(this.reteContainer, this.tupleWidth,
+                    this.memory.distinctValues(), this, this, this.specializedListeners);
+            this.getCommunicationTracker().registerDependency(this, this.memoryIdentityIndexer);
+        }
+        return this.memoryIdentityIndexer;
+    }
+
+    @Override
+    public CommunicationGroup getCurrentGroup() {
+        return currentGroup;
+    }
+
+    @Override
+    public void setCurrentGroup(final CommunicationGroup currentGroup) {
+        this.currentGroup = currentGroup;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/ValueBinderFilterNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/ValueBinderFilterNode.java
new file mode 100644
index 00000000..c641bf6e
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/single/ValueBinderFilterNode.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.single;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.rete.network.ReteContainer;
+
+/**
+ * A filter node that keeps only those tuples that contain a certain value at a certain position.
+ * 
+ * @author Bergmann Gabor
+ * 
+ */
+public class ValueBinderFilterNode extends FilterNode {
+
+    int bindingIndex;
+    Object bindingValue;
+
+    /**
+     * @param reteContainer
+     * @param bindingIndex
+     *            the position in the tuple that should be bound
+     * @param bindingValue
+     *            the value to which the tuple has to be bound
+     */
+    public ValueBinderFilterNode(ReteContainer reteContainer, int bindingIndex, Object bindingValue) {
+        super(reteContainer);
+        this.bindingIndex = bindingIndex;
+        this.bindingValue = bindingValue;
+    }
+
+    @Override
+    public boolean check(Tuple ps) {
+        return bindingValue.equals(ps.get(bindingIndex));
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/ActiveNodeConflictTrace.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/ActiveNodeConflictTrace.java
new file mode 100644
index 00000000..2055dfe8
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/ActiveNodeConflictTrace.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.traceability;
+
+import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+
+public class ActiveNodeConflictTrace extends RecipeTraceInfo { // TODO implement PatternTraceInfo
+    RecipeTraceInfo inactiveRecipeTrace;                
+    public ActiveNodeConflictTrace(ReteNodeRecipe recipe,
+            RecipeTraceInfo parentRecipeTrace,
+            RecipeTraceInfo inactiveRecipeTrace) {
+        super(recipe, parentRecipeTrace);
+        this.inactiveRecipeTrace = inactiveRecipeTrace;
+    }
+    public RecipeTraceInfo getInactiveRecipeTrace() {
+        return inactiveRecipeTrace;
+    }
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/CompiledQuery.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/CompiledQuery.java
new file mode 100644
index 00000000..b8c793c5
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/CompiledQuery.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.traceability;
+
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+
+/**
+ * Indicates that recipe expresses the finished match set of a query.
+ * @author Bergmann Gabor
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class CompiledQuery extends RecipeTraceInfo implements
+        PatternTraceInfo {
+    
+    private PQuery query;
+    private final Map<PBody, ? extends RecipeTraceInfo> parentRecipeTracesPerBody;
+    
+    /**
+     * @since 1.6
+     */
+    public CompiledQuery(ReteNodeRecipe recipe,
+            Map<PBody, ? extends RecipeTraceInfo> parentRecipeTraces,
+            PQuery query) {
+        super(recipe, parentRecipeTraces.values());
+        parentRecipeTracesPerBody = parentRecipeTraces;
+        this.query = query;
+    }
+    public PQuery getQuery() {
+        return query;
+    }
+
+    @Override
+    public String getPatternName() {
+        return query.getFullyQualifiedName();
+    }
+
+    /**
+     * @since 1.6
+     */
+    public Map<PBody, ? extends RecipeTraceInfo> getParentRecipeTracesPerBody() {
+        return parentRecipeTracesPerBody;
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/CompiledSubPlan.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/CompiledSubPlan.java
new file mode 100644
index 00000000..572e943c
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/CompiledSubPlan.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.traceability;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+
+/**
+ * A trace marker associating a Rete recipe with a query SubPlan. 
+ * 
+ * <p> The Rete node represented by the recipe is equivalent to the SubPlan.
+ * <p> Invariant: each variable has at most one index associated with it in the tuple, i.e. no duplicates.
+ */
+public class CompiledSubPlan extends PlanningTrace {
+
+    public CompiledSubPlan(SubPlan subPlan, List<PVariable> variablesTuple,
+            ReteNodeRecipe recipe,
+            Collection<? extends RecipeTraceInfo> parentRecipeTraces) {
+        super(subPlan, variablesTuple, recipe, parentRecipeTraces);
+        
+        // Make sure that each variable occurs only once
+        Set<PVariable> variablesSet = new HashSet<PVariable>(variablesTuple);
+        Preconditions.checkState(variablesSet.size() == variablesTuple.size(),
+                () -> String.format(
+                        "Illegal column duplication (%s) while the query plan %s was compiled into a Rete Recipe %s",
+                        variablesTuple.stream().map(PVariable::getName).collect(Collectors.joining(",")),
+                        subPlan.toShortString(), recipe));
+    }
+    
+    public CompiledSubPlan(SubPlan subPlan, List<PVariable> variablesTuple,
+            ReteNodeRecipe recipe,
+            RecipeTraceInfo... parentRecipeTraces) {
+        this(subPlan, variablesTuple, recipe, Arrays.asList(parentRecipeTraces));
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/ParameterProjectionTrace.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/ParameterProjectionTrace.java
new file mode 100644
index 00000000..8da1e314
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/ParameterProjectionTrace.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.traceability;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+
+/**
+ * The recipe projects the finished results of a {@link PBody} onto the list of parameters.
+ * @author Bergmann Gabor
+ *
+ */
+public class ParameterProjectionTrace extends RecipeTraceInfo implements PatternTraceInfo {
+
+    public ParameterProjectionTrace(PBody body, ReteNodeRecipe recipe,
+            RecipeTraceInfo... parentRecipeTraces) {
+        this(body, recipe, Arrays.asList(parentRecipeTraces));
+    }
+
+    public ParameterProjectionTrace(PBody body, ReteNodeRecipe recipe,
+            Collection<? extends RecipeTraceInfo> parentRecipeTraces) {
+        super(recipe, parentRecipeTraces);
+        this.body = body;
+    }
+
+    PBody body;
+
+    @Override
+    public String getPatternName() {
+        return body.getPattern().getFullyQualifiedName();
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/PatternTraceInfo.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/PatternTraceInfo.java
new file mode 100644
index 00000000..fb7ef062
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/PatternTraceInfo.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.traceability;
+
+/**
+ * One kind of trace marker that merely establishes the pattern for which the node was built.
+ * @author Bergmann Gabor
+ */
+public interface PatternTraceInfo extends TraceInfo {
+    String getPatternName();            
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/PlanningTrace.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/PlanningTrace.java
new file mode 100644
index 00000000..c1cc3a69
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/PlanningTrace.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.traceability;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+
+/**
+ * A trace marker associating a Rete recipe with a query SubPlan. 
+ * 
+ * <p> The recipe may be an auxiliary node; 
+ *   see {@link CompiledSubPlan} if it represents the entire SubPlan instead.
+ */
+public class PlanningTrace extends RecipeTraceInfo implements PatternTraceInfo {
+
+    protected SubPlan subPlan;
+    protected List<PVariable> variablesTuple;
+    protected Map<PVariable, Integer> posMapping;
+
+    public PlanningTrace(SubPlan subPlan, List<PVariable> variablesTuple, 
+            ReteNodeRecipe recipe,
+            Collection<? extends RecipeTraceInfo> parentRecipeTraces) {
+        super(recipe, parentRecipeTraces);
+        this.subPlan = subPlan;
+        this.variablesTuple = variablesTuple;
+        
+        this.posMapping = new HashMap<PVariable, Integer>();
+        for (int i = 0; i < variablesTuple.size(); ++i)
+            posMapping.put(variablesTuple.get(i), i);
+    }
+
+    public PlanningTrace(SubPlan subPlan, List<PVariable> variablesTuple, 
+            ReteNodeRecipe recipe,
+            RecipeTraceInfo... parentRecipeTraces) {
+        this(subPlan, variablesTuple, recipe, Arrays.asList(parentRecipeTraces));
+    }
+
+    public SubPlan getSubPlan() {
+        return subPlan;
+    }
+
+    @Override
+    public String getPatternName() {
+        return subPlan.getBody().getPattern().getFullyQualifiedName();
+    }
+
+    public List<PVariable> getVariablesTuple() {
+        return variablesTuple;
+    }
+
+    public Map<PVariable, Integer> getPosMapping() {
+        return posMapping;
+    }
+
+    /**
+     * Returns a new clone that reinterprets the same compiled form
+     *  as the compiled form of a (potentially different) subPlan.
+     * Useful e.g. if child plan turns out to be a no-op, or when promoting a {@link PlanningTrace} to {@link CompiledSubPlan}. 
+     */
+    public CompiledSubPlan cloneFor(SubPlan newSubPlan) {
+        return new CompiledSubPlan(newSubPlan, 
+                getVariablesTuple(), 
+                getRecipe(), 
+                getParentRecipeTracesForCloning());
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/RecipeTraceInfo.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/RecipeTraceInfo.java
new file mode 100644
index 00000000..8f610550
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/RecipeTraceInfo.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.traceability;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import tools.refinery.viatra.runtime.rete.network.Node;
+import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+
+/**
+ * A trace marker that indicates the recipe for which the node was built.
+ * @author Bergmann Gabor
+ */
+public class RecipeTraceInfo implements TraceInfo {
+    public ReteNodeRecipe getRecipe() {return recipe;}
+    /**
+     * For cloning in case of recursion cut-off points, use {@link #getParentRecipeTracesForCloning()} instead.
+     * @return an unmodifiable view on parent traces, to be constructed before this node (or alongside, in case of recursion)
+     */
+    public List<RecipeTraceInfo> getParentRecipeTraces() {return Collections.unmodifiableList(new ArrayList<>(parentRecipeTraces));}
+    /**
+     * Directly return the underlying collection so that changes to it will be transparent. Use only for recursion-tolerant cloning.
+     * @noreference This method is not intended to be referenced by clients.
+     */
+    public Collection<? extends RecipeTraceInfo> getParentRecipeTracesForCloning() {return parentRecipeTraces;}
+    @Override 
+    public Node getNode() {return node;}
+    
+    private Node node;
+    ReteNodeRecipe recipe;
+    ReteNodeRecipe shadowedRecipe;
+    Collection<? extends RecipeTraceInfo> parentRecipeTraces;
+    
+    
+    public RecipeTraceInfo(ReteNodeRecipe recipe, Collection<? extends RecipeTraceInfo> parentRecipeTraces) {
+        super();
+        this.recipe = recipe;
+        this.parentRecipeTraces = parentRecipeTraces; //ParentTraceList.from(parentRecipeTraces); 
+    }
+    public RecipeTraceInfo(ReteNodeRecipe recipe, RecipeTraceInfo... parentRecipeTraces) {
+        this(recipe, Arrays.asList(parentRecipeTraces));
+    }
+    
+    @Override
+    public boolean propagateToIndexerParent() {return false;}
+    @Override
+    public boolean propagateFromIndexerToSupplierParent() {return false;}
+    @Override
+    public boolean propagateFromStandardNodeToSupplierParent() {return false;}
+    @Override
+    public boolean propagateToProductionNodeParentAlso() {return false;}
+    @Override 
+    public void assignNode(Node node) {this.node = node;}
+    
+    /**
+     * @param knownRecipe a known recipe that is equivalent to the current recipe
+     */
+    public void shadowWithEquivalentRecipe(ReteNodeRecipe knownRecipe) {
+        this.shadowedRecipe = this.recipe;
+        this.recipe = knownRecipe;
+    }
+    
+    /**
+     * Get original recipe shadowed by an equivalent
+     */
+    public ReteNodeRecipe getShadowedRecipe() {
+        return shadowedRecipe;
+    }
+    
+    
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/TraceInfo.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/TraceInfo.java
new file mode 100644
index 00000000..e1d440db
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/TraceInfo.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.traceability;
+
+import tools.refinery.viatra.runtime.rete.network.Node;
+
+
+/**
+ * Traces the node back to a purpose for which the node was built, 
+ * to explain why the node is there and what it means.
+ * @author Bergmann Gabor
+ */
+public interface TraceInfo {
+    boolean propagateToIndexerParent();
+    boolean propagateFromIndexerToSupplierParent();
+    boolean propagateFromStandardNodeToSupplierParent();        
+    boolean propagateToProductionNodeParentAlso();
+
+    void assignNode(Node node);
+    Node getNode();
+}
+// /**
+// * The semantics of the tuples contained in this node.
+// * @return a tuple of correct size representing the semantics of each position.
+// * @post not null
+// */
+// Tuple getSemantics();
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/UserRequestTrace.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/UserRequestTrace.java
new file mode 100644
index 00000000..11e4db32
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/traceability/UserRequestTrace.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.traceability;
+
+import java.util.Collection;
+
+import tools.refinery.viatra.runtime.rete.recipes.ReteNodeRecipe;
+
+//      private class AggregatorReferenceIndexTraceInfo extends RecipeTraceInfo {
+//              RecipeTraceInfo aggregatorNodeRecipeTrace;              
+//              public AggregatorReferenceIndexTraceInfo(ProjectionIndexerRecipe recipe,
+//                              RecipeTraceInfo parentRecipeTrace,
+//                              RecipeTraceInfo aggregatorNodeRecipeTrace) {
+//                      super(recipe, parentRecipeTrace);
+//                      this.aggregatorNodeRecipeTrace = aggregatorNodeRecipeTrace;
+//              }
+//              public RecipeTraceInfo getAggregatorNodeRecipeTrace() {
+//                      return aggregatorNodeRecipeTrace;
+//              }
+//      }
+public  class UserRequestTrace extends RecipeTraceInfo {
+    public UserRequestTrace(ReteNodeRecipe recipe,
+            Collection<RecipeTraceInfo> parentRecipeTraces) {
+        super(recipe, parentRecipeTraces);
+    }
+    public UserRequestTrace(ReteNodeRecipe recipe,
+            RecipeTraceInfo... parentRecipeTraces) {
+        super(recipe, parentRecipeTraces);
+    }
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/LexicographicComparator.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/LexicographicComparator.java
new file mode 100644
index 00000000..0efc50af
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/LexicographicComparator.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.util;
+
+import java.util.Comparator;
+import java.util.Iterator;
+
+/**
+ * A comparator that compares two iterables based on the lexicographic sorting induced by a comparator on elements.
+ * @author Bergmann Gabor
+ *
+ */
+public class LexicographicComparator<T> implements Comparator<Iterable<? extends T>> {
+    
+    final Comparator<T> elementComparator;
+    
+    public LexicographicComparator(Comparator<T> elementComparator) {
+        super();
+        this.elementComparator = elementComparator;
+    }
+
+    @Override
+    public int compare(Iterable<? extends T> o1, Iterable<? extends T> o2) {
+        Iterator<? extends T> it1 = o1.iterator();
+        Iterator<? extends T> it2 = o2.iterator();
+        
+        boolean has1, has2, bothHaveNext;
+        do {
+            has1 = it1.hasNext();
+            has2 = it2.hasNext();
+            bothHaveNext = has1 && has2;
+            if (bothHaveNext) {
+                T element1 = it1.next();
+                T element2 = it2.next();
+                int elementComparison = elementComparator.compare(element1, element2);
+                if (elementComparison != 0) 
+                    return elementComparison;
+            }
+        } while (bothHaveNext);
+        if (has1 && !has2) {
+            return +1;
+        } else if (!has1 && has2) {
+            return -1;
+        } else /*if (!has1 && !has2)*/ { 
+            return 0;
+        }
+    }
+
+
+
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/Options.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/Options.java
new file mode 100644
index 00000000..96cc445f
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/Options.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.util;
+
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.planning.IQueryPlannerStrategy;
+import tools.refinery.viatra.runtime.rete.construction.basiclinear.BasicLinearLayout;
+import tools.refinery.viatra.runtime.rete.construction.quasitree.QuasiTreeLayout;
+import tools.refinery.viatra.runtime.rete.network.communication.timely.TimelyCommunicationGroup;
+
+/**
+ * Feature switches.
+ * @author Gabor Bergmann
+ * @noreference
+ */
+public class Options {
+
+    public enum NodeSharingOption {
+        NEVER, // not recommended, patternmatcher leaks possible
+        INDEXER_AND_REMOTEPROXY, ALL
+    }
+
+    public static final NodeSharingOption nodeSharingOption = NodeSharingOption.ALL;
+    public static final boolean releaseOnetimeIndexers = true; // effective only
+                                                               // with
+                                                               // nodesharing
+                                                               // ==NEVER
+
+    public enum InjectivityStrategy {
+        EAGER, LAZY
+    }
+
+    public static final InjectivityStrategy injectivityStrategy = InjectivityStrategy.EAGER;
+
+    public static final boolean enableInheritance = true;
+
+    // public final static boolean useComplementerMask = true;
+
+    public static final boolean employTrivialIndexers = true;
+
+    // public final static boolean synchronous = false;
+
+    public static final int numberOfLocalContainers = 1;
+    public static final int firstFreeContainer = 0; // 0 if head container is
+                                                    // free to contain pattern
+                                                    // bodies, 1 otherwise
+
+    /**
+     * Enable for internal debugging of Rete communication scheme; 
+     *  catches cases where the topological sort is violated by a message sent "backwards"
+     * @since 1.6
+     */
+    public static final boolean MONITOR_VIOLATION_OF_RETE_NODEGROUP_TOPOLOGICAL_SORTING = false;
+    
+    /**
+     * Enable for internal debugging of message delivery in {@link TimelyCommunicationGroup}s;
+     * catches cases when there is a violation of increasing timestamps during message delivery within a group.  
+     * @since 2.3
+     */
+    public static final boolean MONITOR_VIOLATION_OF_DIFFERENTIAL_DATAFLOW_TIMESTAMPS = false;
+    
+    /**
+     * 
+     * @author Gabor Bergmann
+     * @noreference
+     */
+    public enum BuilderMethod {
+        LEGACY, // ONLY with GTASM
+        PSYSTEM_BASIC_LINEAR, PSYSTEM_QUASITREE;
+        /**
+         * @since 1.5
+         */
+        public IQueryPlannerStrategy layoutStrategy(IQueryBackendContext bContext, IQueryBackendHintProvider hintProvider) {
+            switch (this) {
+            case PSYSTEM_BASIC_LINEAR:
+                return new BasicLinearLayout(bContext);
+            case PSYSTEM_QUASITREE:
+                return new QuasiTreeLayout(bContext, hintProvider);
+            default:
+                throw new UnsupportedOperationException();
+            }
+        }
+    }
+
+    public static final BuilderMethod builderMethod =
+    // BuilderMethod.PSYSTEM_BASIC_LINEAR;
+    BuilderMethod.PSYSTEM_QUASITREE;
+    
+    public enum FunctionalDependencyOption {
+        OFF,
+        OPPORTUNISTIC
+    }
+    public static final FunctionalDependencyOption functionalDependencyOption = 
+            FunctionalDependencyOption.OPPORTUNISTIC;
+    
+    public enum PlanTrimOption {
+        OFF,
+        OPPORTUNISTIC
+    }
+    public static final PlanTrimOption planTrimOption = 
+            PlanTrimOption.OPPORTUNISTIC;
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/OrderingCompareAgent.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/OrderingCompareAgent.java
new file mode 100644
index 00000000..8b147cf6
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/OrderingCompareAgent.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.rete.util;
+
+import java.util.Comparator;
+
+/**
+ * Comparing agent for an ordering. Terminology: the "preferred" item will register as LESS.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public abstract class OrderingCompareAgent<T> {
+    protected T a;
+    protected T b;
+
+    /**
+     * @param a
+     * @param b
+     */
+    public OrderingCompareAgent(T a, T b) {
+        super();
+        this.a = a;
+        this.b = b;
+    }
+
+    int result = 0;
+
+    protected abstract void doCompare();
+
+    /**
+     * @return the result
+     */
+    public int compare() {
+        doCompare();
+        return result;
+    }
+
+    // COMPARISON HELPERS
+    protected boolean isUnknown() {
+        return result == 0;
+    }
+
+    /**
+     * @pre result == 0
+     */
+    protected boolean consider(int partial) {
+        if (isUnknown())
+            result = partial;
+        return isUnknown();
+    }
+
+    protected boolean swallowBoolean(boolean x) {
+        return x;
+    }
+
+    // PREFERENCE FUNCTIONS
+    protected static int dontCare() {
+        return 0;
+    }
+
+    protected static int preferTrue(boolean b1, boolean b2) {
+        return (b1 ^ b2) ? (b1 ? -1 : +1) : 0;
+    }
+
+    protected static int preferFalse(boolean b1, boolean b2) {
+        return (b1 ^ b2) ? (b2 ? -1 : +1) : 0;
+    }
+
+    protected static <U> int preferLess(Comparable<U> c1, U c2) {
+        return c1.compareTo(c2);
+    }
+    
+    protected static <U> int preferLess(U c1, U c2, Comparator<U> comp) {
+        return comp.compare(c1, c2);
+    }
+
+    protected static <U> int preferMore(Comparable<U> c1, U c2) {
+        return -c1.compareTo(c2);
+    }
+    protected static <U> int preferMore(U c1, U c2, Comparator<U> comp) {
+        return -comp.compare(c1, c2);
+    }
+
+}
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/ReteHintOptions.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/ReteHintOptions.java
new file mode 100644
index 00000000..6e685253
--- /dev/null
+++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/util/ReteHintOptions.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.rete.util;
+
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.backend.QueryHintOption;
+import tools.refinery.viatra.runtime.rete.matcher.DRedReteBackendFactory;
+
+/**
+ * Provides key objects (of type {@link QueryHintOption}) for {@link QueryEvaluationHint}s.
+ * @author Gabor Bergmann
+ * @since 1.5
+ */
+public final class ReteHintOptions {
+
+    private ReteHintOptions() {/*Utility class constructor*/}
+    
+    public static final QueryHintOption<Boolean> useDiscriminatorDispatchersForConstantFiltering = 
+            hintOption("useDiscriminatorDispatchersForConstantFiltering", true);
+    
+    public static final QueryHintOption<Boolean> prioritizeConstantFiltering = 
+            hintOption("prioritizeConstantFiltering", true);
+
+    public static final QueryHintOption<Boolean> cacheOutputOfEvaluatorsByDefault = 
+            hintOption("cacheOutputOfEvaluatorsByDefault", true);
+    
+    /**
+     * The incremental query evaluator backend can evaluate recursive patterns. 
+     * However, by default, instance models that contain cycles are not supported with recursive queries 
+     * and can lead to incorrect query results. 
+     * Enabling Delete And Rederive (DRED) mode guarantees that recursive query evaluation leads to correct results in these cases as well.
+     *  
+     * <p> As DRED may diminish the performance of incremental maintenance, it is not enabled by default.
+     * @since 1.6
+     * @deprecated Use {@link DRedReteBackendFactory} instead of setting this option to true. 
+     */
+    @Deprecated
+    public static final QueryHintOption<Boolean> deleteRederiveEvaluation = 
+            hintOption("deleteRederiveEvaluation", false);
+    
+    /**
+     * This hint allows the query planner to take advantage of "weakened alternative" suggestions of the meta context.
+     * For instance, enumerable unary type constraints may be substituted with a simple type filtering where sufficient.
+     * 
+     * @since 1.6
+     */
+    public static final QueryHintOption<Boolean> expandWeakenedAlternativeConstraints =
+            hintOption("expandWeakenedAlternativeConstraints", true);
+   
+    // internal helper for conciseness
+    private static <T> QueryHintOption<T> hintOption(String hintKeyLocalName, T defaultValue) {
+        return new QueryHintOption<>(ReteHintOptions.class, hintKeyLocalName, defaultValue);
+    }
+}
diff --git a/subprojects/viatra-runtime/about.html b/subprojects/viatra-runtime/about.html
new file mode 100644
index 00000000..d1d5593a
--- /dev/null
+++ b/subprojects/viatra-runtime/about.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<!--
+  Copyright (c) 2017, Eclipse.org Foundation, Inc.
+
+  SPDX-License-Identifier: LicenseRef-EPL-Steward
+-->
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>March 18, 2019</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v20.php">http://www.eclipse.org/legal/epl-v20.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+</body>
+</html>
diff --git a/subprojects/viatra-runtime/build.gradle.kts b/subprojects/viatra-runtime/build.gradle.kts
new file mode 100644
index 00000000..c4bd9129
--- /dev/null
+++ b/subprojects/viatra-runtime/build.gradle.kts
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+plugins {
+        id("tools.refinery.gradle.java-library")
+}
+
+dependencies {
+        implementation(libs.slf4j.log4j)
+        implementation(libs.eclipseCollections)
+        implementation(libs.eclipseCollections.api)
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/CancellationToken.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/CancellationToken.java
new file mode 100644
index 00000000..a2ae41e3
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/CancellationToken.java
@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.viatra.runtime;
+
+@FunctionalInterface
+public interface CancellationToken {
+        CancellationToken NONE = () -> {};
+
+        void checkCancelled();
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/AdvancedViatraQueryEngine.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/AdvancedViatraQueryEngine.java
new file mode 100644
index 00000000..32a3430d
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/AdvancedViatraQueryEngine.java
@@ -0,0 +1,363 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api;
+
+import tools.refinery.viatra.runtime.api.scope.QueryScope;
+import tools.refinery.viatra.runtime.internal.apiimpl.ViatraQueryEngineImpl;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.backend.*;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.Callable;
+
+/**
+ * Advanced interface to a VIATRA incremental evaluation engine.
+ *
+ * <p>
+ * You can create a new, private, unmanaged {@link AdvancedViatraQueryEngine} instance using
+ * {@link #createUnmanagedEngine(QueryScope)}. Additionally, you can access the advanced interface on any
+ * {@link ViatraQueryEngine} by {@link AdvancedViatraQueryEngine#from(ViatraQueryEngine)}.
+ *
+ * <p>
+ * While the default interface {@link ViatraQueryEngine}, is suitable for most users, this advanced interface provides more
+ * control over the engine. The most important added functionality is the following:
+ * <ul>
+ * <li>You can have tighter control over the lifecycle of the engine, if you create a private, unmanaged engine
+ * instance. For instance, a (non-managed) engine can be disposed in order to detach from the EMF model and stop
+ * listening on update notifications. The indexes built previously in the engine can then be garbage collected, even if
+ * the model itself is retained. Total lifecycle control is only available for private, unmanaged engines (created using
+ * {@link #createUnmanagedEngine(QueryScope)}); a managed engine (obtained via {@link ViatraQueryEngine#on(QueryScope)}) is
+ * shared among clients and can not be disposed or wiped.
+ * <li>You can add and remove listeners to receive notification when the model or the match sets change.
+ * <li>You can add and remove listeners to receive notification on engine lifecycle events, such as creation of new
+ * matchers. For instance, if you explicitly share a private, unmanaged engine between multiple sites, you should
+ * register a callback using {@link #addLifecycleListener(ViatraQueryEngineLifecycleListener)} to learn when another client
+ * has called the destructive methods {@link #dispose()} or {@link #wipe()}.
+ * </ul>
+ *
+ * @author Bergmann Gabor
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public abstract class AdvancedViatraQueryEngine extends ViatraQueryEngine {
+
+    /**
+     * Creates a new unmanaged VIATRA Query engine to evaluate queries over a given scope specified by an {@link QueryScope}.
+     *
+     * <p> Repeated invocations will return different instances, so other clients are unable to independently access
+     * and influence the returned engine. Note that unmanaged engines do not benefit from some performance improvements
+     * that stem from sharing incrementally maintained indices and caches between multiple clients using the same managed
+     * engine instance.
+     *
+     * <p>
+     * Client is responsible for the lifecycle of the returned engine, hence the usage of the advanced interface
+     * {@link AdvancedViatraQueryEngine}.
+     *
+     * <p>
+     * The match set of any patterns will be incrementally refreshed upon updates from this scope.
+     *
+     * @param scope
+     *          the scope of query evaluation; the definition of the set of model elements that this engine is operates on.
+     *          Provide e.g. a {@link EMFScope} for evaluating queries on an EMF model.
+     * @return the advanced interface to a newly created unmanaged engine
+     * @since 0.9
+     */
+    public static AdvancedViatraQueryEngine createUnmanagedEngine(QueryScope scope) {
+        return new ViatraQueryEngineImpl(null, scope);
+    }
+
+    /**
+     * Creates a new unmanaged VIATRA Query engine to evaluate queries over a given scope specified by an {@link QueryScope}.
+     *
+     * <p> Repeated invocations will return different instances, so other clients are unable to independently access
+     * and influence the returned engine. Note that unmanaged engines do not benefit from some performance improvements
+     * that stem from sharing incrementally maintained indices and caches between multiple clients using the same managed
+     * engine instance.
+     *
+     * <p>
+     * Client is responsible for the lifecycle of the returned engine, hence the usage of the advanced interface
+     * {@link AdvancedViatraQueryEngine}.
+     *
+     * <p>
+     * The match set of any patterns will be incrementally refreshed upon updates from this scope.
+     *
+     * @param scope
+     *      the scope of query evaluation; the definition of the set of model elements that this engine is operates on.
+     *      Provide e.g. a {@link EMFScope} for evaluating queries on an EMF model.
+     * @return the advanced interface to a newly created unmanaged engine
+     * @since 1.4
+     */
+    public static AdvancedViatraQueryEngine createUnmanagedEngine(QueryScope scope, ViatraQueryEngineOptions options) {
+        return new ViatraQueryEngineImpl(null, scope, options);
+    }
+
+    /**
+     * Provides access to a given existing engine through the advanced interface.
+     *
+     * <p>
+     * Caveat: if the referenced engine is managed (i.e. created via {@link ViatraQueryEngine#on(QueryScope)}), the advanced
+     * methods {@link #dispose()} and {@link #wipe()} will not be allowed.
+     *
+     * @param engine
+     *            the engine to access using the advanced interface
+     * @return a reference to the same engine conforming to the advanced interface
+     */
+    public static AdvancedViatraQueryEngine from(ViatraQueryEngine engine) {
+        return (AdvancedViatraQueryEngine) engine;
+    }
+
+    /**
+     * Add an engine lifecycle listener to this engine instance.
+     *
+     * @param listener
+     *            the {@link ViatraQueryEngineLifecycleListener} that should listen to lifecycle events from this engine
+     */
+    public abstract void addLifecycleListener(ViatraQueryEngineLifecycleListener listener);
+
+    /**
+     * Remove an existing lifecycle listener from this engine instance.
+     *
+     * @param listener
+     *            the {@link ViatraQueryEngineLifecycleListener} that should not listen to lifecycle events from this
+     *            engine anymore
+     */
+    public abstract void removeLifecycleListener(ViatraQueryEngineLifecycleListener listener);
+
+    /**
+     * Add an model update event listener to this engine instance (that fires its callbacks according to its
+     * notification level).
+     *
+     * @param listener
+     *            the {@link ViatraQueryModelUpdateListener} that should listen to model update events from this engine.
+     */
+    public abstract void addModelUpdateListener(ViatraQueryModelUpdateListener listener);
+
+    /**
+     * Remove an existing model update event listener to this engine instance.
+     *
+     * @param listener
+     *            the {@link ViatraQueryModelUpdateListener} that should not listen to model update events from this engine
+     *            anymore
+     */
+    public abstract void removeModelUpdateListener(ViatraQueryModelUpdateListener listener);
+
+    /**
+     * Registers low-level callbacks for match appearance and disappearance on this pattern matcher.
+     *
+     * <p>
+     * <b>Caution: </b> This is a low-level callback that is invoked when the pattern matcher is not necessarily in a
+     * consistent state yet. Importantly, no model modification permitted during the callback. Most users should use the
+     * databinding support ({@link org.eclipse.viatra.addon.databinding.runtime.api.ViatraObservables ViatraObservables}) or the event-driven API
+     * ({@link org.eclipse.viatra.transformation.evm.api.EventDrivenVM EventDrivenVM}) instead.
+     *
+     * <p>
+     * Performance note: expected to be much more efficient than polling at {@link #addCallbackAfterUpdates(Runnable)},
+     * but prone to "signal hazards", e.g. spurious match appearances that will disappear immediately afterwards.
+     *
+     * <p>
+     * The callback can be unregistered via {@link #removeCallbackOnMatchUpdate(IMatchUpdateListener)}.
+     *
+     * @param fireNow
+     *            if true, appearCallback will be immediately invoked on all current matches as a one-time effect. See
+     *            also {@link ViatraQueryMatcher#forEachMatch(IMatchProcessor)}.
+     * @param listener
+     *            the listener that will be notified of each new match that appears or disappears, starting from now.
+     * @param matcher
+     *            the {@link ViatraQueryMatcher} for which this listener should be active
+     */
+    public abstract <Match extends IPatternMatch> void addMatchUpdateListener(ViatraQueryMatcher<Match> matcher,
+            IMatchUpdateListener<? super Match> listener, boolean fireNow);
+
+    /**
+     * Remove an existing match update event listener to this engine instance.
+     *
+     * @param matcher
+     *            the {@link ViatraQueryMatcher} for which this listener should not be active anymore
+     * @param listener
+     *            the {@link IMatchUpdateListener} that should not receive the callbacks anymore
+     */
+    public abstract <Match extends IPatternMatch> void removeMatchUpdateListener(ViatraQueryMatcher<Match> matcher,
+            IMatchUpdateListener<? super Match> listener);
+
+
+    /**
+     * Access a pattern matcher based on a {@link IQuerySpecification}, overriding some of the default query evaluation hints.
+     * Multiple calls may return the same matcher depending on the actual evaluation hints.
+     *
+     * <p> It is guaranteed that this method will always return a matcher instance which is functionally compatible
+     *   with the requested functionality (see {@link IMatcherCapability}).
+     *   Otherwise, the query evaluator is free to ignore any hints.
+     *
+     * <p> For stateful query backends (Rete), hints may be effective only the first time a matcher is created.
+     * @param querySpecification a {@link IQuerySpecification} that describes a VIATRA query
+     * @return a pattern matcher corresponding to the specification
+     * @param optionalEvaluationHints additional / overriding options on query evaluation; passing null means default options associated with the query
+     * @throws ViatraQueryRuntimeException if the matcher could not be initialized
+     * @since 0.9
+     */
+    public abstract <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getMatcher(
+            IQuerySpecification<Matcher> querySpecification,
+            QueryEvaluationHint optionalEvaluationHints);
+
+    /**
+     * Initializes matchers for a group of patterns as one step (optionally overriding some of the default query evaluation hints).
+     * If some of the pattern matchers are already
+     * constructed in the engine, no task is performed for them.
+     *
+     * <p>
+     * This preparation step has the advantage that it prepares pattern matchers for an arbitrary number of patterns in a
+     * single-pass traversal of the model.
+     * This is typically more efficient than traversing the model each time an individual pattern matcher is initialized on demand.
+     * The performance benefit only manifests itself if the engine is not in wildcard mode.
+     *
+     * @param queryGroup a {@link IQueryGroup} identifying a set of VIATRA queries
+     * @param optionalEvaluationHints additional / overriding options on query evaluation; passing null means default options associated with each query
+     * @throws ViatraQueryRuntimeException
+     *             if there was an error in preparing the engine
+     * @since 0.9
+     */
+    public abstract void prepareGroup(IQueryGroup queryGroup, QueryEvaluationHint optionalEvaluationHints);
+
+    /**
+     * Indicates whether the engine is managed, i.e. the default engine assigned to the given scope root by
+     * {@link ViatraQueryEngine#on(QueryScope)}.
+     *
+     * <p>
+     * If the engine is managed, there may be other clients using it, as all calls to
+     * {@link ViatraQueryEngine#on(QueryScope)} return the same managed engine instance for a given scope root. Therefore the
+     * destructive methods {@link #wipe()} and {@link #dispose()} are not allowed.
+     *
+     * <p>
+     * On the other hand, if the engine is unmanaged (i.e. a private instance created using
+     * {@link #createUnmanagedEngine(QueryScope)}), then {@link #wipe()} and {@link #dispose()} can be called. If you
+     * explicitly share a private, unmanaged engine between multiple sites, register a callback using
+     * {@link #addLifecycleListener(ViatraQueryEngineLifecycleListener)} to learn when another client has called these
+     * destructive methods.
+     *
+     * @return true if the engine is managed, and therefore potentially shared with other clients querying the same EMF
+     *         model
+     */
+    public abstract boolean isManaged();
+
+    /**
+     * Indicates whether the engine is in a tainted, inconsistent state due to some internal errors. If true, results
+     * are no longer reliable; engine should be disposed.
+     *
+     * <p>
+     * The engine is in a tainted state if any of its internal processes report back a fatal error. The
+     * {@link ViatraQueryEngineLifecycleListener} interface provides a callback method for entering the tainted state.
+     *
+     * @return the tainted state
+     */
+    public abstract boolean isTainted();
+
+    /**
+     * Discards any pattern matcher caches and forgets known patterns. The base index built directly on the underlying
+     * EMF model, however, is kept in memory to allow reuse when new pattern matchers are built. Use this method if you
+     * have e.g. new versions of the same patterns, to be matched on the same model.
+     *
+     * <p>
+     * Matcher objects will continue to return stale results. If no references are retained to the matchers, they can
+     * eventually be GC'ed.
+     * <p>
+     * Disallowed if the engine is managed (see {@link #isManaged()}), as there may be other clients using it.
+     * <p>
+     * If you explicitly share a private, unmanaged engine between multiple sites, register a callback using
+     * {@link #addLifecycleListener(ViatraQueryEngineLifecycleListener)} to learn when another client has called this
+     * destructive method.
+     *
+     * @throws UnsupportedOperationException
+     *             if engine is managed
+     */
+    public abstract void wipe();
+
+    /**
+     * Completely disconnects and dismantles the engine. Cannot be reversed.
+     * <p>
+     * Matcher objects will continue to return stale results. If no references are retained to the matchers or the
+     * engine, they can eventually be GC'ed, and they won't block the EMF model from being GC'ed anymore.
+     * <p>
+     * The base indexer (see {@link #getBaseIndex()}) built on the model will be disposed alongside the engine, unless
+     * the user has manually added listeners on the base index that were not removed yet.
+     * <p>
+     * Disallowed if the engine is managed (see {@link #isManaged()}), as there may be other clients using it.
+     * <p>
+     * If you explicitly share a private, unmanaged engine between multiple sites, register a callback using
+     * {@link #addLifecycleListener(ViatraQueryEngineLifecycleListener)} to learn when another client has called this
+     * destructive method.
+     *
+     * @throws UnsupportedOperationException
+     *             if engine is managed
+     */
+    public abstract void dispose();
+
+    /**
+     * Provides access to the selected query backend component of the VIATRA Query engine.
+     * @noreference for internal use only
+     * @throws ViatraQueryRuntimeException
+     */
+    public abstract IQueryBackend getQueryBackend(IQueryBackendFactory iQueryBackendFactory);
+
+    /**
+     * Access an existing pattern matcher based on a {@link IQuerySpecification}, and optional hints override.
+     * @param querySpecification a {@link IQuerySpecification} that describes a VIATRA query specification
+     * @param optionalOverrideHints a {@link QueryEvaluationHint} that may override the pattern hints (can be null)
+     * @return a pattern matcher corresponding to the specification, <code>null</code> if a matcher does not exist yet.
+     * @since 1.4
+     */
+    public abstract <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getExistingMatcher(IQuerySpecification<Matcher> querySpecification, QueryEvaluationHint optionalOverrideHints);
+
+    /**
+     * Returns the immutable {@link ViatraQueryEngineOptions} of the engine.
+     *
+     * @return the engine options
+     * @since 1.4
+     */
+    public abstract ViatraQueryEngineOptions getEngineOptions();
+
+    /**
+     * Return the underlying result provider for the given matcher.
+     *
+     * @beta This method may change in future versions
+     * @since 1.4
+     * @noreference This method is considered internal API
+     */
+    public abstract IQueryResultProvider getResultProviderOfMatcher(ViatraQueryMatcher<? extends IPatternMatch> matcher);
+
+    /**
+     * The given callable will be executed, and all update propagation in stateful query backends
+     * will be delayed until the execution is done. Within the callback, these backends will provide stale results.
+     *
+     * <p> It is optional for a {@link IQueryBackend} to support the delaying of update propagation; stateless backends will display up-to-date results.
+     * In this case, the given callable shall be executed, and the update propagation shall happen just like in non-delayed execution.
+     *
+     * <p> Example: in the Rete network, no messages will be propagated until the given callable is executed.
+     * After the execution of the callable, all accumulated messages will be delivered.
+     *
+     * <p> The purpose of this method is that stateful query backends may save work when multiple model modifications are performed within the callback that partially cancel each other out.
+     *
+     * @param callable the callable to be executed
+     * @return the result of the callable
+     * @since 1.6
+     */
+    public abstract <V> V delayUpdatePropagation(Callable<V> callable) throws InvocationTargetException;
+
+    /**
+     * Returns true if the update propagation in this engine is currently delayed, false otherwise.
+     *
+     * @see {@link #delayUpdatePropagation(Callable)}
+     * @since 1.6
+     */
+    public abstract boolean isUpdatePropagationDelayed();
+
+    /**
+     * Returns true if the {@link #dispose()} method was called on this engine previously.
+     * @since 2.0
+     */
+    public abstract boolean isDisposed();
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericPatternMatch.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericPatternMatch.java
new file mode 100644
index 00000000..b4de2b70
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericPatternMatch.java
@@ -0,0 +1,166 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.api;
+
+import java.util.Arrays;
+
+import tools.refinery.viatra.runtime.api.impl.BasePatternMatch;
+
+/**
+ * Generic signature object implementation. 
+ *
+ * See also the generated matcher and signature of the pattern, with pattern-specific API simplifications.
+ *
+ * @author Bergmann Gábor
+ * @since 0.9
+ *
+ */
+public abstract class GenericPatternMatch extends BasePatternMatch {
+
+    private final GenericQuerySpecification<? extends GenericPatternMatcher> specification;
+    private final Object[] array;
+
+    private GenericPatternMatch(GenericQuerySpecification<? extends GenericPatternMatcher> specification, Object[] array) {
+        super();
+        this.specification = specification;
+        this.array = array;
+    }
+
+    @Override
+    public Object get(String parameterName) {
+        Integer index = specification.getPositionOfParameter(parameterName);
+        return index == null ? null : array[index];
+    }
+
+    @Override
+    public Object get(int position) {
+        return array[position];
+    }
+
+    @Override
+    public boolean set(String parameterName, Object newValue) {
+        if (!isMutable()) throw new UnsupportedOperationException();
+        Integer index = specification.getPositionOfParameter(parameterName);
+        if (index == null)
+            return false;
+        array[index] = newValue;
+        return true;
+    }
+
+    @Override
+    public Object[] toArray() {
+        return Arrays.copyOf(array, array.length);
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        for (int i = 0; i < array.length; ++i)
+            result = prime * result + ((array[i] == null) ? 0 : array[i].hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!(obj instanceof GenericPatternMatch)) { // this should be infrequent
+            if (obj == null)
+                return false;
+            if (!(obj instanceof IPatternMatch))
+                return false;
+            IPatternMatch other = (IPatternMatch) obj;
+            if (!specification().equals(other.specification()))
+                return false;
+            return Arrays.deepEquals(array, other.toArray());
+        }
+        final GenericPatternMatch other = (GenericPatternMatch) obj;
+        return specification().equals(other.specification()) && Arrays.deepEquals(array, other.array);
+    }
+
+    @Override
+    public String prettyPrint() {
+        StringBuilder result = new StringBuilder();
+        for (int i = 0; i < array.length; ++i) {
+            if (i != 0)
+                result.append(", ");
+            result.append("\"" + parameterNames().get(i) + "\"=" + prettyPrintValue(array[i]));
+        }
+        return result.toString();
+    }
+
+    @Override
+    public GenericQuerySpecification<? extends GenericPatternMatcher> specification() {
+        return specification;
+    }
+    
+    /**
+     * Returns an empty, mutable match. 
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input. 
+     * 
+     * @return the empty match
+     */
+    public static GenericPatternMatch newEmptyMatch(GenericQuerySpecification<? extends GenericPatternMatcher> specification) {
+        return new Mutable(specification, new Object[specification.getParameters().size()]);
+    }
+
+    /**
+     * Returns a mutable (partial) match. 
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input. 
+     * 
+     * @param parameters
+     *            the fixed value of pattern parameters, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     */
+    public static GenericPatternMatch newMutableMatch(GenericQuerySpecification<? extends GenericPatternMatcher> specification, Object... parameters) {
+        return new Mutable(specification, parameters);
+    }
+
+    /**
+     * Returns a new (partial) match. 
+     * This can be used e.g. to call the matcher with a partial match. 
+     * 
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch(GenericQuerySpecification)} to obtain a mutable match object.
+     * 
+     * @param parameters
+     *            the fixed value of pattern parameters, or null if not bound.
+     * @return the (partial) match object.
+     */
+    public static GenericPatternMatch newMatch(GenericQuerySpecification<? extends GenericPatternMatcher> specification, Object... parameters) {
+        return new Immutable(specification, Arrays.copyOf(parameters, parameters.length));
+    }
+    
+    @Override
+    public IPatternMatch toImmutable() {
+        return isMutable() ? newMatch(specification, array) : this;
+    }
+
+    static final class Mutable extends GenericPatternMatch {
+        Mutable(GenericQuerySpecification<? extends GenericPatternMatcher> specification, Object[] array) {
+            super(specification, array);
+        }
+
+        @Override
+        public boolean isMutable() {
+            return true;
+        }
+    }
+    static final class Immutable extends GenericPatternMatch {
+        Immutable(GenericQuerySpecification<? extends GenericPatternMatcher> specification, Object[] array) {
+            super(specification, array);
+        }
+
+        @Override
+        public boolean isMutable() {
+            return false;
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericPatternMatcher.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericPatternMatcher.java
new file mode 100644
index 00000000..9a3fbb44
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericPatternMatcher.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.api;
+
+import tools.refinery.viatra.runtime.api.impl.BaseMatcher;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * This is a generic pattern matcher for any VIATRA pattern, with "interpretative" query execution.
+ * To use the pattern matcher on a given model, obtain a {@link GenericQuerySpecification} first, then 
+ * invoke e.g. {@link GenericQuerySpecification#getMatcher(ViatraQueryEngine)}.
+ * in conjunction with {@link ViatraQueryEngine#on(tools.refinery.viatra.runtime.api.scope.QueryScope)}.
+ * <p>
+ * Whenever available, consider using the pattern-specific generated matcher API instead.
+ * 
+ * <p>
+ * Matches of the pattern will be represented as {@link GenericPatternMatch}.
+ * 
+ * @author Bergmann Gábor
+ * @see GenericPatternMatch
+ * @see GenericMatchProcessor
+ * @see GenericQuerySpecification
+ * @since 0.9
+ */
+public class GenericPatternMatcher extends BaseMatcher<GenericPatternMatch> {
+    
+    /**
+     * @since 1.4
+     */
+    public GenericPatternMatcher(GenericQuerySpecification<? extends GenericPatternMatcher> specification) {
+        super(specification);
+    }
+
+    @Override
+    public GenericPatternMatch arrayToMatch(Object[] parameters) {
+        return GenericPatternMatch.newMatch(getSpecification(), parameters);
+    }
+    
+    @Override
+    public GenericPatternMatch arrayToMatchMutable(Object[] parameters) {
+        return GenericPatternMatch.newMutableMatch(getSpecification(), parameters);
+    }
+
+    @Override
+    protected GenericPatternMatch tupleToMatch(Tuple t) {
+        return new GenericPatternMatch.Immutable(getSpecification(), /*avoid re-cloning*/t.getElements());
+    }
+    
+    @SuppressWarnings("unchecked")
+    @Override
+    public GenericQuerySpecification<? extends GenericPatternMatcher> getSpecification() {
+        return (GenericQuerySpecification<? extends GenericPatternMatcher>)querySpecification;
+    }
+
+    /**
+     * Internal method for {@link GenericQuerySpecification}
+     * @noreference
+     */
+    static <Matcher extends GenericPatternMatcher> GenericPatternMatcher instantiate(GenericQuerySpecification<Matcher> querySpecification) {
+        return new GenericPatternMatcher(querySpecification);
+    }
+  
+    /**
+     * Internal method for {@link GenericQuerySpecification}
+     * @noreference
+     */
+    static <Matcher extends GenericPatternMatcher> GenericPatternMatcher instantiate(ViatraQueryEngine engine, GenericQuerySpecification<Matcher> querySpecification) {
+        // check if matcher already exists
+        GenericPatternMatcher matcher = engine.getExistingMatcher(querySpecification);
+        if (matcher == null) {
+            matcher = engine.getMatcher(querySpecification);
+        }       
+        return matcher;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericQueryGroup.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericQueryGroup.java
new file mode 100644
index 00000000..a5661bc9
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericQueryGroup.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Mark Czotter, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.api.impl.BaseQueryGroup;
+
+/**
+ * Generic implementation of {@link IQueryGroup}, covering an arbitrarily chosen set of patterns. Use the public
+ * constructor or static GenericQueryGroup.of(...) methods to instantiate.
+ * 
+ * @author Mark Czotter
+ * 
+ */
+public class GenericQueryGroup extends BaseQueryGroup {
+
+    private final Set<IQuerySpecification<?>> patterns;
+
+    /**
+     * Creates a GenericQueryGroup object with a set of patterns.
+     * 
+     * @param patterns
+     */
+    public GenericQueryGroup(Set<IQuerySpecification<?>> patterns) {
+        this.patterns = patterns;
+    }
+
+    @Override
+    public Set<IQuerySpecification<?>> getSpecifications() {
+        return patterns;
+    }
+
+    /**
+     * Creates a generic {@link IQueryGroup} instance from {@link IQuerySpecification} objects.
+     * 
+     * @since 2.0
+     */
+    public static IQueryGroup of(Stream<IQuerySpecification<?>> querySpecifications) {
+        return new GenericQueryGroup(querySpecifications.collect(Collectors.toSet()));
+    }
+    
+    /**
+     * Creates a generic {@link IQueryGroup} instance from {@link IQuerySpecification} objects.
+     * 
+     * @param querySpecifications
+     */
+    public static IQueryGroup of(Set<IQuerySpecification<?>> querySpecifications) {
+        return new GenericQueryGroup(querySpecifications);
+    }
+
+    /**
+     * Creates a generic {@link IQueryGroup} instance from {@link IQuerySpecification} objects.
+     * 
+     * @param querySpecifications
+     */
+    public static IQueryGroup of(IQuerySpecification<?>... querySpecifications) {
+        return of(new HashSet<IQuerySpecification<?>>(Arrays.asList(querySpecifications)));
+    }
+
+    /**
+     * Creates a generic {@link IQueryGroup} instance from other {@link IQueryGroup} objects (subgroups).
+     * 
+     */
+    public static IQueryGroup of(IQueryGroup... subGroups) {
+        Set<IQuerySpecification<?>> patterns = new HashSet<IQuerySpecification<?>>();
+        for (IQueryGroup group : subGroups) {
+            patterns.addAll(group.getSpecifications());
+        }
+        return new GenericQueryGroup(patterns);
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericQuerySpecification.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericQuerySpecification.java
new file mode 100644
index 00000000..5681ac19
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/GenericQuerySpecification.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api;
+
+import tools.refinery.viatra.runtime.api.impl.BaseQuerySpecification;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PVisibility;
+
+/**
+ * This is a generic query specification for VIATRA pattern matchers, for "interpretative" query execution. 
+ * Should be subclassed by query specification implementations specific to query languages.
+ *
+ * <p>
+ * When available, consider using the pattern-specific generated matcher API instead.
+ *
+ * <p>
+ * The created matcher will be of type {@link GenericPatternMatcher}. Matches of the pattern will be represented as
+ * {@link GenericPatternMatch}.
+ * 
+ * <p>
+ * Note for overriding (if you have your own query language or ): 
+ * Derived classes should use {@link #defaultInstantiate(ViatraQueryEngine)} for implementing 
+ * {@link #instantiate(ViatraQueryEngine)} if they use {@link GenericPatternMatcher} proper.
+ *
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * @see GenericMatchProcessor
+ * @author Bergmann Gábor
+ * @noinstantiate This class is not intended to be instantiated by end-users.
+ * @since 0.9
+ */
+public abstract class GenericQuerySpecification<Matcher extends GenericPatternMatcher> extends
+        BaseQuerySpecification<Matcher> {
+
+    /**
+     * Instantiates query specification for the given internal query representation.
+     */
+    public GenericQuerySpecification(PQuery wrappedPQuery) {
+        super(wrappedPQuery);
+    }
+
+    @Override
+    public GenericPatternMatch newEmptyMatch() {
+        return GenericPatternMatch.newEmptyMatch(this);
+    }
+
+    @Override
+    public GenericPatternMatch newMatch(Object... parameters) {
+        return GenericPatternMatch.newMatch(this, parameters);
+    }
+
+    /**
+     * Derived classes should use this implementation of {@link #instantiate(ViatraQueryEngine)} 
+     * if they use {@link GenericPatternMatcher} proper.
+     * @throws ViatraQueryRuntimeException
+     */
+    protected GenericPatternMatcher defaultInstantiate(ViatraQueryEngine engine) {
+        return GenericPatternMatcher.instantiate(engine, this);
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public PVisibility getVisibility() {
+        return getInternalQueryRepresentation().getVisibility();
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IMatchUpdateListener.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IMatchUpdateListener.java
new file mode 100644
index 00000000..23c64537
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IMatchUpdateListener.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api;
+
+/**
+ * An interface for low-level notifications about match appearance and disappearance.
+ * 
+ * <p>
+ * See {@link ViatraQueryMatcher#addCallbackOnMatchUpdate(IMatchUpdateListener, boolean)} for usage. Clients should
+ * consider using {@link MatchUpdateAdapter} or deriving their implementation from it.
+ * 
+ * @author Bergmann Gabor
+ * 
+ */
+public interface IMatchUpdateListener<Match extends IPatternMatch> {
+    /**
+     * Will be invoked on each new match that appears.
+     * 
+     * @param match
+     *            the match that has just appeared.
+     */
+    public void notifyAppearance(Match match);
+
+    /**
+     * Will be invoked on each existing match that disappears.
+     * 
+     * @param match
+     *            the match that has just disappeared.
+     */
+    public void notifyDisappearance(Match match);
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IPatternMatch.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IPatternMatch.java
new file mode 100644
index 00000000..be6467cc
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IPatternMatch.java
@@ -0,0 +1,107 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.api;
+
+import java.util.List;
+
+/**
+ * Generic interface for a single match of a pattern. Each instance is a (partial) substitution of pattern parameters,
+ * essentially a parameter to value mapping.
+ * 
+ * <p>Can also represent a partial match; unsubstituted parameters are assigned to null. Pattern matchers must never return
+ * a partial match, but they accept partial matches as method parameters.
+ * 
+ * @author Bergmann Gábor
+ */
+public interface IPatternMatch extends Cloneable /* , Map<String, Object> */{
+    /** @return the pattern for which this is a match. */
+    public IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> specification();
+
+    /** Identifies the name of the pattern for which this is a match. */
+    public String patternName();
+
+    /** Returns the list of symbolic parameter names. */
+    public List<String> parameterNames();
+
+    /** Returns the value of the parameter with the given name, or null if name is invalid. */
+    public Object get(String parameterName);
+
+    /** Returns the value of the parameter at the given position, or null if position is invalid. */
+    public Object get(int position);
+
+    /**
+     * Sets the parameter with the given name to the given value.
+     * 
+     * <p> Works only if match is mutable. See {@link #isMutable()}.
+     * 
+     * @returns true if successful, false if parameter name is invalid. May also fail and return false if the value type
+     *          is incompatible.
+     * @throws UnsupportedOperationException if match is not mutable.
+     */
+    public boolean set(String parameterName, Object newValue);
+
+    /**
+     * Sets the parameter at the given position to the given value.
+     * 
+     * <p> Works only if match is mutable. See {@link #isMutable()}.
+     * 
+     * @returns true if successful, false if position is invalid. May also fail and return false if the value type is
+     *          incompatible.
+     * @throws UnsupportedOperationException if match is not mutable.
+     */
+    public boolean set(int position, Object newValue);
+
+    /**
+     * Returns whether the match object can be further modified after its creation. Setters work only if the match is mutable. 
+     * 
+     * <p>Matches computed by the pattern matchers are not mutable, so that the match set cannot be modified externally. 
+     * Partial matches used as matcher input, however, can be mutable; such match objects can be created using {@link ViatraQueryMatcher#newEmptyMatch()}. 
+     * 
+     * @return whether the match can be modified
+     */
+    public boolean isMutable();
+    
+    /** 
+     * Converts the match to an array representation, with each pattern parameter at their respective position. 
+     * In case of a partial match, unsubstituted parameters will be represented as null elements in the array. 
+     *
+     * @return a newly constructed array containing each parameter substitution of the match in order.
+     */
+    public Object[] toArray();
+    
+    /**
+     * Takes an immutable snapshot of this match.
+     * @return the match itself in case of immutable matches, an immutable copy in case of mutable ones.
+     */
+    public IPatternMatch toImmutable();
+    
+    /** Prints the list of parameter-value pairs. */
+    public String prettyPrint();
+    
+    /**
+     * Checks that this match is compatible with the given other match.
+     * This is used for filtering the match set of a matcher.
+     * 
+     * <p/> Two non-null matches are compatible if and only if:
+     * <ul>
+     *   <li>They share the same pattern.</li>
+     *   <li>For each parameter, where they are set (non-null) in both matches,
+     *    their values are equal.</li>
+     *   </li>  
+     * </ul>
+     * 
+     * <p/> Furthermore, all matches are considered compatible with
+     *  null matches (e.g. empty filter).
+     * 
+     * @param other
+     * @return true, if this is compatible with other, or other is null
+     */
+    public boolean isCompatibleWith(IPatternMatch other);
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IQueryGroup.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IQueryGroup.java
new file mode 100644
index 00000000..a783f823
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IQueryGroup.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Mark Czotter, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api;
+
+import java.util.Set;
+
+/**
+ * Generic interface for group of query specifications.
+ * 
+ * <p>It handles more than one patterns as a group, and provides functionality to initialize the matchers together (which
+ * has performance benefits).
+ * 
+ * @author Mark Czotter
+ * 
+ */
+public interface IQueryGroup {
+
+    /**
+     * Initializes matchers for the group of patterns within an {@link ViatraQueryEngine}. If some of the pattern matchers are already
+     * constructed in the engine, no task is performed for them.
+     * 
+     * <p>
+     * This preparation step has the advantage that it prepares pattern matchers for an arbitrary number of patterns in a
+     * single-pass traversal of the model. 
+     * This is typically more efficient than traversing the model each time an individual pattern matcher is initialized on demand. 
+     * The performance benefit only manifests itself if the engine is not in wildcard mode.
+     * 
+     * @param engine
+     *            the existing VIATRA Query engine in which the matchers will be created.
+     * @throws ViatraQueryRuntimeException
+     *             if there was an error in preparing the engine
+     */
+    public void prepare(ViatraQueryEngine engine);
+
+    /**
+     * Returns the currently assigned {@link IQuerySpecification}s.
+     */
+    public Set<IQuerySpecification<?>> getSpecifications();
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IQuerySpecification.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IQuerySpecification.java
new file mode 100644
index 00000000..326d2202
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/IQuerySpecification.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.api;
+
+import tools.refinery.viatra.runtime.api.scope.QueryScope;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQueryHeader;
+
+/**
+ * API interface for a VIATRA query specification. Each query is associated with a pattern. Methods instantiate a matcher
+ * of the pattern with various parameters.
+ *
+ * <p> As of 0.9.0, some internal details (mostly relevant for query evaluator backends) have been moved to {@link #getInternalQueryRepresentation()}.
+ *
+ * @author Bergmann Gábor
+ *
+ */
+public interface IQuerySpecification<Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> extends PQueryHeader {
+
+    /**
+     * Initializes the pattern matcher within an existing {@link ViatraQueryEngine}. If the pattern matcher is already
+     * constructed in the engine, only a lightweight reference is created.
+     * <p>
+     * The match set will be incrementally refreshed upon updates.
+     *
+     * @param engine
+     *            the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException
+     *             if an error occurs during pattern matcher creation
+     */
+    public Matcher getMatcher(ViatraQueryEngine engine);
+
+
+    /**
+     * Returns an empty, mutable Match compatible with matchers of this query.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * This can be used to call the matcher with a partial match
+     *  even if the specific class of the matcher or the match is unknown.
+     *
+     * @return the empty match
+     */
+    public abstract IPatternMatch newEmptyMatch();
+
+    /**
+     * Returns a new (partial) Match object compatible with matchers of this query.
+     * This can be used e.g. to call the matcher with a partial
+     * match.
+     *
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     *
+     * @param parameters
+     *            the fixed value of pattern parameters, or null if not bound.
+     * @return the (partial) match object.
+     */
+    public abstract IPatternMatch newMatch(Object... parameters);
+
+    /**
+     * The query is formulated over this kind of modeling platform.
+     * E.g. for queries over EMF models, the {@link EMFScope} class is returned.
+     */
+    public Class<? extends QueryScope> getPreferredScopeClass();
+
+    /**
+     * Returns the definition of the query in a format intended for consumption by the query evaluator.
+     * @return the internal representation of the query.
+     */
+    public PQuery getInternalQueryRepresentation();
+
+    /**
+     * Creates a new uninitialized matcher, which is not functional until an engine initializes it. Clients
+     * should not call this method, it is used by the {@link ViatraQueryEngine} instance to instantiate matchers.
+     * @throws ViatraQueryRuntimeException
+     * @noreference This method is not intended to be referenced by clients.
+     * @since 1.4
+     */
+    public Matcher instantiate();
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/MatchUpdateAdapter.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/MatchUpdateAdapter.java
new file mode 100644
index 00000000..7de6d2c6
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/MatchUpdateAdapter.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api;
+
+import java.util.function.Consumer;
+
+/**
+ * A default implementation of {@link IMatchUpdateListener} that contains two match processors, one for appearance, one
+ * for disappearance. Any of the two can be null; in this case, corresponding notifications will be ignored.
+ * 
+ * <p>
+ * Instantiate using either constructor.
+ * 
+ * @author Bergmann Gabor
+ * 
+ */
+public class MatchUpdateAdapter<Match extends IPatternMatch> implements IMatchUpdateListener<Match> {
+
+    Consumer<Match> appearCallback;
+    Consumer<Match> disappearCallback;
+
+    /**
+     * Constructs an instance without any match processors registered yet.
+     * 
+     * Use {@link #setAppearCallback(Consumer)} and {@link #setDisappearCallback(Consumer)} to specify
+     * optional match processors for match appearance and disappearance, respectively.
+     */
+    public MatchUpdateAdapter() {
+        super();
+    }
+
+    /**
+     * Constructs an instance by specifying match processors.
+     * 
+     * @param appearCallback
+     *            a match processor that will be invoked on each new match that appears. If null, no callback will be
+     *            executed on match appearance. See {@link Consumer} for details on how to implement.
+     * @param disappearCallback
+     *            a match processor that will be invoked on each existing match that disappears. If null, no callback
+     *            will be executed on match disappearance. See {@link Consumer} for details on how to implement.
+     * @since 2.0
+     */
+    public MatchUpdateAdapter(Consumer<Match> appearCallback, Consumer<Match> disappearCallback) {
+        super();
+        setAppearCallback(appearCallback);
+        setDisappearCallback(disappearCallback);
+    }
+
+    /**
+     * @return the match processor that will be invoked on each new match that appears. If null, no callback will be
+     *         executed on match appearance.
+     * @since 2.0
+     */
+    public Consumer<Match> getAppearCallback() {
+        return appearCallback;
+    }
+
+    /**
+     * @param appearCallback
+     *            a match processor that will be invoked on each new match that appears. If null, no callback will be
+     *            executed on match appearance. See {@link Consumer} for details on how to implement.
+     * @since 2.0
+     */
+    public void setAppearCallback(Consumer<Match> appearCallback) {
+        this.appearCallback = appearCallback;
+    }
+
+    /**
+     * @return the match processor that will be invoked on each existing match that disappears. If null, no callback
+     *         will be executed on match disappearance.
+     * @since 2.0
+     */
+    public Consumer<Match> getDisappearCallback() {
+        return disappearCallback;
+    }
+
+    /**
+     * @param disappearCallback
+     *            a match processor that will be invoked on each existing match that disappears. If null, no callback
+     *            will be executed on match disappearance. See {@link Consumer} for details on how to implement.
+     * @since 2.0
+     */
+    public void setDisappearCallback(Consumer<Match> disappearCallback) {
+        this.disappearCallback = disappearCallback;
+    }
+
+    @Override
+    public void notifyAppearance(Match match) {
+        if (appearCallback != null)
+            appearCallback.accept(match);
+    }
+
+    @Override
+    public void notifyDisappearance(Match match) {
+        if (disappearCallback != null)
+            disappearCallback.accept(match);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngine.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngine.java
new file mode 100644
index 00000000..4c603a47
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngine.java
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * Copyright (c) 2023 The Refinery Authors <https://refinery.tools>
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.api;
+
+import tools.refinery.viatra.runtime.api.scope.IBaseIndex;
+import tools.refinery.viatra.runtime.api.scope.QueryScope;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * A Viatra Query (incremental) evaluation engine, attached to a model such as an EMF resource. The engine hosts pattern matchers, and
+ * will listen on model update notifications stemming from the given model in order to maintain live results.
+ *
+ * <p>
+ * By default, ViatraQueryEngines do not need to be separately disposed; they will be garbage collected along with the model.
+ * Advanced users: see {@link AdvancedViatraQueryEngine} if you want fine control over the lifecycle of an engine.
+ *
+ * <p>
+ * Pattern matchers within this engine may be instantiated in the following ways:
+ * <ul>
+ * <li>Recommended: instantiate the specific matcher class generated for the pattern by e.g. MyPatternMatcher.on(engine).
+ * <li>Use {@link #getMatcher(IQuerySpecification)} if the pattern-specific generated matcher API is not available.
+ * <li>Advanced: use the query specification associated with the generated matcher class to achieve the same.
+ * </ul>
+ * Additionally, a group of patterns (see {@link IQueryGroup}) can be initialized together before usage; this may improve
+ * the performance of pattern matcher construction by trying to gather all necessary information from the model in one go.
+ * Note that no such improvement is to be expected if the engine is specifically constructed in wildcard mode,
+ * an option available in some scope implementations
+ * (see {@link EMFScope#EMFScope(Notifier, BaseIndexOptions)} and {@link BaseIndexOptions#withWildcardMode(boolean)}).
+ *
+ *
+ * @author Bergmann Gábor
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public abstract class ViatraQueryEngine {
+
+
+    /**
+     * Obtain a (managed) {@link ViatraQueryEngine} to evaluate queries over a given scope specified by an {@link QueryScope}.
+     *
+     * <p> For a given matcher scope, the same engine will be returned to any client.
+     * This facilitates the reuse of internal caches of the engine, greatly improving performance.
+     *
+     * <p> The lifecycle of this engine is centrally managed, and will not be disposed as long as the model is retained in memory.
+     * The engine will be garbage collected along with the model.
+     *
+     * <p>
+     * Advanced users: see {@link AdvancedViatraQueryEngine#createUnmanagedEngine(QueryScope)} to obtain a private,
+     * unmanaged engine that is not shared with other clients and allows tight control over its lifecycle.
+     *
+     * @param scope
+     *          the scope of query evaluation; the definition of the set of model elements that this engine is operates on.
+     *          Provide e.g. a {@link EMFScope} for evaluating queries on an EMF model.
+     * @return a (managed) {@link ViatraQueryEngine} instance
+     */
+    public static ViatraQueryEngine on(QueryScope scope) {
+        return ViatraQueryEngineManager.getInstance().getQueryEngine(scope);
+    }
+
+    /**
+     * Obtain a (managed) {@link ViatraQueryEngine} to evaluate queries over a given scope specified by an {@link QueryScope}.
+     *
+     * <p> For a given matcher scope, the same engine will be returned to any client.
+     * This facilitates the reuse of internal caches of the engine, greatly improving performance.
+     *
+     * <p> The lifecycle of this engine is centrally managed, and will not be disposed as long as the model is retained in memory.
+     * The engine will be garbage collected along with the model.
+     *
+     * <p>
+     * Advanced users: see {@link AdvancedViatraQueryEngine#createUnmanagedEngine(QueryScope)} to obtain a private,
+     * unmanaged engine that is not shared with other clients and allows tight control over its lifecycle.
+     *
+     * @param scope
+     *      the scope of query evaluation; the definition of the set of model elements that this engine is operates on.
+     *      Provide e.g. a {@link EMFScope} for evaluating queries on an EMF model.
+     * @return a (managed) {@link ViatraQueryEngine} instance
+     * @since 1.4
+     */
+    public static ViatraQueryEngine on(QueryScope scope, ViatraQueryEngineOptions options) {
+        return ViatraQueryEngineManager.getInstance().getQueryEngine(scope, options);
+    }
+
+    /**
+     * Provides access to the internal base index component of the engine, responsible for keeping track of basic
+     * contents of the model.
+     *
+     * <p>If using an {@link EMFScope},
+     *  consider {@link EMFScope#extractUnderlyingEMFIndex(ViatraQueryEngine)} instead to access EMF-specific details.
+     *
+     * @return the baseIndex the NavigationHelper maintaining the base index
+     * @throws ViatraQueryRuntimeException
+     *             if the base index could not be constructed
+     */
+    public abstract IBaseIndex getBaseIndex();
+
+    /**
+     * Access a pattern matcher based on a {@link IQuerySpecification}.
+     * Multiple calls will return the same matcher.
+     * @param querySpecification a {@link IQuerySpecification} that describes a VIATRA query specification
+     * @return a pattern matcher corresponding to the specification
+     * @throws ViatraQueryRuntimeException if the matcher could not be initialized
+     */
+    public abstract <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getMatcher(IQuerySpecification<Matcher> querySpecification);
+
+    /**
+     * Access a pattern matcher for the graph pattern with the given fully qualified name.
+     * Will succeed only if a query specification for this fully qualified name has been generated and registered.
+     * Multiple calls will return the same matcher unless the registered specification changes.
+     *
+     * @param patternFQN the fully qualified name of a VIATRA query specification
+     * @return a pattern matcher corresponding to the specification
+     * @throws ViatraQueryRuntimeException if the matcher could not be initialized
+     */
+    public abstract ViatraQueryMatcher<? extends IPatternMatch> getMatcher(String patternFQN);
+
+    /**
+     * Access an existing pattern matcher based on a {@link IQuerySpecification}.
+     * @param querySpecification a {@link IQuerySpecification} that describes a VIATRA query specification
+     * @return a pattern matcher corresponding to the specification, <code>null</code> if a matcher does not exist yet.
+     */
+    public abstract <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getExistingMatcher(IQuerySpecification<Matcher> querySpecification);
+
+
+    /**
+     * Access a copy of available {@link ViatraQueryMatcher} pattern matchers.
+     * @return a copy of the set of currently available pattern matchers registered on this engine instance
+     */
+    public abstract Set<? extends ViatraQueryMatcher<? extends IPatternMatch>> getCurrentMatchers();
+
+    public Set<IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> getRegisteredQuerySpecifications() {
+        return getCurrentMatchers().stream().map(ViatraQueryMatcher::getSpecification).collect(Collectors.toSet());
+    }
+
+    /**
+     * @return the scope of query evaluation; the definition of the set of model elements that this engine is operates on.
+     */
+    public abstract QueryScope getScope();
+
+        public abstract void flushChanges();
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineInitializationListener.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineInitializationListener.java
new file mode 100644
index 00000000..02162a65
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineInitializationListener.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Abel Hegedus, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api;
+
+/**
+ * Listener interface to get notifications when a new managed engine is initialized.
+ * 
+ * @author Abel Hegedus
+ *
+ */
+public interface ViatraQueryEngineInitializationListener {
+
+    /**
+     * Called when a managed engine is initialized in the EngineManager.
+     * 
+     * @param engine the initialized engine
+     */
+    void engineInitialized(AdvancedViatraQueryEngine engine);
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineLifecycleListener.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineLifecycleListener.java
new file mode 100644
index 00000000..1c4dc264
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineLifecycleListener.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Abel Hegedus, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api;
+
+
+/**
+ * Listener interface for getting notification on changes in an {@link ViatraQueryEngine}.
+ * 
+ * You can use it to remove any other listeners that you attached to matchers or the engine,
+ * or to handle matchers that are initialized after you started using the engine.
+ * 
+ * @author Abel Hegedus
+ *
+ */
+public interface ViatraQueryEngineLifecycleListener {
+
+    // -------------------------------------------------------------------------------
+    // MATCHERS (methods notifying on changes in the matchers available in the engine)
+    // -------------------------------------------------------------------------------
+    
+    /**
+     * Called after a matcher is instantiated in the engine
+     *  
+     * @param matcher the new matcher
+     */
+    void matcherInstantiated(ViatraQueryMatcher<? extends IPatternMatch> matcher);
+    
+    // -------------------------------------------------------------------------
+    // HEALTH (methods notifying on changes that affect the health of the engine
+    // -------------------------------------------------------------------------
+    
+    /**
+     * Called after the engine has become tainted due to a fatal error
+     */
+    void engineBecameTainted(String message, Throwable t);
+    
+    /**
+     * Called after the engine has been wiped
+     */
+    void engineWiped();
+    
+    /**
+     * Called after the engine has been disposed
+     */
+    void engineDisposed();
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineManager.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineManager.java
new file mode 100644
index 00000000..4a256aea
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineManager.java
@@ -0,0 +1,191 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.api;
+
+import tools.refinery.viatra.runtime.api.scope.QueryScope;
+import tools.refinery.viatra.runtime.internal.apiimpl.ViatraQueryEngineImpl;
+import tools.refinery.viatra.runtime.util.ViatraQueryLoggingUtil;
+
+import java.lang.ref.WeakReference;
+import java.util.*;
+
+import static tools.refinery.viatra.runtime.matchers.util.Preconditions.checkArgument;
+
+/**
+ * Global registry of active VIATRA Query Engines.
+ *
+ * <p>
+ * Manages an {@link ViatraQueryEngine} for each model (more precisely scope), that is created on demand. Managed engines are shared between
+ * clients querying the same model.
+ *
+ * <p>
+ * It is also possible to create private, unmanaged engines that are not shared between clients.
+ *
+ * <p>
+ * Only weak references are retained on the managed engines. So if there are no other references to the matchers or the
+ * engine, they can eventually be GC'ed, and they won't block the model from being GC'ed either.
+ *
+ *
+ * @author Bergmann Gabor
+ *
+ */
+public class ViatraQueryEngineManager {
+    private static ViatraQueryEngineManager instance = new ViatraQueryEngineManager();
+
+
+    /**
+     * @return the singleton instance
+     */
+    public static ViatraQueryEngineManager getInstance() {
+        return instance;
+    }
+
+    /**
+     * The engine manager keeps track of the managed engines via weak references only, so it will not keep unused
+     * managed engines from being garbage collected. Still, as long as the user keeps the model in memory, the
+     * associated managed engine will not be garbage collected, as it is expected to be strongly reachable from the
+     * model via the scope-specific base index or change notification listeners (see
+     * {@link BaseIndexListener#iqEngine}).
+     */
+    Map<QueryScope, WeakReference<ViatraQueryEngineImpl>> engines;
+
+    ViatraQueryEngineManager() {
+        super();
+        engines = new WeakHashMap<QueryScope, WeakReference<ViatraQueryEngineImpl>>();
+        initializationListeners = new HashSet<ViatraQueryEngineInitializationListener>();
+    }
+
+    /**
+     * Creates a managed VIATRA Query Engine at a given scope (e.g. an EMF Resource or ResourceSet, as in {@link EMFScope})
+     * or retrieves an already existing one. Repeated invocations for a single model root will return the same engine.
+     * Consequently, the engine will be reused between different clients querying the same model, providing performance benefits.
+     *
+     * <p>
+     * The match set of any patterns will be incrementally refreshed upon updates from this scope.
+     *
+     * @param scope
+     *          the scope of query evaluation; the definition of the set of model elements that this engine is operates on.
+     *          Provide e.g. a {@link EMFScope} for evaluating queries on an EMF model.
+     * @return a new or previously existing engine
+     */
+    public ViatraQueryEngine getQueryEngine(QueryScope scope) {
+        return getQueryEngine(scope, ViatraQueryEngineOptions.getDefault());
+    }
+
+    /**
+     * Creates a managed VIATRA Query Engine at a given scope (e.g. an EMF Resource or ResourceSet, as in {@link EMFScope})
+     * or retrieves an already existing one. Repeated invocations for a single model root will return the same engine.
+     * Consequently, the engine will be reused between different clients querying the same model, providing performance benefits.
+     *
+     * <p>
+     * The match set of any patterns will be incrementally refreshed upon updates from this scope.
+     *
+     * @param scope
+     *      the scope of query evaluation; the definition of the set of model elements that this engine is operates on.
+     *      Provide e.g. a {@link EMFScope} for evaluating queries on an EMF model.
+     * @return a new or previously existing engine
+     * @since 1.4
+     */
+    public ViatraQueryEngine getQueryEngine(QueryScope scope, ViatraQueryEngineOptions options) {
+        ViatraQueryEngineImpl engine = getEngineInternal(scope);
+        if (engine == null) {
+            engine = new ViatraQueryEngineImpl(this, scope, options);
+            engines.put(scope, new WeakReference<ViatraQueryEngineImpl>(engine));
+            notifyInitializationListeners(engine);
+        }
+        return engine;
+    }
+
+    /**
+     * Retrieves an already existing managed VIATRA Query Engine.
+     *
+     * @param scope
+     *          the scope of query evaluation; the definition of the set of model elements that this engine is operates on.
+     *          Provide e.g. a {@link EMFScope} for evaluating queries on an EMF model.
+     * @return a previously existing engine, or null if no engine is active for the given EMF model root
+     */
+    public ViatraQueryEngine getQueryEngineIfExists(QueryScope scope) {
+        return getEngineInternal(scope);
+    }
+
+    /**
+     * Collects all {@link ViatraQueryEngine} instances that still exist.
+     *
+     * @return set of engines if there is any, otherwise EMTPY_SET
+     */
+    public Set<ViatraQueryEngine> getExistingQueryEngines(){
+        Set<ViatraQueryEngine> existingEngines = null;
+        for (WeakReference<ViatraQueryEngineImpl> engineRef : engines.values()) {
+            AdvancedViatraQueryEngine engine = engineRef == null ? null : engineRef.get();
+            if(existingEngines == null) {
+                existingEngines = new HashSet<>();
+            }
+            existingEngines.add(engine);
+        }
+        if(existingEngines == null) {
+            existingEngines = Collections.emptySet();
+        }
+        return existingEngines;
+    }
+
+    private final Set<ViatraQueryEngineInitializationListener> initializationListeners;
+
+    /**
+     * Registers a listener for new engine initialization.
+     *
+     * <p/> For removal, use {@link #removeQueryEngineInitializationListener}
+     *
+     * @param listener the listener to register
+     */
+    public void addQueryEngineInitializationListener(ViatraQueryEngineInitializationListener listener) {
+        checkArgument(listener != null, "Cannot add null listener!");
+        initializationListeners.add(listener);
+    }
+
+    /**
+     * Removes a registered listener added with {@link #addQueryEngineInitializationListener}
+     *
+     * @param listener
+     */
+    public void removeQueryEngineInitializationListener(ViatraQueryEngineInitializationListener listener) {
+        checkArgument(listener != null, "Cannot remove null listener!");
+        initializationListeners.remove(listener);
+    }
+
+    /**
+     * Notifies listeners that a new engine has been initialized.
+     *
+     * @param engine the initialized engine
+     */
+    protected void notifyInitializationListeners(AdvancedViatraQueryEngine engine) {
+        try {
+            if (!initializationListeners.isEmpty()) {
+                for (ViatraQueryEngineInitializationListener listener : new HashSet<>(initializationListeners)) {
+                    listener.engineInitialized(engine);
+                }
+            }
+        } catch (Exception ex) {
+            ViatraQueryLoggingUtil.getLogger(getClass()).fatal(
+                    "VIATRA Query Engine Manager encountered an error in delivering notifications"
+                            + " about engine initialization. ", ex);
+        }
+    }
+
+    /**
+     * @param emfRoot
+     * @return
+     */
+    private ViatraQueryEngineImpl getEngineInternal(QueryScope scope) {
+        final WeakReference<ViatraQueryEngineImpl> engineRef = engines.get(scope);
+        ViatraQueryEngineImpl engine = engineRef == null ? null : engineRef.get();
+        return engine;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineOptions.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineOptions.java
new file mode 100644
index 00000000..15bf1f91
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryEngineOptions.java
@@ -0,0 +1,293 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Balázs Grill, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api;
+
+
+import java.util.Objects;
+import java.util.ServiceLoader;
+
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactoryProvider;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * This class is intended to provide options to a created {@link ViatraQueryEngine} instance. The {@link #DEFAULT}
+ * instance represents the configuration that is selected when no explicit options are provided by the user. To create
+ * new configurations, use the static builder methods {@link #defineOptions()} (starts with empty options) or
+ * {@link #copyOptions(ViatraQueryEngineOptions)} (starts with all options from an existing configuration).
+ * 
+ * @author Balázs Grill, Zoltan Ujhelyi
+ * @since 1.4
+ *
+ */
+public final class ViatraQueryEngineOptions {
+
+    private static boolean areSystemDefaultsCalculated = false;
+    private static IQueryBackendFactory systemDefaultBackendFactory;
+    private static IQueryBackendFactory systemDefaultCachingBackendFactory;
+    private static IQueryBackendFactory systemDefaultSearchBackendFactory;
+    
+    /**
+     * @since 2.0
+     */
+    public static void setSystemDefaultBackends(IQueryBackendFactory systemDefaultBackendFactory,
+            IQueryBackendFactory systemDefaultCachingBackendFactory,
+            IQueryBackendFactory systemDefaultSearchBackendFactory) {
+                areSystemDefaultsCalculated = true;
+                ViatraQueryEngineOptions.systemDefaultBackendFactory = systemDefaultBackendFactory;
+                ViatraQueryEngineOptions.systemDefaultCachingBackendFactory = systemDefaultCachingBackendFactory;
+                ViatraQueryEngineOptions.systemDefaultSearchBackendFactory = systemDefaultSearchBackendFactory;
+    }
+    
+    /**
+     * If {@link #setSystemDefaultBackends(IQueryBackendFactory, IQueryBackendFactory, IQueryBackendFactory)} is not
+     * called, this method is responsible of finding the corresponding backends on the classpath using Java Service
+     * loaders.
+     */
+    private static void calculateSystemDefaultBackends() {
+        for (IQueryBackendFactoryProvider provider : ServiceLoader.load(IQueryBackendFactoryProvider.class)) {
+            if (provider.isSystemDefaultEngine()) {
+                systemDefaultBackendFactory = provider.getFactory();
+            }
+            if (provider.isSystemDefaultCachingBackend()) {
+                systemDefaultCachingBackendFactory = provider.getFactory();
+            }
+            if (provider.isSystemDefaultSearchBackend()) {
+                systemDefaultSearchBackendFactory = provider.getFactory();
+            }
+        }
+        areSystemDefaultsCalculated = true;
+    }
+    
+    private static IQueryBackendFactory getSystemDefaultBackend() {
+        if (!areSystemDefaultsCalculated) {
+            calculateSystemDefaultBackends();
+        }
+        return Objects.requireNonNull(systemDefaultBackendFactory, "System default backend not found");
+    }
+    
+    private static IQueryBackendFactory getSystemDefaultCachingBackend() {
+        if (!areSystemDefaultsCalculated) {
+            calculateSystemDefaultBackends();
+        }
+        return Objects.requireNonNull(systemDefaultCachingBackendFactory, "System default caching backend not found");
+    }
+    
+    private static IQueryBackendFactory getSystemDefaultSearchBackend() {
+        if (!areSystemDefaultsCalculated) {
+            calculateSystemDefaultBackends();
+        }
+        return Objects.requireNonNull(systemDefaultSearchBackendFactory, "System default search backend not found");
+    }
+    
+    private final QueryEvaluationHint engineDefaultHints;
+
+    private final IQueryBackendFactory defaultCachingBackendFactory;
+    private final IQueryBackendFactory defaultSearchBackendFactory;
+
+    /** The default engine options; if options are not defined, this version will be used. */
+    private static ViatraQueryEngineOptions DEFAULT;
+    
+    /**
+     * @since 2.0
+     */
+    public static final ViatraQueryEngineOptions getDefault() {
+        if (DEFAULT == null) {
+            DEFAULT = new Builder().build();
+        }
+        return DEFAULT;
+    }
+
+    public static final class Builder {
+        private QueryEvaluationHint engineDefaultHints;
+
+        private IQueryBackendFactory defaultBackendFactory;
+        private IQueryBackendFactory defaultCachingBackendFactory;
+        private IQueryBackendFactory defaultSearchBackendFactory;
+
+        public Builder() {
+
+        }
+
+        public Builder(ViatraQueryEngineOptions from) {
+            this.engineDefaultHints = from.engineDefaultHints;
+            this.defaultBackendFactory = engineDefaultHints.getQueryBackendFactory();
+            this.defaultCachingBackendFactory = from.defaultCachingBackendFactory;
+            this.defaultSearchBackendFactory = from.defaultSearchBackendFactory;
+        }
+
+        /**
+         * Note that the backend factory in the hint is overridden by a factory added with
+         * {@link #withDefaultBackend(IQueryBackendFactory)}.
+         */
+        public Builder withDefaultHint(QueryEvaluationHint engineDefaultHints) {
+            this.engineDefaultHints = engineDefaultHints;
+            return this;
+        }
+
+        /**
+         * Note that this backend factory overrides the factory defined by the hint added by
+         * {@link #withDefaultHint(QueryEvaluationHint)}.
+         */
+        public Builder withDefaultBackend(IQueryBackendFactory defaultBackendFactory) {
+            this.defaultBackendFactory = defaultBackendFactory;
+            return this;
+        }
+
+        /**
+         * @since 2.0
+         */
+        public Builder withDefaultSearchBackend(IQueryBackendFactory defaultSearchBackendFactory) {
+            Preconditions.checkArgument(!defaultSearchBackendFactory.isCaching(), "%s is not a search backend", defaultSearchBackendFactory.getClass());
+            this.defaultSearchBackendFactory = defaultSearchBackendFactory;
+            return this;
+        }
+        
+        public Builder withDefaultCachingBackend(IQueryBackendFactory defaultCachingBackendFactory) {
+            Preconditions.checkArgument(defaultCachingBackendFactory.isCaching(), "%s is not a caching backend", defaultCachingBackendFactory.getClass());
+            this.defaultCachingBackendFactory = defaultCachingBackendFactory;
+            return this;
+        }
+
+        public ViatraQueryEngineOptions build() {
+            IQueryBackendFactory defaultFactory = getDefaultBackend();
+            QueryEvaluationHint hint = getEngineDefaultHints(defaultFactory);
+            return new ViatraQueryEngineOptions(hint, getDefaultCachingBackend(), getDefaultSearchBackend());
+        }
+
+        private IQueryBackendFactory getDefaultBackend() {
+            if (defaultBackendFactory != null){
+                return defaultBackendFactory;
+            } else if (engineDefaultHints != null) {
+                return engineDefaultHints.getQueryBackendFactory();
+            } else {
+                return getSystemDefaultBackend();
+            }
+        }
+
+        private IQueryBackendFactory getDefaultCachingBackend() {
+            if (defaultCachingBackendFactory != null) {
+                return defaultCachingBackendFactory;
+            } else if (defaultBackendFactory != null && defaultBackendFactory.isCaching()) {
+                return defaultBackendFactory;
+            } else {
+                return getSystemDefaultCachingBackend();
+            }
+        }
+        
+        private IQueryBackendFactory getDefaultSearchBackend() {
+            if (defaultSearchBackendFactory != null) {
+                return defaultSearchBackendFactory;
+            } else if (defaultBackendFactory != null && !defaultBackendFactory.isCaching()) {
+                return defaultBackendFactory;
+            } else {
+                return getSystemDefaultSearchBackend();
+            }
+        }
+
+        private QueryEvaluationHint getEngineDefaultHints(IQueryBackendFactory defaultFactory) {
+            if (engineDefaultHints != null){
+                return engineDefaultHints.overrideBy(new QueryEvaluationHint(null, defaultFactory));
+            } else {
+                return new QueryEvaluationHint(null, defaultFactory);
+            }
+        }
+    }
+
+    /**
+     * Initializes an option builder with no previously set options.
+     */
+    public static Builder defineOptions() {
+        return new Builder();
+    }
+
+    /**
+     * Initializes an option builder with settings from an existing configuration.
+     */
+    public static Builder copyOptions(ViatraQueryEngineOptions options) {
+        return new Builder(options);
+    }
+
+    private ViatraQueryEngineOptions(QueryEvaluationHint engineDefaultHints,
+            IQueryBackendFactory defaultCachingBackendFactory, IQueryBackendFactory defaultSearchBackendFactory) {
+        this.engineDefaultHints = engineDefaultHints;
+        this.defaultCachingBackendFactory = defaultCachingBackendFactory;
+        this.defaultSearchBackendFactory = defaultSearchBackendFactory;
+    }
+
+    public QueryEvaluationHint getEngineDefaultHints() {
+        return engineDefaultHints;
+    }
+
+    /**
+     * Returns the configured default backend
+     * 
+     * @return the defaultBackendFactory
+     */
+    public IQueryBackendFactory getDefaultBackendFactory() {
+        switch (engineDefaultHints.getQueryBackendRequirementType()) {
+        case DEFAULT_CACHING:
+            return ViatraQueryEngineOptions.getSystemDefaultCachingBackend();
+        case DEFAULT_SEARCH:
+            return ViatraQueryEngineOptions.getSystemDefaultCachingBackend();
+        case SPECIFIC:
+            return engineDefaultHints.getQueryBackendFactory();
+        case UNSPECIFIED:
+        default:
+            return ViatraQueryEngineOptions.getSystemDefaultBackend();
+        }
+    }
+
+    /**
+     * Returns the configured default caching backend. If the default backend caches matches, it is usually expected, but
+     * not mandatory for the two default backends to be the same.
+     */
+    public IQueryBackendFactory getDefaultCachingBackendFactory() {
+        return defaultCachingBackendFactory;
+    }
+    
+    /**
+     * Returns the configured default search-based backend. If the default backend is search-based, it is usually expected, but
+     * not mandatory for the two default backends to be the same.
+     * @since 2.0
+     */
+    public IQueryBackendFactory getDefaultSearchBackendFactory() {
+        return defaultSearchBackendFactory;
+    }
+
+    @Override
+    public String toString() {
+        // TODO defaultCachingBackendFactory is ignored
+        if(Objects.equals(engineDefaultHints, DEFAULT.engineDefaultHints)) 
+            return "defaults";
+        else
+            return engineDefaultHints.toString();
+    }
+    
+    /**
+     * @since 2.0
+     */
+    public IQueryBackendFactory getQueryBackendFactory(QueryEvaluationHint hint) {
+        if (hint == null) {
+            return getDefaultBackendFactory();
+        }
+
+        switch (hint.getQueryBackendRequirementType()) {
+        case DEFAULT_CACHING: 
+            return getDefaultCachingBackendFactory();
+        case DEFAULT_SEARCH: 
+            return getDefaultSearchBackendFactory();
+        case SPECIFIC:
+            return hint.getQueryBackendFactory();
+        default:
+            return getDefaultBackendFactory();
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryMatcher.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryMatcher.java
new file mode 100644
index 00000000..1ae0c96f
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryMatcher.java
@@ -0,0 +1,258 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.api;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+/**
+ * Interface for a VIATRA Query matcher associated with a graph pattern.
+ * 
+ * @param <Match>
+ *            the IPatternMatch type representing a single match of this pattern.
+ * @author Bergmann Gábor
+ * @noimplement This interface is not intended to be implemented by clients. Implement BaseMatcher instead.
+ */
+public interface ViatraQueryMatcher<Match extends IPatternMatch> {
+    // REFLECTION
+    /** The pattern that will be matched. */
+    IQuerySpecification<? extends ViatraQueryMatcher<Match>> getSpecification();
+
+    /** Fully qualified name of the pattern. */
+    String getPatternName();
+
+    /** Returns the index of the symbolic parameter with the given name. */
+    Integer getPositionOfParameter(String parameterName);
+
+    /** Returns the array of symbolic parameter names. */
+    List<String> getParameterNames();
+
+    // ALL MATCHES
+    /**
+     * Returns the set of all pattern matches.
+     * 
+     * @return matches represented as a Match object.
+     */
+    Collection<Match> getAllMatches();
+
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * 
+     * @param partialMatch
+     *            a partial match of the pattern where each non-null field binds the corresponding pattern parameter to
+     *            a fixed value.
+     * @return matches represented as a Match object.
+     */
+    Collection<Match> getAllMatches(Match partialMatch);
+    
+    /**
+     * Returns a stream of all pattern matches.
+     * <p>
+     * <strong>WARNING</strong> If the result set changes while the stream is evaluated, the set of matches included in
+     * the stream are unspecified. In such cases, either rely on {@link #getAllMatches()} or collect the results of the
+     * stream in end-user code.
+     * 
+     * @return matches represented as a Match object.
+     * @since 2.0
+     */
+    Stream<Match> streamAllMatches();
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * <p>
+     * <strong>WARNING</strong> If the result set changes while the stream is evaluated, the set of matches included in
+     * the stream are unspecified. In such cases, either rely on {@link #getAllMatches()} or collect the results of the
+     * stream in end-user code.
+     * 
+     * @param partialMatch
+     *            a partial match of the pattern where each non-null field binds the corresponding pattern parameter to
+     *            a fixed value.
+     * @return matches represented as a Match object.
+     * @since 2.0
+     */
+    Stream<Match> streamAllMatches(Match partialMatch);
+    
+    // variant(s) with input binding as pattern-specific parameters: not declared in interface
+
+    // SINGLE MATCH
+    /**
+     * Returns an arbitrarily chosen pattern match. Neither determinism nor randomness of selection is guaranteed.
+     * 
+     * @return a match represented as a Match object, or an empty Optional if no match is found.
+     * @since 2.0
+     */
+    Optional<Match> getOneArbitraryMatch();
+
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * 
+     * @param partialMatch
+     *            a partial match of the pattern where each non-null field binds the corresponding pattern parameter to
+     *            a fixed value.
+     * @return a match represented as a Match object, or an empty Optional if no match is found.
+     * @since 2.0
+     */
+    Optional<Match> getOneArbitraryMatch(Match partialMatch);
+
+    // variant(s) with input binding as pattern-specific parameters: not declared in interface
+
+    // MATCH CHECKING
+    /**
+     * Indicates whether the query has any kind of matches.
+     * 
+     * @return true if there exists a valid match of the pattern.
+     * @since 1.7
+     */
+    boolean hasMatch();
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match, under
+     * any possible substitution of the unspecified parameters (if any).
+     * 
+     * @param partialMatch
+     *            a (partial) match of the pattern where each non-null field binds the corresponding pattern parameter
+     *            to a fixed value.
+     * @return true if the input is a valid (partial) match of the pattern.
+     */
+    boolean hasMatch(Match partialMatch);
+
+    // variant(s) with input binding as pattern-specific parameters: not declared in interface
+
+    // NUMBER OF MATCHES
+    /**
+     * Returns the number of all pattern matches.
+     * 
+     * @return the number of pattern matches found.
+     */
+    int countMatches();
+
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * 
+     * @param partialMatch
+     *            a partial match of the pattern where each non-null field binds the corresponding pattern parameter to
+     *            a fixed value.
+     * @return the number of pattern matches found.
+     */
+    int countMatches(Match partialMatch);
+
+    // variant(s) with input binding as pattern-specific parameters: not declared in interface
+
+    // FOR EACH MATCH
+    /**
+     * Executes the given processor on each match of the pattern.
+     * 
+     * @param processor
+     *            the action that will process each pattern match.
+     * @since 2.0
+     */
+    void forEachMatch(Consumer<? super Match> processor);
+
+    /**
+     * Executes the given processor on each match of the pattern that conforms to the given fixed values of some
+     * parameters.
+     * 
+     * @param partialMatch
+     *            array where each non-null element binds the corresponding pattern parameter to a fixed value.
+     * @param processor
+     *            the action that will process each pattern match.
+     * @since 2.0
+     */
+    void forEachMatch(Match partialMatch, Consumer<? super Match> processor);
+
+    // variant(s) with input binding as pattern-specific parameters: not declared in interface
+
+    // FOR ONE ARBITRARY MATCH
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern. Neither determinism nor randomness of
+     * selection is guaranteed.
+     * 
+     * @param processor
+     *            the action that will process the selected match.
+     * @return true if the pattern has at least one match, false if the processor was not invoked
+     * @since 2.0
+     */
+    boolean forOneArbitraryMatch(Consumer<? super Match> processor);
+
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed
+     * values of some parameters. Neither determinism nor randomness of selection is guaranteed.
+     * 
+     * @param partialMatch
+     *            array where each non-null element binds the corresponding pattern parameter to a fixed value.
+     * @param processor
+     *            the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was
+     *         not invoked
+     * @since 2.0
+     */
+    boolean forOneArbitraryMatch(Match partialMatch, Consumer<? super Match> processor);
+
+    // variant(s) with input binding as pattern-specific parameters: not declared in interface
+    
+    /**
+     * Returns an empty, mutable Match for the matcher. 
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input. 
+     * This can be used to call the matcher with a partial match 
+     *  even if the specific class of the matcher or the match is unknown.
+     * 
+     * @return the empty match
+     */
+    Match newEmptyMatch();
+
+    /**
+     * Returns a new (partial) Match object for the matcher. 
+     * This can be used e.g. to call the matcher with a partial
+     * match. 
+     * 
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * 
+     * @param parameters
+     *            the fixed value of pattern parameters, or null if not bound.
+     * @return the (partial) match object.
+     */
+    Match newMatch(Object... parameters);
+
+    /**
+     * Retrieve the set of values that occur in matches for the given parameterName.
+     * 
+     * @param parameterName
+     *            name of the parameter for which values are returned
+     * @return the Set of all values for the given parameter, null if the parameter with the given name does not exists,
+     *         empty set if there are no matches
+     */
+    Set<Object> getAllValues(final String parameterName);
+
+    /**
+     * Retrieve the set of values that occur in matches for the given parameterName, that conforms to the given fixed
+     * values of some parameters.
+     * 
+     * @param parameterName
+     *            name of the parameter for which values are returned
+     * @param partialMatch
+     *            a partial match of the pattern where each non-null field binds the corresponding pattern parameter to
+     *            a fixed value.
+     * @return the Set of all values for the given parameter, null if the parameter with the given name does not exists
+     *         or if the parameter with the given name is set in partialMatch, empty set if there are no matches
+     */
+    Set<Object> getAllValues(final String parameterName, Match partialMatch);
+
+    /**
+     * Returns the engine that the matcher uses.
+     * 
+     * @return the engine
+     */
+    ViatraQueryEngine getEngine();
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryModelUpdateListener.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryModelUpdateListener.java
new file mode 100644
index 00000000..da8bf87e
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/ViatraQueryModelUpdateListener.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Abel Hegedus, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api;
+
+
+
+/**
+ * Listener interface for model changes affecting different levels of the VIATRA Query architecture.
+ * 
+ * @author Abel Hegedus
+ *
+ */
+public interface ViatraQueryModelUpdateListener {
+
+    /** 
+     * Possible notification levels for changes
+     * 
+     * @author Abel Hegedus
+     *
+     */
+    enum ChangeLevel {
+        NO_CHANGE, MODEL, INDEX, MATCHSET;
+        
+        public ChangeLevel changeOccured(ChangeLevel occuredLevel) {
+            if(this.compareTo(occuredLevel) < 0) {
+                return occuredLevel;
+            } else {
+                return this;
+            }
+        }
+    }
+    /**
+     * Called after each change with also sending the level of change.
+     * Only called if the change level is at least at the level returned by getLevel().
+     * 
+     * @param changeLevel
+     */
+    void notifyChanged(ChangeLevel changeLevel);
+    
+    /**
+     * This may be queried only ONCE (!!!) at the registration of the listener.
+     * 
+     * NOTE: this allows us to only create engine level change providers if there is someone who needs it.
+     * 
+     * @return the change level where you want notifications
+     */
+    ChangeLevel getLevel();
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseGeneratedPatternGroup.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseGeneratedPatternGroup.java
new file mode 100644
index 00000000..2e2a823b
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseGeneratedPatternGroup.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Mark Czotter, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api.impl;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.api.IQuerySpecification;
+
+/**
+ * @author Mark Czotter
+ * 
+ */
+public abstract class BaseGeneratedPatternGroup extends BaseQueryGroup {
+
+    @Override
+    public Set<IQuerySpecification<?>> getSpecifications() {
+        return querySpecifications;
+    }
+
+    /**
+     * Returns {@link IQuerySpecification} objects for handling them as a group. To be filled by constructors of subclasses.
+     */
+    protected Set<IQuerySpecification<?>> querySpecifications = new HashSet<IQuerySpecification<?>>();
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseMatcher.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseMatcher.java
new file mode 100644
index 00000000..ad79aafd
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseMatcher.java
@@ -0,0 +1,350 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.api.impl;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.api.IPatternMatch;
+import tools.refinery.viatra.runtime.api.IQuerySpecification;
+import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
+import tools.refinery.viatra.runtime.api.ViatraQueryMatcher;
+import tools.refinery.viatra.runtime.internal.apiimpl.QueryResultWrapper;
+import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * Base implementation of ViatraQueryMatcher.
+ *
+ * @author Bergmann Gábor
+ *
+ * @param <Match>
+ */
+public abstract class BaseMatcher<Match extends IPatternMatch> extends QueryResultWrapper implements ViatraQueryMatcher<Match> {
+
+    // FIELDS AND CONSTRUCTOR
+
+    protected ViatraQueryEngine engine;
+    protected IQuerySpecification<? extends BaseMatcher<Match>> querySpecification;
+    private IMatcherCapability capabilities;
+
+    /**
+     * @since 1.4
+     */
+    public BaseMatcher(IQuerySpecification<? extends BaseMatcher<Match>> querySpecification) {
+        this.querySpecification = querySpecification;
+        this.querySpecification.getInternalQueryRepresentation().ensureInitialized();
+    }
+    
+    /**
+     * @since 1.4
+     */
+    @Override
+    protected
+    void setBackend(ViatraQueryEngine engine, IQueryResultProvider resultProvider, IMatcherCapability capabilities){
+        this.backend = resultProvider;
+        this.engine = engine;
+        this.capabilities = capabilities;
+    }
+
+    // ARRAY-BASED INTERFACE
+
+    /** Converts the array representation of a pattern match to an immutable Match object. */
+    protected abstract Match arrayToMatch(Object[] parameters);
+    /** Converts the array representation of a pattern match to a mutable Match object. */
+    protected abstract Match arrayToMatchMutable(Object[] parameters);
+
+    /** Converts the Match object of a pattern match to the array representation. */
+    protected Object[] matchToArray(Match partialMatch) {
+        return partialMatch.toArray();
+    }
+    // TODO make me public for performance reasons
+    protected abstract Match tupleToMatch(Tuple t);
+
+    private Object[] fEmptyArray;
+
+    protected Object[] emptyArray() {
+        if (fEmptyArray == null)
+            fEmptyArray = new Object[getSpecification().getParameterNames().size()];
+        return fEmptyArray;
+    }
+
+    // REFLECTION
+
+    @Override
+    public Integer getPositionOfParameter(String parameterName) {
+        return getSpecification().getPositionOfParameter(parameterName);
+    }
+
+    @Override
+    public List<String> getParameterNames() {
+        return getSpecification().getParameterNames();
+    }
+
+    // BASE IMPLEMENTATION
+
+    @Override
+    public Collection<Match> getAllMatches() {
+        return rawStreamAllMatches(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    @Override
+    public Stream<Match> streamAllMatches() {
+        return rawStreamAllMatches(emptyArray());
+    }
+
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     *
+     * @param parameters
+     *            array where each non-null element binds the corresponding pattern parameter to a fixed value.
+     * @pre size of input array must be equal to the number of parameters.
+     * @return matches represented as a Match object.
+     * @since 2.0
+     */
+    protected Stream<Match> rawStreamAllMatches(Object[] parameters) {
+        // clones the tuples into a match object to protect the Tuples from modifications outside of the ReteMatcher
+        return backend.getAllMatches(parameters).map(this::tupleToMatch);
+    }
+
+    @Override
+    public Collection<Match> getAllMatches(Match partialMatch) {
+        return rawStreamAllMatches(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    @Override
+    public Stream<Match> streamAllMatches(Match partialMatch) {
+        return rawStreamAllMatches(partialMatch.toArray());
+    }
+
+    // with input binding as pattern-specific parameters: not declared in interface
+
+    @Override
+    public Optional<Match> getOneArbitraryMatch() {
+        return rawGetOneArbitraryMatch(emptyArray());
+    }
+
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     *
+     * @param parameters
+     *            array where each non-null element binds the corresponding pattern parameter to a fixed value.
+     * @pre size of input array must be equal to the number of parameters.
+     * @return a match represented as a Match object, or null if no match is found.
+     * @since 2.0
+     */
+    protected Optional<Match> rawGetOneArbitraryMatch(Object[] parameters) {
+        return backend.getOneArbitraryMatch(parameters).map(this::tupleToMatch);
+    }
+
+    @Override
+    public Optional<Match> getOneArbitraryMatch(Match partialMatch) {
+        return rawGetOneArbitraryMatch(partialMatch.toArray());
+    }
+
+    // with input binding as pattern-specific parameters: not declared in interface
+
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match, under
+     * any possible substitution of the unspecified parameters.
+     *
+     * @param parameters
+     *            array where each non-null element binds the corresponding pattern parameter to a fixed value.
+     * @return true if the input is a valid (partial) match of the pattern.
+     */
+    protected boolean rawHasMatch(Object[] parameters) {
+        return backend.hasMatch(parameters);
+    }
+
+    @Override
+    public boolean hasMatch() {
+        return rawHasMatch(emptyArray());
+    }
+    
+    @Override
+    public boolean hasMatch(Match partialMatch) {
+        return rawHasMatch(partialMatch.toArray());
+    }
+
+    // with input binding as pattern-specific parameters: not declared in interface
+
+    @Override
+    public int countMatches() {
+        return rawCountMatches(emptyArray());
+    }
+
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     *
+     * @param parameters
+     *            array where each non-null element binds the corresponding pattern parameter to a fixed value.
+     * @pre size of input array must be equal to the number of parameters.
+     * @return the number of pattern matches found.
+     */
+    protected int rawCountMatches(Object[] parameters) {
+        return backend.countMatches(parameters);
+    }
+
+    @Override
+    public int countMatches(Match partialMatch) {
+        return rawCountMatches(partialMatch.toArray());
+    }
+
+    // with input binding as pattern-specific parameters: not declared in interface
+
+    /**
+     * Executes the given processor on each match of the pattern that conforms to the given fixed values of some
+     * parameters.
+     *
+     * @param parameters
+     *            array where each non-null element binds the corresponding pattern parameter to a fixed value.
+     * @pre size of input array must be equal to the number of parameters.
+     * @param action
+     *            the action that will process each pattern match.
+     * @since 2.0
+     */
+    protected void rawForEachMatch(Object[] parameters, Consumer<? super Match> processor) {
+        backend.getAllMatches(parameters).map(this::tupleToMatch).forEach(processor);
+    }
+
+    @Override
+    public void forEachMatch(Consumer<? super Match> processor) {
+        rawForEachMatch(emptyArray(), processor);
+    }
+
+    @Override
+    public void forEachMatch(Match match, Consumer<? super Match> processor) {
+        rawForEachMatch(match.toArray(), processor);
+    }
+
+    // with input binding as pattern-specific parameters: not declared in interface
+
+    @Override
+    public boolean forOneArbitraryMatch(Consumer<? super Match> processor) {
+        return rawForOneArbitraryMatch(emptyArray(), processor);
+    }
+
+    @Override
+    public boolean forOneArbitraryMatch(Match partialMatch, Consumer<? super Match> processor) {
+        return rawForOneArbitraryMatch(partialMatch.toArray(), processor);
+    }
+
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed
+     * values of some parameters. Neither determinism nor randomness of selection is guaranteed.
+     *
+     * @param parameters
+     *            array where each non-null element binds the corresponding pattern parameter to a fixed value.
+     * @pre size of input array must be equal to the number of parameters.
+     * @param processor
+     *            the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was
+     *         not invoked
+     * @since 2.0
+     */
+    protected boolean rawForOneArbitraryMatch(Object[] parameters, Consumer<? super Match> processor) {
+        return backend.getOneArbitraryMatch(parameters).map(this::tupleToMatch).map(m -> {
+            processor.accept(m);
+            return true;
+        }).orElse(false);
+    }
+
+    // with input binding as pattern-specific parameters: not declared in interface
+
+
+    @Override
+    public Match newEmptyMatch() {
+        return arrayToMatchMutable(new Object[getParameterNames().size()]);
+    }
+
+    @Override
+    public Match newMatch(Object... parameters) {
+        return arrayToMatch(parameters);
+    }
+
+    @Override
+    public Set<Object> getAllValues(final String parameterName) {
+        return rawStreamAllValues(getPositionOfParameter(parameterName), emptyArray()).collect(Collectors.toSet());
+    }
+
+    @Override
+    public Set<Object> getAllValues(final String parameterName, Match partialMatch) {
+        return rawStreamAllValues(getPositionOfParameter(parameterName), partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve a stream of values that occur in matches for the given parameterName, that conforms to the given fixed
+     * values of some parameters.
+     *
+     * @param position
+     *            position of the parameter for which values are returned
+     * @param parameters
+     *            a parameter array corresponding to a partial match of the pattern where each non-null field binds the
+     *            corresponding pattern parameter to a fixed value.
+     * @return the stream of all values in the given position
+     * @throws IllegalArgumentException
+     *             if length of parameters array does not equal to number of parameters
+     * @throws IndexOutOfBoundsException
+     *             if position is not appropriate for the current parameter size
+     * @since 2.0
+     */
+    protected Stream<Object> rawStreamAllValues(final int position, Object[] parameters) {
+        Preconditions.checkElementIndex(position, getParameterNames().size());
+        Preconditions.checkArgument(parameters.length == getParameterNames().size());
+        return rawStreamAllMatches(parameters).map(match -> match.get(position));
+    }
+
+    /**
+     * Uses an existing set to accumulate all values of the parameter with the given name. Since it is a protected
+     * method, no error checking or input validation is performed!
+     *
+     * @param position
+     *            position of the parameter for which values are returned
+     * @param parameters
+     *            a parameter array corresponding to a partial match of the pattern where each non-null field binds the
+     *            corresponding pattern parameter to a fixed value.
+     * @param accumulator
+     *            the existing set to fill with the values
+     */
+    @SuppressWarnings("unchecked")
+    protected <T> void rawAccumulateAllValues(final int position, Object[] parameters, final Set<T> accumulator) {
+        rawForEachMatch(parameters, match -> accumulator.add((T) match.get(position)));
+    }
+    
+    @Override
+    public ViatraQueryEngine getEngine() {
+        return engine;
+    }
+
+    @Override
+    public IQuerySpecification<? extends BaseMatcher<Match>> getSpecification() {
+        return querySpecification;
+    }
+
+    @Override
+    public String getPatternName() {
+        return querySpecification.getFullyQualifiedName();
+    }
+
+    /**
+     * @since 1.4
+     */
+    public IMatcherCapability getCapabilities() {
+        return capabilities;
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BasePatternMatch.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BasePatternMatch.java
new file mode 100644
index 00000000..182bb466
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BasePatternMatch.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.api.impl;
+
+import tools.refinery.viatra.runtime.api.IPatternMatch;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Base implementation of IPatternMatch.
+ *
+ * @author Bergmann Gábor
+ *
+ */
+public abstract class BasePatternMatch implements IPatternMatch {
+
+    @SafeVarargs
+    protected static <T> List<T> makeImmutableList(T... elements) {
+        return Collections.unmodifiableList(Arrays.asList(elements));
+    }
+
+    public static String prettyPrintValue(Object o) {
+        if (o == null) {
+            return "(null)";
+        }
+        return o.toString();
+    }
+
+    // TODO performance can be improved here somewhat
+
+    @Override
+    public Object get(int position) {
+        if (position >= 0 && position < parameterNames().size())
+            return get(parameterNames().get(position));
+        else
+            return null;
+    }
+
+    @Override
+    public boolean set(int position, Object newValue) {
+        if (!isMutable()) throw new UnsupportedOperationException();
+        if (position >= 0 && position < parameterNames().size()) {
+            return set(parameterNames().get(position), newValue);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "Match<" + patternName() + ">{" + prettyPrint() + "}";
+    }
+
+    @Override
+    public boolean isCompatibleWith(IPatternMatch other) {
+        if(other == null) {
+            return true;
+        }
+        // we assume that the pattern is set for this match!
+        if (!specification().equals(other.specification())) {
+            return false;
+        }
+        for (int i = 0; i < parameterNames().size(); i++) {
+            Object value = get(i);
+            Object otherValue = other.get(i);
+            if(value != null && otherValue != null && !value.equals(otherValue)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public String patternName() {
+        return specification().getFullyQualifiedName();
+    }
+
+    @Override
+    public List<String> parameterNames() {
+        return specification().getParameterNames();
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseQueryGroup.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseQueryGroup.java
new file mode 100644
index 00000000..b92727e7
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseQueryGroup.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Mark Czotter, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api.impl;
+
+import tools.refinery.viatra.runtime.api.AdvancedViatraQueryEngine;
+import tools.refinery.viatra.runtime.api.IQueryGroup;
+import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
+
+/**
+ * Base implementation of {@link IQueryGroup}.
+ *
+ * @author Mark Czotter
+ *
+ */
+public abstract class BaseQueryGroup implements IQueryGroup {
+
+    @Override
+    public void prepare(ViatraQueryEngine engine) {
+        prepare(AdvancedViatraQueryEngine.from(engine));
+    }
+    
+    protected void prepare(AdvancedViatraQueryEngine engine) {
+        engine.prepareGroup(this, null /* default options */);
+    }
+    
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseQuerySpecification.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseQuerySpecification.java
new file mode 100644
index 00000000..bee4b93d
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/impl/BaseQuerySpecification.java
@@ -0,0 +1,147 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.api.impl;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.api.IPatternMatch;
+import tools.refinery.viatra.runtime.api.IQuerySpecification;
+import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
+import tools.refinery.viatra.runtime.api.ViatraQueryMatcher;
+import tools.refinery.viatra.runtime.exception.ViatraQueryException;
+import tools.refinery.viatra.runtime.matchers.psystem.annotations.PAnnotation;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.QueryInitializationException;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery.PQueryStatus;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PVisibility;
+
+/**
+ * Base implementation of IQuerySpecification.
+ *
+ * @author Gabor Bergmann
+ *
+ */
+public abstract class BaseQuerySpecification<Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> implements
+        IQuerySpecification<Matcher> {
+
+    /**
+     * @since 1.6
+     */
+    protected static ViatraQueryException processInitializerError(ExceptionInInitializerError err) {
+        Throwable cause1 = err.getCause();
+        if (cause1 instanceof RuntimeException) {
+            Throwable cause2 = ((RuntimeException) cause1).getCause();
+            if (cause2 instanceof ViatraQueryException) {
+                return (ViatraQueryException) cause2;
+            } else if (cause2 instanceof QueryInitializationException) {
+                return new ViatraQueryException((QueryInitializationException) cause2);
+            } 
+        }
+        throw err;
+    }
+    protected final PQuery wrappedPQuery;
+    
+    protected abstract Matcher instantiate(ViatraQueryEngine engine);
+
+    /**
+     * For backward compatibility of code generated with previous versions of viatra query, this method has a default
+     * implementation returning null, indicating that a matcher can only be created using the old method, which ignores
+     * the hints provided by the user.
+     * 
+     * @since 1.4
+     */
+    @Override
+    public Matcher instantiate() {
+        return null;
+    }
+    
+    
+    /**
+     * Instantiates query specification for the given internal query representation.
+     */
+    public BaseQuerySpecification(PQuery wrappedPQuery) {
+        super();
+        this.wrappedPQuery = wrappedPQuery;
+        wrappedPQuery.publishedAs().add(this);
+    }
+
+
+    @Override
+    public PQuery getInternalQueryRepresentation() {
+        return wrappedPQuery;
+    }
+
+    @Override
+    public Matcher getMatcher(ViatraQueryEngine engine) {
+        ensureInitializedInternal();
+        if (wrappedPQuery.getStatus() == PQueryStatus.ERROR) {
+            String errorMessages = wrappedPQuery.getPProblems().stream()
+                    .map(input -> (input == null) ? "" : input.getShortMessage()).collect(Collectors.joining("\n"));
+            throw new ViatraQueryException(String.format("Erroneous query specification: %s %n %s", getFullyQualifiedName(), errorMessages),
+                    "Cannot initialize matchers on erroneous query specifications.");
+        } else if (!engine.getScope().isCompatibleWithQueryScope(this.getPreferredScopeClass())) {
+            throw new ViatraQueryException(
+                    String.format(
+                            "Scope class incompatibility: the query %s is formulated over query scopes of class %s, "
+                                    + " thus the query engine formulated over scope %s of class %s cannot evaluate it.",
+                            this.getFullyQualifiedName(), this.getPreferredScopeClass().getCanonicalName(),
+                            engine.getScope(), engine.getScope().getClass().getCanonicalName()),
+                    "Incompatible scope classes of engine and query.");
+        }
+        return instantiate(engine);
+    }
+
+    protected void ensureInitializedInternal() {
+        wrappedPQuery.ensureInitialized();
+    }
+    
+    // // DELEGATIONS
+    
+    @Override
+    public List<PAnnotation> getAllAnnotations() {
+        return wrappedPQuery.getAllAnnotations();
+    }
+    @Override
+    public List<PAnnotation> getAnnotationsByName(String annotationName) {
+        return wrappedPQuery.getAnnotationsByName(annotationName);
+    }
+    @Override
+    public Optional<PAnnotation> getFirstAnnotationByName(String annotationName) {
+        return wrappedPQuery.getFirstAnnotationByName(annotationName);
+    }
+    @Override
+    public String getFullyQualifiedName() {
+        return wrappedPQuery.getFullyQualifiedName();
+    }
+    @Override
+    public List<String> getParameterNames() {
+        return wrappedPQuery.getParameterNames();
+    }
+    @Override
+    public List<PParameter> getParameters() {
+        return wrappedPQuery.getParameters();
+    }
+    @Override
+    public Integer getPositionOfParameter(String parameterName) {
+        return wrappedPQuery.getPositionOfParameter(parameterName);
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public PVisibility getVisibility() {
+        return wrappedPQuery.getVisibility();
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IBaseIndex.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IBaseIndex.java
new file mode 100644
index 00000000..1795a8ef
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IBaseIndex.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api.scope;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.Callable;
+
+/**
+ * Represents the index maintained on the model.
+ * @author Bergmann Gabor
+ * @since 0.9
+ * 
+ */
+public interface IBaseIndex {
+    // TODO lightweightObserver?
+    // TODO ViatraBaseIndexChangeListener?
+    
+    /**
+     * The given callback will be executed, and all model traversals and index registrations will be delayed until the
+     * execution is done. If there are any outstanding feature, class or datatype registrations, a single coalesced model
+     * traversal will initialize the caches and deliver the notifications.
+     * 
+     * @param callable
+     */
+    public <V> V coalesceTraversals(Callable<V> callable) throws InvocationTargetException;
+    
+    /**
+     * Adds a coarse-grained listener that will be invoked after the NavigationHelper index or the underlying model is changed. Can be used
+     * e.g. to check model contents. Not intended for general use.
+     * 
+     * <p/> See {@link #removeBaseIndexChangeListener(ViatraBaseIndexChangeListener)}
+     * @param listener
+     */
+    public void addBaseIndexChangeListener(ViatraBaseIndexChangeListener listener);
+    
+    /**
+     * Removes a registered listener.
+     * 
+     * <p/> See {@link #addBaseIndexChangeListener(ViatraBaseIndexChangeListener)}
+     * 
+     * @param listener
+     */
+    public void removeBaseIndexChangeListener(ViatraBaseIndexChangeListener listener);
+    
+    /**
+     * Updates the value of indexed derived features that are not well-behaving.
+     */
+    void resampleDerivedFeatures();
+
+    /**
+     * Adds a listener for internal errors in the index. A listener can only be added once.
+     * @param listener
+     * @returns true if the listener was not already added
+     * @since 0.8.0
+     */
+    boolean addIndexingErrorListener(IIndexingErrorListener listener);
+    /**
+     * Removes a listener for internal errors in the index
+     * @param listener
+     * @returns true if the listener was successfully removed (e.g. it did exist)
+     * @since 0.8.0
+     */
+    boolean removeIndexingErrorListener(IIndexingErrorListener listener);
+
+    /**
+     * Register a lightweight observer that is notified if any edge starting at the given Object changes.
+     * 
+     * @param observer the listener instance
+     * @param observedObject the observed instance object
+     * @return false if no observer can be registered for the given instance (e.g. it is a primitive), 
+     *  or observer was already registered (call has no effect)
+     */
+    public boolean addInstanceObserver(IInstanceObserver observer, Object observedObject);
+    
+    /**
+     * Unregisters a lightweight observer for the given Object.
+     * 
+     * @param observer the listener instance
+     * @param observedObject the observed instance object
+     * @return false if no observer can be registered for the given instance (e.g. it is a primitive), 
+     *  or no observer was registered previously (call has no effect)
+     */
+    public boolean removeInstanceObserver(IInstanceObserver observer, Object observedObject);
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IEngineContext.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IEngineContext.java
new file mode 100644
index 00000000..55060853
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IEngineContext.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api.scope;
+
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+
+/**
+ * The context of the engine is instantiated by the scope, 
+ * and provides information and services regarding the model the towards the engine.  
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public interface IEngineContext {
+    
+    /**
+     * Returns the base index. 
+     * @throws ViatraQueryRuntimeException if the base index cannot be accessed 
+     */ 
+    IBaseIndex getBaseIndex();
+
+    /**
+     * Disposes this context object. Resources in the index may now be freed up.
+     * No more methods should be called after this one.
+     * 
+     * @throws IllegalStateException if there are any active listeners to the underlying index
+     */
+    void dispose();
+
+    /**
+     * Provides instance model information for pattern matching.
+     * 
+     * <p> Implementors note: must be reentrant. 
+     * If called while index loading is already in progress, must return the single runtime context instance that will eventually index the model. 
+     * When the runtime query context is invoked in such a case, incomplete indexes are tolerable, but change notifications must be correctly provided as loading commences. 
+     * 
+     * @return a runtime context for pattern matching
+     * @since 1.2
+     * @throws ViatraQueryRuntimeException if the runtime context cannot be initialized
+     */
+    public IQueryRuntimeContext getQueryRuntimeContext();
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IIndexingErrorListener.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IIndexingErrorListener.java
new file mode 100644
index 00000000..f61a5edb
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IIndexingErrorListener.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api.scope;
+
+/**
+ *
+ * This interface contains callbacks for various internal errors from the {@link NavigationHelper base index}.
+ *
+ * @author Zoltan Ujhelyi
+ * @since 0.9
+ *
+ */
+public interface IIndexingErrorListener {
+
+    void error(String description, Throwable t);
+    void fatal(String description, Throwable t);
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IInstanceObserver.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IInstanceObserver.java
new file mode 100644
index 00000000..8ef29cbe
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/IInstanceObserver.java
@@ -0,0 +1,21 @@
+/*******************************************************************************

+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro

+ * This program and the accompanying materials are made available under the

+ * terms of the Eclipse Public License v. 2.0 which is available at

+ * http://www.eclipse.org/legal/epl-v20.html.

+ * 

+ * SPDX-License-Identifier: EPL-2.0

+ *******************************************************************************/

+package tools.refinery.viatra.runtime.api.scope;

+

+

+/**

+ * Listener interface for lightweight observation of changes in edges leaving from given source instance elements.

+ * @author Bergmann Gabor

+ * @since 0.9

+ *

+ */

+public interface IInstanceObserver {

+    void notifyBinaryChanged(Object sourceElement, Object edgeType);

+    void notifyTernaryChanged(Object sourceElement, Object edgeType);

+}

diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/QueryScope.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/QueryScope.java
new file mode 100644
index 00000000..5456b9ea
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/QueryScope.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api.scope;
+
+import tools.refinery.viatra.runtime.api.IQuerySpecification;
+import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
+import tools.refinery.viatra.runtime.internal.apiimpl.EngineContextFactory;
+
+/**
+ * Defines a scope for a VIATRA Query engine, which determines the set of model elements that query evaluation operates on.
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public abstract class QueryScope extends EngineContextFactory {
+    
+    /**
+     * Determines whether a query engine initialized on this scope can evaluate queries formulated against the given scope type.
+     * <p> Every query scope class is compatible with a query engine initialized on a scope of the same class or a subclass.
+     * @param queryScopeClass the scope class returned by invoking {@link IQuerySpecification#getPreferredScopeClass()} on a query specification
+     * @return true if an {@link ViatraQueryEngine} initialized on this scope can consume an {@link IQuerySpecification}
+     */
+    public boolean isCompatibleWithQueryScope(Class<? extends QueryScope> queryScopeClass) {
+        return queryScopeClass.isAssignableFrom(this.getClass());
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/ViatraBaseIndexChangeListener.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/ViatraBaseIndexChangeListener.java
new file mode 100644
index 00000000..b746e637
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/api/scope/ViatraBaseIndexChangeListener.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Abel Hegedus, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.api.scope;
+
+/**
+ * Listener interface for change notifications from the VIATRA Base index.
+ * 
+ * @author Abel Hegedus
+ * @since 0.9
+ *
+ */
+public interface ViatraBaseIndexChangeListener {
+
+    /**
+     * NOTE: it is possible that this method is called only ONCE! Consider returning a constant value that is set in the constructor.
+     * 
+     * @return true, if the listener should be notified only after index changes, false if notification is needed after each model change 
+     */
+    public boolean onlyOnIndexChange();
+    
+    /**
+     * Called after a model change is handled by the VIATRA Base index and if <code>indexChanged == onlyOnIndexChange()</code>.
+     *  
+     * @param indexChanged true, if the model change also affected the contents of the base index
+     */
+    public void notifyChanged(boolean indexChanged);
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/exception/ViatraQueryException.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/exception/ViatraQueryException.java
new file mode 100644
index 00000000..fec547a6
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/exception/ViatraQueryException.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Akos Horvath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.exception;
+
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.QueryInitializationException;
+
+/**
+ * A general VIATRA Query-related problem during the operation of the VIATRA Query
+ * engine, or the loading, manipulation and evaluation of queries.
+ * 
+ * @author Bergmann Gabor
+ * @since 0.9
+ * 
+ */
+public class ViatraQueryException extends ViatraQueryRuntimeException {
+
+    private static final long serialVersionUID = -74252748358355750L;
+
+    public static final String PARAM_NOT_SUITABLE_WITH_NO = "The type of the parameters are not suitable for the operation. Parameter number: ";
+    public static final String CONVERSION_FAILED = "Could not convert the term to the designated type";
+    public static final String CONVERT_NULL_PARAMETER = "Could not convert null to the designated type";
+    public static final String RELATIONAL_PARAM_UNSUITABLE = "The parameters are not acceptable by the operation";
+    /**
+     * @since 0.9
+     */
+    public static final String PROCESSING_PROBLEM = "The following error occurred during the processing of a query (e.g. for the preparation of a VIATRA pattern matcher)";
+    /**
+     * @since 0.9
+     */
+    public static final String QUERY_INIT_PROBLEM = "The following error occurred during the initialization of a VIATRA query specification";
+    public static final String GETNAME_FAILED = "Could not get 'name' attribute of the result";
+
+    public static final String INVALID_EMFROOT = "Incremental EMF query engine can only be attached on the contents of an EMF EObject, Resource, ResourceSet or multiple ResourceSets. Received instead: ";
+    public static final String INVALID_EMFROOT_SHORT = "Invalid EMF model root";
+    // public static final String EMF_MODEL_PROCESSING_ERROR = "Error while processing the EMF model";
+
+    private final String shortMessage;
+
+    public ViatraQueryException(String s, String shortMessage) {
+        super(s);
+        this.shortMessage = shortMessage;
+    }
+
+    public ViatraQueryException(QueryProcessingException e) {
+        super(PROCESSING_PROBLEM + ": " + e.getMessage(), e);
+        this.shortMessage = e.getShortMessage();
+    }
+    
+    public ViatraQueryException(QueryInitializationException e) {
+        super(QUERY_INIT_PROBLEM + ": " + e.getMessage(), e);
+        this.shortMessage = e.getShortMessage();
+    }
+
+    public ViatraQueryException(String s, String shortMessage, Throwable e) {
+        super(s + ": " + e.getMessage(), e);
+        this.shortMessage = shortMessage;
+    }
+
+    public String getShortMessage() {
+        return shortMessage;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/EngineContextFactory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/EngineContextFactory.java
new file mode 100644
index 00000000..bed07ebf
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/EngineContextFactory.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.internal.apiimpl;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
+import tools.refinery.viatra.runtime.api.scope.IEngineContext;
+import tools.refinery.viatra.runtime.api.scope.IIndexingErrorListener;
+
+/**
+ * Internal interface for a Scope to reveal model contents to the engine.
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public abstract class EngineContextFactory {
+    protected abstract IEngineContext createEngineContext(ViatraQueryEngine engine, IIndexingErrorListener errorListener, Logger logger);
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/QueryResultWrapper.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/QueryResultWrapper.java
new file mode 100644
index 00000000..47f3268d
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/QueryResultWrapper.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.internal.apiimpl;
+
+import tools.refinery.viatra.runtime.api.ViatraQueryEngine;
+import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+
+/**
+ * Internal class for wrapping a query result providing backend. It's only supported usage is by the
+ * {@link ViatraQueryEngineImpl} class.
+ * </p>
+ * 
+ * <strong>Important note</strong>: this class must not introduce any public method, as it will be visible through
+ * BaseMatcher as an API, although this class is not an API itself.
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public abstract class QueryResultWrapper {
+
+    protected IQueryResultProvider backend;
+
+    protected abstract void setBackend(ViatraQueryEngine engine, IQueryResultProvider resultProvider, IMatcherCapability capabilities);
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/ViatraQueryEngineImpl.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/ViatraQueryEngineImpl.java
new file mode 100644
index 00000000..47a51629
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/apiimpl/ViatraQueryEngineImpl.java
@@ -0,0 +1,693 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * Copyright (c) 2023 The Refinery Authors <https://refinery.tools>
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.internal.apiimpl;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.api.*;
+import tools.refinery.viatra.runtime.api.impl.BaseMatcher;
+import tools.refinery.viatra.runtime.api.scope.IBaseIndex;
+import tools.refinery.viatra.runtime.api.scope.IEngineContext;
+import tools.refinery.viatra.runtime.api.scope.IIndexingErrorListener;
+import tools.refinery.viatra.runtime.api.scope.QueryScope;
+import tools.refinery.viatra.runtime.exception.ViatraQueryException;
+import tools.refinery.viatra.runtime.internal.engine.LifecycleProvider;
+import tools.refinery.viatra.runtime.internal.engine.ModelUpdateProvider;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.backend.*;
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryCacheContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryResultProviderAccess;
+import tools.refinery.viatra.runtime.matchers.context.IQueryRuntimeContext;
+import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQueries;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery.PQueryStatus;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.viatra.runtime.util.ViatraQueryLoggingUtil;
+
+import java.lang.ref.WeakReference;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+
+import static tools.refinery.viatra.runtime.matchers.util.Preconditions.checkArgument;
+
+/**
+ * A VIATRA Query engine back-end (implementation)
+ *
+ * @author Bergmann Gábor
+ */
+public final class ViatraQueryEngineImpl extends AdvancedViatraQueryEngine
+        implements IQueryBackendHintProvider, IQueryCacheContext, IQueryResultProviderAccess {
+
+    /**
+     *
+     */
+    private static final String ERROR_ACCESSING_BACKEND = "Error while accessing query evaluator backend";
+    /**
+     *
+     */
+    private static final String QUERY_ON_DISPOSED_ENGINE_MESSAGE = "Cannot evaluate query on disposed engine!";
+    /**
+     * The engine manager responsible for this engine. Null if this engine is unmanaged.
+     */
+    private final ViatraQueryEngineManager manager;
+    /**
+     * The model to which the engine is attached.
+     */
+    private final QueryScope scope;
+
+    /**
+     * The context of the engine, provided by the scope.
+     */
+    private IEngineContext engineContext;
+
+    /**
+     * Initialized matchers for each query
+     */
+    private final IMultiLookup<IQuerySpecification<? extends ViatraQueryMatcher<?>>, ViatraQueryMatcher<?>> matchers =
+            CollectionsFactory.createMultiLookup(Object.class, MemoryType.SETS, Object.class);
+
+    /**
+     * The RETE and other pattern matcher implementations of the VIATRA Query Engine.
+     */
+    private volatile Map<IQueryBackendFactory, IQueryBackend> queryBackends = new HashMap<>();
+
+    /**
+     * The current engine default hints
+     */
+    private final ViatraQueryEngineOptions engineOptions;
+
+    /**
+     * Common query analysis provided to backends
+     */
+    private QueryAnalyzer queryAnalyzer;
+
+    /**
+     * true if message delivery is currently delayed, false otherwise
+     */
+    private boolean delayMessageDelivery = true;
+
+    private final LifecycleProvider lifecycleProvider;
+    private final ModelUpdateProvider modelUpdateProvider;
+    private Logger logger;
+    private boolean disposed = false;
+
+    /**
+     * @param manager
+     *            null if unmanaged
+     * @param scope
+     * @param engineDefaultHint
+     * @since 1.4
+     */
+    public ViatraQueryEngineImpl(ViatraQueryEngineManager manager, QueryScope scope,
+            ViatraQueryEngineOptions engineOptions) {
+        super();
+        this.manager = manager;
+        this.scope = scope;
+        this.lifecycleProvider = new LifecycleProvider(this, getLogger());
+        this.modelUpdateProvider = new ModelUpdateProvider(this, getLogger());
+        this.engineContext = scope.createEngineContext(this, taintListener, getLogger());
+
+        if (engineOptions != null) {
+            this.engineOptions = engineOptions;
+        } else {
+            this.engineOptions = ViatraQueryEngineOptions.getDefault();
+        }
+
+    }
+
+    /**
+     * @param manager
+     *            null if unmanaged
+     * @param scope
+     * @param engineDefaultHint
+     */
+    public ViatraQueryEngineImpl(ViatraQueryEngineManager manager, QueryScope scope) {
+        this(manager, scope, ViatraQueryEngineOptions.getDefault());
+    }
+
+    @Override
+    public boolean isUpdatePropagationDelayed() {
+        return this.delayMessageDelivery;
+    }
+
+    @Override
+    public <V> V delayUpdatePropagation(Callable<V> callable) throws InvocationTargetException {
+                if (!delayMessageDelivery) {
+                        throw new IllegalStateException("Trying to delay propagation while changes are being flushed");
+                }
+        try {
+            return callable.call();
+        } catch (Exception e) {
+            throw new InvocationTargetException(e);
+        }
+    }
+
+        @Override
+        public void flushChanges() {
+                if (!delayMessageDelivery) {
+                        throw new IllegalStateException("Trying to flush changes while changes are already being flushed");
+                }
+                delayMessageDelivery = false;
+                try {
+                        for (IQueryBackend backend : this.queryBackends.values()) {
+                                backend.flushUpdates();
+                        }
+                } finally {
+                        delayMessageDelivery = true;
+                }
+        }
+
+        @Override
+    public Set<? extends ViatraQueryMatcher<? extends IPatternMatch>> getCurrentMatchers() {
+        return matchers.distinctValuesStream().collect(Collectors.toSet());
+    }
+
+    @Override
+    public <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getMatcher(
+            IQuerySpecification<Matcher> querySpecification) {
+        return getMatcher(querySpecification, null);
+    }
+
+    @Override
+    public <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getMatcher(
+            IQuerySpecification<Matcher> querySpecification, QueryEvaluationHint optionalEvaluationHints) {
+        IMatcherCapability capability = getRequestedCapability(querySpecification, optionalEvaluationHints);
+        Matcher matcher = doGetExistingMatcher(querySpecification, capability);
+        if (matcher != null) {
+            return matcher;
+        }
+        matcher = querySpecification.instantiate();
+
+        BaseMatcher<?> baseMatcher = (BaseMatcher<?>) matcher;
+        ((QueryResultWrapper) baseMatcher).setBackend(this,
+                getResultProvider(querySpecification, optionalEvaluationHints), capability);
+        internalRegisterMatcher(querySpecification, baseMatcher);
+        return matcher;
+    }
+
+    @Override
+    public <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getExistingMatcher(
+            IQuerySpecification<Matcher> querySpecification) {
+        return getExistingMatcher(querySpecification, null);
+    }
+
+    @Override
+    public <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher getExistingMatcher(
+            IQuerySpecification<Matcher> querySpecification, QueryEvaluationHint optionalOverrideHints) {
+        return doGetExistingMatcher(querySpecification, getRequestedCapability(querySpecification, optionalOverrideHints));
+    }
+
+    @SuppressWarnings("unchecked")
+    private <Matcher extends ViatraQueryMatcher<? extends IPatternMatch>> Matcher doGetExistingMatcher(
+            IQuerySpecification<Matcher> querySpecification, IMatcherCapability requestedCapability) {
+        for (ViatraQueryMatcher<?> matcher : matchers.lookupOrEmpty(querySpecification)) {
+            BaseMatcher<?> baseMatcher = (BaseMatcher<?>) matcher;
+            if (baseMatcher.getCapabilities().canBeSubstitute(requestedCapability))
+                return (Matcher) matcher;
+        }
+        return null;
+    }
+
+    @Override
+    public ViatraQueryMatcher<? extends IPatternMatch> getMatcher(String patternFQN) {
+                throw new UnsupportedOperationException("Query specification registry is not available");
+    }
+
+    @Override
+    public IBaseIndex getBaseIndex() {
+        return engineContext.getBaseIndex();
+    }
+
+    public final Logger getLogger() {
+        if (logger == null) {
+            final int hash = System.identityHashCode(this);
+            logger = Logger.getLogger(ViatraQueryLoggingUtil.getLogger(ViatraQueryEngine.class).getName() + "." + hash);
+            if (logger == null)
+                throw new AssertionError(
+                        "Configuration error: unable to create VIATRA Query runtime logger for engine " + hash);
+        }
+        return logger;
+    }
+
+    ///////////////// internal stuff //////////////
+    private void internalRegisterMatcher(IQuerySpecification<?> querySpecification, ViatraQueryMatcher<?> matcher) {
+        matchers.addPair(querySpecification, matcher);
+        lifecycleProvider.matcherInstantiated(matcher);
+    }
+
+    /**
+     * Provides access to the selected query backend component of the VIATRA Query Engine.
+     */
+    @Override
+    public IQueryBackend getQueryBackend(IQueryBackendFactory iQueryBackendFactory) {
+        IQueryBackend iQueryBackend = queryBackends.get(iQueryBackendFactory);
+        if (iQueryBackend == null) {
+            // do this first, to make sure the runtime context exists
+            final IQueryRuntimeContext queryRuntimeContext = engineContext.getQueryRuntimeContext();
+
+            // maybe the backend has been created in the meantime when the indexer was initialized and queried for
+            // derived features
+            // no need to instantiate a new backend in that case
+            iQueryBackend = queryBackends.get(iQueryBackendFactory);
+            if (iQueryBackend == null) {
+
+                // need to instantiate the backend
+                iQueryBackend = iQueryBackendFactory.create(new IQueryBackendContext() {
+
+                    @Override
+                    public IQueryRuntimeContext getRuntimeContext() {
+                        return queryRuntimeContext;
+                    }
+
+                    @Override
+                    public IQueryCacheContext getQueryCacheContext() {
+                        return ViatraQueryEngineImpl.this;
+                    }
+
+                    @Override
+                    public Logger getLogger() {
+                        return logger;
+                    }
+
+                    @Override
+                    public IQueryBackendHintProvider getHintProvider() {
+                        return ViatraQueryEngineImpl.this;
+                    }
+
+                    @Override
+                    public IQueryResultProviderAccess getResultProviderAccess() {
+                        return ViatraQueryEngineImpl.this;
+                    }
+
+                    @Override
+                    public QueryAnalyzer getQueryAnalyzer() {
+                        if (queryAnalyzer == null)
+                            queryAnalyzer = new QueryAnalyzer(queryRuntimeContext.getMetaContext());
+                        return queryAnalyzer;
+                    }
+
+                    @Override
+                    public boolean areUpdatesDelayed() {
+                        return ViatraQueryEngineImpl.this.delayMessageDelivery;
+                    }
+
+                    @Override
+                    public IMatcherCapability getRequiredMatcherCapability(PQuery query,
+                            QueryEvaluationHint hint) {
+                        return engineOptions.getQueryBackendFactory(hint).calculateRequiredCapability(query, hint);
+                    }
+
+
+
+                });
+                queryBackends.put(iQueryBackendFactory, iQueryBackend);
+            }
+        }
+        return iQueryBackend;
+    }
+
+    ///////////////// advanced stuff /////////////
+
+    @Override
+    public void dispose() {
+        if (manager != null) {
+            throw new UnsupportedOperationException(
+                    String.format("Cannot dispose() managed VIATRA Query Engine. Attempted for scope %s.", scope));
+        }
+        wipe();
+
+        this.disposed = true;
+
+        // called before base index disposal to allow removal of base listeners
+        lifecycleProvider.engineDisposed();
+
+        try {
+            engineContext.dispose();
+        } catch (IllegalStateException ex) {
+            getLogger().warn(
+                    "The base index could not be disposed along with the VIATRA Query engine, as there are still active listeners on it.");
+        }
+    }
+
+    @Override
+    public void wipe() {
+        if (manager != null) {
+            throw new UnsupportedOperationException(
+                    String.format("Cannot wipe() managed VIATRA Query Engine. Attempted for scope %s.", scope));
+        }
+        if (queryBackends != null) {
+            for (IQueryBackend backend : queryBackends.values()) {
+                backend.dispose();
+            }
+            queryBackends.clear();
+        }
+        matchers.clear();
+        queryAnalyzer = null;
+        lifecycleProvider.engineWiped();
+    }
+
+    /**
+     * Indicates whether the engine is in a tainted, inconsistent state.
+     */
+    private boolean tainted = false;
+    private IIndexingErrorListener taintListener = new SelfTaintListener(this);
+
+    private static class SelfTaintListener implements IIndexingErrorListener {
+        WeakReference<ViatraQueryEngineImpl> queryEngineRef;
+
+        public SelfTaintListener(ViatraQueryEngineImpl queryEngine) {
+            this.queryEngineRef = new WeakReference<ViatraQueryEngineImpl>(queryEngine);
+        }
+
+        public void engineBecameTainted(String description, Throwable t) {
+            final ViatraQueryEngineImpl queryEngine = queryEngineRef.get();
+            if (queryEngine != null) {
+                queryEngine.tainted = true;
+                queryEngine.lifecycleProvider.engineBecameTainted(description, t);
+            }
+        }
+
+        private boolean noTaintDetectedYet = true;
+
+        protected void notifyTainted(String description, Throwable t) {
+            if (noTaintDetectedYet) {
+                noTaintDetectedYet = false;
+                engineBecameTainted(description, t);
+            }
+        }
+
+        @Override
+        public void error(String description, Throwable t) {
+            // Errors does not mean tainting
+        }
+
+        @Override
+        public void fatal(String description, Throwable t) {
+            notifyTainted(description, t);
+        }
+    }
+
+    @Override
+    public boolean isTainted() {
+        return tainted;
+    }
+
+    @Override
+    public boolean isManaged() {
+        return manager != null;
+        // return isAdvanced; ???
+    }
+
+    private <Match extends IPatternMatch> IQueryResultProvider getUnderlyingResultProvider(
+            final BaseMatcher<Match> matcher) {
+        // IQueryResultProvider resultProvider = reteEngine.accessMatcher(matcher.getSpecification());
+        return matcher.backend;
+    }
+
+    @Override
+    public <Match extends IPatternMatch> void addMatchUpdateListener(final ViatraQueryMatcher<Match> matcher,
+            final IMatchUpdateListener<? super Match> listener, boolean fireNow) {
+
+        checkArgument(listener != null, "Cannot add null listener!");
+        checkArgument(matcher.getEngine() == this, "Cannot register listener for matcher of different engine!");
+        checkArgument(!disposed, "Cannot register listener on matcher of disposed engine!");
+
+        final BaseMatcher<Match> bm = (BaseMatcher<Match>) matcher;
+
+        final IUpdateable updateDispatcher = (updateElement, isInsertion) -> {
+            Match match = null;
+            try {
+                match = bm.newMatch(updateElement.getElements());
+                if (isInsertion)
+                    listener.notifyAppearance(match);
+                else
+                    listener.notifyDisappearance(match);
+            } catch (Throwable e) { // NOPMD
+                if (e instanceof Error)
+                    throw (Error) e;
+                logger.warn(
+                        String.format(
+                                "The incremental pattern matcher encountered an error during %s a callback on %s of match %s of pattern %s. Error message: %s. (Developer note: %s in %s callback)",
+                                match == null ? "preparing" : "invoking", isInsertion ? "insertion" : "removal",
+                                match == null ? updateElement.toString() : match.prettyPrint(),
+                                matcher.getPatternName(), e.getMessage(), e.getClass().getSimpleName(), listener),
+                        e);
+            }
+
+        };
+
+        IQueryResultProvider resultProvider = getUnderlyingResultProvider(bm);
+        resultProvider.addUpdateListener(updateDispatcher, listener, fireNow);
+    }
+
+    @Override
+    public <Match extends IPatternMatch> void removeMatchUpdateListener(ViatraQueryMatcher<Match> matcher,
+            IMatchUpdateListener<? super Match> listener) {
+        checkArgument(listener != null, "Cannot remove null listener!");
+        checkArgument(matcher.getEngine() == this, "Cannot remove listener from matcher of different engine!");
+        checkArgument(!disposed, "Cannot remove listener from matcher of disposed engine!");
+
+        final BaseMatcher<Match> bm = (BaseMatcher<Match>) matcher;
+
+        try {
+            IQueryResultProvider resultProvider = getUnderlyingResultProvider(bm);
+            resultProvider.removeUpdateListener(listener);
+        } catch (Exception e) {
+            logger.error(
+                    "Error while removing listener " + listener + " from the matcher of " + matcher.getPatternName(),
+                    e);
+        }
+    }
+
+    @Override
+    public void addModelUpdateListener(ViatraQueryModelUpdateListener listener) {
+        modelUpdateProvider.addListener(listener);
+    }
+
+    @Override
+    public void removeModelUpdateListener(ViatraQueryModelUpdateListener listener) {
+        modelUpdateProvider.removeListener(listener);
+    }
+
+    @Override
+    public void addLifecycleListener(ViatraQueryEngineLifecycleListener listener) {
+        lifecycleProvider.addListener(listener);
+    }
+
+    @Override
+    public void removeLifecycleListener(ViatraQueryEngineLifecycleListener listener) {
+        lifecycleProvider.removeListener(listener);
+    }
+
+    /**
+     * Returns an internal interface towards the query backend to feed the matcher with results.
+     *
+     * @param query
+     *            the pattern for which the result provider should be delivered
+     *
+     * @throws ViatraQueryRuntimeException
+     */
+    public IQueryResultProvider getResultProvider(IQuerySpecification<?> query) {
+        Preconditions.checkState(!disposed, QUERY_ON_DISPOSED_ENGINE_MESSAGE);
+
+        return getResultProviderInternal(query, null);
+    }
+
+    /**
+     * Returns an internal interface towards the query backend to feed the matcher with results.
+     *
+     * @param query
+     *            the pattern for which the result provider should be delivered
+     *
+     * @throws ViatraQueryRuntimeException
+     */
+    public IQueryResultProvider getResultProvider(IQuerySpecification<?> query, QueryEvaluationHint hint) {
+        Preconditions.checkState(!disposed, QUERY_ON_DISPOSED_ENGINE_MESSAGE);
+
+        return getResultProviderInternal(query, hint);
+    }
+
+    /**
+     * This method returns the result provider exactly as described by the passed hint. Query cannot be null! Use
+     * {@link #getQueryEvaluationHint(IQuerySpecification, QueryEvaluationHint)} before passing a hint to this method to
+     * make sure engine and query specific hints are correctly applied.
+     *
+     * @throws ViatraQueryRuntimeException
+     */
+    private IQueryResultProvider getResultProviderInternal(IQuerySpecification<?> query, QueryEvaluationHint hint) {
+        return getResultProviderInternal(query.getInternalQueryRepresentation(), hint);
+    }
+
+    /**
+     * This method returns the result provider exactly as described by the passed hint. Query cannot be null! Use
+     * {@link #getQueryEvaluationHint(IQuerySpecification, QueryEvaluationHint)} before passing a hint to this method to
+     * make sure engine and query specific hints are correctly applied.
+     *
+     * @throws ViatraQueryRuntimeException
+     */
+    private IQueryResultProvider getResultProviderInternal(PQuery query, QueryEvaluationHint hint) {
+        Preconditions.checkArgument(query != null, "Query cannot be null!");
+        Preconditions.checkArgument(query.getStatus() != PQueryStatus.ERROR, "Cannot initialize a result provider for the erronoues query `%s`.", query.getSimpleName());
+        final IQueryBackend backend = getQueryBackend(engineOptions.getQueryBackendFactory(getQueryEvaluationHint(query, hint)));
+        return backend.getResultProvider(query, hint);
+    }
+
+    /**
+     * Returns the query backend (influenced by the hint system), even if it is a non-caching backend.
+     *
+     * @throws ViatraQueryRuntimeException
+     */
+    private IQueryBackend getQueryBackend(PQuery query) {
+        final IQueryBackendFactory factory = engineOptions.getQueryBackendFactory(getQueryEvaluationHint(query));
+        return getQueryBackend(factory);
+    }
+
+    /**
+     * Returns a caching query backend (influenced by the hint system).
+     *
+     * @throws ViatraQueryRuntimeException
+     */
+    private IQueryBackend getCachingQueryBackend(PQuery query) {
+        IQueryBackend regularBackend = getQueryBackend(query);
+        if (regularBackend.isCaching())
+            return regularBackend;
+        else
+            return getQueryBackend(engineOptions.getDefaultCachingBackendFactory());
+    }
+
+    @Override
+    public boolean isResultCached(PQuery query) {
+        try {
+            return null != getCachingQueryBackend(query).peekExistingResultProvider(query);
+        } catch (ViatraQueryException iqe) {
+            getLogger().error(ERROR_ACCESSING_BACKEND, iqe);
+            return false;
+        }
+    }
+
+    @Override
+    public IQueryResultProvider getCachingResultProvider(PQuery query) {
+        try {
+            return getCachingQueryBackend(query).getResultProvider(query);
+        } catch (ViatraQueryException iqe) {
+            getLogger().error(ERROR_ACCESSING_BACKEND, iqe);
+            throw iqe;
+        }
+    }
+
+    private QueryEvaluationHint getEngineDefaultHint() {
+        return engineOptions.getEngineDefaultHints();
+    }
+
+    @Override
+    public QueryEvaluationHint getQueryEvaluationHint(PQuery query) {
+        return getEngineDefaultHint().overrideBy(query.getEvaluationHints());
+    }
+
+    private QueryEvaluationHint getQueryEvaluationHint(IQuerySpecification<?> querySpecification,
+            QueryEvaluationHint optionalOverrideHints) {
+        return getQueryEvaluationHint(querySpecification.getInternalQueryRepresentation())
+                        .overrideBy(optionalOverrideHints);
+    }
+
+    private QueryEvaluationHint getQueryEvaluationHint(PQuery query, QueryEvaluationHint optionalOverrideHints) {
+        return getQueryEvaluationHint(query).overrideBy(optionalOverrideHints);
+    }
+
+    private IMatcherCapability getRequestedCapability(IQuerySpecification<?> querySpecification,
+            QueryEvaluationHint optionalOverrideHints) {
+        final QueryEvaluationHint hint = getQueryEvaluationHint(querySpecification, optionalOverrideHints);
+        return engineOptions.getQueryBackendFactory(hint)
+                .calculateRequiredCapability(querySpecification.getInternalQueryRepresentation(), hint);
+    }
+
+    @Override
+    public void prepareGroup(IQueryGroup queryGroup, final QueryEvaluationHint optionalEvaluationHints) {
+        try {
+            Preconditions.checkState(!disposed, QUERY_ON_DISPOSED_ENGINE_MESSAGE);
+
+            final Set<IQuerySpecification<?>> specifications = new HashSet<IQuerySpecification<?>>(
+                    queryGroup.getSpecifications());
+            final Collection<PQuery> patterns = specifications.stream().map(
+                    IQuerySpecification::getInternalQueryRepresentation).collect(Collectors.toList());
+            patterns.forEach(PQuery::ensureInitialized);
+
+            Collection<String> erroneousPatterns = patterns.stream().
+                    filter(PQueries.queryStatusPredicate(PQueryStatus.ERROR)).
+                    map(PQuery::getFullyQualifiedName).
+                    collect(Collectors.toList());
+            Preconditions.checkState(erroneousPatterns.isEmpty(), "Erroneous query(s) found: %s",
+                    erroneousPatterns.stream().collect(Collectors.joining(", ")));
+
+            // TODO maybe do some smarter preparation per backend?
+            try {
+                engineContext.getBaseIndex().coalesceTraversals(new Callable<Void>() {
+                    @Override
+                    public Void call() throws Exception {
+                        for (IQuerySpecification<?> query : specifications) {
+                            getResultProviderInternal(query, optionalEvaluationHints);
+                        }
+                        return null;
+                    }
+                });
+            } catch (InvocationTargetException ex) {
+                final Throwable cause = ex.getCause();
+                if (cause instanceof QueryProcessingException)
+                    throw (QueryProcessingException) cause;
+                if (cause instanceof ViatraQueryException)
+                    throw (ViatraQueryException) cause;
+                if (cause instanceof RuntimeException)
+                    throw (RuntimeException) cause;
+                assert (false);
+            }
+        } catch (QueryProcessingException e) {
+            throw new ViatraQueryException(e);
+        }
+    }
+
+    @Override
+    public QueryScope getScope() {
+        return scope;
+    }
+
+    @Override
+    public ViatraQueryEngineOptions getEngineOptions() {
+        return engineOptions;
+    }
+
+    @Override
+    public IQueryResultProvider getResultProviderOfMatcher(ViatraQueryMatcher<? extends IPatternMatch> matcher) {
+        return ((QueryResultWrapper) matcher).backend;
+    }
+
+    @Override
+    public IQueryResultProvider getResultProvider(PQuery query, QueryEvaluationHint overrideHints) {
+        try {
+            return getResultProviderInternal(query, overrideHints);
+        } catch (ViatraQueryException e) {
+            getLogger().error(ERROR_ACCESSING_BACKEND, e);
+            throw e;
+        }
+    }
+
+    @Override
+    public boolean isDisposed() {
+        return disposed;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/LifecycleProvider.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/LifecycleProvider.java
new file mode 100644
index 00000000..8bbf2a66
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/LifecycleProvider.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Abel Hegedus, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.internal.engine;
+
+import java.util.ArrayList;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.api.AdvancedViatraQueryEngine;
+import tools.refinery.viatra.runtime.api.IPatternMatch;
+import tools.refinery.viatra.runtime.api.ViatraQueryEngineLifecycleListener;
+import tools.refinery.viatra.runtime.api.ViatraQueryMatcher;
+
+public final class LifecycleProvider extends ListenerContainer<ViatraQueryEngineLifecycleListener> implements ViatraQueryEngineLifecycleListener{
+
+        private final Logger logger;
+
+        /**
+         * @param queryEngine
+         */
+        public LifecycleProvider(AdvancedViatraQueryEngine queryEngine, Logger logger) {
+            this.logger = logger;
+        }
+
+        @Override
+        protected void listenerAdded(ViatraQueryEngineLifecycleListener listener) {
+            logger.debug("Lifecycle listener " + listener + " added to engine.");
+        }
+
+        @Override
+        protected void listenerRemoved(ViatraQueryEngineLifecycleListener listener) {
+            logger.debug("Lifecycle listener " + listener + " removed from engine.");
+        }
+
+//        public void propagateEventToListeners(Predicate<ViatraQueryEngineLifecycleListener> function) {
+//            if (!listeners.isEmpty()) {
+//                for (ViatraQueryEngineLifecycleListener listener : new ArrayList<ViatraQueryEngineLifecycleListener>(listeners)) {
+//                    try {
+//                        function.apply(listener);
+//                    } catch (Exception ex) {
+//                        logger.error(
+//                                "VIATRA Query encountered an error in delivering notification to listener "
+//                                        + listener + ".", ex);
+//                    }
+//                }
+//            }
+//        }
+        
+        @Override
+        public void matcherInstantiated(final ViatraQueryMatcher<? extends IPatternMatch> matcher) {
+            if (!listeners.isEmpty()) {
+                for (ViatraQueryEngineLifecycleListener listener : new ArrayList<ViatraQueryEngineLifecycleListener>(listeners)) {
+                    try {
+                        listener.matcherInstantiated(matcher);
+                    } catch (Exception ex) {
+                        logger.error(
+                                "VIATRA Query encountered an error in delivering matcher initialization notification to listener "
+                                        + listener + ".", ex);
+                    }
+                }
+            }
+//            propagateEventToListeners(new Predicate<ViatraQueryEngineLifecycleListener>() {
+//               public boolean apply(ViatraQueryEngineLifecycleListener listener) {
+//                   listener.matcherInstantiated(matcher);
+//                   return true;
+//               }
+//            });
+        }
+
+        @Override
+        public void engineBecameTainted(String description, Throwable t) {
+            if (!listeners.isEmpty()) {
+                for (ViatraQueryEngineLifecycleListener listener : new ArrayList<ViatraQueryEngineLifecycleListener>(listeners)) {
+                    try {
+                        listener.engineBecameTainted(description, t);
+                    } catch (Exception ex) {
+                        logger.error(
+                                "VIATRA Query encountered an error in delivering engine tainted notification to listener "
+                                        + listener + ".", ex);
+                    }
+                }
+            }
+//            propagateEventToListeners(new Predicate<ViatraQueryEngineLifecycleListener>() {
+//                public boolean apply(ViatraQueryEngineLifecycleListener listener) {
+//                    listener.engineBecameTainted();
+//                    return true;
+//                }
+//             });
+        }
+
+        @Override
+        public void engineWiped() {
+            if (!listeners.isEmpty()) {
+                for (ViatraQueryEngineLifecycleListener listener : new ArrayList<ViatraQueryEngineLifecycleListener>(listeners)) {
+                    try {
+                        listener.engineWiped();
+                    } catch (Exception ex) {
+                        logger.error(
+                                "VIATRA Query encountered an error in delivering engine wiped notification to listener "
+                                        + listener + ".", ex);
+                    }
+                }
+            }
+//            propagateEventToListeners(new Predicate<ViatraQueryEngineLifecycleListener>() {
+//                public boolean apply(ViatraQueryEngineLifecycleListener listener) {
+//                    listener.engineWiped();
+//                    return true;
+//                }
+//             });
+        }
+
+        @Override
+        public void engineDisposed() {
+            if (!listeners.isEmpty()) {
+                for (ViatraQueryEngineLifecycleListener listener : new ArrayList<ViatraQueryEngineLifecycleListener>(listeners)) {
+                    try {
+                        listener.engineDisposed();
+                    } catch (Exception ex) {
+                        logger.error(
+                                "VIATRA Query encountered an error in delivering engine disposed notification to listener "
+                                        + listener + ".", ex);
+                    }
+                }
+            }
+//            propagateEventToListeners(new Predicate<ViatraQueryEngineLifecycleListener>() {
+//                public boolean apply(ViatraQueryEngineLifecycleListener listener) {
+//                    listener.engineDisposed();
+//                    return true;
+//                }
+//             });
+        }
+        
+    }
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/ListenerContainer.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/ListenerContainer.java
new file mode 100644
index 00000000..34133bed
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/ListenerContainer.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Abel Hegedus, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.internal.engine;
+
+import static tools.refinery.viatra.runtime.matchers.util.Preconditions.checkArgument;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public abstract class ListenerContainer<Listener> {
+    
+    protected final Set<Listener> listeners;
+    
+    public ListenerContainer() {
+        this.listeners = new HashSet<Listener>();
+    }
+    
+    public synchronized void addListener(Listener listener) {
+        checkArgument(listener != null, "Cannot add null listener!");
+        boolean added = listeners.add(listener);
+        if(added) {
+            listenerAdded(listener);
+        }
+    }
+    
+    public synchronized void removeListener(Listener listener) {
+        checkArgument(listener != null, "Cannot remove null listener!");
+        boolean removed = listeners.remove(listener);
+        if(removed) {
+            listenerRemoved(listener);
+        }
+    }
+    
+    protected abstract void listenerAdded(Listener listener);
+    
+    protected abstract void listenerRemoved(Listener listener);
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/ModelUpdateProvider.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/ModelUpdateProvider.java
new file mode 100644
index 00000000..1f2c27e8
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/internal/engine/ModelUpdateProvider.java
@@ -0,0 +1,214 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Abel Hegedus, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.internal.engine;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.api.AdvancedViatraQueryEngine;
+import tools.refinery.viatra.runtime.api.IMatchUpdateListener;
+import tools.refinery.viatra.runtime.api.IPatternMatch;
+import tools.refinery.viatra.runtime.api.ViatraQueryEngineLifecycleListener;
+import tools.refinery.viatra.runtime.api.ViatraQueryMatcher;
+import tools.refinery.viatra.runtime.api.ViatraQueryModelUpdateListener;
+import tools.refinery.viatra.runtime.api.ViatraQueryModelUpdateListener.ChangeLevel;
+import tools.refinery.viatra.runtime.api.scope.ViatraBaseIndexChangeListener;
+import tools.refinery.viatra.runtime.exception.ViatraQueryException;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+
+public final class ModelUpdateProvider extends ListenerContainer<ViatraQueryModelUpdateListener> {
+
+    private final AdvancedViatraQueryEngine queryEngine;
+    private ChangeLevel currentChange = ChangeLevel.NO_CHANGE;
+    private ChangeLevel maxLevel = ChangeLevel.NO_CHANGE;
+    private final Map<ChangeLevel, Collection<ViatraQueryModelUpdateListener>> listenerMap;
+    private final Logger logger;
+    
+    public ModelUpdateProvider(AdvancedViatraQueryEngine queryEngine, Logger logger) {
+        super();
+        this.queryEngine = queryEngine;
+        this.logger = logger;
+        listenerMap = new EnumMap<>(ChangeLevel.class);
+    }
+    
+    @Override
+    protected void listenerAdded(ViatraQueryModelUpdateListener listener) {
+        // check ChangeLevel
+        // create callback for given level if required
+        if(listenerMap.isEmpty()) {
+            try {
+                this.queryEngine.getBaseIndex().addBaseIndexChangeListener(indexListener);
+                // add listener to new matchers (use lifecycle listener)
+                this.queryEngine.addLifecycleListener(selfListener);
+            } catch (ViatraQueryException e) {
+                throw new IllegalStateException("Model update listener used on engine without base index", e);
+            }
+        }
+        
+        ChangeLevel changeLevel = listener.getLevel();
+        listenerMap.computeIfAbsent(changeLevel, k -> CollectionsFactory.createSet()).add(listener);
+        // increase or keep max level of listeners
+        ChangeLevel oldMaxLevel = maxLevel;
+        maxLevel = maxLevel.changeOccured(changeLevel); 
+        if(!maxLevel.equals(oldMaxLevel) && ChangeLevel.MATCHSET.compareTo(oldMaxLevel) > 0 && ChangeLevel.MATCHSET.compareTo(maxLevel) <= 0) {
+            // add matchUpdateListener to all matchers
+            for (ViatraQueryMatcher<?> matcher : this.queryEngine.getCurrentMatchers()) {
+                this.queryEngine.addMatchUpdateListener(matcher, matchSetListener, false);
+            }
+        }
+    }
+
+    @Override
+    protected void listenerRemoved(ViatraQueryModelUpdateListener listener) {
+        ChangeLevel changeLevel = listener.getLevel();
+        Collection<ViatraQueryModelUpdateListener> old = listenerMap.getOrDefault(changeLevel, Collections.emptySet());
+        boolean removed = old.remove(listener);
+        if(removed) {
+            if (old.isEmpty()) listenerMap.remove(changeLevel);
+        } else {
+            handleUnsuccesfulRemove(listener);
+        }
+        
+        updateMaxLevel();
+        
+        if(listenerMap.isEmpty()) {
+            this.queryEngine.removeLifecycleListener(selfListener);
+            removeBaseIndexChangeListener();
+        }
+    }
+
+    private void removeBaseIndexChangeListener() {
+        try {
+            this.queryEngine.getBaseIndex().removeBaseIndexChangeListener(indexListener);
+        } catch (ViatraQueryException e) {
+            throw new IllegalStateException("Model update listener used on engine without base index", e);
+        }
+    }
+
+    private void updateMaxLevel() {
+        if(!listenerMap.containsKey(maxLevel)) {
+            ChangeLevel newMaxLevel = ChangeLevel.NO_CHANGE;
+            for (ChangeLevel level : new HashSet<>(listenerMap.keySet())) {
+                newMaxLevel = newMaxLevel.changeOccured(level);
+            }
+            maxLevel = newMaxLevel;
+        }
+        if(maxLevel.compareTo(ChangeLevel.MATCHSET) < 0) {
+            // remove listener from matchers
+            for (ViatraQueryMatcher<?> matcher : this.queryEngine.getCurrentMatchers()) {
+                this.queryEngine.removeMatchUpdateListener(matcher, matchSetListener);
+            }
+        }
+    }
+
+    private void handleUnsuccesfulRemove(ViatraQueryModelUpdateListener listener) {
+        for (Entry<ChangeLevel, Collection<ViatraQueryModelUpdateListener>> entry : listenerMap.entrySet()) {
+            Collection<ViatraQueryModelUpdateListener> existingListeners = entry.getValue();
+            // if the listener is contained in some other bucket, remove it from there
+            if(existingListeners.remove(listener)) {
+                logger.error("Listener "+listener+" change level changed since initialization!");
+                if (existingListeners.isEmpty()) listenerMap.remove(entry.getKey());
+                return; // listener is contained only once
+            }
+        }
+        logger.error("Listener "+listener+" already removed from map (e.g. engine was already disposed)!");
+    }
+
+    private void notifyListeners() {
+        
+        // any change that occurs after this point should be regarded as a new event
+        // FIXME what should happen when a listener creates new notifications?
+        // -> other listeners will get events in different order
+        ChangeLevel tempLevel = currentChange;
+        currentChange = ChangeLevel.NO_CHANGE;
+        
+        if(!listenerMap.isEmpty()) {
+            for (ChangeLevel level : new HashSet<>(listenerMap.keySet())) {
+                if(tempLevel.compareTo(level) >= 0) {
+                    for (ViatraQueryModelUpdateListener listener : new ArrayList<>(listenerMap.get(level))) {
+                        try {
+                            listener.notifyChanged(tempLevel);
+                        } catch (Exception ex) {
+                            logger.error(
+                                    "VIATRA Query encountered an error in delivering model update notification to listener "
+                                            + listener + ".", ex);
+                        }
+                    }
+                }
+            }
+        } else {
+            throw new IllegalStateException("Notify listeners must not be called without listeners! Maybe an update callback was not removed correctly.");
+        }
+        
+    }
+    
+    // model update "providers":
+    // - model: IQBase callback even if not dirty
+    // - index: IQBase dirty callback
+    private final ViatraBaseIndexChangeListener indexListener = new ViatraBaseIndexChangeListener() {
+        
+        @Override
+        public boolean onlyOnIndexChange() {
+            return false;
+        }
+        
+        @Override
+        public void notifyChanged(boolean indexChanged) {
+            if(indexChanged) {
+                currentChange = currentChange.changeOccured(ChangeLevel.INDEX);
+            } else {
+                currentChange = currentChange.changeOccured(ChangeLevel.MODEL);
+            }
+            notifyListeners();
+        }
+        
+    };
+    // - matchset: add the same listener to each matcher and use a dirty flag. needs IQBase callback as well
+    private final IMatchUpdateListener<IPatternMatch> matchSetListener = new IMatchUpdateListener<IPatternMatch>() {
+        
+        @Override
+        public void notifyDisappearance(IPatternMatch match) {
+            currentChange = currentChange.changeOccured(ChangeLevel.MATCHSET);
+        }
+        
+        @Override
+        public void notifyAppearance(IPatternMatch match) {
+            currentChange = currentChange.changeOccured(ChangeLevel.MATCHSET);
+        }
+    };
+    
+    private final ViatraQueryEngineLifecycleListener selfListener = new ViatraQueryEngineLifecycleListener() {
+        
+        @Override
+        public void matcherInstantiated(ViatraQueryMatcher<? extends IPatternMatch> matcher) {
+            if (maxLevel.compareTo(ChangeLevel.MATCHSET) >= 0) {
+                ModelUpdateProvider.this.queryEngine.addMatchUpdateListener(matcher, matchSetListener, false);
+            }
+        }
+        
+        @Override
+        public void engineWiped() {}
+        
+        @Override
+        public void engineDisposed() {
+            removeBaseIndexChangeListener();
+            listenerMap.clear();
+            maxLevel = ChangeLevel.NO_CHANGE;
+        }
+        
+        @Override
+        public void engineBecameTainted(String description, Throwable t) {}
+    };
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/ViatraQueryRuntimeException.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/ViatraQueryRuntimeException.java
new file mode 100644
index 00000000..83f6f766
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/ViatraQueryRuntimeException.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers;
+
+/**
+ * A common base class for all exceptions thrown by various VIATRA Query Runtime APIs.
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 2.0
+ */
+public abstract class ViatraQueryRuntimeException extends RuntimeException {
+
+    private static final long serialVersionUID = -8505253058035069310L;
+
+    public ViatraQueryRuntimeException() {
+        super();
+    }
+
+    public ViatraQueryRuntimeException(String message) {
+        super(message);
+    }
+
+    public ViatraQueryRuntimeException(Throwable cause) {
+        super(cause);
+    }
+
+    public ViatraQueryRuntimeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ViatraQueryRuntimeException(String message, Throwable cause, boolean enableSuppression,
+            boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/AverageAccumulator.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/AverageAccumulator.java
new file mode 100644
index 00000000..2c09ede1
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/AverageAccumulator.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.aggregators;
+
+/**
+ * @since 2.0
+ */
+class AverageAccumulator<Domain> {
+    Domain value;
+    long count;
+
+    public AverageAccumulator(Domain value, long count) {
+        super();
+        this.value = value;
+        this.count = count;
+    }
+    
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/DoubleAverageOperator.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/DoubleAverageOperator.java
new file mode 100644
index 00000000..e8a26afd
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/DoubleAverageOperator.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.aggregators;
+
+import java.util.OptionalDouble;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @since 2.0
+ */
+public class DoubleAverageOperator implements IMultisetAggregationOperator<Double, AverageAccumulator<Double>, Double> {
+
+    public static final DoubleAverageOperator INSTANCE = new DoubleAverageOperator();
+    
+    private DoubleAverageOperator() {
+        // Singleton, do not call.
+    }
+    
+    @Override
+    public String getShortDescription() {
+        return "avg<Integer> incrementally computes the average of java.lang.Integer values";
+    }
+
+    @Override
+    public String getName() {
+        return "avg<Integer>";
+    }
+
+    @Override
+    public AverageAccumulator<Double> createNeutral() {
+        return new AverageAccumulator<Double>(0d, 0l);
+    }
+
+    @Override
+    public boolean isNeutral(AverageAccumulator<Double> result) {
+        return result.count == 0l;
+    }
+
+    @Override
+    public AverageAccumulator<Double> update(AverageAccumulator<Double> oldResult, Double updateValue,
+            boolean isInsertion) {
+        if (isInsertion) {
+            oldResult.value += updateValue;
+            oldResult.count++;
+        } else {
+            oldResult.value -= updateValue;
+            oldResult.count--;
+        }
+        return oldResult;
+    }
+
+    @Override
+    public Double getAggregate(AverageAccumulator<Double> result) {
+        return (result.count == 0)
+                ? null
+                : result.value/result.count;
+    }
+
+    @Override
+    public Double aggregateStream(Stream<Double> stream) {
+        final OptionalDouble averageOpt = stream.mapToDouble(Double::doubleValue).average();
+        return averageOpt.isPresent() ? averageOpt.getAsDouble() : null;
+    }
+    
+    /**
+     * @since 2.4
+     */
+    @Override
+    public AverageAccumulator<Double> clone(AverageAccumulator<Double> original) {
+        return new AverageAccumulator<Double>(original.value, original.count);
+    }
+    
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/DoubleSumOperator.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/DoubleSumOperator.java
new file mode 100644
index 00000000..744b0cd1
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/DoubleSumOperator.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.aggregators;
+
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AbstractMemorylessAggregationOperator;
+
+/**
+ * Incrementally computes the sum of java.lang.Double values
+ * @author Gabor Bergmann
+ * @since 1.4
+ */
+public class DoubleSumOperator extends AbstractMemorylessAggregationOperator<Double, Double> {
+    public static final DoubleSumOperator INSTANCE = new DoubleSumOperator();
+    
+    private DoubleSumOperator() {
+        // Singleton, do not call.
+    }
+
+    @Override
+    public String getShortDescription() {
+        return "sum<Double> incrementally computes the sum of java.lang.Double values";
+    }
+    @Override
+    public String getName() {
+        return "sum<Double>";
+    }
+    
+    @Override
+    public Double createNeutral() {
+        return 0d;
+    }
+
+    @Override
+    public boolean isNeutral(Double result) {
+        return createNeutral().equals(result);
+    }
+
+    @Override
+    public Double update(Double oldResult, Double updateValue, boolean isInsertion) {
+        return isInsertion ? 
+                oldResult + updateValue : 
+                oldResult - updateValue;
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public Double aggregateStream(Stream<Double> stream) {
+        return stream.mapToDouble(Double::doubleValue).sum();
+    }
+    
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/ExtremumOperator.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/ExtremumOperator.java
new file mode 100644
index 00000000..ee4ceeb8
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/ExtremumOperator.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.aggregators;
+
+import java.util.Comparator;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+
+/**
+ * Incrementally computes the minimum or maximum of java.lang.Comparable values, using the default comparison
+ * 
+ * @author Gabor Bergmann
+ * @since 1.4
+ */
+public class ExtremumOperator<T extends Comparable<T>>
+        implements IMultisetAggregationOperator<T, SortedMap<T, Integer>, T> {
+    
+    public enum Extreme {
+        MIN, MAX;
+        
+        /**
+         * @since 2.0
+         */
+        public <T> T pickFrom(SortedMap<T, Integer> nonEmptyMultiSet) {
+            switch(this) {
+            case MIN: 
+                return nonEmptyMultiSet.firstKey(); 
+            case MAX:
+                return nonEmptyMultiSet.lastKey();
+            default:
+                return null;
+            }
+        }
+    }
+
+    private static final ExtremumOperator MIN_OP = new ExtremumOperator<>(Extreme.MIN);
+    private static final ExtremumOperator MAX_OP = new ExtremumOperator<>(Extreme.MAX);
+
+    public static <T extends Comparable<T>> ExtremumOperator<T> getMin() {
+        return MIN_OP;
+    }
+    public static <T extends Comparable<T>> ExtremumOperator<T> getMax() {
+        return MAX_OP;
+    }
+    
+    Extreme extreme;
+    private ExtremumOperator(Extreme extreme) {
+        super();
+        this.extreme = extreme;
+    }
+
+    @Override
+    public String getShortDescription() {
+        String opName = getName();
+        return String.format(
+                "%s incrementally computes the %simum of java.lang.Comparable values, using the default comparison",
+                opName, opName);
+    }
+
+    @Override
+    public String getName() {
+        return extreme.name().toLowerCase();
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public SortedMap<T, Integer> createNeutral() {
+        return new TreeMap<>();
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public boolean isNeutral(SortedMap<T, Integer> result) {
+        return result.isEmpty();
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public SortedMap<T, Integer> update(SortedMap<T, Integer> oldResult, T updateValue, boolean isInsertion) {
+        oldResult.compute(updateValue, (value, c) -> {
+            int count = (c == null) ? 0 : c;
+            int result = (isInsertion) ? count+1 : count-1;  
+            return (result == 0) ? null : result;
+        });
+        return oldResult;
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public T getAggregate(SortedMap<T, Integer> result) {
+        return result.isEmpty() ? null : 
+            extreme.pickFrom(result);
+    }
+    
+    /**
+     * @since 2.0
+     */
+    @Override
+    public T aggregateStream(Stream<T> stream) {
+        switch (extreme) {
+        case MIN:
+            return stream.min(Comparator.naturalOrder()).orElse(null);
+        case MAX:
+            return stream.max(Comparator.naturalOrder()).orElse(null);
+        default:
+            return null;
+        }
+    }
+    
+    /**
+     * @since 2.4
+     */
+    @Override
+    public SortedMap<T, Integer> clone(SortedMap<T, Integer> original) {
+        return new TreeMap<T, Integer>(original);
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/IntegerAverageOperator.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/IntegerAverageOperator.java
new file mode 100644
index 00000000..bf422476
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/IntegerAverageOperator.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.aggregators;
+
+import java.util.OptionalDouble;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @since 2.0
+ */
+public class IntegerAverageOperator implements IMultisetAggregationOperator<Integer, AverageAccumulator<Integer>, Double> {
+
+    public static final IntegerAverageOperator INSTANCE = new IntegerAverageOperator();
+    
+    private IntegerAverageOperator() {
+        // Singleton, do not call.
+    }
+    
+    @Override
+    public String getShortDescription() {
+        return "avg<Integer> incrementally computes the average of java.lang.Integer values";
+    }
+
+    @Override
+    public String getName() {
+        return "avg<Integer>";
+    }
+
+    @Override
+    public AverageAccumulator<Integer> createNeutral() {
+        return new AverageAccumulator<Integer>(0, 0l);
+    }
+
+    @Override
+    public boolean isNeutral(AverageAccumulator<Integer> result) {
+        return result.count == 0l;
+    }
+
+    @Override
+    public AverageAccumulator<Integer> update(AverageAccumulator<Integer> oldResult, Integer updateValue,
+            boolean isInsertion) {
+        if (isInsertion) {
+            oldResult.value += updateValue;
+            oldResult.count++;
+        } else {
+            oldResult.value -= updateValue;
+            oldResult.count--;
+        }
+        return oldResult;
+    }
+
+    @Override
+    public Double getAggregate(AverageAccumulator<Integer> result) {
+        return (result.count == 0)
+                ? null
+                : ((double)result.value)/result.count;
+    }
+
+    @Override
+    public Double aggregateStream(Stream<Integer> stream) {
+        final OptionalDouble averageOpt = stream.mapToInt(Integer::intValue).average();
+        return averageOpt.isPresent() ? averageOpt.getAsDouble() : null;
+    }
+    
+    /**
+     * @since 2.4
+     */
+    @Override
+    public AverageAccumulator<Integer> clone(AverageAccumulator<Integer> original) {
+        return new AverageAccumulator<Integer>(original.value, original.count);
+    }
+    
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/IntegerSumOperator.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/IntegerSumOperator.java
new file mode 100644
index 00000000..18584256
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/IntegerSumOperator.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.aggregators;
+
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AbstractMemorylessAggregationOperator;
+
+/**
+ * Incrementally computes the sum of java.lang.Integer values
+ * @author Gabor Bergmann
+ * @since 1.4
+ */
+public class IntegerSumOperator extends AbstractMemorylessAggregationOperator<Integer, Integer> {
+    public static final IntegerSumOperator INSTANCE = new IntegerSumOperator();
+    
+    private IntegerSumOperator() {
+        // Singleton, do not call.
+    }
+
+    @Override
+    public String getShortDescription() {
+        return "sum<Integer> incrementally computes the sum of java.lang.Integer values";
+    }
+    @Override
+    public String getName() {
+        return "sum<Integer>";
+    }
+    
+    @Override
+    public Integer createNeutral() {
+        return 0;
+    }
+
+    @Override
+    public boolean isNeutral(Integer result) {
+        return createNeutral().equals(result);
+    }
+
+    @Override
+    public Integer update(Integer oldResult, Integer updateValue, boolean isInsertion) {
+        return isInsertion ? 
+                oldResult + updateValue : 
+                oldResult - updateValue;
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public Integer aggregateStream(Stream<Integer> stream) {
+        return stream.mapToInt(Integer::intValue).sum();
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/LongAverageOperator.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/LongAverageOperator.java
new file mode 100644
index 00000000..d56c9507
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/LongAverageOperator.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.aggregators;
+
+import java.util.OptionalDouble;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @since 2.0
+ */
+public class LongAverageOperator implements IMultisetAggregationOperator<Long, AverageAccumulator<Long>, Double> {
+
+    public static final LongAverageOperator INSTANCE = new LongAverageOperator();
+    
+    private LongAverageOperator() {
+        // Singleton, do not call.
+    }
+    
+    @Override
+    public String getShortDescription() {
+        return "avg<Integer> incrementally computes the average of java.lang.Integer values";
+    }
+
+    @Override
+    public String getName() {
+        return "avg<Integer>";
+    }
+
+    @Override
+    public AverageAccumulator<Long> createNeutral() {
+        return new AverageAccumulator<Long>(0l, 0l);
+    }
+
+    @Override
+    public boolean isNeutral(AverageAccumulator<Long> result) {
+        return result.count == 0l;
+    }
+
+    @Override
+    public AverageAccumulator<Long> update(AverageAccumulator<Long> oldResult, Long updateValue,
+            boolean isInsertion) {
+        if (isInsertion) {
+            oldResult.value += updateValue;
+            oldResult.count++;
+        } else {
+            oldResult.value -= updateValue;
+            oldResult.count--;
+        }
+        return oldResult;
+    }
+
+    @Override
+    public Double getAggregate(AverageAccumulator<Long> result) {
+        return (result.count == 0)
+                ? null
+                : ((double)result.value)/result.count;
+    }
+
+    @Override
+    public Double aggregateStream(Stream<Long> stream) {
+        final OptionalDouble averageOpt = stream.mapToLong(Long::longValue).average();
+        return averageOpt.isPresent() ? averageOpt.getAsDouble() : null;
+    }
+    
+    /**
+     * @since 2.4
+     */
+    @Override
+    public AverageAccumulator<Long> clone(AverageAccumulator<Long> original) {
+        return new AverageAccumulator<Long>(original.value, original.count);
+    }
+    
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/LongSumOperator.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/LongSumOperator.java
new file mode 100644
index 00000000..29ded090
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/LongSumOperator.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.aggregators;
+
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AbstractMemorylessAggregationOperator;
+
+/**
+ * Incrementally computes the sum of java.lang.Long values
+ * @author Gabor Bergmann
+ * @since 1.4
+ */
+public class LongSumOperator extends AbstractMemorylessAggregationOperator<Long, Long> {
+    public static final LongSumOperator INSTANCE = new LongSumOperator();
+    
+    private LongSumOperator() {
+        // Singleton, do not call.
+    }
+
+    @Override
+    public String getShortDescription() {
+        return "sum<Long> incrementally computes the sum of java.lang.Long values";
+    }
+    @Override
+    public String getName() {
+        return "sum<Long>";
+    }
+    
+    @Override
+    public Long createNeutral() {
+        return 0L;
+    }
+
+    @Override
+    public boolean isNeutral(Long result) {
+        return createNeutral().equals(result);
+    }
+
+    @Override
+    public Long update(Long oldResult, Long updateValue, boolean isInsertion) {
+        return isInsertion ? 
+                oldResult + updateValue : 
+                oldResult - updateValue;
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public Long aggregateStream(Stream<Long> stream) {
+        return stream.mapToLong(Long::longValue).sum();
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/avg.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/avg.java
new file mode 100644
index 00000000..c25678aa
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/avg.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.aggregators;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AggregatorType;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.BoundAggregator;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IAggregatorFactory;
+
+/**
+ * This aggregator calculates the average of the values of a selected aggregate parameter of a called pattern. The aggregate
+ * parameter is selected with the '#' symbol; the aggregate parameter must not be used outside the aggregator call. The
+ * other parameters of the call might be bound or unbound; bound parameters limit the matches to consider for the
+ * summation.
+ * 
+ * @since 2.0
+ *
+ */
+@AggregatorType(
+        parameterTypes = {Integer.class, Double.class, Long.class},
+        returnTypes = {Double.class, Double.class, Double.class})
+public final class avg implements IAggregatorFactory {
+
+    @Override
+    public BoundAggregator getAggregatorLogic(Class<?> domainClass) {
+        if (Integer.class.equals(domainClass))
+            return new BoundAggregator(IntegerAverageOperator.INSTANCE, Integer.class, Double.class);
+        if (Double.class.equals(domainClass))
+            return new BoundAggregator(DoubleAverageOperator.INSTANCE, Double.class, Double.class);
+        if (Long.class.equals(domainClass))
+            return new BoundAggregator(LongAverageOperator.INSTANCE, Long.class, Double.class);
+        else throw new IllegalArgumentException();
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/count.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/count.java
new file mode 100644
index 00000000..8310a0ce
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/count.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.aggregators;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AggregatorType;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.BoundAggregator;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IAggregatorFactory;
+
+/**
+ * An aggregator to count the number of matches a pattern has. The return of the aggregator is an non-negative integer
+ * number.
+ * 
+ * @since 1.4
+ *
+ */
+@AggregatorType(parameterTypes = {Void.class}, returnTypes = {Integer.class})
+public final class count implements IAggregatorFactory {
+
+    @Override
+    public BoundAggregator getAggregatorLogic(Class<?> domainClass) {
+        if (Void.class.equals(domainClass))
+            return new BoundAggregator(null, Void.class, Integer.class);
+        else throw new IllegalArgumentException();
+    }
+
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/max.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/max.java
new file mode 100644
index 00000000..e0236223
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/max.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.aggregators;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.Date;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AggregatorType;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.BoundAggregator;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IAggregatorFactory;
+
+/**
+ * This aggregator calculates the maximum value of a selected aggregate parameter of a called pattern. The aggregate
+ * parameter is selected with the '#' symbol; the aggregate parameter must not be used outside the aggregator call. The
+ * other parameters of the call might be bound or unbound; bound parameters limit the matches to consider for the
+ * minimum calculation.
+ * 
+ * @since 1.4
+ * @author Gabor Bergmann
+ */
+@AggregatorType(
+        // TODO T extends Comparable?
+        parameterTypes = {BigDecimal.class, BigInteger.class, Boolean.class, Byte.class, Calendar.class, Character.class, 
+                Date.class, Double.class, Enum.class, Float.class, Integer.class, Long.class, Short.class, String.class},
+        returnTypes = {BigDecimal.class, BigInteger.class, Boolean.class, Byte.class, Calendar.class, Character.class, 
+                Date.class, Double.class, Enum.class, Float.class, Integer.class, Long.class, Short.class, String.class})
+public final class max implements IAggregatorFactory {
+
+    @Override
+    public BoundAggregator getAggregatorLogic(Class<?> domainClass) {
+        if (Comparable.class.isAssignableFrom(domainClass))
+            return new BoundAggregator(ExtremumOperator.getMax(), domainClass, domainClass);
+        else throw new IllegalArgumentException();
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/min.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/min.java
new file mode 100644
index 00000000..6408c57b
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/min.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.aggregators;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.Date;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AggregatorType;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.BoundAggregator;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IAggregatorFactory;
+
+/**
+ * This aggregator calculates the minimum value of a selected aggregate parameter of a called pattern. The aggregate
+ * parameter is selected with the '#' symbol; the aggregate parameter must not be used outside the aggregator call. The
+ * other parameters of the call might be bound or unbound; bound parameters limit the matches to consider for the
+ * minimum calculation.
+ * 
+ * @since 1.4
+ *
+ */
+@AggregatorType(
+        // TODO T extends Comparable?
+        parameterTypes = {BigDecimal.class, BigInteger.class, Boolean.class, Byte.class, Calendar.class, Character.class, 
+                Date.class, Double.class, Enum.class, Float.class, Integer.class, Long.class, Short.class, String.class},
+        returnTypes = {BigDecimal.class, BigInteger.class, Boolean.class, Byte.class, Calendar.class, Character.class, 
+                Date.class, Double.class, Enum.class, Float.class, Integer.class, Long.class, Short.class, String.class})
+public final class min implements IAggregatorFactory {
+    
+    @Override
+    public BoundAggregator getAggregatorLogic(Class<?> domainClass) {
+        if (Comparable.class.isAssignableFrom(domainClass))
+            return new BoundAggregator(ExtremumOperator.getMin(), domainClass, domainClass);
+        else throw new IllegalArgumentException();
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/sum.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/sum.java
new file mode 100644
index 00000000..69ff2e75
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/aggregators/sum.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.aggregators;
+
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.AggregatorType;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.BoundAggregator;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IAggregatorFactory;
+
+/**
+ * This aggregator calculates the sum of the values of a selected aggregate parameter of a called pattern. The aggregate
+ * parameter is selected with the '#' symbol; the aggregate parameter must not be used outside the aggregator call. The
+ * other parameters of the call might be bound or unbound; bound parameters limit the matches to consider for the
+ * summation.
+ * 
+ * @since 1.4
+ *
+ */
+@AggregatorType(
+        parameterTypes = {Integer.class, Double.class, Long.class},
+        returnTypes = {Integer.class, Double.class, Long.class})
+public final class sum implements IAggregatorFactory {
+
+    @Override
+    public BoundAggregator getAggregatorLogic(Class<?> domainClass) {
+        if (Integer.class.equals(domainClass))
+            return new BoundAggregator(IntegerSumOperator.INSTANCE, Integer.class, Integer.class);
+        if (Double.class.equals(domainClass))
+            return new BoundAggregator(DoubleSumOperator.INSTANCE, Double.class, Double.class);
+        if (Long.class.equals(domainClass))
+            return new BoundAggregator(LongSumOperator.INSTANCE, Long.class, Long.class);
+        else throw new IllegalArgumentException();
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/OrderedIterableMerge.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/OrderedIterableMerge.java
new file mode 100644
index 00000000..1917e909
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/OrderedIterableMerge.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.algorithms;
+
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+/**
+ * @author Gabor Bergmann
+ * @since 2.1
+ *
+ */
+public class OrderedIterableMerge {
+    
+    private OrderedIterableMerge() {
+        // Hidden utility class constructor
+    }
+    
+    /**
+     * Lazily merges two iterables, each ordered according to a given comparator. 
+     * Retains order in the result, and also eliminates any duplicates that appear in both arguments.
+     */
+    public static <T> Iterable<T> mergeUniques(Iterable<T> first, Iterable<T> second, Comparator<T> comparator) {
+        return () -> new Iterator<T>() {
+            Iterator<T> firstIterator = first.iterator();
+            Iterator<T> secondIterator = second.iterator();
+            T firstItem;
+            T secondItem;
+            
+            {
+                fetchFirst();
+                fetchSecond();
+            }
+            
+            private T fetchFirst() {
+                T previous = firstItem;
+                if (firstIterator.hasNext()) 
+                    firstItem = firstIterator.next();
+                else 
+                    firstItem = null;
+                return previous;
+            }
+            private T fetchSecond() {
+               T previous = secondItem;
+               if (secondIterator.hasNext()) 
+                    secondItem = secondIterator.next();
+                else 
+                    secondItem = null;
+               return previous;
+            }
+            
+            @Override
+            public boolean hasNext() {
+                return firstItem != null || secondItem != null;
+            }
+            @Override
+            public T next() {
+                if (!hasNext()) throw new NoSuchElementException();
+                if (firstItem != null && secondItem != null) {
+                    if (secondItem == firstItem) { // duplicates
+                        fetchFirst();
+                        return fetchSecond();
+                    } else if (comparator.compare(firstItem, secondItem) < 0) {
+                        return fetchFirst();
+                    } else {
+                        return fetchSecond();
+                    }
+                } else if (firstItem != null) {
+                    return fetchFirst();
+                } else { // secondItem must be non-null
+                    return fetchSecond();
+                }
+            }
+        };
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/UnionFind.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/UnionFind.java
new file mode 100644
index 00000000..c69f08e5
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/UnionFind.java
@@ -0,0 +1,214 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.algorithms;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+
+/**
+ * Union-find data structure implementation. Note that the implementation relies on the correct implementation of the
+ * equals method of the type parameter's class.
+ * 
+ * @author Tamas Szabo
+ * 
+ * @param <V>
+ *            the type parameter of the element's stored in the union-find data structure
+ */
+public class UnionFind<V> {
+
+    private final Map<V, UnionFindNodeProperty<V>> nodeMap;
+    final Map<V, Set<V>> setMap;
+
+    /**
+     * Instantiate a new union-find data structure.
+     */
+    public UnionFind() {
+        nodeMap = CollectionsFactory.createMap();
+        setMap = CollectionsFactory.createMap();
+    }
+
+    /**
+     * Instantiate a new union-find data structure with the given elements as separate sets.
+     */
+    public UnionFind(Iterable<V> elements) {
+        this();
+        for (V element : elements) {
+            makeSet(element);
+        }
+    }
+
+    /**
+     * Creates a new union set from a collection of elements.
+     * 
+     * @param nodes
+     *            the collection of elements
+     * @return the root element
+     */
+    public V makeSet(Collection<V> nodes) {
+        if (!nodes.isEmpty()) {
+            Iterator<V> iterator = nodes.iterator();
+            V root = makeSet(iterator.next());
+            while (iterator.hasNext()) {
+                root = union(root, iterator.next());
+            }
+            return root;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * This method creates a single set containing the given node.
+     * 
+     * @param node
+     *            the root node of the set
+     * @return the root element
+     */
+    public V makeSet(V node) {
+        if (!nodeMap.containsKey(node)) {
+            UnionFindNodeProperty<V> prop = new UnionFindNodeProperty<V>(0, node);
+            nodeMap.put(node, prop);
+            Set<V> set = new HashSet<V>();
+            set.add(node);
+            setMap.put(node, set);
+        }
+        return node;
+    }
+
+    /**
+     * Find method with path compression.
+     * 
+     * @param node
+     *            the node to find
+     * @return the root node of the set in which the given node can be found
+     */
+    public V find(V node) {
+        UnionFindNodeProperty<V> prop = nodeMap.get(node);
+
+        if (prop != null) {
+            if (prop.parent.equals(node)) {
+                return node;
+            } else {
+                prop.parent = find(prop.parent);
+                return prop.parent;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Union by rank implementation of the two sets which contain x and y; x and/or y can be a single element from the
+     * universe.
+     * 
+     * @param x
+     *            set or single element of the universe
+     * @param y
+     *            set or single element of the universe
+     * @return the new root of the two sets
+     */
+    public V union(V x, V y) {
+        V xRoot = find(x);
+        V yRoot = find(y);
+
+        if ((xRoot == null) || (yRoot == null)) {
+            return union( (xRoot == null) ? makeSet(x) : xRoot, (yRoot == null) ? makeSet(y) : yRoot);
+        }
+        else if (!xRoot.equals(yRoot)) {
+            UnionFindNodeProperty<V> xRootProp = nodeMap.get(xRoot);
+            UnionFindNodeProperty<V> yRootProp = nodeMap.get(yRoot);
+
+            if (xRootProp.rank < yRootProp.rank) {
+                xRootProp.parent = yRoot;
+                setMap.get(yRoot).addAll(setMap.get(xRoot));
+                setMap.remove(xRoot);
+                return yRoot;
+            } else {// (xRootProp.rank >= yRootProp.rank)
+                yRootProp.parent = xRoot;
+                yRootProp.rank = (xRootProp.rank == yRootProp.rank) ? yRootProp.rank + 1 : yRootProp.rank;
+                setMap.get(xRoot).addAll(setMap.get(yRoot));
+                setMap.remove(yRoot);
+                return xRoot;
+            }
+        } else {
+            return xRoot;
+        }
+    }
+
+    /**
+     * Places the given elements in to the same partition.
+     */
+    public void unite(Set<V> elements) {
+        if (elements.size() > 1) {
+            V current = null;
+            for (V element : elements) {
+                if (current != null) {
+                    if (getPartition(element) != null) {
+                        union(current, element);
+                    }
+                } else {
+                    if (getPartition(element) != null) {
+                        current = element;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Delete the set whose root is the given node.
+     * 
+     * @param root
+     *            the root node
+     */
+    public void deleteSet(V root) {
+        // if (setMap.containsKey(root))
+        for (V n : setMap.get(root)) {
+            nodeMap.remove(n);
+        }
+        setMap.remove(root);
+    }
+
+    /**
+     * Returns if all given elements are in the same partition.
+     */
+    public boolean isSameUnion(Set<V> elements) {
+        for (Set<V> partition : setMap.values()) {
+            if (partition.containsAll(elements)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    
+    /**
+     * Returns the partition in which the given element can be found, or null otherwise.
+     */
+    public Set<V> getPartition(V element) {
+        V root = find(element);
+        return setMap.get(root);
+    }
+
+    /**
+     * Returns all partitions.
+     */
+    public Collection<Set<V>> getPartitions() {
+        return setMap.values();
+    }
+
+    public Set<V> getPartitionHeads() {
+        return setMap.keySet();
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/UnionFindNodeProperty.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/UnionFindNodeProperty.java
new file mode 100644
index 00000000..82852f9c
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/algorithms/UnionFindNodeProperty.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.algorithms;
+
+public class UnionFindNodeProperty<V> {
+
+    public int rank;
+    public V parent;
+
+    public UnionFindNodeProperty() {
+        this.rank = 0;
+        this.parent = null;
+    }
+
+    public UnionFindNodeProperty(int rank, V parent) {
+        super();
+        this.rank = rank;
+        this.parent = parent;
+    }
+
+    @Override
+    public String toString() {
+        return "[rank:" + rank + ", parent:" + parent.toString() + "]";
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/CommonQueryHintOptions.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/CommonQueryHintOptions.java
new file mode 100644
index 00000000..317293bf
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/CommonQueryHintOptions.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Grill Balázs, IncQueryLabs
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.backend;
+
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IRewriterTraceCollector;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.NopTraceCollector;
+
+/**
+ * Query evaluation hints applicable to any engine
+ * @since 1.6
+ *
+ */
+public final class CommonQueryHintOptions {
+    
+    private CommonQueryHintOptions() {
+        // Hiding constructor for utility class
+    }
+    
+    /**
+     * This hint instructs the query backends to record trace information into the given trace collector
+     */
+    public static final QueryHintOption<IRewriterTraceCollector> normalizationTraceCollector = 
+            hintOption("normalizationTraceCollector", NopTraceCollector.INSTANCE);
+    
+    // internal helper for conciseness
+    private static <T> QueryHintOption<T> hintOption(String hintKeyLocalName, T defaultValue) {
+        return new QueryHintOption<>(CommonQueryHintOptions.class, hintKeyLocalName, defaultValue);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/ICallDelegationStrategy.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/ICallDelegationStrategy.java
new file mode 100644
index 00000000..40853f46
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/ICallDelegationStrategy.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.backend;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryResultProviderAccess;
+import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+
+/**
+ * Function object that specifies how hints (including backend preferences) shall propagate through pattern calls.
+ * 
+ * <p> A few useful default implementations are included as static fields.
+ * 
+ * <p> As of 2.1, only suppported by the local search backend, and only if the pattern call is not flattened.
+ * 
+ * @author Gabor Bergmann
+ * @since 2.1
+ */
+@FunctionalInterface
+public interface ICallDelegationStrategy {
+
+    /**
+     * Specifies how hints (including backend preferences) shall propagate through pattern calls.
+     * 
+     * @param call a {@link PConstraint} in a query that calls another query.
+     * @param callerHint  a hint under which the calling pattern is evaluated, 
+     * @param callerBackend the actual backend evaluating the calling pattern.  
+     * @param calleeHintProvider the provider of hints for the called pattern.
+     * @return the hints, including backend selection, 
+     * that the backend responsible for the caller pattern must specify when 
+     * requesting the {@link IQueryResultProvider} for the called pattern via {@link IQueryResultProviderAccess}.
+     */
+    public QueryEvaluationHint transformHints(IQueryReference call, 
+            QueryEvaluationHint callerHint, 
+            IQueryBackend callerBackend,
+            IQueryBackendHintProvider calleeHintProvider);
+    
+    
+    /**
+     * Options known for callee are used to override caller options, except the backend selection. 
+     * Always use the same backend for the callee and the caller, regardless what is specified for the callee pattern. 
+     * @author Gabor Bergmann
+     */
+    public static final ICallDelegationStrategy FULL_BACKEND_ADHESION = (call, callerHint, callerBackend, calleeHintProvider) -> {
+        QueryEvaluationHint calleeHint = 
+                calleeHintProvider.getQueryEvaluationHint(call.getReferredQuery());
+        QueryEvaluationHint result = 
+            callerHint == null ? calleeHint : callerHint.overrideBy(calleeHint);
+            
+        QueryEvaluationHint backendAdhesion = new QueryEvaluationHint(
+                null /* settings-ignorant */, callerBackend.getFactory());
+        result = result.overrideBy(backendAdhesion);
+        return result;
+    };
+    /**
+     * Options known for callee are used to override caller options, including the backend selection. 
+     * If callee does not specify a backend requirement, the backend of the caller is kept.
+     * @author Gabor Bergmann
+     */
+    public static final ICallDelegationStrategy PARTIAL_BACKEND_ADHESION = (call, callerHint, callerBackend, calleeHintProvider) -> {
+        QueryEvaluationHint backendAdhesion = new QueryEvaluationHint(
+                null /* settings-ignorant */, callerBackend.getFactory());
+        
+        QueryEvaluationHint result = 
+                callerHint == null ? backendAdhesion : callerHint.overrideBy(backendAdhesion);
+        
+        QueryEvaluationHint calleeHint = calleeHintProvider.getQueryEvaluationHint(call.getReferredQuery());
+        result = result.overrideBy(calleeHint);
+
+        return result;
+    };
+    /**
+     * Options known for callee are used to override caller options, including the backend selection. 
+     * Always use the backend specified for the callee (or the default if none), regardless of the backend of the caller.
+     * @author Gabor Bergmann
+     */
+    public static final ICallDelegationStrategy NO_BACKEND_ADHESION = (call, callerHint, callerBackend, calleeHintProvider) -> {
+        QueryEvaluationHint calleeHint = calleeHintProvider.getQueryEvaluationHint(call.getReferredQuery());
+        return callerHint == null ? calleeHint : callerHint.overrideBy(calleeHint);
+    };
+    
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IMatcherCapability.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IMatcherCapability.java
new file mode 100644
index 00000000..104b68a8
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IMatcherCapability.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.backend;
+
+/**
+ * Implementations of this interface can be used to decide whether a matcher created by an arbitrary backend can
+ * potentially be used as a substitute for another matcher.
+ * 
+ * @author Grill Balázs
+ * @since 1.4
+ *
+ */
+public interface IMatcherCapability {
+
+    /**
+     * Returns true if matchers of this capability can be used as a substitute for a matcher implementing the given capability
+     */
+    public boolean canBeSubstitute(IMatcherCapability capability);
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackend.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackend.java
new file mode 100644
index 00000000..c85f10a4
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackend.java
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.backend;
+
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * Internal interface for a VIATRA query specification. Each query is associated with a pattern. Methods instantiate a matcher
+ * of the pattern with various parameters.
+ *
+ * @author Bergmann Gábor
+ * @since 0.9
+ * @noextend This interface is not intended to be extended by users of the VIATRA framework, and should only be used by the query engine
+ */
+public interface IQueryBackend {
+        
+        /**
+         * @return true iff this backend is incremental, i.e. it caches the results of queries for quick retrieval, 
+         * and can provide update notifications on result set changes.
+         */
+        public boolean isCaching();
+        
+    /**
+     * Returns a result provider for a given query. Repeated calls may return the same instance.
+     * @throws ViatraQueryRuntimeException
+     */
+        public IQueryResultProvider getResultProvider(PQuery query);
+        
+        /**
+     * Returns a result provider for a given query. Repeated calls may return the same instance.
+     * @param optional hints that may override engine and query defaults (as provided by {@link IQueryBackendHintProvider}). Can be null.
+     * @throws ViatraQueryRuntimeException 
+         * @since 1.4
+     */
+    public IQueryResultProvider getResultProvider(PQuery query, QueryEvaluationHint hints);
+        
+    /**
+     * Returns an existing result provider for a given query, if it was previously constructed, returns null otherwise.
+     * Will not construct and initialize new result providers.
+     */
+        public IQueryResultProvider peekExistingResultProvider(PQuery query);
+
+        /**
+         * Propagates all pending updates in this query backend. The implementation of this method is optional, and it 
+         * can be ignored entirely if the backend does not delay updates.   
+         * @since 1.6
+         */
+        public void flushUpdates();
+        
+        /**
+         * Disposes the query backend.
+         */
+        public abstract void dispose();
+        
+        /**
+         * @return the factory that created this backend, if this functionality is supported
+         * @since 2.1
+         */
+        public IQueryBackendFactory getFactory();
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendFactory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendFactory.java
new file mode 100644
index 00000000..e264ab3f
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendFactory.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.backend;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * A Query Backend Factory identifies a query evaluator implementation, and can create an evaluator instance (an {@link IQueryBackend}) tied to a specific VIATRA Query engine upon request. 
+ * 
+ * <p> The factory is used as a lookup key for the backend instance, 
+ *   therefore implementors should either be singletons, or implement equals() / hashCode() accordingly. 
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public interface IQueryBackendFactory {
+    
+    /**
+     * Creates a new {@link IQueryBackend} instance tied to the given context elements. 
+     * 
+     * @return an instance of the class returned by {@link #getBackendClass()} that operates in the given context.
+     * @since 1.5
+     */
+    public IQueryBackend 
+        create(IQueryBackendContext context);
+    
+    
+    /**
+     * The backend instances created by this factory are guaranteed to conform to the returned class.
+     */
+    public Class<? extends IQueryBackend> getBackendClass();
+
+    /**
+     * Calculate the required capabilities, which are needed to execute the given pattern
+     * 
+     * @since 1.4
+     */
+    public IMatcherCapability calculateRequiredCapability(PQuery query, QueryEvaluationHint hint);
+    
+    /**
+     * Returns whether the current backend is caching
+     * @since 2.0
+     */
+    public boolean isCaching();
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendFactoryProvider.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendFactoryProvider.java
new file mode 100644
index 00000000..8787814e
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendFactoryProvider.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.backend;
+
+/**
+ * A provider interface for {@link IQueryBackendFactory} instances.
+ * @since 2.0
+ */
+public interface IQueryBackendFactoryProvider {
+
+    /**
+     * Returns a query backend factory instance. The method should return the same instance in case of repeated calls.
+     */
+    IQueryBackendFactory getFactory();
+    
+    /**
+     * Returns whether the given query backend should be considered as system default. If multiple backends are
+     * registered as system default, it is undefined which one will be chosen.
+     */
+    default boolean isSystemDefaultEngine() {
+        return false;
+    }
+    
+    /**
+     * Returns whether the given query backend should be considered as system default search backend. If multiple
+     * backends are registered as system default, it is undefined which one will be chosen.
+     */
+    default boolean isSystemDefaultSearchBackend() {
+        return false;
+    }
+    
+    
+    /**
+     * Returns whether the given query backend should be considered as system default caching backend. If multiple
+     * backends are registered as system default, it is undefined which one will be chosen.
+     */
+    default boolean isSystemDefaultCachingBackend() {
+        return false;
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendHintProvider.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendHintProvider.java
new file mode 100644
index 00000000..9bb76349
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryBackendHintProvider.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.backend;
+
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * Provides query evaluation hints consisting of the Engine default hints and
+ * the hints provided by the pattern itself.
+ * 
+ * @author Bergmann Gabor
+ * @since 0.9
+ * @noimplement This interface is not intended to be implemented by clients, except in the tools.refinery.viatra.runtime plugin.
+ */
+public interface IQueryBackendHintProvider {
+    
+    /**
+     * Suggests query evaluation hints regarding a query. The returned hints reflects the default hints of the 
+     * query engine merged with the hints provided by the pattern itself. These can be overridden via specific
+     * advanced API of the engine.  
+     * 
+     * @since 1.4
+     */
+    QueryEvaluationHint getQueryEvaluationHint(PQuery query);
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryResultProvider.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryResultProvider.java
new file mode 100644
index 00000000..cd7d050f
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IQueryResultProvider.java
@@ -0,0 +1,202 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.backend;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.planning.helpers.StatisticsHelper;
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Accuracy;
+
+/**
+ * An internal interface of the query backend that provides results of a given query. 
+ * @author Bergmann Gabor
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface IQueryResultProvider {
+
+    /**
+     * Decides whether there are any matches of the pattern that conform to the given fixed values of some parameters.
+     *
+     * @param parameters
+     *            array where each non-null element binds the corresponding pattern parameter to a fixed value.
+     * @pre size of input array must be equal to the number of parameters.
+     * @since 2.0
+     */
+    public boolean hasMatch(Object[] parameters);
+    
+    /**
+     * Decides whether there are any matches of the pattern that conform to the given fixed values of some parameters.
+     *
+     * @param parameterSeedMask
+     *            a mask that extracts those parameters of the query (from the entire parameter list) that should be
+     *            bound to a fixed value
+     * @param parameters
+     *            the tuple of fixed values restricting the match set to be considered, in the same order as given in
+     *            parameterSeedMask, so that for each considered match tuple,
+     *            projectedParameterSeed.equals(parameterSeedMask.transform(match)) should hold
+     * @since 2.0
+     */
+    public boolean hasMatch(TupleMask parameterSeedMask, ITuple projectedParameterSeed);
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     *
+     * @param parameters
+     *            array where each non-null element binds the corresponding pattern parameter to a fixed value.
+     * @pre size of input array must be equal to the number of parameters.
+     * @return the number of pattern matches found.
+     */
+    public int countMatches(Object[] parameters);
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     *
+     * @param parameterSeedMask
+     *            a mask that extracts those parameters of the query (from the entire parameter list) that should be
+     *            bound to a fixed value
+     * @param parameters
+     *            the tuple of fixed values restricting the match set to be considered, in the same order as given in
+     *            parameterSeedMask, so that for each considered match tuple,
+     *            projectedParameterSeed.equals(parameterSeedMask.transform(match)) should hold
+     * @return the number of pattern matches found.
+     * @since 1.7
+     */
+    public int countMatches(TupleMask parameterSeedMask, ITuple projectedParameterSeed);
+    
+    /**
+     * Gives an estimate of the number of different groups the matches are projected into by the given mask
+     * (e.g. for an identity mask, this means the full match set size). The estimate must meet the required accuracy.
+     * 
+     * <p> If there is insufficient information to provide an answer up to the required precision, {@link Optional#empty()} may be returned.
+     * In other words, query backends may deny an answer, or do their best to give an estimate without actually determining the match set of the query. 
+     * However, caching backends are expected to simply return the indexed (projection) size, initialized on-demand if necessary.
+     * 
+     * <p> PRE: {@link TupleMask#isNonrepeating()} must hold for the group mask.
+     * 
+     * @return if available, an estimate of the cardinality of the projection of the match set, with the desired accuracy.
+     * 
+     * @since 2.1
+     */
+    public Optional<Long> estimateCardinality(TupleMask groupMask, Accuracy requiredAccuracy);
+    
+    /**
+     * Gives an estimate of the average size of different groups the matches are projected into by the given mask
+     * (e.g. for an identity mask, this means 1, while for an empty mask, the result is match set size). 
+     * The estimate must meet the required accuracy.
+     * 
+     * <p> If there is insufficient information to provide an answer up to the required precision, {@link Optional#empty()} may be returned.
+     * In other words, query backends may deny an answer, or do their best to give an estimate without actually determining the match set of the query. 
+     * However, caching backends are expected to simply return the exact value from the index, initialized on-demand if necessary.
+     * 
+     * <p> For an empty match set, zero is acceptable as an exact answer.
+     * 
+     * <p> PRE: {@link TupleMask#isNonrepeating()} must hold for the group mask.
+     * 
+     * @return if available, an estimate of the average size of each projection group of the match set, with the desired accuracy.
+     * 
+     * @since 2.1
+     */
+    public default Optional<Double> estimateAverageBucketSize(TupleMask groupMask, Accuracy requiredAccuracy) {
+        return StatisticsHelper.estimateAverageBucketSize(groupMask, requiredAccuracy, this::estimateCardinality);
+    }
+   
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     *
+     * @param parameters
+     *            array where each non-null element binds the corresponding pattern parameter to a fixed value.
+     * @pre size of input array must be equal to the number of parameters.
+     * @return a match represented in the internal {@link Tuple} representation.
+     * @since 2.0
+     */
+    public Optional<Tuple> getOneArbitraryMatch(Object[] parameters);
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * 
+     * @param parameterSeedMask
+     *            a mask that extracts those parameters of the query (from the entire parameter list) that should be
+     *            bound to a fixed value
+     * @param parameters
+     *            the tuple of fixed values restricting the match set to be considered, in the same order as given in
+     *            parameterSeedMask, so that for each considered match tuple,
+     *            projectedParameterSeed.equals(parameterSeedMask.transform(match)) should hold
+     * @return a match represented in the internal {@link Tuple} representation.
+     * @since 2.0
+     */
+    public Optional<Tuple> getOneArbitraryMatch(TupleMask parameterSeedMask, ITuple parameters); 
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     *
+     * @param parameters
+     *            array where each non-null element binds the corresponding pattern parameter to a fixed value.
+     * @pre size of input array must be equal to the number of parameters.
+     * @return matches represented in the internal {@link Tuple} representation.
+     * @since 2.0
+     */
+    public Stream<Tuple> getAllMatches(Object[] parameters);
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     *
+     * @param parameterSeedMask
+     *            a mask that extracts those parameters of the query (from the entire parameter list) that should be
+     *            bound to a fixed value
+     * @param parameters
+     *            the tuple of fixed values restricting the match set to be considered, in the same order as given in
+     *            parameterSeedMask, so that for each considered match tuple,
+     *            projectedParameterSeed.equals(parameterSeedMask.transform(match)) should hold
+     * @return matches represented in the internal {@link Tuple} representation.
+     * @since 2.0
+     */
+    public Stream<Tuple> getAllMatches(TupleMask parameterSeedMask, ITuple parameters); 
+    
+    /**
+     * The underlying query evaluator backend.
+     */
+    public IQueryBackend getQueryBackend();
+    
+    /**
+     * Internal method that registers low-level callbacks for match appearance and disappearance.
+     * 
+     * <p>
+     * <b>Caution: </b> This is a low-level callback that is invoked when the pattern matcher is not necessarily in a
+     * consistent state yet. Importantly, no model modification permitted during the callback.
+     * 
+     * <p>
+     * The callback can be unregistered via invoking {@link #removeUpdateListener(Object)} with the same tag.
+     * 
+     * @param listener
+     *            the listener that will be notified of each new match that appears or disappears, starting from now.
+     * @param listenerTag
+     *            a tag by which to identify the listener for later removal by {@link #removeUpdateListener(Object)}. 
+     * @param fireNow
+     *            if true, the insertion update allback will be immediately invoked on all current matches as a one-time effect. 
+     *            
+     * @throws UnsupportedOperationException if this is a non-incremental backend 
+     *  (i.e. {@link IQueryBackend#isCaching()} on {@link #getQueryBackend()} returns false)
+     */ 
+    public void addUpdateListener(final IUpdateable listener, final Object listenerTag, boolean fireNow);
+    
+    /**
+     * Removes an existing listener previously registered with the given tag.
+     *            
+     * @throws UnsupportedOperationException if this is a non-incremental backend 
+     *  (i.e. {@link IQueryBackend#isCaching()} on {@link #getQueryBackend()} returns false)
+     */
+    public void removeUpdateListener(final Object listenerTag);
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IUpdateable.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IUpdateable.java
new file mode 100644
index 00000000..baf7144a
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/IUpdateable.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.backend;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * Internal interface for the query backend to singal an update to a query result.
+ * @author Bergmann Gabor
+ * @since 0.9
+ *
+ */
+public interface IUpdateable {
+    
+    /**
+     * This callback method must be free of exceptions, even {@link RuntimeException}s (though not {@link Error}s).
+     * @param updateElement the tuple that is changed
+     * @param isInsertion true if the tuple appeared in the result set, false if disappeared from the result set
+     */
+    public void update(Tuple updateElement, boolean isInsertion);
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/QueryEvaluationHint.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/QueryEvaluationHint.java
new file mode 100644
index 00000000..eab92128
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/QueryEvaluationHint.java
@@ -0,0 +1,241 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.backend;
+
+import java.util.AbstractMap;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * Provides VIATRA Query with additional hints on how a query should be evaluated. The same hint can be provided to multiple queries. 
+ * 
+ * <p> This class is immutable. Overriding options will create a new instance.
+ * 
+ * <p>
+ * Here be dragons: for advanced users only.
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public class QueryEvaluationHint {
+    
+    /**
+     * @since 2.0
+     *
+     */
+    public enum BackendRequirement {
+        /**
+         * The current hint does not specify any backend requirement
+         */
+        UNSPECIFIED,
+        /**
+         * The current hint specifies that the default search backend of the engine should be used
+         */
+        DEFAULT_SEARCH,
+        /**
+         * The current hint specifies that the default caching backend of the engine should be used
+         */
+        DEFAULT_CACHING,
+        /**
+         * The current hint specifies that a specific backend is to be used
+         */
+        SPECIFIC
+    }
+    
+    final IQueryBackendFactory queryBackendFactory; 
+    final Map<QueryHintOption<?>, Object> backendHintSettings;
+    final BackendRequirement requirement;
+
+    /**
+     * Specifies the suggested query backend requirements, and value settings for additional backend-specific options.
+     * 
+     * <p>
+     * The backend requirement type must not be {@link BackendRequirement#SPECIFIC} - for that case, use the constructor
+     * {@link #QueryEvaluationHint(Map, IQueryBackendFactory)}.
+     * 
+     * @param backendHintSettings
+     *            if non-null, each entry in the map overrides backend-specific options regarding query evaluation
+     *            (null-valued map entries permitted to erase hints); passing null means default options associated with
+     *            the query
+     * @param backendRequirementType
+     *            defines the kind of backend requirement
+     * @since 2.0
+     */
+    public QueryEvaluationHint(Map<QueryHintOption<?>, Object> backendHintSettings, BackendRequirement backendRequirementType) {
+        super();
+        Preconditions.checkArgument(backendRequirementType != null, "Specific requirement needs to be set");
+        Preconditions.checkArgument(backendRequirementType != BackendRequirement.SPECIFIC, "Specific backend requirement needs providing a corresponding backend type");
+        this.queryBackendFactory = null;
+        this.requirement = backendRequirementType; 
+        this.backendHintSettings = (backendHintSettings == null) 
+                ? Collections.<QueryHintOption<?>, Object> emptyMap()
+                : new HashMap<>(backendHintSettings);
+    }
+    
+    /**
+     * Specifies the suggested query backend, and value settings for additional backend-specific options. The first
+     * parameter can be null; if the second parameter is null, it is expected that the other constructor is called
+     * instead with a {@link BackendRequirement#UNSPECIFIED} parameter.
+     * 
+     * @param backendHintSettings
+     *            if non-null, each entry in the map overrides backend-specific options regarding query evaluation
+     *            (null-valued map entries permitted to erase hints); passing null means default options associated with
+     *            the query
+     * @param queryBackendFactory
+     *            overrides the query evaluator algorithm; passing null retains the default algorithm associated with
+     *            the query
+     * @since 1.5
+     */
+    public QueryEvaluationHint(
+            Map<QueryHintOption<?>, Object> backendHintSettings, 
+            IQueryBackendFactory queryBackendFactory) {
+        super();
+        this.queryBackendFactory = queryBackendFactory;
+        this.requirement = (queryBackendFactory == null) ? BackendRequirement.UNSPECIFIED : BackendRequirement.SPECIFIC; 
+        this.backendHintSettings = (backendHintSettings == null) 
+                ? Collections.<QueryHintOption<?>, Object> emptyMap()
+                : new HashMap<>(backendHintSettings);
+    }
+    
+    /**
+     * Returns the backend requirement described by this hint. If a specific backend is required, that can be queried by {@link #getQueryBackendFactory()}.
+     * @since 2.0
+     */
+    public BackendRequirement getQueryBackendRequirementType() {
+        return requirement;
+    }
+    
+    /**
+     * A suggestion for choosing the query evaluator algorithm.
+     * 
+     * <p>
+     * Returns null iff {@link #getQueryBackendRequirementType()} does not return {@link BackendRequirement#SPECIFIC};
+     * in such cases a corresponding default backend is selected inside the engine
+     */
+    public IQueryBackendFactory getQueryBackendFactory() {
+        return queryBackendFactory;
+    }
+    
+    /**
+     * Each entry in the immutable map overrides backend-specific options regarding query evaluation. 
+     * 
+     * <p>The map is non-null, even if empty. 
+     * Null-valued map entries are also permitted to erase hints via {@link #overrideBy(QueryEvaluationHint)}. 
+     * 
+     * @since 1.5
+     */
+    public Map<QueryHintOption<?>, Object> getBackendHintSettings() {
+        return backendHintSettings;
+    }
+
+
+    /**
+     * Override values in this hint and return a consolidated instance.
+     * 
+     * @since 1.4
+     */
+    public QueryEvaluationHint overrideBy(QueryEvaluationHint overridingHint){
+        if (overridingHint == null)
+            return this;
+        
+        BackendRequirement overriddenRequirement = this.getQueryBackendRequirementType();
+        if (overridingHint.getQueryBackendRequirementType() != BackendRequirement.UNSPECIFIED) {
+            overriddenRequirement = overridingHint.getQueryBackendRequirementType();
+        }
+        Map<QueryHintOption<?>, Object> hints = new HashMap<>(this.getBackendHintSettings());
+        if (overridingHint.getBackendHintSettings() != null) {
+            hints.putAll(overridingHint.getBackendHintSettings());
+        }
+        if (overriddenRequirement == BackendRequirement.SPECIFIC) {
+            IQueryBackendFactory factory = this.getQueryBackendFactory();
+            if (overridingHint.getQueryBackendFactory() != null) {
+                factory = overridingHint.getQueryBackendFactory();
+            }
+            return new QueryEvaluationHint(hints, factory);
+        } else {
+            return new QueryEvaluationHint(hints, overriddenRequirement);
+        }
+    }
+    
+    /**
+     * Returns whether the given hint option is overridden.
+     * @since 1.5
+     */
+    public boolean isOptionOverridden(QueryHintOption<?> option) {
+        return getBackendHintSettings().containsKey(option);
+    }
+    
+    /**
+     * Returns the value of the given hint option from the given hint collection, or null if not defined.
+     * @since 1.5
+     */
+    @SuppressWarnings("unchecked")
+    public <HintValue> HintValue getValueOrNull(QueryHintOption<HintValue> option) {
+        return (HintValue) getBackendHintSettings().get(option);
+    }
+    
+    /**
+     * Returns the value of the given hint option from the given hint collection, or the default value if not defined.
+     * Intended to be called by backends to find out the definitive value that should be considered.
+     * @since 1.5
+     */
+    public <HintValue> HintValue getValueOrDefault(QueryHintOption<HintValue> option) {
+        return option.getValueOrDefault(this);
+    }
+    
+    @Override
+    public int hashCode() {
+        return Objects.hash(backendHintSettings, queryBackendFactory, requirement);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        QueryEvaluationHint other = (QueryEvaluationHint) obj;
+        return Objects.equals(backendHintSettings, other.backendHintSettings)
+               &&
+               Objects.equals(queryBackendFactory, other.queryBackendFactory)
+               &&
+               Objects.equals(requirement, other.requirement)
+        ;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        
+        if (getQueryBackendFactory() != null)
+            sb.append("backend: ").append(getQueryBackendFactory().getBackendClass().getSimpleName());
+        if (! backendHintSettings.isEmpty()) {
+            sb.append("hints: ");
+            if(backendHintSettings instanceof AbstractMap){
+                sb.append(backendHintSettings.toString());
+            } else {
+                // we have to iterate on the contents
+                
+                String joinedHintMap = backendHintSettings.entrySet().stream()
+                        .map(setting -> setting.getKey() + "=" + setting.getValue()).collect(Collectors.joining(", "));
+                sb.append('{').append(joinedHintMap).append('}');
+            }            
+        }
+        
+        final String result = sb.toString();
+        return result.isEmpty() ? "defaults" : result;
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/QueryHintOption.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/QueryHintOption.java
new file mode 100644
index 00000000..2c6bb4de
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/QueryHintOption.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.backend;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Each instance of this class corresponds to a given hint option.
+ * 
+ * It is recommended to expose options to clients (and query backends) as public static fields.
+ * 
+ * @author Gabor Bergmann
+ * @since 1.5
+ */
+public class QueryHintOption<HintValue> {
+
+    private String optionQualifiedName;
+    private HintValue defaultValue;
+
+    /**
+     * Instantiates an option object with the given name and default value.
+     */
+    public QueryHintOption(String optionQualifiedName, HintValue defaultValue) {
+        this.optionQualifiedName = optionQualifiedName;
+        this.defaultValue = defaultValue;
+    }
+    
+    /**
+     * This is the recommended constructor for hint options defined as static fields within an enclosing class. 
+     * Combines the qualified name of the hint from the (qualified) name of the enclosing class and a local name (unique within that class).  
+     */
+    public <T extends HintValue> QueryHintOption(Class<?> optionNamespace, String optionLocalName, T defaultValue) {
+        this(String.format("%s@%s", optionLocalName, optionNamespace.getName()), defaultValue);
+    }
+
+    /**
+     * Returns the qualified name, a unique string identifier of the option.
+     */
+    public String getQualifiedName() {
+        return optionQualifiedName;
+    }
+
+    /**
+     * Returns the default value of this hint option, which is to be used by query backends in the case no overriding value is assigned.
+     */
+    public HintValue getDefaultValue() {
+        return defaultValue;
+    }
+
+    /**
+     * Returns the value of this hint option from the given hint collection, or the default value if not defined.
+     * Intended to be called by backends to find out the definitive value that should be considered.
+     */
+    @SuppressWarnings("unchecked")
+    public HintValue getValueOrDefault(QueryEvaluationHint hints) {
+        Object value = hints.getValueOrNull(this);
+        if (value == null)
+            return getDefaultValue();
+        else {
+            return (HintValue) value;
+        }
+    }
+
+    
+    /**
+     * Returns the value of this hint option from the given hint collection, or null if not defined.
+     */
+    public HintValue getValueOrNull(QueryEvaluationHint hints) {
+        return hints.getValueOrNull(this);
+    }
+    
+    /**
+     * Returns whether this hint option is defined in the given hint collection.
+     */
+    public boolean isOverriddenIn(QueryEvaluationHint hints) {
+        return hints.isOptionOverridden(this);
+    }
+       
+    /**
+     * Puts a value of this hint option into an option-to-value map.
+     * 
+     * <p> This method is offered in lieu of a builder API. 
+     * Use this method on any number of hint options in order to populate an option-value map.
+     * Then instantiate the immutable {@link QueryEvaluationHint} using the map.
+     * 
+     * @see #insertValueIfNondefault(Map, Object)
+     * @return the hint value that was previously present in the map under this hint option, carrying over the semantics of {@link Map#put(Object, Object)}.  
+     */
+    @SuppressWarnings("unchecked")
+    public HintValue insertOverridingValue(Map<QueryHintOption<?>, Object> hints, HintValue overridingValue) {
+        return (HintValue) hints.put(this, overridingValue);
+    }
+
+    /**
+     * Puts a value of this hint option into an option-to-value map, if the given value differs from the default value of the option.
+     * If the default value is provided instead, then the map is not updated.
+     * 
+     * <p> This method is offered in lieu of a builder API. 
+     * Use this method on any number of hint options in order to populate an option-value map.
+     * Then instantiate the immutable {@link QueryEvaluationHint} using the map.
+     * 
+     * @see #insertOverridingValue(Map, Object)
+     * @since 2.0
+     */
+    public void insertValueIfNondefault(Map<QueryHintOption<?>, Object> hints, HintValue overridingValue) {
+        if (!Objects.equals(defaultValue, overridingValue))
+            hints.put(this, overridingValue);
+    }
+    
+    @Override
+    public String toString() {
+        return optionQualifiedName;
+    }
+        
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/ResultProviderRequestor.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/ResultProviderRequestor.java
new file mode 100644
index 00000000..6ec6d53e
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/backend/ResultProviderRequestor.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.backend;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryResultProviderAccess;
+import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+
+/**
+ * Uniform way of requesting result providers for pattern calls within queries.
+ * Intended users are query backends, for calling other backends to deliver results of dependee queries.
+ * 
+ * @author Gabor Bergmann
+ * @since 2.1
+ */
+public class ResultProviderRequestor {
+    IQueryBackend callerBackend;
+    IQueryResultProviderAccess resultProviderAccess;
+    IQueryBackendHintProvider hintProvider;
+    ICallDelegationStrategy delegationStrategy;
+    QueryEvaluationHint callerHint;
+    QueryEvaluationHint universalOverride;
+    
+    
+    /**
+     * @param callerBackend the actual backend evaluating the calling pattern.  
+     * @param resultProviderAccess
+     * @param hintProvider
+     * @param delegationStrategy
+     * @param callerHint  a hint under which the calling pattern is evaluated, 
+     * @param universalOverride if non-null, overrides the hint with extra options <i>after</i> the {@link ICallDelegationStrategy}
+     */
+    public ResultProviderRequestor(IQueryBackend callerBackend, IQueryResultProviderAccess resultProviderAccess,
+            IQueryBackendHintProvider hintProvider, ICallDelegationStrategy delegationStrategy,
+            QueryEvaluationHint callerHint, QueryEvaluationHint universalOverride) {
+        super();
+        this.callerBackend = callerBackend;
+        this.resultProviderAccess = resultProviderAccess;
+        this.hintProvider = hintProvider;
+        this.delegationStrategy = delegationStrategy;
+        this.callerHint = callerHint;
+        this.universalOverride = universalOverride;
+    }
+
+
+
+
+    /**
+     * 
+     * @param call a {@link PConstraint} in a query that calls another query.
+     * @param spotOverride if non-null, overrides the hint with extra options <i>after</i> the {@link ICallDelegationStrategy} 
+     * and the universal override specified in the constructor
+     * @return the obtained result provider
+     */
+    public IQueryResultProvider requestResultProvider(IQueryReference call, QueryEvaluationHint spotOverride) {
+        QueryEvaluationHint hints = 
+                delegationStrategy.transformHints(call, callerHint, callerBackend, hintProvider);
+        
+        if (universalOverride != null)
+            hints = hints.overrideBy(universalOverride);
+        
+        if (spotOverride != null)
+            hints = hints.overrideBy(spotOverride);
+        
+        return resultProviderAccess.getResultProvider(call.getReferredQuery(), hints);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/AbstractQueryMetaContext.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/AbstractQueryMetaContext.java
new file mode 100644
index 00000000..99611758
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/AbstractQueryMetaContext.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Common abstract class for implementers of {@link IQueryMetaContext}
+ * 
+ * @author Grill Balázs
+ * @since 1.3
+ *
+ */
+public abstract class AbstractQueryMetaContext implements IQueryMetaContext {
+    
+    /**
+     * @since 2.0
+     */
+    @Override
+    public Map<InputKeyImplication, Set<InputKeyImplication>> getConditionalImplications(IInputKey implyingKey) {
+        return new HashMap<>();
+    }
+
+    /**
+     * @since 1.6
+     */
+    @Override
+    public boolean canLeadOutOfScope(IInputKey key) {
+        return key.getArity() > 1;
+    }
+    
+    /**
+     * @since 1.6
+     */
+    @Override
+    public Comparator<IInputKey> getSuggestedEliminationOrdering() {
+        return (o1, o2) -> 0;
+    }
+    
+    /**
+     * @since 1.6
+     */
+    @Override
+    public Collection<InputKeyImplication> getWeakenedAlternatives(IInputKey implyingKey) {
+        return Collections.emptySet();
+    }    
+
+    @Override
+    public boolean isPosetKey(IInputKey key) {
+        return false;
+    }
+
+    @Override
+    public IPosetComparator getPosetComparator(Iterable<IInputKey> key) {
+        return null;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/AbstractQueryRuntimeContext.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/AbstractQueryRuntimeContext.java
new file mode 100644
index 00000000..c797eff9
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/AbstractQueryRuntimeContext.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context;
+
+/**
+ * This class is intended to be extended by implementors. The main purpose of this abstract implementation to protect
+ * implementors from future changes in the interface.
+ * 
+ * @author Grill Balázs
+ * @since 1.4
+ *
+ */
+public abstract class AbstractQueryRuntimeContext implements IQueryRuntimeContext {
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IInputKey.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IInputKey.java
new file mode 100644
index 00000000..4dbcca88
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IInputKey.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context;
+
+/**
+ * An input key identifies an input (extensional) relation, such as the instance set of a given node or edge type, or the direct containment relation.
+ * 
+ * <p> The input key, at the very minimum, is associated with an arity (number of columns), a user-friendly name, and a string identifier (for distributive purposes). 
+ * 
+ * <p> The input key itself must be an immutable data object that properly overrides equals() and hashCode(). 
+ * It must be instantiable without using the query context object, so that query specifications may construct the appropriate PQueries. 
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public interface IInputKey {
+
+    /**
+     * A user-friendly name that can be shown on screen for debug purposes, included in exceptions, etc.
+     */
+    public String getPrettyPrintableName();
+    /**
+     * An internal string identifier that can be used to uniquely identify to input key (relevant for distributed applications).
+     */
+    public String getStringID();
+    
+    /**
+     * The width of tuples in this relation.
+     */
+    public int getArity();
+    
+    /**
+     * Returns true iff instance tuples of the key can be enumerated.
+     * <p> If false, the runtime can only test tuple membership in the extensional relation identified by the key, but not enumerate member tuples in general.
+     */
+    boolean isEnumerable();
+    
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IPosetComparator.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IPosetComparator.java
new file mode 100644
index 00000000..e2d5bcee
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IPosetComparator.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * Implementations of this interface aid the query engine with the ordering of poset elements. This information is
+ * particularly important in the delete and re-derive evaluation mode because they let the engine identify monotone
+ * change pairs.
+ * 
+ * @author Tamas Szabo
+ * @since 1.6
+ */
+public interface IPosetComparator {
+
+    /**
+     * Returns true if the 'left' tuple of poset elements is smaller or equal than the 'right' tuple of poset elements according to
+     * the partial order that this poset comparator employs. 
+     * 
+     * @param left
+     *            the left tuple of poset elements
+     * @param right
+     *            the right tuple of poset elements
+     * @return true if left is smaller or equal to right, false otherwise
+     */
+    public boolean isLessOrEqual(final Tuple left, final Tuple right);
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryBackendContext.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryBackendContext.java
new file mode 100644
index 00000000..04f00aaa
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryBackendContext.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * This interface is a collector which holds every API that is provided by the engine to control
+ * the operation of the backends.
+ *
+ * @since 1.5
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface IQueryBackendContext {
+
+    Logger getLogger();
+    
+    IQueryRuntimeContext getRuntimeContext();
+    
+    IQueryCacheContext getQueryCacheContext();
+    
+    IQueryBackendHintProvider getHintProvider();
+    
+    IQueryResultProviderAccess getResultProviderAccess();
+    
+    QueryAnalyzer getQueryAnalyzer();
+    
+    /**
+     * @since 2.0
+     */
+    IMatcherCapability getRequiredMatcherCapability(PQuery query, QueryEvaluationHint overrideHints);
+    
+    /**
+     * @since 1.6
+     */
+    boolean areUpdatesDelayed();
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryCacheContext.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryCacheContext.java
new file mode 100644
index 00000000..617207f6
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryCacheContext.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context;
+
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * Provides information on already cached queries to query evaluator backends at runtime.
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public interface IQueryCacheContext {
+    
+    /**
+     * Checks if there already is a caching result provider for the given query.
+     * <p> Returns false if called while the caching result provider of the given query is being constructed in the first place. 
+     */
+    public boolean isResultCached(PQuery query);
+    
+    /**
+     * Returns a caching result provider for the given query; it must be constructed if it does not exist yet.
+     * <p> <b>Caution:</b> behavior undefined if called while the caching result provider of the given query is being constructed. 
+     *   Beware of infinite loops. 
+     * <p> <b>Postcondition:</b> {@link IQueryBackend#isCaching()} returns true for the {@link #getQueryBackend()} of the returned provider
+     * 
+     * @throws ViatraQueryRuntimeException
+     */
+    public IQueryResultProvider getCachingResultProvider(PQuery query);
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryMetaContext.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryMetaContext.java
new file mode 100644
index 00000000..4c22a3cb
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryMetaContext.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Provides metamodel information (relationship of input keys) to query evaluator backends at runtime and at query planning time.
+ * 
+ * @noimplement Implementors should extend {@link AbstractQueryMetaContext} instead of directly implementing this interface.
+ * @author Bergmann Gabor
+ */
+public interface IQueryMetaContext {
+        
+        /**
+         * Returns true iff instance tuples of the given key can be enumerated.
+         * <p> If false, the runtime can only test tuple membership in the extensional relation identified by the key, but not enumerate member tuples in general.
+         * <p> Equivalent to {@link IInputKey#isEnumerable()}.
+         */
+        boolean isEnumerable(IInputKey key);
+        
+        /**
+         * Returns true iff the set of instance tuples of the given key is immutable.
+         * <p> If false, the runtime provides notifications upon change.
+         */
+        boolean isStateless(IInputKey key);
+    
+    /**
+     * Returns a set of implications (weakened alternatives),
+     *  with a suggestion for the query planner that satisfying them first may help in satisfying the implying key.
+     * <p> Note that for the obvious reasons, enumerable keys can only be implied by enumerable keys.
+     * <p> Must follow directly or transitively from implications of {@link #getImplications(IInputKey)}.
+     * @since 1.6
+     */
+    Collection<InputKeyImplication> getWeakenedAlternatives(IInputKey implyingKey);
+        
+        /**
+         * Returns known direct implications, e.g. edge supertypes, edge opposites, node type constraints, etc.
+     * <p> Note that for the obvious reasons, enumerable keys can only be implied by enumerable keys.
+         */
+        Collection<InputKeyImplication> getImplications(IInputKey implyingKey);
+    
+    /**
+     * Returns known "double dispatch" implications, where the given implying key implies other input keys under certain additional conditions (themselves input keys).
+     * For example, a "type x, unscoped" input key may imply the "type x, in scope" input key under the condition of the input key "x is in scope"
+     * 
+     * <p> Note that for the obvious reasons, enumerable keys can only be implied by enumerable keys (either as the implying key or as the additional condition).
+     * <p> Note that symmetry is not required, i.e. the additional conditions do not have to list the same conditional implication.
+     * @return multi-map, where the keys are additional conditions and the values are input key implications jointly implied by the condition and the given implying key.
+     * @since 2.0
+     */
+    Map<InputKeyImplication, Set<InputKeyImplication>> getConditionalImplications(IInputKey implyingKey);
+        
+        /**
+         * Returns functional dependencies of the input key expressed in terms of column indices.
+         * 
+         * <p> Each entry of the map is a functional dependency rule, where the entry key specifies source columns and the entry value specifies target columns. 
+         */
+        Map<Set<Integer>, Set<Integer>> getFunctionalDependencies(IInputKey key);
+        
+        /**
+         * For query normalizing, this is the order suggested for trying to eliminate input keys.
+         * @since 1.6
+         */
+        Comparator<IInputKey> getSuggestedEliminationOrdering();
+        
+        /**
+         * Tells whether the given {@link IInputKey} is an edge and may lead out of scope.
+         * 
+         * @since 1.6
+         */
+        boolean canLeadOutOfScope(IInputKey key);
+
+        /**
+         * Returns true if the given {@link IInputKey} represents a poset type.    
+         * @since 1.6
+         */
+        boolean isPosetKey(IInputKey key);
+        
+        /**
+         * Returns an {@link IPosetComparator} for the given set of {@link IInputKey}s. 
+         * 
+         * @param keys an iterable collection of input keys
+         * @return the poset comparator
+         * @since 1.6
+         */
+        IPosetComparator getPosetComparator(Iterable<IInputKey> keys);
+        
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryResultProviderAccess.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryResultProviderAccess.java
new file mode 100644
index 00000000..7fecd01a
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryResultProviderAccess.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context;
+
+import tools.refinery.viatra.runtime.matchers.backend.IQueryResultProvider;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * This interface exposes API to request {@link IQueryResultProvider} for {@link PQuery} instances.
+ * 
+ * @author Grill Balázs
+ * @since 1.5
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface IQueryResultProviderAccess {
+
+    /**
+     * Get a result provider for the given {@link PQuery}, which conforms the capabilities requested by the
+     * given {@link QueryEvaluationHint} object.
+     * @throws ViatraQueryRuntimeException 
+     */
+    public IQueryResultProvider getResultProvider(PQuery query, QueryEvaluationHint overrideHints);
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryRuntimeContext.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryRuntimeContext.java
new file mode 100644
index 00000000..61359c1b
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryRuntimeContext.java
@@ -0,0 +1,287 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * Copyright (c) 2023 The Refinery Authors <https://refinery.tools>
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context;
+
+import tools.refinery.viatra.runtime.CancellationToken;
+import tools.refinery.viatra.runtime.matchers.planning.helpers.StatisticsHelper;
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Accuracy;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+
+/**
+ * Provides instance model information (relations corresponding to input keys) to query evaluator backends at runtime.
+ * Implementors shall extend {@link AbstractQueryRuntimeContext} instead directly this interface.
+ *
+ * @author Bergmann Gabor
+ * @noimplement This interface is not intended to be implemented by clients. Extend {@link AbstractQueryRuntimeContext} instead.
+ */
+public interface IQueryRuntimeContext {
+    /**
+     * Provides metamodel-specific info independent of the runtime instance model.
+     */
+    public IQueryMetaContext getMetaContext();
+
+
+    /**
+     * The given callable will be executed, and all model traversals will be delayed until the execution is done. If
+     * there are any outstanding information to be read from the model, a single coalesced model traversal will
+     * initialize the caches and deliver the notifications.
+     *
+     * <p> Calls may be nested. A single coalesced traversal will happen at the end of the outermost call.
+     *
+     * <p> <b>Caution: </b> results returned by the runtime context may be incomplete during the coalescing period, to be corrected by notifications sent during the final coalesced traversal.
+     * For example, if a certain input key is not cached yet, an empty relation may be reported during <code>callable.call()</code>; the cache will be constructed after the call terminates and notifications will deliver the entire content of the relation.
+     * Non-incremental query backends should therefore never enumerate input keys while coalesced (verify using {@link #isCoalescing()}).
+     *
+     * @param callable
+     */
+    public abstract <V> V coalesceTraversals(Callable<V> callable) throws InvocationTargetException;
+    /**
+     * @return true iff currently within a coalescing section (i.e. within the callable of a call to {@link #coalesceTraversals(Callable)}).
+     */
+    public boolean isCoalescing();
+
+    /**
+     * Returns true if index is available for the given key providing the given service.
+     * @throws IllegalArgumentException if key is not enumerable or an unknown type, see {@link IQueryMetaContext#isEnumerable(IInputKey)}.
+     * @since 1.4
+     */
+    public boolean isIndexed(IInputKey key, IndexingService service);
+
+    /**
+     * If the given (enumerable) input key is not yet indexed, the model will be traversed
+     * (after the end of the outermost coalescing block, see {@link IQueryRuntimeContext#coalesceTraversals(Callable)})
+     * so that the index can be built. It is possible that the base indexer will select a higher indexing level merging
+     * multiple indexing requests to an appropriate level.
+     *
+     * <p><b>Postcondition:</b> After invoking this method, {@link #getIndexed(IInputKey, IndexingService)} for the same key
+     * and service will be guaranteed to return the requested or a highing indexing level as soon as {@link #isCoalescing()} first returns false.
+     *
+     * <p><b>Precondition:</b> the given key is enumerable, see {@link IQueryMetaContext#isEnumerable(IInputKey)}.
+     * @throws IllegalArgumentException if key is not enumerable or an unknown type, see {@link IQueryMetaContext#isEnumerable(IInputKey)}.
+     * @since 1.4
+     */
+    public void ensureIndexed(IInputKey key, IndexingService service);
+
+    /**
+     * Returns the number of tuples in the extensional relation identified by the input key seeded with the given mask and tuple.
+     *
+     * @param key an input key
+     * @param seedMask
+     *            a mask that extracts those parameters of the input key (from the entire parameter list) that should be
+     *            bound to a fixed value;  must not be null. <strong>Note</strong>: any given index must occur at most once in seedMask.
+     * @param seed
+     *            the tuple of fixed values restricting the match set to be considered, in the same order as given in
+     *            parameterSeedMask, so that for each considered match tuple,
+     *            projectedParameterSeed.equals(parameterSeedMask.transform(match)) should hold. Must not be null.
+     *
+     * @return the number of tuples in the model for the given key and seed
+     *
+     * <p><b>Precondition:</b> the given key is enumerable, see {@link IQueryMetaContext#isEnumerable(IInputKey)}.
+     * @throws IllegalArgumentException if key is not enumerable, see {@link IQueryMetaContext#isEnumerable(IInputKey)}.
+     * @since 1.7
+     */
+    public int countTuples(IInputKey key, TupleMask seedMask, ITuple seed);
+
+
+    /**
+     * Gives an estimate of the number of different groups the tuples of the given relation are projected into by the given mask
+     * (e.g. for an identity mask, this means the full relation size). The estimate must meet the required accuracy.
+     *
+     * <p> Must accept any input key, even non-enumerables or those not recognized by this runtime context.
+     * If there is insufficient information to provide an answer up to the required precision, {@link Optional#empty()} is returned.
+     *
+     * <p> PRE: {@link TupleMask#isNonrepeating()} must hold for the group mask.
+     *
+     * @return if available, an estimate of the cardinality of the projection of the given extensional relation, with the desired accuracy.
+     *
+     * @since 2.1
+     */
+    public Optional<Long> estimateCardinality(IInputKey key, TupleMask groupMask, Accuracy requiredAccuracy);
+
+
+    /**
+     * Gives an estimate of the average size of different groups the tuples of the given relation are projected into by the given mask
+     * (e.g. for an identity mask, this means 1, while for an empty mask, the result is the full relation size).
+     * The estimate must meet the required accuracy.
+     *
+     * <p> Must accept any input key, even non-enumerables or those not recognized by this runtime context.
+     * If there is insufficient information to provide an answer up to the required precision, {@link Optional#empty()} may be returned.
+     *
+     * <p> For an empty relation, zero is acceptable as an exact answer.
+     *
+     * <p> PRE: {@link TupleMask#isNonrepeating()} must hold for the group mask.
+     *
+     * @return if available, an estimate of the average size of each projection group of the given extensional relation, with the desired accuracy.
+     *
+     * @since 2.1
+     */
+    public default Optional<Double> estimateAverageBucketSize(IInputKey key, TupleMask groupMask, Accuracy requiredAccuracy) {
+        if (key.isEnumerable()) {
+            return StatisticsHelper.estimateAverageBucketSize(groupMask, requiredAccuracy,
+                (mask, accuracy) -> this.estimateCardinality(key, mask, accuracy));
+        } else return groupMask.isIdentity() ? Optional.of(1.0) : Optional.empty();
+    }
+
+
+    /**
+     * Returns the tuples in the extensional relation identified by the input key, optionally seeded with the given tuple.
+     *
+     * @param key an input key
+     * @param seedMask
+     *            a mask that extracts those parameters of the input key (from the entire parameter list) that should be
+     *            bound to a fixed value;  must not be null. <strong>Note</strong>: any given index must occur at most once in seedMask.
+     * @param seed
+     *            the tuple of fixed values restricting the match set to be considered, in the same order as given in
+     *            parameterSeedMask, so that for each considered match tuple,
+     *            projectedParameterSeed.equals(parameterSeedMask.transform(match)) should hold. Must not be null.
+     * @return the tuples in the model for the given key and seed
+     *
+     * <p><b>Precondition:</b> the given key is enumerable, see {@link IQueryMetaContext#isEnumerable(IInputKey)}.
+     * @throws IllegalArgumentException if key is not enumerable, see {@link IQueryMetaContext#isEnumerable(IInputKey)}.
+     * @since 1.7
+     */
+    public Iterable<Tuple> enumerateTuples(IInputKey key, TupleMask seedMask, ITuple seed);
+
+    /**
+     * Simpler form of {@link #enumerateTuples(IInputKey, TupleMask, Tuple)} in the case where all values of the tuples
+     * are bound by the seed except for one.
+     *
+     * <p>
+     * Selects the tuples in the extensional relation identified by the input key, optionally seeded with the given
+     * tuple, and then returns the single value from each tuple which is not bound by the ssed mask.
+     *
+     * @param key
+     *            an input key
+     * @param seedMask
+     *            a mask that extracts those parameters of the input key (from the entire parameter list) that should be
+     *            bound to a fixed value; must not be null. <strong>Note</strong>: any given index must occur at most
+     *            once in seedMask, and seedMask must include all parameters in any arbitrary order except one.
+     * @param seed
+     *            the tuple of fixed values restricting the match set to be considered, in the same order as given in
+     *            parameterSeedMask, so that for each considered match tuple,
+     *            projectedParameterSeed.equals(parameterSeedMask.transform(match)) should hold. Must not be null.
+     * @return the objects in the model for the given key and seed
+     *
+     *         <p>
+     *         <b>Precondition:</b> the given key is enumerable, see {@link IQueryMetaContext#isEnumerable(IInputKey)}.
+     * @throws IllegalArgumentException
+     *             if key is not enumerable, see {@link IQueryMetaContext#isEnumerable(IInputKey)}.
+     * @since 1.7
+     */
+    public Iterable<? extends Object> enumerateValues(IInputKey key, TupleMask seedMask, ITuple seed);
+
+    /**
+     * Simpler form of {@link #enumerateTuples(IInputKey, TupleMask, Tuple)} in the case where all values of the tuples
+     * are bound by the seed.
+     *
+     * <p>
+     * Returns whether the given tuple is in the extensional relation identified by the input key.
+     *
+     * <p>
+     * Note: this call works for non-enumerable input keys as well.
+     *
+     * @param key
+     *            an input key
+     * @param seed
+     *            the tuple of fixed values restricting the match set to be considered, in the same order as given in
+     *            parameterSeedMask, so that for each considered match tuple,
+     *            projectedParameterSeed.equals(parameterSeedMask.transform(match)) should hold. Must not be null.
+     * @return true iff there is at least a single tuple contained in the relation that corresponds to the seed tuple
+     * @since 2.0
+     */
+    public boolean containsTuple(IInputKey key, ITuple seed);
+
+
+    /**
+     * Subscribes for updates in the extensional relation identified by the input key, optionally seeded with the given tuple.
+     * <p> This should be called after invoking
+     *
+     * @param key an input key
+     * @param seed can be null or a tuple with matching arity;
+     *  if non-null, only those updates in the model are notified about
+     *  that match the seed at positions where the seed is non-null.
+     * @param listener will be notified of future changes
+     *
+     * <p><b>Precondition:</b> the given key is enumerable, see {@link IQueryMetaContext#isEnumerable(IInputKey)}.
+     * @throws IllegalArgumentException if key is not enumerable, see {@link IQueryMetaContext#isEnumerable(IInputKey)}.
+     */
+    public void addUpdateListener(IInputKey key, Tuple seed, IQueryRuntimeContextListener listener);
+
+    /**
+     * Unsubscribes from updates in the extensional relation identified by the input key, optionally seeded with the given tuple.
+     *
+     * @param key an input key
+     * @param seed can be null or a tuple with matching arity;
+     *  if non-null, only those updates in the model are notified about
+     *  that match the seed at positions where the seed is non-null.
+     * @param listener will no longer be notified of future changes
+     *
+     * <p><b>Precondition:</b> the given key is enumerable, see {@link IQueryMetaContext#isEnumerable(IInputKey)}.
+     * @throws IllegalArgumentException if key is not enumerable, see {@link IQueryMetaContext#isEnumerable(IInputKey)}.
+     */
+    public void removeUpdateListener(IInputKey key, Tuple seed, IQueryRuntimeContextListener listener);
+    /*
+     TODO: uniqueness
+     */
+
+    /**
+     * Wraps the external element into the internal representation that is to be used by the query backend
+     * <p> model element -> internal object.
+     * <p> null must be mapped to null.
+     */
+    public Object wrapElement(Object externalElement);
+
+    /**
+     * Unwraps the internal representation of the element into its original form
+     * <p> internal object -> model element
+     * <p> null must be mapped to null.
+     */
+    public Object unwrapElement(Object internalElement);
+
+    /**
+     * Unwraps the tuple of elements into the internal representation that is to be used by the query backend
+     * <p> model elements -> internal objects
+     * <p> null must be mapped to null.
+    */
+    public Tuple wrapTuple(Tuple externalElements);
+
+    /**
+     * Unwraps the tuple of internal representations of elements into their original forms
+     * <p> internal objects -> model elements
+     * <p> null must be mapped to null.
+    */
+    public Tuple unwrapTuple(Tuple internalElements);
+
+    /**
+     * Starts wildcard indexing for the given service. After this call, no registration is required for this {@link IndexingService}.
+     * a previously set wildcard level cannot be lowered, only extended.
+     * @since 1.4
+     */
+    public void ensureWildcardIndexing(IndexingService service);
+
+    /**
+     * Execute the given runnable after traversal. It is guaranteed that the runnable is executed as soon as
+     * the indexing is finished. The callback is executed only once, then is removed from the callback queue.
+     * @param traversalCallback
+     * @throws InvocationTargetException
+     * @since 1.4
+     */
+    public void executeAfterTraversal(Runnable runnable) throws InvocationTargetException;
+
+        default CancellationToken getCancellationToken() {
+                return CancellationToken.NONE;
+        }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryRuntimeContextListener.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryRuntimeContextListener.java
new file mode 100644
index 00000000..7be27d56
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IQueryRuntimeContextListener.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * Listens for changes in the runtime context.
+ * @author Bergmann Gabor
+ *
+ */
+public interface IQueryRuntimeContextListener {
+    
+    /**
+     * The given tuple was inserted into or removed from the input relation indicated by the given key.
+     * @param key the key identifying the input relation that was updated
+     * @param updateTuple the tuple that was inserted or removed
+     * @param isInsertion true if it was an insertion, false otherwise.
+     */
+    public void update(IInputKey key, Tuple updateTuple, boolean isInsertion);
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IndexingService.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IndexingService.java
new file mode 100644
index 00000000..8210765d
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/IndexingService.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQueryLabs
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context;
+
+/**
+ * These are the different services which can be provided by an {@link IQueryRuntimeContext} implementation.
+ * 
+ * @author Grill Balázs
+ * @since 1.4
+ *
+ */
+public enum IndexingService {
+
+    /**
+     * Cardinality information is available. Makes possible to calculate 
+     * unseeded calls of {@link IQueryRuntimeContext#countTuples(IInputKey, tools.refinery.viatra.runtime.matchers.tuple.Tuple)}
+     */
+    STATISTICS,
+    
+    /**
+     * The indexer can provide notifications about changes in the model.
+     */
+    NOTIFICATIONS,
+    
+    /**
+     * Enables enumeration of instances and reverse-navigation.
+     */
+    INSTANCES
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/InputKeyImplication.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/InputKeyImplication.java
new file mode 100644
index 00000000..2a403810
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/InputKeyImplication.java
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Data object representing the implication of an input key, in use cases including edge supertypes, edge opposites, node type constraints, etc.
+ * 
+ * <p> Each instance tuple of the <i>implying input key</i> (if given) implies the presence of an instance tuple of the <i>implied input key</i> consisting of elements of the original tuple at given positions.
+ * When the input key is null, it is not an input constraint but some other source that implies input keys.
+ * 
+ * <p> The implication is an immutable data object.
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public final class InputKeyImplication {
+    private IInputKey implyingKey;
+    private IInputKey impliedKey;
+    private List<Integer> impliedIndices;
+
+    /**
+     * Optional. Instance tuples of this input key imply an instance tuple of another key. 
+     * Sometimes it is not an input key that implies other input keys, so this attribute can be null.
+     */
+    public IInputKey getImplyingKey() {
+        return implyingKey;
+    }
+    /**
+     * An instance tuple of this input key is implied by another key.
+     */
+    public IInputKey getImpliedKey() {
+        return impliedKey;
+    }
+    /**
+     * The implied instance tuple consists of the values in the implying tuple at these indices.
+     */
+    public List<Integer> getImpliedIndices() {
+        return impliedIndices;
+    }
+    /**
+     * @param implyingKey instance tuples of this input key imply an instance tuple of the other key.
+     * @param impliedKey instance tuple of this input key is implied by the other key.
+     * @param implyingIndices the implied instance tuple consists of the values in the implying tuple at these indices.
+     */
+    public InputKeyImplication(IInputKey implyingKey, IInputKey impliedKey,
+            List<Integer> implyingIndices) {
+        super();
+        this.implyingKey = implyingKey;
+        this.impliedKey = impliedKey;
+        this.impliedIndices = Collections.unmodifiableList(new ArrayList<>(implyingIndices));
+    }
+    
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+                + ((impliedIndices == null) ? 0 : impliedIndices.hashCode());
+        result = prime * result
+                + ((impliedKey == null) ? 0 : impliedKey.hashCode());
+        result = prime * result
+                + ((implyingKey == null) ? 0 : implyingKey.hashCode());
+        return result;
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (!(obj instanceof InputKeyImplication))
+            return false;
+        InputKeyImplication other = (InputKeyImplication) obj;
+        if (impliedIndices == null) {
+            if (other.impliedIndices != null)
+                return false;
+        } else if (!impliedIndices.equals(other.impliedIndices))
+            return false;
+        if (impliedKey == null) {
+            if (other.impliedKey != null)
+                return false;
+        } else if (!impliedKey.equals(other.impliedKey))
+            return false;
+        if (implyingKey == null) {
+            if (other.implyingKey != null)
+                return false;
+        } else if (!implyingKey.equals(other.implyingKey))
+            return false;
+        return true;
+    }
+
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/common/BaseInputKeyWrapper.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/common/BaseInputKeyWrapper.java
new file mode 100644
index 00000000..f9b05e5b
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/common/BaseInputKeyWrapper.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context.common;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+
+
+/**
+ * An input key that is identified by a single wrapped object and the class of the wrapper. 
+ * @author Bergmann Gabor
+ *
+ */
+public abstract class BaseInputKeyWrapper<Wrapped> implements IInputKey {
+    protected Wrapped wrappedKey;
+
+    public BaseInputKeyWrapper(Wrapped wrappedKey) {
+        super();
+        this.wrappedKey = wrappedKey;
+    }
+
+    public Wrapped getWrappedKey() {
+        return wrappedKey;
+    }
+    
+    
+    @Override
+    public int hashCode() {
+        return ((wrappedKey == null) ? 0 : wrappedKey.hashCode());
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (!(this.getClass().equals(obj.getClass())))
+            return false;
+        BaseInputKeyWrapper other = (BaseInputKeyWrapper) obj;
+        if (wrappedKey == null) {
+            if (other.wrappedKey != null)
+                return false;
+        } else if (!wrappedKey.equals(other.wrappedKey))
+            return false;
+        return true;
+    }
+
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/common/JavaTransitiveInstancesKey.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/common/JavaTransitiveInstancesKey.java
new file mode 100644
index 00000000..eb972c2d
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/common/JavaTransitiveInstancesKey.java
@@ -0,0 +1,165 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context.common;
+
+
+
+/**
+ * Instance tuples are of form (x), where object x is an instance of the given Java class or its subclasses.
+ * <p> Fine print 1: classes with the same name are considered equivalent. 
+ * Can be instantiated with class name, even if the class itself is not loaded yet; but if the class is available, passing it in the constructor is beneficial to avoid classloading troubles.  
+ * <p> Fine print 2: primitive types (char, etc.) are transparently treated as their wrapper class (Character, etc.). 
+ * <p> Non-enumerable type, can only be checked.
+ * <p> Stateless type (objects can't change their type)
+ * @author Bergmann Gabor
+ *
+*/
+public class JavaTransitiveInstancesKey extends BaseInputKeyWrapper<String> {
+    
+    /**
+     * The actual Class whose (transitive) instances this relation contains. Can be null at compile time, if only the name is available.
+     * Can be a primitive.  
+     */
+    private Class<?> cachedOriginalInstanceClass;
+    
+    /**
+     * Same as {@link #cachedOriginalInstanceClass}, but primitive classes are replaced with their wrapper classes (e.g. int --> java.lang.Integer).
+     */
+    private Class<?> cachedWrapperInstanceClass;
+
+    /**
+     * Preferred constructor.
+     */
+    public JavaTransitiveInstancesKey(Class<?> instanceClass) {
+        this(primitiveTypeToWrapperClass(instanceClass).getName());
+        this.cachedOriginalInstanceClass = instanceClass;
+    }
+    
+    /**
+     * Call this constructor only in contexts where the class itself is not available for loading, e.g. it has not yet been compiled.
+     */
+    public JavaTransitiveInstancesKey(String className) {
+        super(className);
+    }
+    
+
+    /**
+     * Returns null if class cannot be loaded.
+     */
+    private Class<?> getOriginalInstanceClass() {
+        if (cachedOriginalInstanceClass == null) {
+            try {
+                resolveClassInternal();
+            } catch (ClassNotFoundException e) {
+                // class not yet available at this point
+            }
+        }
+        return cachedOriginalInstanceClass;
+    }
+
+
+    /**
+     * @return non-null instance class
+     * @throws ClassNotFoundException 
+     */
+    private Class<?> forceGetOriginalInstanceClass() throws ClassNotFoundException {
+        if (cachedOriginalInstanceClass == null) {
+            resolveClassInternal();
+        }
+        return cachedOriginalInstanceClass;
+    }
+    
+    /**
+     * @return non-null instance class, wrapped if primitive class
+     * @throws ClassNotFoundException 
+     */
+    public Class<?> forceGetWrapperInstanceClass() throws ClassNotFoundException {
+        forceGetOriginalInstanceClass();
+        return getWrapperInstanceClass();
+    }
+    /**
+     * @return non-null instance class, wrapped if primitive class
+     * @throws ClassNotFoundException 
+     */
+    public Class<?> forceGetInstanceClass() throws ClassNotFoundException {
+        return forceGetWrapperInstanceClass();
+    }
+    
+    /**
+     * @return instance class, wrapped if primitive class, null if class cannot be loaded
+     */
+    public Class<?> getWrapperInstanceClass()  {
+        if (cachedWrapperInstanceClass == null) {
+            cachedWrapperInstanceClass = primitiveTypeToWrapperClass(getOriginalInstanceClass());
+        }
+        return cachedWrapperInstanceClass;
+    }
+    /**
+     * @return instance class, wrapped if primitive class, null if class cannot be loaded
+     */
+    public Class<?> getInstanceClass()  {
+        return getWrapperInstanceClass();
+    }
+    
+    private void resolveClassInternal() throws ClassNotFoundException {
+        cachedOriginalInstanceClass = Class.forName(wrappedKey);
+    }
+    
+    @Override
+    public String getPrettyPrintableName() {
+        getWrapperInstanceClass();
+        return cachedWrapperInstanceClass == null ? wrappedKey == null ? "<null>" : wrappedKey : cachedWrapperInstanceClass.getName();
+    }
+
+    @Override
+    public String getStringID() {
+        return "javaClass#"+ getPrettyPrintableName();
+    }
+
+    @Override
+    public int getArity() {
+        return 1;
+    }
+    
+    @Override
+    public boolean isEnumerable() {
+        return false;
+    }
+    
+    @Override
+    public String toString() {
+        return this.getPrettyPrintableName();
+    }
+
+    private static Class<?> primitiveTypeToWrapperClass(Class<?> instanceClass) {
+        if (instanceClass != null && instanceClass.isPrimitive()) {
+            if (Void.TYPE.equals(instanceClass))
+                return Void.class;
+            if (Boolean.TYPE.equals(instanceClass))
+                return Boolean.class;
+            if (Character.TYPE.equals(instanceClass))
+                return Character.class;
+            if (Byte.TYPE.equals(instanceClass))
+                return Byte.class;
+            if (Short.TYPE.equals(instanceClass))
+                return Short.class;
+            if (Integer.TYPE.equals(instanceClass))
+                return Integer.class;
+            if (Long.TYPE.equals(instanceClass))
+                return Long.class;
+            if (Float.TYPE.equals(instanceClass))
+                return Float.class;
+            if (Double.TYPE.equals(instanceClass))
+                return Double.class;
+        }
+        return instanceClass;
+    }
+
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/surrogate/SurrogateQueryRegistry.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/surrogate/SurrogateQueryRegistry.java
new file mode 100644
index 00000000..bb24ec8c
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/context/surrogate/SurrogateQueryRegistry.java
@@ -0,0 +1,153 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Abel Hegedus, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.context.surrogate;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.util.IProvider;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.viatra.runtime.matchers.util.SingletonInstanceProvider;
+
+/**
+ * @author Abel Hegedus
+ *
+ */
+public class SurrogateQueryRegistry {
+    
+    private Map<IInputKey, IProvider<PQuery>> registeredSurrogateQueryMap = new HashMap<>();
+    private Map<IInputKey, IProvider<PQuery>> dynamicSurrogateQueryMap = new HashMap<>();
+    
+    /**
+     * Hidden constructor
+     */
+    private SurrogateQueryRegistry() {
+    }
+
+    private static final SurrogateQueryRegistry INSTANCE = new SurrogateQueryRegistry();
+    
+    public static SurrogateQueryRegistry instance() {
+        return INSTANCE;
+    }
+    
+    /**
+     * 
+     * @param feature
+     * @param surrogateQuery
+     * @return the previous surrogate query associated with feature, or null if there was no such query FQN registered
+     * @throws IllegalArgumentException if feature or surrogateQuery is null 
+     */
+    public IProvider<PQuery> registerSurrogateQueryForFeature(IInputKey feature, PQuery surrogateQuery) {
+        Preconditions.checkArgument(surrogateQuery != null, "Surrogate query must not be null!");
+        return registerSurrogateQueryForFeature(feature, new SingletonInstanceProvider<PQuery>(surrogateQuery));
+    }
+
+    /**
+     * 
+     * @param feature
+     * @param surrogateQuery
+     * @return the previous surrogate query associated with feature, or null
+     *         if there was no such query registered
+     * @throws IllegalArgumentException
+     *             if feature or surrogateQuery is null
+     */
+    public IProvider<PQuery> registerSurrogateQueryForFeature(IInputKey feature, IProvider<PQuery> surrogateQueryProvider) {
+        Preconditions.checkArgument(feature != null, "Feature must not be null!");
+        Preconditions.checkArgument(surrogateQueryProvider != null, "Surrogate query must not be null!");
+        return registeredSurrogateQueryMap.put(feature, surrogateQueryProvider);
+    }
+    
+    public IProvider<PQuery> addDynamicSurrogateQueryForFeature(IInputKey feature, PQuery surrogateQuery) {
+        Preconditions.checkArgument(surrogateQuery != null, "Surrogate query FQN must not be null!");
+        return addDynamicSurrogateQueryForFeature(feature, new SingletonInstanceProvider<PQuery>(surrogateQuery));
+    }
+    
+    public IProvider<PQuery> addDynamicSurrogateQueryForFeature(IInputKey feature, IProvider<PQuery> surrogateQuery) {
+        Preconditions.checkArgument(feature != null, "Feature must not be null!");
+        Preconditions.checkArgument(surrogateQuery != null, "Surrogate query FQN must not be null!");
+        return dynamicSurrogateQueryMap.put(feature, surrogateQuery);
+    }
+
+    public IProvider<PQuery> removeDynamicSurrogateQueryForFeature(IInputKey feature) {
+        Preconditions.checkArgument(feature != null, "Feature must not be null!");
+        return dynamicSurrogateQueryMap.remove(feature);
+    }
+    
+    /**
+     * 
+     * @param feature that may have surrogate query defined, null not allowed
+     * @return true if the feature has a surrogate query defined
+     * @throws IllegalArgumentException if feature is null
+     */
+    public boolean hasSurrogateQueryFQN(IInputKey feature) {
+        Preconditions.checkArgument(feature != null, "Feature must not be null!");
+        boolean surrogateExists = dynamicSurrogateQueryMap.containsKey(feature);
+        if(!surrogateExists){
+            surrogateExists = registeredSurrogateQueryMap.containsKey(feature);
+        }
+        return surrogateExists;
+    }
+    
+    /**
+     * 
+     * @param feature for which the surrogate query FQN should be returned
+     * @return the surrogate query FQN defined for the feature
+     * @throws IllegalArgumentException if feature is null
+     * @throws NoSuchElementException if the feature has no surrogate query defined, use {@link #hasSurrogateQueryFQN} to check
+     */
+    public PQuery getSurrogateQuery(IInputKey feature) {
+        Preconditions.checkArgument(feature != null, "Feature must not be null!");
+        IProvider<PQuery> surrogate = dynamicSurrogateQueryMap.get(feature);
+        if(surrogate == null) {
+            surrogate = registeredSurrogateQueryMap.get(feature);
+        }
+        if(surrogate != null) {
+            return surrogate.get();
+        } else {
+            throw new NoSuchElementException(String.format("Feature %s has no surrogate query defined! Use #hasSurrogateQueryFQN to check existence.", feature));
+        }
+    }
+
+    /**
+     * @return an unmodifiable set of features with registered surrogate queries
+     */
+    public Set<IInputKey> getRegisteredSurrogateQueries() {
+        return Collections.unmodifiableSet(getRegisteredSurrogateQueriesInternal());
+    }
+    
+    private Set<IInputKey> getRegisteredSurrogateQueriesInternal() {
+        return registeredSurrogateQueryMap.keySet();
+    }
+    
+    /**
+     * @return an unmodifiable set of features with dynamically added surrogate queries
+     */
+    public Set<IInputKey> getDynamicSurrogateQueries() {
+        return Collections.unmodifiableSet(getDynamicSurrogateQueriesInternal());
+    }
+    
+    private Set<IInputKey> getDynamicSurrogateQueriesInternal() {
+        return dynamicSurrogateQueryMap.keySet();       
+    }
+    
+    /**
+     * @return an unmodifiable set that contains all features with surrogate queries.
+     */
+    public Set<IInputKey> getAllSurrogateQueries() {
+        Set<IInputKey> results = new HashSet<>(getRegisteredSurrogateQueriesInternal());
+        results.addAll(getDynamicSurrogateQueriesInternal());
+        return results;
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/AbstractTrivialMaskedMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/AbstractTrivialMaskedMemory.java
new file mode 100644
index 00000000..66587f77
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/AbstractTrivialMaskedMemory.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.memories;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.matchers.util.IMemory;
+
+/**
+ * Common parts of nullary and identity specializations.
+ * 
+ * @noextend This class is not intended to be subclassed by clients.
+ * @author Gabor Bergmann
+ * @since 2.0
+ */
+abstract class AbstractTrivialMaskedMemory<Timestamp extends Comparable<Timestamp>> extends MaskedTupleMemory<Timestamp> {
+
+    protected IMemory<Tuple> tuples;
+
+    protected AbstractTrivialMaskedMemory(TupleMask mask, MemoryType bucketType, Object owner) {
+        super(mask, owner);
+        tuples = CollectionsFactory.createMemory(Object.class, bucketType);
+    }
+    
+    @Override
+    public Map<Tuple, Timeline<Timestamp>> getWithTimeline(ITuple signature) {
+        throw new UnsupportedOperationException("Timeless memories do not support timestamp-based lookup!");
+    }
+
+    @Override
+    public void clear() {
+        tuples.clear();
+    }
+
+    @Override
+    public int getTotalSize() {
+        return tuples.size();
+    }
+
+    @Override
+    public Iterator<Tuple> iterator() {
+        return tuples.iterator();
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/DefaultMaskedTupleMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/DefaultMaskedTupleMemory.java
new file mode 100644
index 00000000..92081409
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/DefaultMaskedTupleMemory.java
@@ -0,0 +1,127 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.memories;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
+import tools.refinery.viatra.runtime.matchers.util.IMultiLookup.ChangeGranularity;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ *         Default implementation that covers all cases.
+ * 
+ * @since 2.0
+ */
+public final class DefaultMaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
+        extends MaskedTupleMemory<Timestamp> {
+    /**
+     * Maps a signature tuple to the bucket of tuples with the given signature.
+     * 
+     * @since 2.0
+     */
+    protected IMultiLookup<Tuple, Tuple> signatureToTuples;
+
+    /**
+     * @param mask
+     *            The mask used to index the matchings
+     * @param owner
+     *            the object "owning" this memory
+     * @param bucketType
+     *            the kind of tuple collection maintained for each indexer bucket
+     * @since 2.0
+     */
+    public DefaultMaskedTupleMemory(TupleMask mask, MemoryType bucketType, Object owner) {
+        super(mask, owner);
+        signatureToTuples = CollectionsFactory.<Tuple, Tuple> createMultiLookup(Object.class, bucketType, Object.class);
+    }
+
+    @Override
+    public boolean add(Tuple tuple) {
+        Tuple signature = mask.transform(tuple);
+        return add(tuple, signature);
+    }
+
+    @Override
+    public boolean add(Tuple tuple, Tuple signature) {
+        try {
+            return signatureToTuples.addPair(signature, tuple) == ChangeGranularity.KEY;
+        } catch (IllegalStateException ex) { // ignore worthless internal exception details
+            throw raiseDuplicateInsertion(tuple);
+        }
+
+    }
+
+    @Override
+    public boolean remove(Tuple tuple) {
+        Tuple signature = mask.transform(tuple);
+        return remove(tuple, signature);
+    }
+
+    @Override
+    public boolean remove(Tuple tuple, Tuple signature) {
+        try {
+            return signatureToTuples.removePair(signature, tuple) == ChangeGranularity.KEY;
+        } catch (IllegalStateException ex) { // ignore worthless internal exception details
+            throw raiseDuplicateDeletion(tuple);
+        }
+    }
+    
+    @Override
+    public Map<Tuple, Timeline<Timestamp>> getWithTimeline(ITuple signature) {
+        throw new UnsupportedOperationException("Timeless memories do not support timestamp-based lookup!");
+    }
+
+    @Override
+    public Collection<Tuple> get(ITuple signature) {
+        IMemoryView<Tuple> bucket = signatureToTuples.lookupUnsafe(signature);
+        return bucket == null ? null : bucket.distinctValues();
+    }
+
+    @Override
+    public void clear() {
+        signatureToTuples.clear();
+    }
+
+    @Override
+    public Iterable<Tuple> getSignatures() {
+        return signatureToTuples.distinctKeys();
+    }
+
+    @Override
+    public Iterator<Tuple> iterator() {
+        return signatureToTuples.distinctValues().iterator();
+    }
+
+    @Override
+    public int getTotalSize() {
+        int i = 0;
+        for (Tuple key : signatureToTuples.distinctKeys()) {
+            i += signatureToTuples.lookup(key).size();
+        }
+        return i;
+    }
+
+    @Override
+    public int getKeysetSize() {
+        return signatureToTuples.countKeys();
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/IdentityMaskedTupleMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/IdentityMaskedTupleMemory.java
new file mode 100644
index 00000000..dc59daf5
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/IdentityMaskedTupleMemory.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.memories;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+
+/**
+ * Specialized for identity mask; tuples are stored as a simple set/multiset memory.
+ * 
+ * @author Gabor Bergmann
+ * @since 2.0
+ */
+public final class IdentityMaskedTupleMemory<Timestamp extends Comparable<Timestamp>> extends AbstractTrivialMaskedMemory<Timestamp> {
+
+    /**
+     * @param mask
+     *            The mask used to index the matchings
+     * @param owner the object "owning" this memory
+     * @param bucketType the kind of tuple collection maintained for each indexer bucket
+     * @since 2.0
+     */
+    public IdentityMaskedTupleMemory(TupleMask mask, MemoryType bucketType, Object owner) {
+        super(mask, bucketType, owner);
+        if (!mask.isIdentity()) throw new IllegalArgumentException(mask.toString());
+    }
+
+    @Override
+    public int getKeysetSize() {
+        return tuples.size();
+    }
+
+    @Override
+    public Iterable<Tuple> getSignatures() {
+        return tuples;
+    }
+
+    @Override
+    public Collection<Tuple> get(ITuple signature) {
+        Tuple contained = tuples.theContainedVersionOfUnsafe(signature);
+        return contained != null ? 
+                        Collections.singleton(contained) :
+                        null;
+    }
+
+    @Override
+    public boolean remove(Tuple tuple, Tuple signature) {
+        return tuples.removeOne(tuple);
+    }
+
+    @Override
+    public boolean remove(Tuple tuple) {
+        return tuples.removeOne(tuple);
+    }
+
+    @Override
+    public boolean add(Tuple tuple, Tuple signature) {
+        return tuples.addOne(tuple);
+    }
+
+    @Override
+    public boolean add(Tuple tuple) {
+        return tuples.addOne(tuple);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/MaskedTupleMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/MaskedTupleMemory.java
new file mode 100644
index 00000000..62377624
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/MaskedTupleMemory.java
@@ -0,0 +1,385 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.memories;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.memories.timely.TimelyDefaultMaskedTupleMemory;
+import tools.refinery.viatra.runtime.matchers.memories.timely.TimelyIdentityMaskedTupleMemory;
+import tools.refinery.viatra.runtime.matchers.memories.timely.TimelyNullaryMaskedTupleMemory;
+import tools.refinery.viatra.runtime.matchers.memories.timely.TimelyUnaryMaskedTupleMemory;
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Clearable;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.viatra.runtime.matchers.util.resumable.MaskedResumable;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+
+/**
+ * Indexes a collection of tuples by their signature (i.e. footprint, projection) obtained according to a mask. May
+ * belong to an "owner" (for documentation / traceability purposes).
+ * <p>
+ * There are timeless and timely versions of the different memories. Timely versions associate {@link Timeline}s with
+ * the stored tuples.
+ * 
+ * @noextend This class is not intended to be subclassed by clients.
+ * @author Gabor Bergmann
+ * @author Tamas Szabo
+ * @since 2.0
+ */
+public abstract class MaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
+        implements Clearable, MaskedResumable<Timestamp> {
+
+    /**
+     * Creates a new memory for the given owner that indexes tuples according to the given mask.
+     */
+    public static <T extends Comparable<T>> MaskedTupleMemory<T> create(final TupleMask mask,
+            final MemoryType bucketType, final Object owner) {
+        return create(mask, bucketType, owner, false);
+    }
+
+    /**
+     * Creates a new memory for the given owner that indexes tuples according to the given mask. Clients can specify if
+     * the created memory should be timely or not. <br>
+     * <br>
+     * Timely means that tuples are associated with a timeline.
+     * 
+     * @since 2.3
+     */
+    public static <T extends Comparable<T>> MaskedTupleMemory<T> create(final TupleMask mask,
+            final MemoryType bucketType, final Object owner, final boolean isTimely) {
+        return create(mask, bucketType, owner, isTimely, false);
+    }
+
+    /**
+     * Creates a new memory for the given owner that indexes tuples according to the given mask. Clients can specify if
+     * the created memory should be timely or not. In case of timely memory, clients can also specify if the memory is
+     * lazy or not. <br>
+     * <br>
+     * Timely means that tuples are associated with a timeline. <br>
+     * <br>
+     * Lazyness can only be used together with timely memories. It means that the maintenance of the timelines is lazy,
+     * that is, the memory only updates its internal data structures at the timestamp affected by an update, and can be
+     * instructed later to resume the maintenance at higher timestamps, as well.
+     * 
+     * @since 2.4
+     */
+    public static <T extends Comparable<T>> MaskedTupleMemory<T> create(final TupleMask mask,
+            final MemoryType bucketType, final Object owner, final boolean isTimely, final boolean isLazy) {
+        if (isTimely) {
+            if (bucketType != MemoryType.SETS) {
+                throw new IllegalArgumentException("Timely memories only support SETS as the bucket type!");
+            }
+            if (mask.isIdentity()) {
+                return new TimelyIdentityMaskedTupleMemory<T>(mask, owner, isLazy);
+            } else if (0 == mask.getSize()) {
+                return new TimelyNullaryMaskedTupleMemory<T>(mask, owner, isLazy);
+            } else if (1 == mask.getSize()) {
+                return new TimelyUnaryMaskedTupleMemory<T>(mask, owner, isLazy);
+            } else {
+                return new TimelyDefaultMaskedTupleMemory<T>(mask, owner, isLazy);
+            }
+        } else {
+            if (isLazy) {
+                throw new IllegalArgumentException("Lazy maintenance is only supported by timely memories!");
+            }
+            if (mask.isIdentity()) {
+                return new IdentityMaskedTupleMemory<T>(mask, bucketType, owner);
+            } else if (0 == mask.getSize()) {
+                return new NullaryMaskedTupleMemory<T>(mask, bucketType, owner);
+            } else if (1 == mask.getSize()) {
+                return new UnaryMaskedTupleMemory<T>(mask, bucketType, owner);
+            } else {
+                return new DefaultMaskedTupleMemory<T>(mask, bucketType, owner);
+            }
+        }
+    }
+
+    @Override
+    public Map<Tuple, Map<Tuple, Diff<Timestamp>>> resumeAt(final Timestamp timestamp) {
+        throw new UnsupportedOperationException("This is only supported by lazy timely memory implementations!");
+    }
+
+    @Override
+    public Iterable<Tuple> getResumableSignatures() {
+        throw new UnsupportedOperationException("This is only supported by lazy timely memory implementations!");
+    }
+
+    @Override
+    public Timestamp getResumableTimestamp() {
+        return null;
+    }
+
+    /**
+     * Initializes the contents of this memory based on the contents of another memory. The default value is associated
+     * with each tuple in the timely memories.
+     * 
+     * @since 2.3
+     */
+    public void initializeWith(final MaskedTupleMemory<Timestamp> other, final Timestamp defaultValue) {
+        throw new UnsupportedOperationException("This is only supported by timely memory implementations!");
+    }
+
+    /**
+     * Returns true if there is any tuple with the given signature that is present at the timestamp +inf, false
+     * otherwise.
+     * @since 2.4
+     */
+    public boolean isPresentAtInfinity(final ITuple signature) {
+        return get(signature) != null;
+    }
+
+    /**
+     * Returns true of this memory is timely, false otherwise.
+     * 
+     * @since 2.3
+     */
+    public boolean isTimely() {
+        return false;
+    }
+
+    /**
+     * The mask by which the tuples are indexed.
+     */
+    protected final TupleMask mask;
+
+    /**
+     * The object "owning" this memory. May be null.
+     * 
+     * @since 1.7
+     */
+    protected final Object owner;
+
+    /**
+     * The node owning this memory. May be null.
+     * 
+     * @since 2.0
+     */
+    public Object getOwner() {
+        return owner;
+    }
+
+    /**
+     * The mask according to which tuples are projected and indexed.
+     * 
+     * @since 2.0
+     */
+    public TupleMask getMask() {
+        return mask;
+    }
+
+    /**
+     * @return the number of distinct signatures of all stored tuples.
+     */
+    public abstract int getKeysetSize();
+
+    /**
+     * @return the total number of distinct tuples stored. Multiple copies of the same tuple, if allowed, are counted as
+     *         one.
+     * 
+     *         <p>
+     *         This is currently not cached but computed on demand. It is therefore not efficient, and shall only be
+     *         used for debug / profiling purposes.
+     */
+    public abstract int getTotalSize();
+
+    /**
+     * Iterates over distinct tuples stored in the memory, regardless of their signatures.
+     */
+    public abstract Iterator<Tuple> iterator();
+
+    /**
+     * Retrieves a read-only view of exactly those signatures for which at least one tuple is stored
+     * 
+     * @since 2.0
+     */
+    public abstract Iterable<Tuple> getSignatures();
+
+    /**
+     * Retrieves tuples that have the specified signature
+     * 
+     * @return collection of tuples found, null if none
+     */
+    public abstract Collection<Tuple> get(final ITuple signature);
+
+    /**
+     * Retrieves the tuples and their associated timelines that have the specified signature.
+     * 
+     * @return the mappings from tuples to timelines, null if there is no mapping for the signature
+     * @since 2.4
+     */
+    public abstract Map<Tuple, Timeline<Timestamp>> getWithTimeline(final ITuple signature);
+
+    /**
+     * Retrieves tuples that have the specified signature.
+     * 
+     * @return collection of tuples found, never null
+     * @since 2.1
+     */
+    public Collection<Tuple> getOrEmpty(final ITuple signature) {
+        final Collection<Tuple> result = get(signature);
+        return result == null ? Collections.emptySet() : result;
+    }
+
+    /**
+     * Retrieves tuples with their associated timelines that have the specified signature.
+     * 
+     * @return map of tuples and timelines found, never null
+     * @since 2.4
+     */
+    public Map<Tuple, Timeline<Timestamp>> getOrEmptyWithTimeline(final ITuple signature) {
+        final Map<Tuple, Timeline<Timestamp>> result = getWithTimeline(signature);
+        return result == null ? Collections.emptyMap() : result;
+    }
+
+    /**
+     * Removes a tuple occurrence from the memory with the given signature.
+     * 
+     * @param tuple
+     *            the tuple to be removed from the memory
+     * @param signature
+     *            precomputed footprint of the tuple according to the mask
+     * 
+     * @return true if this was the the last occurrence of the signature (according to the mask)
+     */
+    public boolean remove(final Tuple tuple, final Tuple signature) {
+        throw new UnsupportedOperationException("This is only supported by timeless memory implementations!");
+    }
+
+    /**
+     * Removes a tuple occurrence from the memory with the given signature and timestamp.
+     * 
+     * @param tuple
+     *            the tuple to be removed from the memory
+     * @param signature
+     *            precomputed footprint of the tuple according to the mask
+     * @param timestamp
+     *            the timestamp associated with the tuple
+     * 
+     * @return A {@link Diff} describing how the timeline of the given tuple changed.
+     * 
+     * @since 2.4
+     */
+    public Diff<Timestamp> removeWithTimestamp(final Tuple tuple, final Tuple signature, final Timestamp timestamp) {
+        throw new UnsupportedOperationException("This is only supported by timely memory implementations!");
+    }
+
+    /**
+     * Removes a tuple occurrence from the memory.
+     * 
+     * @param tuple
+     *            the tuple to be removed from the memory
+     * 
+     * @return true if this was the the last occurrence of the signature (according to the mask)
+     */
+    public boolean remove(final Tuple tuple) {
+        throw new UnsupportedOperationException("This is only supported by timeless memory implementations!");
+    }
+
+    /**
+     * Removes a tuple occurrence from the memory with the given timestamp.
+     * 
+     * @param tuple
+     *            the tuple to be removed from the memory
+     * @param timestamp
+     *            the timestamp associated with the tuple
+     * 
+     * @return A {@link Diff} describing how the timeline of the given tuple changed.
+     * 
+     * @since 2.4
+     */
+    public Diff<Timestamp> removeWithTimestamp(final Tuple tuple, final Timestamp timestamp) {
+        throw new UnsupportedOperationException("This is only supported by timely memory implementations!");
+    }
+
+    /**
+     * Adds a tuple occurrence to the memory with the given signature.
+     * 
+     * @param tuple
+     *            the tuple to be added to the memory
+     * @param signature
+     *            precomputed footprint of the tuple according to the mask
+     * 
+     * @return true if new signature encountered (according to the mask)
+     */
+    public boolean add(final Tuple tuple, final Tuple signature) {
+        throw new UnsupportedOperationException("This is only supported by timeless memory implementations!");
+    }
+
+    /**
+     * Adds a tuple occurrence to the memory with the given signature and timestamp.
+     * 
+     * @param tuple
+     *            the tuple to be added to the memory
+     * @param signature
+     *            precomputed footprint of the tuple according to the mask
+     * @param timestamp
+     *            the timestamp associated with the tuple
+     * 
+     * @return A {@link Diff} describing how the timeline of the given tuple changed.
+     * 
+     * @since 2.4
+     */
+    public Diff<Timestamp> addWithTimestamp(final Tuple tuple, final Tuple signature, final Timestamp timestamp) {
+        throw new UnsupportedOperationException("This is only supported by timely memory implementations!");
+    }
+
+    /**
+     * Adds a tuple occurrence to the memory.
+     * 
+     * @param tuple
+     *            the tuple to be added to the memory
+     * 
+     * @return true if new signature encountered (according to the mask)
+     */
+    public boolean add(final Tuple tuple) {
+        throw new UnsupportedOperationException("This is only supported by timeless memory implementations!");
+    }
+
+    /**
+     * Adds a tuple occurrence to the memory with the given timestamp.
+     * 
+     * @param tuple
+     *            the tuple to be added to the memory
+     * @param timestamp
+     *            the timestamp associated with the tuple
+     * 
+     * @return A {@link Diff} describing how the timeline of the given tuple changed.
+     * 
+     * @since 2.4
+     */
+    public Diff<Timestamp> addWithTimestamp(final Tuple tuple, final Timestamp timestamp) {
+        throw new UnsupportedOperationException("This is only supported by timely memory implementations!");
+    }
+
+    protected MaskedTupleMemory(final TupleMask mask, final Object owner) {
+        super();
+        this.mask = mask;
+        this.owner = owner;
+    }
+
+    protected IllegalStateException raiseDuplicateInsertion(final Tuple tuple) {
+        return new IllegalStateException(String.format("Duplicate insertion of tuple %s into %s", tuple, owner));
+    }
+
+    protected IllegalStateException raiseDuplicateDeletion(final Tuple tuple) {
+        return new IllegalStateException(String.format("Duplicate deletion of tuple %s from %s", tuple, owner));
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "<" + mask + ">@" + owner;
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/NullaryMaskedTupleMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/NullaryMaskedTupleMemory.java
new file mode 100644
index 00000000..7fa9e053
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/NullaryMaskedTupleMemory.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.memories;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+
+/**
+ * Specialized for nullary mask; tuples are stored as a simple set/multiset memory.
+ * 
+ * @author Gabor Bergmann
+ * @since 2.0
+ */
+public final class NullaryMaskedTupleMemory<Timestamp extends Comparable<Timestamp>> extends AbstractTrivialMaskedMemory<Timestamp> {
+
+    protected static final Set<Tuple> UNIT_RELATION = 
+            Collections.singleton(Tuples.staticArityFlatTupleOf());
+    protected static final Set<Tuple> EMPTY_RELATION = 
+            Collections.emptySet();
+    /**
+     * @param mask
+     *            The mask used to index the matchings
+     * @param owner the object "owning" this memory
+     * @param bucketType the kind of tuple collection maintained for each indexer bucket
+     * @since 2.0
+     */
+    public NullaryMaskedTupleMemory(TupleMask mask, MemoryType bucketType, Object owner) {
+        super(mask, bucketType, owner);
+        if (0 != mask.getSize()) throw new IllegalArgumentException(mask.toString());
+    }
+
+    @Override
+    public int getKeysetSize() {
+        return tuples.isEmpty() ? 0 : 1;
+    }
+
+    @Override
+    public Iterable<Tuple> getSignatures() {
+        return tuples.isEmpty() ? EMPTY_RELATION : UNIT_RELATION;
+    }
+
+    @Override
+    public Collection<Tuple> get(ITuple signature) {
+        if (0 == signature.getSize())
+            return tuples.distinctValues(); 
+        else return null;
+    }
+
+    @Override
+    public boolean remove(Tuple tuple, Tuple signature) {
+        tuples.removeOne(tuple);
+        return tuples.isEmpty();
+    }
+
+    @Override
+    public boolean remove(Tuple tuple) {
+        return remove(tuple, null);
+    }
+
+    @Override
+    public boolean add(Tuple tuple, Tuple signature) {
+        boolean wasEmpty = tuples.isEmpty();
+        tuples.addOne(tuple);
+        return wasEmpty;
+    }
+
+    @Override
+    public boolean add(Tuple tuple) {
+        return add(tuple, null);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/UnaryMaskedTupleMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/UnaryMaskedTupleMemory.java
new file mode 100644
index 00000000..f34cc9e3
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/UnaryMaskedTupleMemory.java
@@ -0,0 +1,143 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.memories;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
+import tools.refinery.viatra.runtime.matchers.util.IMultiLookup.ChangeGranularity;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+
+/**
+ * Specialized for unary mask; tuples are indexed by a single column as opposed to a projection (signature) tuple.
+ * 
+ * @author Gabor Bergmann
+ * @since 2.0
+ */
+public final class UnaryMaskedTupleMemory<Timestamp extends Comparable<Timestamp>> extends MaskedTupleMemory<Timestamp> {
+
+    protected IMultiLookup<Object, Tuple> columnToTuples;
+    protected final int keyPosition;
+
+    /**
+     * @param mask
+     *            The mask used to index the matchings
+     * @param owner the object "owning" this memory
+     * @param bucketType the kind of tuple collection maintained for each indexer bucket
+     * @since 2.0
+     */
+    public UnaryMaskedTupleMemory(TupleMask mask, MemoryType bucketType, Object owner) {
+        super(mask, owner);
+        if (1 != mask.getSize()) throw new IllegalArgumentException(mask.toString());
+        
+        columnToTuples = CollectionsFactory.<Object, Tuple>createMultiLookup(
+                Object.class, bucketType, Object.class);
+        keyPosition = mask.indices[0];
+    }
+    
+    @Override
+    public void clear() {
+        columnToTuples.clear();
+    }
+
+    @Override
+    public int getKeysetSize() {
+        return columnToTuples.countKeys();
+    }
+
+    @Override
+    public int getTotalSize() {
+        int i = 0;
+        for (Object key : columnToTuples.distinctKeys()) {
+            i += columnToTuples.lookup(key).size();
+        }
+        return i;
+    }
+
+    @Override
+    public Iterator<Tuple> iterator() {
+        return columnToTuples.distinctValues().iterator();
+    }
+
+    @Override
+    public Iterable<Tuple> getSignatures() {
+        return () -> {
+            Iterator<Object> wrapped = columnToTuples.distinctKeys().iterator();
+            return new Iterator<Tuple>() {
+                @Override
+                public boolean hasNext() {
+                    return wrapped.hasNext();
+                }
+                @Override
+                public Tuple next() {
+                    Object key = wrapped.next();
+                    return Tuples.staticArityFlatTupleOf(key);
+                }
+            };
+        };
+    }
+
+    @Override
+    public Collection<Tuple> get(ITuple signature) {
+        Object key = signature.get(0);
+        IMemoryView<Tuple> bucket = columnToTuples.lookup(key);
+        return bucket == null ? null : bucket.distinctValues();
+    }
+    
+    @Override
+    public Map<Tuple, Timeline<Timestamp>> getWithTimeline(ITuple signature) {
+        throw new UnsupportedOperationException("Timeless memories do not support timestamp-based lookup!");
+    }
+
+    @Override
+    public boolean remove(Tuple tuple, Tuple signature) {
+        return removeInternal(tuple, tuple.get(keyPosition));
+    }
+
+    @Override
+    public boolean remove(Tuple tuple) {
+        return removeInternal(tuple, tuple.get(keyPosition));
+    }
+
+    @Override
+    public boolean add(Tuple tuple, Tuple signature) {
+        return addInternal(tuple, tuple.get(keyPosition));
+    }
+
+    @Override
+    public boolean add(Tuple tuple) {
+        return addInternal(tuple, tuple.get(keyPosition));
+    }
+    
+    protected boolean addInternal(Tuple tuple, Object key) {
+        try {
+            return columnToTuples.addPair(key, tuple) == ChangeGranularity.KEY;
+        } catch (IllegalStateException ex) { // ignore worthless internal exception details
+            throw raiseDuplicateInsertion(tuple);
+        }
+    }
+    
+    protected boolean removeInternal(Tuple tuple, Object key) {
+        try {
+            return columnToTuples.removePair(key, tuple) == ChangeGranularity.KEY;
+        } catch (IllegalStateException ex) { // ignore worthless internal exception details
+            throw raiseDuplicateDeletion(tuple);
+        }
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/AbstractTimelyMaskedMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/AbstractTimelyMaskedMemory.java
new file mode 100644
index 00000000..45ce3a4e
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/AbstractTimelyMaskedMemory.java
@@ -0,0 +1,228 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.memories.timely;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeMap;
+
+import tools.refinery.viatra.runtime.matchers.memories.MaskedTupleMemory;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.Signed;
+import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+
+/**
+ * Common parts of timely default and timely unary implementations.
+ * 
+ * @noextend This class is not intended to be subclassed by clients.
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+abstract class AbstractTimelyMaskedMemory<Timestamp extends Comparable<Timestamp>, KeyType>
+        extends MaskedTupleMemory<Timestamp> {
+
+    protected final TreeMap<Timestamp, Set<KeyType>> foldingStates;
+    protected final Map<KeyType, TimelyMemory<Timestamp>> memoryMap;
+    protected final boolean isLazy;
+
+    public AbstractTimelyMaskedMemory(final TupleMask mask, final Object owner, final boolean isLazy) {
+        super(mask, owner);
+        this.isLazy = isLazy;
+        this.memoryMap = CollectionsFactory.createMap();
+        this.foldingStates = this.isLazy ? CollectionsFactory.createTreeMap() : null;
+    }
+
+    @Override
+    public void initializeWith(final MaskedTupleMemory<Timestamp> other, final Timestamp defaultValue) {
+        final Iterable<Tuple> signatures = other.getSignatures();
+        for (final Tuple signature : signatures) {
+            if (other.isTimely()) {
+                final Map<Tuple, Timeline<Timestamp>> tupleMap = other.getWithTimeline(signature);
+                for (final Entry<Tuple, Timeline<Timestamp>> entry : tupleMap.entrySet()) {
+                    for (final Signed<Timestamp> signed : entry.getValue().asChangeSequence()) {
+                        if (signed.getDirection() == Direction.DELETE) {
+                            this.removeWithTimestamp(entry.getKey(), signed.getPayload());
+                        } else {
+                            this.addWithTimestamp(entry.getKey(), signed.getPayload());
+                        }
+                    }
+                }
+            } else {
+                final Collection<Tuple> tuples = other.get(signature);
+                for (final Tuple tuple : tuples) {
+                    this.addWithTimestamp(tuple, defaultValue);
+                }
+            }
+        }
+    }
+
+    public boolean isPresentAtInfinityInteral(KeyType key) {
+        final TimelyMemory<Timestamp> values = this.memoryMap.get(key);
+        if (values == null) {
+            return false;
+        } else {
+            return values.getCountAtInfinity() != 0;
+        }
+    }
+
+    @Override
+    public void clear() {
+        this.memoryMap.clear();
+    }
+
+    @Override
+    public int getKeysetSize() {
+        return this.memoryMap.keySet().size();
+    }
+
+    @Override
+    public int getTotalSize() {
+        int i = 0;
+        for (final Entry<KeyType, TimelyMemory<Timestamp>> entry : this.memoryMap.entrySet()) {
+            i += entry.getValue().size();
+        }
+        return i;
+    }
+
+    @Override
+    public Iterator<Tuple> iterator() {
+        return this.memoryMap.values().stream().flatMap(e -> e.keySet().stream()).iterator();
+    }
+
+    protected Collection<Tuple> getInternal(final KeyType key) {
+        final TimelyMemory<Timestamp> memory = this.memoryMap.get(key);
+        if (memory == null) {
+            return null;
+        } else {
+            return memory.getTuplesAtInfinity();
+        }
+    }
+
+    public Map<Tuple, Timeline<Timestamp>> getWithTimestampInternal(final KeyType key) {
+        final TimelyMemory<Timestamp> memory = this.memoryMap.get(key);
+        if (memory == null) {
+            return null;
+        } else {
+            return memory.asMap();
+        }
+    }
+
+    protected Diff<Timestamp> removeInternal(final KeyType key, final Tuple tuple, final Timestamp timestamp) {
+        Timestamp oldResumableTimestamp = null;
+        Timestamp newResumableTimestamp = null;
+        
+        final TimelyMemory<Timestamp> keyMemory = this.memoryMap.get(key);
+        if (keyMemory == null) {
+            throw raiseDuplicateDeletion(tuple);
+        }
+        
+        if (this.isLazy) {            
+            oldResumableTimestamp = keyMemory.getResumableTimestamp();
+        }
+        
+        Diff<Timestamp> diff = null;
+        try {
+            diff = keyMemory.remove(tuple, timestamp);
+        } catch (final IllegalStateException e) {
+            throw raiseDuplicateDeletion(tuple);
+        }
+        if (keyMemory.isEmpty()) {
+            this.memoryMap.remove(key);
+        }
+        
+        if (this.isLazy) {            
+            newResumableTimestamp = keyMemory.getResumableTimestamp();
+            if (!Objects.equals(oldResumableTimestamp, newResumableTimestamp)) {
+                unregisterFoldingState(oldResumableTimestamp, key);
+                registerFoldingState(newResumableTimestamp, key);
+            }
+        }
+        
+        return diff;
+    }
+
+    protected Diff<Timestamp> addInternal(final KeyType key, final Tuple tuple, final Timestamp timestamp) {
+        Timestamp oldResumableTimestamp = null;
+        Timestamp newResumableTimestamp = null;
+                
+        final TimelyMemory<Timestamp> keyMemory = this.memoryMap.computeIfAbsent(key,
+                k -> new TimelyMemory<Timestamp>(this.isLazy));
+        
+        if (this.isLazy) {            
+            oldResumableTimestamp = keyMemory.getResumableTimestamp();
+        }
+        
+        final Diff<Timestamp> diff = keyMemory.put(tuple, timestamp);
+        
+        if (this.isLazy) {            
+            newResumableTimestamp = keyMemory.getResumableTimestamp();
+            if (!Objects.equals(oldResumableTimestamp, newResumableTimestamp)) {
+                unregisterFoldingState(oldResumableTimestamp, key);
+                registerFoldingState(newResumableTimestamp, key);
+            }
+        }
+        
+        return diff;
+    }
+    
+    @Override
+    public Diff<Timestamp> removeWithTimestamp(final Tuple tuple, final Timestamp timestamp) {
+        return removeWithTimestamp(tuple, null, timestamp);
+    }
+
+    @Override
+    public Diff<Timestamp> addWithTimestamp(final Tuple tuple, final Timestamp timestamp) {
+        return addWithTimestamp(tuple, null, timestamp);
+    }
+
+    @Override
+    public boolean isTimely() {
+        return true;
+    }
+    
+    protected void registerFoldingState(final Timestamp timestamp, final KeyType key) {
+        if (timestamp != null) {
+            this.foldingStates.compute(timestamp, (k, v) -> {
+                if (v == null) {
+                    v = CollectionsFactory.createSet();
+                }
+                v.add(key);
+                return v;
+            });
+        }
+    }
+    
+    protected void unregisterFoldingState(final Timestamp timestamp, final KeyType key) {
+        if (timestamp != null) {
+            this.foldingStates.compute(timestamp, (k, v) -> {
+                v.remove(key);
+                return v.isEmpty() ? null : v;
+            });
+        }
+    }
+    
+    @Override
+    public Timestamp getResumableTimestamp() {
+        if (this.foldingStates == null || this.foldingStates.isEmpty()) {
+            return null;
+        } else {
+            return this.foldingStates.firstKey();
+        }
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/AbstractTimelyTrivialMaskedMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/AbstractTimelyTrivialMaskedMemory.java
new file mode 100644
index 00000000..ca06685a
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/AbstractTimelyTrivialMaskedMemory.java
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.memories.timely;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import tools.refinery.viatra.runtime.matchers.memories.MaskedTupleMemory;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.Signed;
+import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+
+/**
+ * Common parts of timely nullary and timely identity implementations.
+ * 
+ * @noextend This class is not intended to be subclassed by clients.
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+abstract class AbstractTimelyTrivialMaskedMemory<Timestamp extends Comparable<Timestamp>> extends MaskedTupleMemory<Timestamp> {
+
+    protected final TimelyMemory<Timestamp> memory;
+
+    protected AbstractTimelyTrivialMaskedMemory(final TupleMask mask, final Object owner, final boolean isLazy) {
+        super(mask, owner);
+        this.memory = new TimelyMemory<Timestamp>(isLazy);
+    }
+    
+    @Override
+    public void initializeWith(final MaskedTupleMemory<Timestamp> other, final Timestamp defaultValue) {
+        final Iterable<Tuple> signatures = other.getSignatures();
+        for (final Tuple signature : signatures) {
+            if (other.isTimely()) {
+                final Map<Tuple, Timeline<Timestamp>> tupleMap = other.getWithTimeline(signature);
+                for (final Entry<Tuple, Timeline<Timestamp>> entry : tupleMap.entrySet()) {
+                    for (final Signed<Timestamp> signed : entry.getValue().asChangeSequence()) {
+                        if (signed.getDirection() == Direction.DELETE) {
+                            this.removeWithTimestamp(entry.getKey(), signed.getPayload());
+                        } else {
+                            this.addWithTimestamp(entry.getKey(), signed.getPayload());                                            
+                        }
+                    }
+                }                
+            } else {
+                final Collection<Tuple> tuples = other.get(signature);
+                for (final Tuple tuple : tuples) {
+                    this.removeWithTimestamp(tuple, defaultValue);
+                }
+            }
+        }            
+    }
+
+    @Override
+    public void clear() {
+        this.memory.clear();
+    }
+
+    @Override
+    public int getTotalSize() {
+        return this.memory.size();
+    }
+
+    @Override
+    public Iterator<Tuple> iterator() {
+        return this.memory.keySet().iterator();
+    }
+    
+    @Override
+    public Diff<Timestamp> removeWithTimestamp(final Tuple tuple, final Timestamp timestamp) {
+        return removeWithTimestamp(tuple, null, timestamp);
+    }
+
+    @Override
+    public Diff<Timestamp> addWithTimestamp(final Tuple tuple, final Timestamp timestamp) {
+        return addWithTimestamp(tuple, null, timestamp);
+    }
+    
+    @Override
+    public boolean isTimely() {
+        return true;
+    }
+        
+    @Override
+    public Timestamp getResumableTimestamp() {
+        return this.memory.getResumableTimestamp();
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyDefaultMaskedTupleMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyDefaultMaskedTupleMemory.java
new file mode 100644
index 00000000..623d7399
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyDefaultMaskedTupleMemory.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.memories.timely;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+
+/**
+ * Default timely implementation that covers all cases.
+ * 
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public final class TimelyDefaultMaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
+        extends AbstractTimelyMaskedMemory<Timestamp, Tuple> {
+
+    public TimelyDefaultMaskedTupleMemory(final TupleMask mask, final Object owner, final boolean isLazy) {
+        super(mask, owner, isLazy);
+    }
+
+    @Override
+    public Iterable<Tuple> getSignatures() {
+        return this.memoryMap.keySet();
+    }
+
+    @Override
+    public Diff<Timestamp> removeWithTimestamp(final Tuple tuple, final Tuple signature,
+            final Timestamp timestamp) {
+        final Tuple key = mask.transform(tuple);
+        return removeInternal(key, tuple, timestamp);
+    }
+
+    @Override
+    public Diff<Timestamp> addWithTimestamp(final Tuple tuple, final Tuple signature,
+            final Timestamp timestamp) {
+        final Tuple key = this.mask.transform(tuple);
+        return addInternal(key, tuple, timestamp);
+    }
+
+    @Override
+    public Collection<Tuple> get(final ITuple signature) {
+        return getInternal(signature.toImmutable());
+    }
+
+    @Override
+    public Map<Tuple, Timeline<Timestamp>> getWithTimeline(final ITuple signature) {
+        return getWithTimestampInternal(signature.toImmutable());
+    }
+    
+    @Override
+    public boolean isPresentAtInfinity(final ITuple signature) {
+        return isPresentAtInfinityInteral(signature.toImmutable());
+    }
+    
+    @Override
+    public Set<Tuple> getResumableSignatures() {
+        if (this.foldingStates == null || this.foldingStates.isEmpty()) {
+            return Collections.emptySet();
+        } else {
+            return this.foldingStates.firstEntry().getValue();
+        }
+    }
+    
+    @Override
+    public Map<Tuple, Map<Tuple, Diff<Timestamp>>> resumeAt(final Timestamp timestamp) {
+        final Map<Tuple, Map<Tuple, Diff<Timestamp>>> result = CollectionsFactory.createMap();
+        final Timestamp resumableTimestamp = this.getResumableTimestamp();
+        if (resumableTimestamp == null || resumableTimestamp.compareTo(timestamp) != 0) {
+            throw new IllegalStateException("Expected to continue folding at " + resumableTimestamp + "!");
+        }
+        final Set<Tuple> signatures = this.foldingStates.remove(timestamp);
+        for (final Tuple signature : signatures) {
+            final TimelyMemory<Timestamp> memory = this.memoryMap.get(signature);
+            final Map<Tuple, Diff<Timestamp>> diffMap = memory.resumeAt(resumableTimestamp);
+            result.put(signature, diffMap);
+            registerFoldingState(memory.getResumableTimestamp(), signature);
+        }
+        return result;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyIdentityMaskedTupleMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyIdentityMaskedTupleMemory.java
new file mode 100644
index 00000000..568f274d
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyIdentityMaskedTupleMemory.java
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.memories.timely;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+
+/**
+ * Timely specialization for identity mask. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public final class TimelyIdentityMaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
+        extends AbstractTimelyTrivialMaskedMemory<Timestamp> {
+
+    public TimelyIdentityMaskedTupleMemory(final TupleMask mask, final Object owner, final boolean isLazy) {
+        super(mask, owner, isLazy);
+        if (!mask.isIdentity())
+            throw new IllegalArgumentException(mask.toString());
+    }
+
+    @Override
+    public int getKeysetSize() {
+        return this.memory.size();
+    }
+
+    @Override
+    public Iterable<Tuple> getSignatures() {
+        return this.memory.keySet();
+    }
+
+    @Override
+    public Collection<Tuple> get(final ITuple signature) {
+        if (this.memory.getTuplesAtInfinity().contains(signature)) {
+            return Collections.singleton(signature.toImmutable());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Map<Tuple, Timeline<Timestamp>> getWithTimeline(final ITuple signature) {
+        final Timeline<Timestamp> value = this.memory.get(signature);
+        if (value != null) {
+            return Collections.singletonMap(signature.toImmutable(), value);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Diff<Timestamp> removeWithTimestamp(final Tuple tuple, final Tuple signature, final Timestamp timestamp) {
+        try {
+            return this.memory.remove(tuple, timestamp);
+        } catch (final IllegalStateException e) {
+            throw raiseDuplicateDeletion(tuple);
+        }
+    }
+
+    @Override
+    public Diff<Timestamp> addWithTimestamp(final Tuple tuple, final Tuple signature, final Timestamp timestamp) {
+        return this.memory.put(tuple, timestamp);
+    }
+
+    @Override
+    public boolean isPresentAtInfinity(final ITuple signature) {
+        return this.memory.isPresentAtInfinity(signature.toImmutable());
+    }
+
+    @Override
+    public Set<Tuple> getResumableSignatures() {
+        if (this.memory.getResumableTimestamp() != null) {
+            return this.memory.getResumableTuples();
+        } else {
+            return Collections.emptySet();
+        }
+    }
+
+    @Override
+    public Map<Tuple, Map<Tuple, Diff<Timestamp>>> resumeAt(final Timestamp timestamp) {
+        final Map<Tuple, Diff<Timestamp>> diffMap = this.memory.resumeAt(timestamp);
+        final Map<Tuple, Map<Tuple, Diff<Timestamp>>> result = CollectionsFactory.createMap();
+        for (final Entry<Tuple, Diff<Timestamp>> entry : diffMap.entrySet()) {
+            result.put(entry.getKey(), Collections.singletonMap(entry.getKey(), entry.getValue()));
+        }
+        return result;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyNullaryMaskedTupleMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyNullaryMaskedTupleMemory.java
new file mode 100644
index 00000000..75987a89
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyNullaryMaskedTupleMemory.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.memories.timely;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+
+/**
+ * Timely specialization for nullary mask. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public final class TimelyNullaryMaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
+        extends AbstractTimelyTrivialMaskedMemory<Timestamp> {
+
+    protected static final Tuple EMPTY_TUPLE = Tuples.staticArityFlatTupleOf();
+    protected static final Set<Tuple> UNIT_RELATION = Collections.singleton(EMPTY_TUPLE);
+    protected static final Set<Tuple> EMPTY_RELATION = Collections.emptySet();
+
+    public TimelyNullaryMaskedTupleMemory(final TupleMask mask, final Object owner, final boolean isLazy) {
+        super(mask, owner, isLazy);
+        if (0 != mask.getSize()) {
+            throw new IllegalArgumentException(mask.toString());
+        }
+    }
+
+    @Override
+    public int getKeysetSize() {
+        return this.memory.isEmpty() ? 0 : 1;
+    }
+
+    @Override
+    public Iterable<Tuple> getSignatures() {
+        return this.memory.isEmpty() ? EMPTY_RELATION : UNIT_RELATION;
+    }
+
+    @Override
+    public Collection<Tuple> get(final ITuple signature) {
+        if (0 == signature.getSize()) {
+            return this.memory.getTuplesAtInfinity();
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Map<Tuple, Timeline<Timestamp>> getWithTimeline(final ITuple signature) {
+        if (0 == signature.getSize()) {
+            return this.memory.asMap();
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Diff<Timestamp> removeWithTimestamp(final Tuple tuple, final Tuple signature, final Timestamp timestamp) {
+        try {
+            return this.memory.remove(tuple, timestamp);
+        } catch (final IllegalStateException e) {
+            throw raiseDuplicateDeletion(tuple);
+        }
+    }
+
+    @Override
+    public Diff<Timestamp> addWithTimestamp(final Tuple tuple, final Tuple signature, final Timestamp timestamp) {
+        return this.memory.put(tuple, timestamp);
+    }
+
+    @Override
+    public boolean isPresentAtInfinity(final ITuple signature) {
+        if (0 == signature.getSize()) {
+            return this.memory.getCountAtInfinity() > 0;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public Set<Tuple> getResumableSignatures() {
+        if (this.memory.getResumableTimestamp() != null) {
+            return UNIT_RELATION;
+        } else {
+            return EMPTY_RELATION;
+        }
+    }
+
+    @Override
+    public Map<Tuple, Map<Tuple, Diff<Timestamp>>> resumeAt(final Timestamp timestamp) {
+        return Collections.singletonMap(EMPTY_TUPLE, this.memory.resumeAt(timestamp));
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyUnaryMaskedTupleMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyUnaryMaskedTupleMemory.java
new file mode 100644
index 00000000..178193af
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/memories/timely/TimelyUnaryMaskedTupleMemory.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.memories.timely;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.TimelyMemory;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+
+/**
+ * Timely specialization for unary mask. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public final class TimelyUnaryMaskedTupleMemory<Timestamp extends Comparable<Timestamp>>
+        extends AbstractTimelyMaskedMemory<Timestamp, Object> {
+
+    protected final int keyPosition;
+
+    public TimelyUnaryMaskedTupleMemory(final TupleMask mask, final Object owner, final boolean isLazy) {
+        super(mask, owner, isLazy);
+        if (1 != mask.getSize())
+            throw new IllegalArgumentException(mask.toString());
+        this.keyPosition = mask.indices[0];
+    }
+
+    @Override
+    public Iterable<Tuple> getSignatures() {
+        return () -> {
+            final Iterator<Object> wrapped = this.memoryMap.keySet().iterator();
+            return new Iterator<Tuple>() {
+                @Override
+                public boolean hasNext() {
+                    return wrapped.hasNext();
+                }
+
+                @Override
+                public Tuple next() {
+                    final Object key = wrapped.next();
+                    return Tuples.staticArityFlatTupleOf(key);
+                }
+            };
+        };
+    }
+
+    @Override
+    public Diff<Timestamp> removeWithTimestamp(final Tuple tuple, final Tuple signature, final Timestamp timestamp) {
+        final Object key = tuple.get(keyPosition);
+        return removeInternal(key, tuple, timestamp);
+    }
+
+    @Override
+    public Diff<Timestamp> addWithTimestamp(final Tuple tuple, final Tuple signature, final Timestamp timestamp) {
+        final Object key = tuple.get(keyPosition);
+        return addInternal(key, tuple, timestamp);
+    }
+
+    @Override
+    public Collection<Tuple> get(final ITuple signature) {
+        return getInternal(signature.get(0));
+    }
+
+    @Override
+    public Map<Tuple, Timeline<Timestamp>> getWithTimeline(final ITuple signature) {
+        return getWithTimestampInternal(signature.get(0));
+    }
+
+    @Override
+    public boolean isPresentAtInfinity(ITuple signature) {
+        return isPresentAtInfinityInteral(signature.get(0));
+    }
+
+    @Override
+    public Iterable<Tuple> getResumableSignatures() {
+        if (this.foldingStates == null || this.foldingStates.isEmpty()) {
+            return Collections.emptySet();
+        } else {
+            return () -> {
+                final Iterator<Object> wrapped = this.foldingStates.firstEntry().getValue().iterator();
+                return new Iterator<Tuple>() {
+                    @Override
+                    public boolean hasNext() {
+                        return wrapped.hasNext();
+                    }
+
+                    @Override
+                    public Tuple next() {
+                        final Object key = wrapped.next();
+                        return Tuples.staticArityFlatTupleOf(key);
+                    }
+                };
+            };
+        }
+    }
+
+    @Override
+    public Map<Tuple, Map<Tuple, Diff<Timestamp>>> resumeAt(final Timestamp timestamp) {
+        final Map<Tuple, Map<Tuple, Diff<Timestamp>>> result = CollectionsFactory.createMap();
+        final Timestamp resumableTimestamp = this.getResumableTimestamp();
+        if (resumableTimestamp == null) {
+            throw new IllegalStateException("There is nothing to fold!");
+        } else if (resumableTimestamp.compareTo(timestamp) != 0) {
+            throw new IllegalStateException("Expected to continue folding at " + resumableTimestamp + "!");
+        }
+        
+        final Set<Object> signatures = this.foldingStates.remove(timestamp);
+        for (final Object signature : signatures) {
+            final TimelyMemory<Timestamp> memory = this.memoryMap.get(signature);
+            final Map<Tuple, Diff<Timestamp>> diffMap = memory.resumeAt(resumableTimestamp);
+            result.put(Tuples.staticArityFlatTupleOf(signature), diffMap);
+            registerFoldingState(memory.getResumableTimestamp(), signature);
+        }
+        return result;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/IOperationCompiler.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/IOperationCompiler.java
new file mode 100644
index 00000000..c9f4b305
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/IOperationCompiler.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.planning;
+
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+
+/**
+ * 
+ * An implicit common parameter is the "effort" PatternDescription. This
+ * indicates that the build request is part of an effort to build the matcher of
+ * the given pattern; it it important to record this during code generation so
+ * that the generated code can be separated according to patterns.
+ * 
+ * @param <Collector>
+ *            the handle of a receiver-like RETE ending to which plans can be
+ *            connected
+ * @author Gabor Bergmann
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface IOperationCompiler<Collector> {
+
+    /**
+     * @throws ViatraQueryRuntimeException
+     */
+    public Collector patternCollector(PQuery pattern);
+ 
+    public void buildConnection(SubPlan parentPlan, Collector collector);
+    
+    /**
+     * @since 0.9
+     */
+    public void patternFinished(PQuery pattern, Collector collector);
+    
+    /**
+     * @throws ViatraQueryRuntimeException
+     */
+    public SubPlan patternCallPlan(Tuple nodes, PQuery supplierKey);
+
+    public SubPlan transitiveInstantiationPlan(Tuple nodes);
+
+    public SubPlan directInstantiationPlan(Tuple nodes);
+
+    public SubPlan transitiveGeneralizationPlan(Tuple nodes);
+
+    public SubPlan directGeneralizationPlan(Tuple nodes);
+
+    public SubPlan transitiveContainmentPlan(Tuple nodes);
+
+    public SubPlan directContainmentPlan(Tuple nodes);
+
+    public SubPlan binaryEdgeTypePlan(Tuple nodes, Object supplierKey);
+
+    public SubPlan ternaryEdgeTypePlan(Tuple nodes, Object supplierKey);
+
+    public SubPlan unaryTypePlan(Tuple nodes, Object supplierKey);
+
+    public SubPlan buildStartingPlan(Object[] constantValues, Object[] constantNames);
+
+    public SubPlan buildEqualityChecker(SubPlan parentPlan, int[] indices);
+
+    public SubPlan buildInjectivityChecker(SubPlan parentPlan, int subject, int[] inequalIndices);
+
+    public SubPlan buildTransitiveClosure(SubPlan parentPlan);
+
+    public SubPlan buildTrimmer(SubPlan parentPlan, TupleMask trimMask, boolean enforceUniqueness);
+
+    public SubPlan buildBetaNode(SubPlan primaryPlan, SubPlan sidePlan,
+            TupleMask primaryMask, TupleMask sideMask, TupleMask complementer, boolean negative);
+
+    public SubPlan buildCounterBetaNode(SubPlan primaryPlan, SubPlan sidePlan,
+            TupleMask primaryMask, TupleMask originalSideMask, TupleMask complementer,
+            Object aggregateResultCalibrationElement);
+
+    public SubPlan buildCountCheckBetaNode(SubPlan primaryPlan, SubPlan sidePlan,
+            TupleMask primaryMask, TupleMask originalSideMask, int resultPositionInSignature);
+
+    public SubPlan buildPredicateChecker(IExpressionEvaluator evaluator, Map<String, Integer> tupleNameMap,
+            SubPlan parentPlan);
+    public SubPlan buildFunctionEvaluator(IExpressionEvaluator evaluator, Map<String, Integer> tupleNameMap,
+            SubPlan parentPlan, Object computedResultCalibrationElement);
+    
+    /**
+     * @return an operation compiler that potentially acts on a separate container
+     */
+    public IOperationCompiler<Collector> getNextContainer();
+
+    /**
+     * @return an operation compiler that puts build actions on the tab of the given pattern
+     * @since 0.9
+     */
+    public IOperationCompiler<Collector> putOnTab(PQuery effort /*, IPatternMatcherContext context*/);
+
+    public void reinitialize();
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/IQueryPlannerStrategy.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/IQueryPlannerStrategy.java
new file mode 100644
index 00000000..6ce9d91b
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/IQueryPlannerStrategy.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.planning;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+
+/**
+ * An algorithm that builds a query plan based on a PSystem representation of a body of constraints. This interface is
+ * for internal use of the various query backends.
+ * 
+ * @author Gabor Bergmann
+ */
+public interface IQueryPlannerStrategy {
+    
+    /**
+     * @throws ViatraQueryRuntimeException
+     */
+    public SubPlan plan(PBody pSystem, Logger logger, IQueryMetaContext context);
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/QueryProcessingException.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/QueryProcessingException.java
new file mode 100644
index 00000000..501ddf73
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/QueryProcessingException.java
@@ -0,0 +1,102 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.planning;
+
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @since 0.9
+ */
+public class QueryProcessingException extends ViatraQueryRuntimeException {
+
+    private static final long serialVersionUID = -8272290113656867086L;
+    /**
+     * Binding the '{n}' (n = 1..N) strings to contextual conditions in 'context'
+     * 
+     * @param context
+     *            : array of context-sensitive Strings
+     */
+    protected static String bind(String message, String[] context) {
+        if (context == null) 
+            return message;
+    
+        String internal = message;
+        for (int i = 0; i < context.length; i++) {
+            internal = internal.replace("{" + (i + 1) + "}", context[i] != null ? context[i] : "<<null>>");
+        }
+        return internal;
+    }
+    
+    private Object patternDescription;
+    private String shortMessage;
+
+    /**
+     * @param message
+     *            The template of the exception message
+     * @param context
+     *            The data elements to be used to instantiate the template. Can be null if no context parameter is
+     *            defined
+     * @param patternDescription
+     *            the PatternDescription where the exception occurred
+     * @since 2.0
+     */
+    public QueryProcessingException(String message, Object patternDescription) {
+        super(message);
+        initializeFields(message, patternDescription);
+    }
+    
+    /**
+     * @param message
+     *            The template of the exception message
+     * @param context
+     *            The data elements to be used to instantiate the template. Can be null if no context parameter is
+     *            defined
+     * @param patternDescription
+     *            the PatternDescription where the exception occurred
+     */
+    public QueryProcessingException(String message, String[] context, String shortMessage, Object patternDescription) {
+        super(bind(message, context));
+        initializeFields(shortMessage, patternDescription);
+    }
+
+    /**
+     * @param message
+     *            The template of the exception message
+     * @param context
+     *            The data elements to be used to instantiate the template. Can be null if no context parameter is
+     *            defined
+     * @param patternDescription
+     *            the PatternDescription where the exception occurred
+     */
+    public QueryProcessingException(String message, String[] context, String shortMessage, Object patternDescription,
+            Throwable cause) {
+        super(bind(message, context), cause);
+        initializeFields(shortMessage, patternDescription);
+    }
+    
+    public Object getPatternDescription() {
+        return patternDescription;
+    }
+
+    public String getShortMessage() {
+        return shortMessage;
+    }
+
+    private void initializeFields(String shortMessage, Object patternDescription) {
+        this.patternDescription = patternDescription;
+        this.shortMessage = shortMessage;
+    }
+
+    
+    public void setPatternDescription(Object patternDescription) {
+        this.patternDescription = patternDescription;
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/SubPlan.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/SubPlan.java
new file mode 100644
index 00000000..1998df9d
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/SubPlan.java
@@ -0,0 +1,240 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.planning;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.planning.helpers.TypeHelper;
+import tools.refinery.viatra.runtime.matchers.planning.operations.POperation;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PProject;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PStart;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
+
+/**
+ * A plan representing a subset of (or possibly all the) constraints evaluated. A SubPlan instance is responsible for
+ * representing a state of the plan; but after it is initialized it is expected be immutable 
+ *  (exception: inferred constraints, see {@link #inferConstraint(PConstraint)}).
+ * 
+ * <p> A SubPlan is constructed by applying a {@link POperation} on zero or more parent SubPlans. 
+ * Important maintained information: <ul>
+ * <li>set of <b>variables</b> whose values are known when the runtime evaluation is at this stage,
+ * <li>set of <b>constraints</b> that are known to hold true at this point.
+ * </ul>
+ * 
+ * <p> Recommended to instantiate via a {@link SubPlanFactory} or subclasses, 
+ * so that query planners can subclass SubPlan if needed. 
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public class SubPlan {
+    private PBody body;
+    private List<? extends SubPlan> parentPlans;
+    private POperation operation;
+
+    private final Set<PVariable> visibleVariables; 
+    private final Set<PVariable> allVariables; 
+    private final Set<PVariable> introducedVariables; // delta compared to first parent
+    private Set<PConstraint> allConstraints;
+    private Set<PConstraint> deltaConstraints; // delta compared to all parents
+    private Set<PConstraint> externallyInferredConstraints; // inferred in addition to direct consequences of the operation and parents 
+    
+
+    
+    
+    
+    /**
+     * A SubPlan is constructed by applying a {@link POperation} on zero or more parent SubPlans.
+     */
+    public SubPlan(PBody body, POperation operation, SubPlan... parentPlans) {
+        this(body, operation, Arrays.asList(parentPlans));
+    }
+    /**
+     * A SubPlan is constructed by applying a {@link POperation} on zero or more parent SubPlans.
+     */
+    public SubPlan(PBody body, POperation operation, List<? extends SubPlan> parentPlans) {
+        super();
+        this.body = body;
+        this.parentPlans = parentPlans;
+        this.operation = operation;
+        
+        this.externallyInferredConstraints = new HashSet<PConstraint>();
+        this.deltaConstraints = new HashSet<PConstraint>(operation.getDeltaConstraints());
+        
+        this.allVariables = new HashSet<PVariable>();
+        for (PConstraint constraint: deltaConstraints) {
+            this.allVariables.addAll(constraint.getDeducedVariables());
+        }
+        this.allConstraints = new HashSet<PConstraint>(deltaConstraints);
+        for (SubPlan parentPlan: parentPlans) {
+            this.allConstraints.addAll(parentPlan.getAllEnforcedConstraints());
+            this.allVariables.addAll(parentPlan.getAllDeducedVariables());
+        }     
+        
+        // TODO this is ugly a bit
+        if (operation instanceof PStart) {
+            this.visibleVariables = new HashSet<PVariable>(((PStart) operation).getAPrioriVariables());
+            this.allVariables.addAll(visibleVariables);
+        } else if (operation instanceof PProject) { 
+            this.visibleVariables = new HashSet<PVariable>(((PProject) operation).getToVariables());
+        } else {
+            this.visibleVariables = new HashSet<PVariable>();
+            for (SubPlan parentPlan: parentPlans)
+                this.visibleVariables.addAll(parentPlan.getVisibleVariables());
+            for (PConstraint constraint: deltaConstraints)
+                this.visibleVariables.addAll(constraint.getDeducedVariables());
+        } 
+        
+        this.introducedVariables = new HashSet<PVariable>(this.visibleVariables);
+        if (!parentPlans.isEmpty()) 
+            introducedVariables.removeAll(parentPlans.get(0).getVisibleVariables());
+        
+        operation.checkConsistency(this);
+    }
+    
+    
+    @Override
+    public String toString() {
+        return toLongString();
+    }
+    public String toShortString() {
+        return String.format("Plan{%s}:%s", 
+                visibleVariables.stream().map(PVariable::getName).collect(Collectors.joining(",")),
+                operation.getShortName());
+    }
+    public String toLongString() {
+        return String.format("%s<%s>", 
+                toShortString(),
+                parentPlans.stream().map(Object::toString).collect(Collectors.joining("; ")));
+    }
+
+
+    /**
+     * All constraints that are known to hold at this point
+     */
+    public Set<PConstraint> getAllEnforcedConstraints() {
+        return allConstraints;
+    }
+
+    /**
+     * The new constraints enforced at this stage of plan, that aren't yet enforced at parents
+     * (results are also included in {@link SubPlan#getAllEnforcedConstraints()})
+     */
+    public Set<PConstraint> getDeltaEnforcedConstraints() {
+        return deltaConstraints;
+    }
+
+    /**
+     * Indicate that a given constraint was found to be automatically satisfied at this point 
+     *   without additional operations. 
+     * (results are also included in {@link SubPlan#getDeltaEnforcedConstraints()})
+     *   
+     * <p>Warning: not propagated automatically to child plans, 
+     *  so best to invoke before constructing further SubPlans. </p>
+     */
+    public void inferConstraint(PConstraint constraint) {
+        externallyInferredConstraints.add(constraint);
+        deltaConstraints.add(constraint);
+        allConstraints.add(constraint);
+    }
+    
+    public PBody getBody() {
+        return body;
+    }
+    
+    /**
+     * Variables which are assigned a value at this point 
+     * (results are also included in {@link SubPlan#getAllDeducedVariables()})
+     */
+    public Set<PVariable> getVisibleVariables() {
+        return visibleVariables;
+    }
+    /**
+     * Variables which have been assigned a value; 
+     * includes visible variables (see {@link #getVisibleVariables()}) 
+     *   and additionally any variables hidden by a projection (see {@link PProject}). 
+     */
+    public Set<PVariable> getAllDeducedVariables() {
+        return allVariables;
+    }
+    /**
+     * Delta compared to first parent: variables that are visible here but were not visible at the first parent.
+     */
+    public Set<PVariable> getIntroducedVariables() {
+        return introducedVariables;
+    }
+    public List<? extends SubPlan> getParentPlans() {
+        return parentPlans;
+    }
+    public POperation getOperation() {
+        return operation;
+    }
+    
+    
+    /**
+     * The closure of all type judgments of enforced constraints at this point.
+     * <p> No subsumption applied.
+     */
+    public Set<TypeJudgement> getAllImpliedTypeJudgements(IQueryMetaContext context) {
+        Set<TypeJudgement> impliedJudgements = allImpliedTypeJudgements.get(context);
+        if (impliedJudgements == null) {
+            Set<TypeJudgement> equivalentJudgements = TypeHelper.getDirectJudgements(getAllEnforcedConstraints(), context);
+            impliedJudgements = TypeHelper.typeClosure(equivalentJudgements, context);
+
+            allImpliedTypeJudgements.put(context, impliedJudgements);
+        }
+        return impliedJudgements;
+    }
+    private WeakHashMap<IQueryMetaContext, Set<TypeJudgement>> allImpliedTypeJudgements = new WeakHashMap<IQueryMetaContext, Set<TypeJudgement>>();   
+    
+    
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+                + ((operation == null) ? 0 : operation.hashCode());
+        result = prime * result
+                + ((parentPlans == null) ? 0 : parentPlans.hashCode());
+        return result;
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (!(obj instanceof SubPlan))
+            return false;
+        SubPlan other = (SubPlan) obj;
+        if (operation == null) {
+            if (other.operation != null)
+                return false;
+        } else if (!operation.equals(other.operation))
+            return false;
+        if (parentPlans == null) {
+            if (other.parentPlans != null)
+                return false;
+        } else if (!parentPlans.equals(other.parentPlans))
+            return false;
+        return true;
+    }
+
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/SubPlanFactory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/SubPlanFactory.java
new file mode 100644
index 00000000..d0df5fac
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/SubPlanFactory.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.planning;
+
+import tools.refinery.viatra.runtime.matchers.planning.operations.POperation;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+
+/**
+ * Single entry point for creating subplans.
+ * Can be subclassed by query planner to provide specialized SubPlans.
+ * @author Bergmann Gabor
+ *
+ */
+public class SubPlanFactory {
+
+    protected PBody body;
+
+    public SubPlanFactory(PBody body) {
+        super();
+        this.body = body;
+    }
+    
+    public SubPlan createSubPlan(POperation operation, SubPlan... parentPlans) {
+        return new SubPlan(body, operation, parentPlans);               
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/BuildHelper.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/BuildHelper.java
new file mode 100644
index 00000000..ed5d1cbb
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/BuildHelper.java
@@ -0,0 +1,165 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.planning.helpers;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlanFactory;
+import tools.refinery.viatra.runtime.matchers.planning.operations.PProject;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+public class BuildHelper {
+
+    private BuildHelper() {
+        // Hiding constructor for utility class
+    }
+
+//    public static SubPlan naturalJoin(IOperationCompiler buildable,
+//            SubPlan primaryPlan, SubPlan secondaryPlan) {
+//        JoinHelper joinHelper = new JoinHelper(primaryPlan, secondaryPlan);
+//        return buildable.buildBetaNode(primaryPlan, secondaryPlan, joinHelper.getPrimaryMask(),
+//                joinHelper.getSecondaryMask(), joinHelper.getComplementerMask(), false);
+//    }
+    
+    
+    /**
+     * Reduces the number of tuples by trimming (existentially quantifying) the set of variables that <ul>
+     * <li> are visible in the subplan, 
+     * <li> are not exported parameters, 
+     * <li> have all their constraints already enforced in the subplan,
+     * </ul> and thus will not be needed anymore.
+     * 
+     * @param onlyIfNotDetermined if true, no trimming performed unless there is at least one variable that is not functionally determined
+     * @return the plan after the trimming (possibly the original)
+     * @since 1.5
+     */
+    public static SubPlan trimUnneccessaryVariables(SubPlanFactory planFactory, /*IOperationCompiler buildable,*/
+            SubPlan plan, boolean onlyIfNotDetermined, QueryAnalyzer analyzer) {
+        Set<PVariable> canBeTrimmed = new HashSet<PVariable>();
+        Set<PVariable> variablesInPlan = plan.getVisibleVariables();
+        for (PVariable trimCandidate : variablesInPlan) {
+            if (trimCandidate.getReferringConstraintsOfType(ExportedParameter.class).isEmpty()) {
+                if (plan.getAllEnforcedConstraints().containsAll(trimCandidate.getReferringConstraints()))
+                    canBeTrimmed.add(trimCandidate);
+            }
+        }
+        final Set<PVariable> retainedVars = setMinus(variablesInPlan, canBeTrimmed);    
+        if (!canBeTrimmed.isEmpty() && !(onlyIfNotDetermined && areVariablesDetermined(plan, retainedVars, canBeTrimmed, analyzer, false))) {
+            // TODO add smart ordering? 
+            plan = planFactory.createSubPlan(new PProject(retainedVars), plan);
+        }
+        return plan;
+    }
+    
+    /**
+     * @return true iff a set of given variables functionally determine all visible variables in the subplan according to the subplan's constraints
+     * @param strict if true, only "hard" dependencies are taken into account that are strictly enforced by the model representation; 
+     *  if false, user-provided soft dependencies are included as well, that are anticipated but not guaranteed by the storage mechanism;
+     *  use true if superfluous dependencies may taint the correctness of a computation, false if they would merely impact performance
+     * @since 1.5
+     */
+    public static boolean areAllVariablesDetermined(SubPlan plan, Collection<PVariable> determining, QueryAnalyzer analyzer, boolean strict) {
+        return areVariablesDetermined(plan, determining, plan.getVisibleVariables(), analyzer, strict);
+    }
+    
+    /**
+     * @return true iff one set of given variables functionally determine the other set according to the subplan's constraints
+     * @param strict if true, only "hard" dependencies are taken into account that are strictly enforced by the model representation; 
+     *  if false, user-provided soft dependencies are included as well, that are anticipated but not guaranteed by the storage mechanism;
+     *  use true if superfluous dependencies may taint the correctness of a computation, false if they would merely impact performance
+     * @since 1.5
+     */
+    public static boolean areVariablesDetermined(SubPlan plan, Collection<PVariable> determining, Collection<PVariable> determined, 
+            QueryAnalyzer analyzer, boolean strict) {
+        Map<Set<PVariable>, Set<PVariable>> dependencies = analyzer.getFunctionalDependencies(plan.getAllEnforcedConstraints(), strict);
+        final Set<PVariable> closure = FunctionalDependencyHelper.closureOf(determining, dependencies);
+        final boolean isDetermined = closure.containsAll(determined);
+        return isDetermined;
+    }
+
+    private static <T> Set<T> setMinus(Set<T> a, Set<T> b) {
+        Set<T> difference = new HashSet<T>(a);
+        difference.removeAll(b);
+        return difference;
+    }
+    
+    /**
+     * Finds an arbitrary constraint that is not enforced at the given plan.
+     * 
+     * @param pSystem
+     * @param plan
+     * @return a PConstraint that is not enforced, if any, or null if all are enforced
+     */
+    public static PConstraint getAnyUnenforcedConstraint(PBody pSystem,
+            SubPlan plan) {
+        Set<PConstraint> allEnforcedConstraints = plan.getAllEnforcedConstraints();
+        Set<PConstraint> constraints = pSystem.getConstraints();
+        for (PConstraint pConstraint : constraints) {
+            if (!allEnforcedConstraints.contains(pConstraint))
+                return pConstraint;
+        }
+        return null;
+    }
+    
+    /**
+     * Skips the last few steps, if any, that are projections, so that a custom projection can be added instead.
+     * Useful for connecting body final plans into the production node.
+     * 
+     * @since 2.1
+     */
+    public static SubPlan eliminateTrailingProjections(SubPlan plan) {
+        while (plan.getOperation() instanceof PProject)
+            plan = plan.getParentPlans().get(0);
+        return plan;
+    }
+
+    /**
+     * Verifies whether all constraints are enforced and exported parameters are present.
+     * 
+     * @param pSystem
+     * @param plan
+     * @throws ViatraQueryRuntimeException
+     */
+    public static void finalCheck(final PBody pSystem, SubPlan plan, IQueryMetaContext context) {
+        PConstraint unenforcedConstraint = getAnyUnenforcedConstraint(pSystem, plan);
+        if (unenforcedConstraint != null) {
+            throw new QueryProcessingException(
+                    "Pattern matcher construction terminated without successfully enforcing constraint {1}."
+                            + " Could be caused if the value of some variables can not be deduced, e.g. by circularity of pattern constraints.",
+                    new String[] { unenforcedConstraint.toString() }, "Could not enforce a pattern constraint", null);
+        }
+        for (ExportedParameter export : pSystem
+                .getConstraintsOfType(ExportedParameter.class)) {
+            if (!export.isReadyAt(plan, context)) {
+                throw new QueryProcessingException(
+                        "Exported pattern parameter {1} could not be deduced during pattern matcher construction."
+                                + " A pattern constraint is required to positively deduce its value.",
+                        new String[] { export.getParameterName() }, "Could not calculate pattern parameter",
+                        null);
+            }
+        }
+    }    
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/FunctionalDependencyHelper.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/FunctionalDependencyHelper.java
new file mode 100644
index 00000000..40835f52
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/FunctionalDependencyHelper.java
@@ -0,0 +1,143 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Adam Dudas, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.planning.helpers;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.util.Sets;
+
+/**
+ * Helper utility class for functional dependency analysis.
+ * 
+ * Throughout this class attribute sets are represented as generic sets and functional dependencies as maps from
+ * attribute set (generic sets) to attribute set (generic sets)
+ * 
+ * @author Adam Dudas
+ * 
+ */
+public class FunctionalDependencyHelper {
+    
+    private FunctionalDependencyHelper() {
+        // Hiding constructor for utility class
+    }
+    
+    /**
+     * Get the closure of the specified attribute set relative to the specified functional dependencies.
+     * 
+     * @param attributes
+     *            The attributes to get the closure of.
+     * @param dependencies
+     *            The functional dependencies of which the closure operation is relative to.
+     * @return The closure of the specified attribute set relative to the specified functional dependencies.
+     */
+    public static <A> Set<A> closureOf(Collection<A> attributes, Map<Set<A>, Set<A>> dependencies) {
+        Set<A> closureSet = new HashSet<A>();
+
+        for (Set<A> closureSet1 = new HashSet<A>(attributes); closureSet.addAll(closureSet1);) {
+            closureSet1 = new HashSet<A>();
+            for (Entry<Set<A>, Set<A>> dependency : dependencies.entrySet()) {
+                if (closureSet.containsAll(dependency.getKey()))
+                    closureSet1.addAll(dependency.getValue());
+            }
+        }
+
+        return closureSet;
+    }
+    
+    /**
+     * @return true if the dependency from the left set to the right set is trivial
+     * @since 1.5
+     */
+    public static <A> boolean isTrivial(Set<A> left, Set<A> right) {
+        return left.containsAll(right);
+    }
+    
+    /***
+     * Returns the dependency set over attributes in {@link targetAttributes} that are implied by a given source dependency set.
+     * <p> Note: exponential in the size of the target attribute set.
+     * <p> Note: minimality of the returned dependency set is currently not guaranteed.
+     * @param originalDependencies all dependencies that are known to hold on a wider set of attributes
+     * @param targetAttributes the set of attributes we are interested in
+     * @since 1.5
+     */
+    public static <A> Map<Set<A>, Set<A>> projectDependencies(Map<Set<A>, Set<A>> originalDependencies, Set<A> targetAttributes) {
+        // only those attributes are considered as left-hand-side candidates that occur at least once in dependencies
+        Set<A> leftCandidates = new HashSet<A>(); 
+        for (Entry<Set<A>, Set<A>> dependency : originalDependencies.entrySet()) {
+            if (!isTrivial(dependency.getKey(), dependency.getValue())) // only if non-trivial
+                leftCandidates.addAll(Sets.intersection(dependency.getKey(), targetAttributes));
+        }
+        
+        // Compute an initial list of nontrivial projected dependencies - it does not have to be minimal yet
+        Map<Set<A>, Set<A>> initialDependencies = new HashMap<Set<A>, Set<A>>();
+        for (Set<A> leftSet : Sets.powerSet(leftCandidates)) {
+            Set<A> rightSet = Sets.intersection(closureOf(leftSet, originalDependencies), targetAttributes);
+            if (!isTrivial(leftSet, rightSet)) {
+                initialDependencies.put(leftSet, rightSet);
+            }
+        }
+        // Don't forget to include constants!
+        Set<A> constants = Sets.intersection(closureOf(Collections.<A>emptySet(), originalDependencies), targetAttributes);
+        if (! constants.isEmpty()) {
+            initialDependencies.put(Collections.<A>emptySet(), constants);
+        }
+        
+        // Omit those dependencies where the LHS has superfluous attributes
+        Map<Set<A>, Set<A>> solidDependencies = new HashMap<Set<A>, Set<A>>();
+        for (Entry<Set<A>, Set<A>> dependency : initialDependencies.entrySet()) {
+            Set<A> leftSet = dependency.getKey();
+            Set<A> rightSet = dependency.getValue();
+            boolean solid = true;
+            for (A skipped : leftSet) { // what if we skip one attribute from the left set?
+                Set<A> singleton = Collections.singleton(skipped);
+                Set<A> candidate = Sets.difference(leftSet, singleton);
+                Set<A> rightCandidate = initialDependencies.get(candidate);
+                if (rightCandidate != null) {
+                    if (Sets.union(rightCandidate, singleton).containsAll(rightSet)) {
+                        solid = false;
+                        break;
+                    }
+                }
+            }
+            if (solid) {
+                solidDependencies.put(leftSet, rightSet);
+            }
+        }
+        
+        // TODO perform proper minimization, 
+        // see e.g. page 45 in http://www.cs.ubc.ca/~hkhosrav/db/slides/03.design%20theory.pdf
+        
+        return Collections.unmodifiableMap(solidDependencies);
+    }
+    
+    /**
+     * Adds a given dependency to a mutable accumulator.
+     * @since 1.5
+     */
+    public static <A> void includeDependency(Map<Set<A>, Set<A>> accumulator, Set<A> left, Set<A> right) {
+        Set<A> accumulatorRights = accumulator.computeIfAbsent(left, l -> new HashSet<>());
+        accumulatorRights.addAll(right);
+    }    
+    
+    /**
+     * Adds all given dependencies to a mutable accumulator.
+     * @since 1.5
+     */
+    public static <A> void includeDependencies(Map<Set<A>, Set<A>> accumulator, Map<Set<A>, Set<A>> additionalDependencies) {
+        for (Entry<Set<A>, Set<A>> entry : additionalDependencies.entrySet()) {
+            includeDependency(accumulator, entry.getKey(), entry.getValue());
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/StatisticsHelper.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/StatisticsHelper.java
new file mode 100644
index 00000000..b4f848a7
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/StatisticsHelper.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.planning.helpers;
+
+import java.util.Optional;
+import java.util.function.BiFunction;
+
+import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
+import tools.refinery.viatra.runtime.matchers.util.Accuracy;
+
+/**
+ * Helpers dealing with optionally present statistics information 
+ * 
+ * @author Gabor Bergmann
+ * @since 2.1
+ *
+ */
+public class StatisticsHelper {
+    
+    private StatisticsHelper() {
+        // Hidden utility class constructor
+    }
+    
+    public static Optional<Double> estimateAverageBucketSize(TupleMask groupMask, Accuracy requiredAccuracy, 
+            BiFunction<TupleMask, Accuracy, Optional<Long>> estimateCardinality) 
+    {
+        if (groupMask.isIdentity()) return Optional.of(1.0);
+        
+        Accuracy numeratorAccuracy = requiredAccuracy;
+        Accuracy denominatorAccuracy = requiredAccuracy.reciprocal();
+        TupleMask identityMask = TupleMask.identity(groupMask.sourceWidth);
+        
+        Optional<Long> totalCountEstimate  = estimateCardinality.apply(identityMask, numeratorAccuracy);
+        Optional<Long> bucketCountEstimate = estimateCardinality.apply(groupMask,    denominatorAccuracy);
+
+        return totalCountEstimate.flatMap(matchCount -> 
+            bucketCountEstimate.map(bucketCount -> 
+                bucketCount == 0L ? 0L : ((double) matchCount) / bucketCount
+        ));
+    }
+
+    public static Optional<Double> min(Optional<Double> a,  Optional<Double> b) {
+        if (b.isPresent()) {
+            if (a.isPresent()) {
+                return Optional.of(Math.min(a.get(), b.get()));
+            } else return b;
+        } else return a;
+    }
+    public static Optional<Double> min(Optional<Double> a, double b) {
+        if (a.isPresent()) {
+            return Optional.of(Math.min(a.get(), b));
+        } else return Optional.of(b);
+    }
+
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/TypeHelper.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/TypeHelper.java
new file mode 100644
index 00000000..926a591f
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/helpers/TypeHelper.java
@@ -0,0 +1,217 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.planning.helpers;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.psystem.ITypeInfoProviderConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
+
+/**
+ * @author Gabor Bergmann
+ * @author Tamas Szabo
+ */
+public class TypeHelper {
+    
+    private TypeHelper() {
+        // Hiding constructor for utility class
+    }
+
+    /**
+     * Collects the type constraints for the specified collection of variables. The type constraints consist of the
+     * constraints directly enforced on the variable itself, plus all of those that the given variable is unified with
+     * through equalities.
+     * 
+     * @param variables
+     *            the variables in question
+     * @param constraints
+     *            the constraints in the pattern body
+     * @param context
+     *            the query meta context
+     * @return the mapping from variable to set of type constraints
+     * @since 1.6
+     */
+    public static Map<PVariable, Set<IInputKey>> inferUnaryTypesFor(Iterable<PVariable> variables,
+            Set<PConstraint> constraints, IQueryMetaContext context) {
+        Map<PVariable, Set<TypeJudgement>> typeMap = TypeHelper.inferUnaryTypes(constraints, context);
+        return inferUnaryTypesFor(variables, typeMap);
+    }
+
+    /**
+     * Collects the type constraints for the specified collection of variables. The type constraints consist of the
+     * constraints directly enforced on the variable itself, plus all of those that the given variable is unified with
+     * through equalities.
+     * 
+     * The method accepts a type map which is the result of the basic type inference from the
+     * {@link TypeHelper.inferUnaryTypes} method. The purpose of this method is that the type map can be reused across
+     * several calls to this method.
+     * 
+     * @param variables
+     *            the variables in question
+     * @param typeMap
+     *            the type map of inference results
+     * @return the mapping from variable to set of type constraints
+     * @since 1.6
+     */
+    public static Map<PVariable, Set<IInputKey>> inferUnaryTypesFor(Iterable<PVariable> variables,
+            Map<PVariable, Set<TypeJudgement>> typeMap) {
+        Map<PVariable, Set<IInputKey>> result = new HashMap<PVariable, Set<IInputKey>>();
+
+        for (PVariable original : variables) {
+            // it can happen that the variable was unified into an other one due to equalities
+            Set<IInputKey> keys = new HashSet<IInputKey>();
+            PVariable current = original;
+
+            while (current != null) {
+                Set<TypeJudgement> judgements = typeMap.get(current);
+                if (judgements != null) {
+                    for (TypeJudgement judgement : judgements) {
+                        keys.add(judgement.getInputKey());
+                    }
+                }
+                current = current.getDirectUnifiedInto();
+            }
+
+            result.put(original, keys);
+        }
+
+        return result;
+    }
+
+    /**
+     * Infers unary type information for variables, based on the given constraints.
+     * 
+     * Subsumptions are not taken into account.
+     * 
+     * @param constraints
+     *            the set of constraints to extract type info from
+     */
+    public static Map<PVariable, Set<TypeJudgement>> inferUnaryTypes(Set<PConstraint> constraints,
+            IQueryMetaContext context) {
+        Set<TypeJudgement> equivalentJudgements = getDirectJudgements(constraints, context);
+        Set<TypeJudgement> impliedJudgements = typeClosure(equivalentJudgements, context);
+
+        Map<PVariable, Set<TypeJudgement>> results = new HashMap<PVariable, Set<TypeJudgement>>();
+        for (TypeJudgement typeJudgement : impliedJudgements) {
+            final IInputKey inputKey = typeJudgement.getInputKey();
+            if (inputKey.getArity() == 1) {
+                PVariable variable = (PVariable) typeJudgement.getVariablesTuple().get(0);
+                Set<TypeJudgement> inferredTypes = results.computeIfAbsent(variable, v -> new HashSet<>());
+                inferredTypes.add(typeJudgement);
+            }
+        }
+        return results;
+    }
+
+    /**
+     * Gets direct judgements reported by constraints. No closure is applied yet.
+     */
+    public static Set<TypeJudgement> getDirectJudgements(Set<PConstraint> constraints, IQueryMetaContext context) {
+        Set<TypeJudgement> equivalentJudgements = new HashSet<TypeJudgement>();
+        for (PConstraint pConstraint : constraints) {
+            if (pConstraint instanceof ITypeInfoProviderConstraint) {
+                equivalentJudgements.addAll(((ITypeInfoProviderConstraint) pConstraint).getImpliedJudgements(context));
+            }
+        }
+        return equivalentJudgements;
+    }
+
+    /**
+     * Calculates the closure of a set of type judgements, with respect to supertyping.
+     * 
+     * @return the set of all type judgements in typesToClose and all their direct and indirect supertypes
+     */
+    public static Set<TypeJudgement> typeClosure(Set<TypeJudgement> typesToClose, IQueryMetaContext context) {
+        return typeClosure(Collections.<TypeJudgement> emptySet(), typesToClose, context);
+    }
+
+    /**
+     * Calculates the closure of a set of type judgements (with respect to supertyping), where the closure has been
+     * calculated before for a given base set, but not for a separate delta set.
+     * <p>
+     * Precondition: the set (typesToClose MINUS delta) is already closed w.r.t. supertyping.
+     * 
+     * @return the set of all type judgements in typesToClose and all their direct and indirect supertypes
+     * @since 1.6
+     */
+    public static Set<TypeJudgement> typeClosure(Set<TypeJudgement> preclosedBaseSet, Set<TypeJudgement> delta,
+            IQueryMetaContext context) {
+        Queue<TypeJudgement> queue = delta.stream().filter(input -> !preclosedBaseSet.contains(input)).collect(Collectors.toCollection(LinkedList::new)); 
+        if (queue.isEmpty())
+            return preclosedBaseSet;
+        
+        Set<TypeJudgement> closure = new HashSet<TypeJudgement>(preclosedBaseSet);
+
+        Map<TypeJudgement, Set<TypeJudgement>> conditionalImplications = new HashMap<>();
+        for (TypeJudgement typeJudgement : closure) {
+            conditionalImplications.putAll(typeJudgement.getConditionalImpliedJudgements(context));
+        }
+
+        do {
+            TypeJudgement deltaType = queue.poll();
+            if (closure.add(deltaType)) {
+                // direct implications
+                queue.addAll(deltaType.getDirectlyImpliedJudgements(context));
+
+                // conditional implications, source key processed before, this is the condition key
+                final Set<TypeJudgement> implicationSet = conditionalImplications.get(deltaType);
+                if (implicationSet != null) {
+                     queue.addAll(implicationSet);
+                }
+
+                // conditional implications, this is the source key
+                Map<TypeJudgement, Set<TypeJudgement>> deltaConditionalImplications = deltaType
+                        .getConditionalImpliedJudgements(context);
+                for (Entry<TypeJudgement, Set<TypeJudgement>> entry : deltaConditionalImplications.entrySet()) {
+                    if (closure.contains(entry.getKey())) {
+                        // condition processed before
+                        queue.addAll(entry.getValue());
+                    } else {
+                        // condition not processed yet
+                        conditionalImplications.computeIfAbsent(entry.getKey(), key -> new HashSet<>())
+                                .addAll(entry.getValue());
+                    }
+                }
+            }
+        } while (!queue.isEmpty());
+
+        return closure;
+    }
+
+    /**
+     * Calculates a remainder set of types from a larger set, that are not subsumed by a given set of subsuming types.
+     * 
+     * @param subsumableTypes
+     *            a set of types from which some may be implied by the subsuming types
+     * @param subsumingTypes
+     *            a set of types that may imply some of the subsuming types
+     * @return the collection of types in subsumableTypes that are NOT identical to or supertypes of any type in
+     *         subsumingTypes.
+     */
+    public static Set<TypeJudgement> subsumeTypes(Set<TypeJudgement> subsumableTypes, Set<TypeJudgement> subsumingTypes,
+            IQueryMetaContext context) {
+        Set<TypeJudgement> closure = typeClosure(subsumingTypes, context);
+        Set<TypeJudgement> subsumed = new HashSet<TypeJudgement>(subsumableTypes);
+        subsumed.removeAll(closure);
+        return subsumed;
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PApply.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PApply.java
new file mode 100644
index 00000000..2c285b54
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PApply.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.planning.operations;
+
+import java.util.Collections;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * Represents a constraint application on a single parent SubPlan. 
+ * <p> Either a "selection" filter operation according to a deferred PConstraint (or transform in case of eval/aggregate), or
+ * alternatively a shorthand for PJoin + a PEnumerate on the right input for an enumerable PConstraint.
+ * 
+ * <p> <b>WARNING</b>: if there are coinciding variables in the variable tuple of the enumerable constraint, 
+ *   it is the responsibility of the compiler to check them for equality.
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public class PApply extends POperation {
+    
+    private PConstraint pConstraint;
+
+    public PApply(PConstraint pConstraint) {
+        super();
+        this.pConstraint = pConstraint;
+    }
+    public PConstraint getPConstraint() {
+        return pConstraint;
+    }
+
+    @Override
+    public String getShortName() {
+        return String.format("APPLY_%s", pConstraint.toString());
+    }
+    
+    @Override
+    public Set<? extends PConstraint> getDeltaConstraints() {
+        return Collections.singleton(pConstraint);
+    }
+    
+    @Override
+    public int numParentSubPlans() {
+        return 1;
+    }
+    
+    @Override
+    public void checkConsistency(SubPlan subPlan) {
+        super.checkConsistency(subPlan);
+        for (SubPlan parentPlan : subPlan.getParentPlans())
+            Preconditions.checkArgument(!parentPlan.getAllEnforcedConstraints().contains(pConstraint),
+                    "Double-checking constraint %s", pConstraint);              
+        // TODO obtain context?
+        //if (pConstraint instanceof DeferredPConstraint)
+        //      Preconditions.checkArgument(((DeferredPConstraint) pConstraint).isReadyAt(subPlan, context))
+    }
+    
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime
+                * result
+                + ((pConstraint == null) ? 0 : pConstraint
+                        .hashCode());
+        return result;
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (!(obj instanceof PApply))
+            return false;
+        PApply other = (PApply) obj;
+        if (pConstraint == null) {
+            if (other.pConstraint != null)
+                return false;
+        } else if (!pConstraint.equals(other.pConstraint))
+            return false;
+        return true;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PEnumerate.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PEnumerate.java
new file mode 100644
index 00000000..a975d50c
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PEnumerate.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.planning.operations;
+
+import java.util.Collections;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.psystem.EnumerablePConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+
+/**
+ * Represents a base relation defined by the instance set of an enumerable PConstraint; there are no parent SubPlans.
+ * 
+ * <p> <b>WARNING</b>: if there are coinciding variables in the variable tuple of the enumerable constraint, 
+ *   it is the responsibility of the compiler to check them for equality.
+ * @author Bergmann Gabor
+ *
+ */
+public class PEnumerate extends POperation {
+
+    EnumerablePConstraint enumerablePConstraint;
+    
+    public PEnumerate(EnumerablePConstraint enumerablePConstraint) {
+        super();
+        this.enumerablePConstraint = enumerablePConstraint;
+    }
+    public EnumerablePConstraint getEnumerablePConstraint() {
+        return enumerablePConstraint;
+    }
+
+    @Override
+    public Set<? extends PConstraint> getDeltaConstraints() {
+        return Collections.singleton(enumerablePConstraint);
+    }
+    @Override
+    public int numParentSubPlans() {
+        return 0;
+    }
+    @Override
+    public String getShortName() {
+        return enumerablePConstraint.toString();
+    }
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime
+                * result
+                + ((enumerablePConstraint == null) ? 0 : enumerablePConstraint
+                        .hashCode());
+        return result;
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (!(obj instanceof PEnumerate))
+            return false;
+        PEnumerate other = (PEnumerate) obj;
+        if (enumerablePConstraint == null) {
+            if (other.enumerablePConstraint != null)
+                return false;
+        } else if (!enumerablePConstraint.equals(other.enumerablePConstraint))
+            return false;
+        return true;
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PJoin.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PJoin.java
new file mode 100644
index 00000000..10e0a85a
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PJoin.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.planning.operations;
+
+import java.util.Collections;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+
+/**
+ * Represents a natural join of two parent SubPlans.
+ * @author Bergmann Gabor
+ *
+ */
+public class PJoin extends POperation {
+    
+//      // TODO leave here? is this a problem in equivalnece checking?
+//      private Set<PVariable> onVariables;
+
+    public PJoin(/*Set<PVariable> onVariables*/) {
+        super();
+        //this.onVariables = new HashSet<PVariable>(onVariables);
+    }
+//      public Set<PVariable> getOnVariables() {
+//              return onVariables;
+//      }
+
+    @Override
+    public Set<? extends PConstraint> getDeltaConstraints() {
+        return Collections.emptySet();
+    }
+    @Override
+    public int numParentSubPlans() {
+        return 2;
+    }
+
+    @Override
+    public String getShortName() {
+        return "JOIN"; //String.format("JOIN_{%s}", Joiner.on(",").join(onVariables));
+    }
+    
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (!(obj instanceof PJoin))
+            return false;
+        return true;
+    }
+    
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/POperation.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/POperation.java
new file mode 100644
index 00000000..e71cf217
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/POperation.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.planning.operations;
+
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * Abstract superclass for representing a high-level query evaluation operation.
+ * 
+ *  <p> Subclasses correspond to various POperations modeled after relational algebra.  
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public abstract class POperation {
+
+    /**
+     * Newly enforced constraints
+     */
+    public abstract Set<? extends PConstraint> getDeltaConstraints();
+    
+    public abstract String getShortName();
+    
+    /**
+     * @return the number of SubPlans that must be specified as parents
+     */
+    public abstract int numParentSubPlans();
+    
+    /**
+     * Checks whether this constraint can be properly applied at the given SubPlan.
+     */
+    public void checkConsistency(SubPlan subPlan) {
+        Preconditions.checkArgument(this == subPlan.getOperation(), "POperation misalignment");
+        Preconditions.checkArgument(subPlan.getParentPlans().size() == numParentSubPlans(), "Incorrect number of parent SubPlans");
+    }
+        
+    @Override
+    public String toString() {
+        return getShortName();
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PProject.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PProject.java
new file mode 100644
index 00000000..d0539b2c
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PProject.java
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.planning.operations;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * Represents a projection of a single parent SubPlan onto a limited set of variables.
+ * <p> May optionally prescribe an ordering of variables (List, as opposed to Set).
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public class PProject extends POperation {
+
+    private Collection<PVariable> toVariables;
+    private boolean ordered;
+        
+    
+    public PProject(Set<PVariable> toVariables) {
+        super();
+        this.toVariables = toVariables;
+        this.ordered = false;
+    }
+    public PProject(List<PVariable> toVariables) {
+        super();
+        this.toVariables = toVariables;
+        this.ordered = true;
+    }
+    
+    public Collection<PVariable> getToVariables() {
+        return toVariables;
+    }
+    public boolean isOrdered() {                
+        return ordered;
+    }
+    
+    @Override
+    public Set<? extends PConstraint> getDeltaConstraints() {
+        return Collections.emptySet();
+    }
+    @Override
+    public int numParentSubPlans() {
+        return 1;
+    }
+    @Override
+    public void checkConsistency(SubPlan subPlan) {
+        super.checkConsistency(subPlan);
+        final SubPlan parentPlan = subPlan.getParentPlans().get(0);
+        
+        Preconditions.checkArgument(parentPlan.getVisibleVariables().containsAll(toVariables), 
+                () -> toVariables.stream()
+                        .filter(input -> !parentPlan.getVisibleVariables().contains(input)).map(PVariable::getName)
+                        .collect(Collectors.joining(",", "Variables missing from project: ", "")));
+    }
+
+    @Override
+    public String getShortName() {
+        return String.format("PROJECT%s_{%s}", ordered? "!" : "", 
+                toVariables.stream().map(PVariable::getName).collect(Collectors.joining(",")));
+    }
+    
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + (ordered ? 1231 : 1237);
+        result = prime * result
+                + ((toVariables == null) ? 0 : toVariables.hashCode());
+        return result;
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (!(obj instanceof PProject))
+            return false;
+        PProject other = (PProject) obj;
+        if (ordered != other.ordered)
+            return false;
+        if (toVariables == null) {
+            if (other.toVariables != null)
+                return false;
+        } else if (!toVariables.equals(other.toVariables))
+            return false;
+        return true;
+    }
+
+
+    
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PStart.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PStart.java
new file mode 100644
index 00000000..9e6ea10e
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/planning/operations/PStart.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.planning.operations;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+
+/**
+ * No constraints, and no parent SubPlan, just a (possibly empty) set of a priori known (input) variables. Satisfied by a single tuple.
+ * 
+ * <p> Can also be used without a priori variables, 
+ *   e.g. as a "virtual parent" in extreme cases, 
+ *   such as <code>pattern foo(Bar) = {Bar = eval (3*4)} </code> 
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public class PStart extends POperation {
+    
+    private Set<PVariable> aPrioriVariables;
+
+    
+    public PStart(Set<PVariable> aPrioriVariables) {
+        super();
+        this.aPrioriVariables = aPrioriVariables;
+    }
+    public PStart(PVariable... aPrioriVariables) {
+        this(new HashSet<PVariable>(Arrays.asList(aPrioriVariables)));
+    }
+    public Set<PVariable> getAPrioriVariables() {
+        return aPrioriVariables;
+    }
+
+    @Override
+    public String getShortName() {
+        return aPrioriVariables.stream().map(PVariable::getName).collect(Collectors.joining(",", "START_{", "}"));
+    }
+    @Override
+    public int numParentSubPlans() {
+        return 0;
+    }
+
+    @Override
+    public Set<? extends PConstraint> getDeltaConstraints() {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime
+                * result
+                + ((aPrioriVariables == null) ? 0 : aPrioriVariables.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (!(obj instanceof PStart))
+            return false;
+        PStart other = (PStart) obj;
+        if (aPrioriVariables == null) {
+            if (other.aPrioriVariables != null)
+                return false;
+        } else if (!aPrioriVariables.equals(other.aPrioriVariables))
+            return false;
+        return true;
+    }
+
+
+    
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/BasePConstraint.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/BasePConstraint.java
new file mode 100644
index 00000000..eda4aa25
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/BasePConstraint.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @author Gabor Bergmann
+ *
+ */
+public abstract class BasePConstraint implements PConstraint {
+
+
+    protected PBody pBody;
+    private final Set<PVariable> affectedVariables;
+
+
+    private final int sequentialID = nextID.getAndIncrement();
+
+        // Use a static atomic integer to avoid race conditions when creating new constraints.
+    private static AtomicInteger nextID = new AtomicInteger(0);
+
+    public BasePConstraint(PBody pBody, Set<PVariable> affectedVariables) {
+        super();
+        this.pBody = pBody;
+        this.affectedVariables = new HashSet<PVariable>(affectedVariables);
+
+        for (PVariable pVariable : affectedVariables) {
+            pVariable.refer(this);
+        }
+        pBody.registerConstraint(this);
+    }
+
+    @Override
+    public String toString() {
+        return "PC[" + getClass().getSimpleName() + ":" + toStringRest() + "]";
+    }
+
+    protected abstract String toStringRest();
+
+    @Override
+    public Set<PVariable> getAffectedVariables() {
+        return affectedVariables;
+    }
+
+    @Override
+    public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context) {
+        return Collections.emptyMap();
+    }
+
+    @Override
+    public void replaceVariable(PVariable obsolete, PVariable replacement) {
+        pBody.checkMutability();
+        if (affectedVariables.remove(obsolete)) {
+            affectedVariables.add(replacement);
+            obsolete.unrefer(this);
+            replacement.refer(this);
+            doReplaceVariable(obsolete, replacement);
+        }
+    }
+
+    protected abstract void doReplaceVariable(PVariable obsolete, PVariable replacement);
+
+    @Override
+    public void delete() {
+        pBody.checkMutability();
+        for (PVariable pVariable : affectedVariables) {
+            pVariable.unrefer(this);
+        }
+        pBody.unregisterConstraint(this);
+    }
+
+    @Override
+    public void checkSanity() {
+    }
+
+    /**
+     * For backwards compatibility. Equivalent to {@link #getBody()}
+     */
+    public PBody getPSystem() {
+        return pBody;
+    }
+    /**
+     * @since 2.1
+     */
+    @Override
+    public PBody getBody() {
+        return pBody;
+    }
+
+    @Override
+    public int getMonotonousID() {
+        return sequentialID;
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/DeferredPConstraint.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/DeferredPConstraint.java
new file mode 100644
index 00000000..d2bf088c
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/DeferredPConstraint.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+
+/**
+ * Any constraint that can only be checked on certain SubPlans (e.g. those plans that already contain some variables).
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public abstract class DeferredPConstraint extends BasePConstraint {
+
+    public DeferredPConstraint(PBody pBody, Set<PVariable> affectedVariables) {
+        super(pBody, affectedVariables);
+    }
+
+    public abstract boolean isReadyAt(SubPlan plan, IQueryMetaContext context);
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/EnumerablePConstraint.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/EnumerablePConstraint.java
new file mode 100644
index 00000000..9129aa47
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/EnumerablePConstraint.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * A constraint for which all satisfying tuples of variable values can be enumerated at any point during run-time.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public abstract class EnumerablePConstraint extends BasePConstraint {
+    protected Tuple variablesTuple;
+
+    protected EnumerablePConstraint(PBody pBody, Tuple variablesTuple) {
+        super(pBody, variablesTuple.<PVariable> getDistinctElements());
+        this.variablesTuple = variablesTuple;
+    }
+
+    @Override
+    public void doReplaceVariable(PVariable obsolete, PVariable replacement) {
+        variablesTuple = variablesTuple.replaceAll(obsolete, replacement);
+    }
+
+    @Override
+    protected String toStringRest() {
+        String stringRestRest = toStringRestRest();
+        String tupleString = "@" + variablesTuple.toString();
+        return stringRestRest == null ? tupleString : ":" + stringRestRest + tupleString;
+    }
+
+    protected String toStringRestRest() {
+        return null;
+    }
+
+    public Tuple getVariablesTuple() {
+        return variablesTuple;
+    }
+
+    @Override
+    public Set<PVariable> getDeducedVariables() {
+        return getAffectedVariables();
+    }
+
+    public PVariable getVariableInTuple(int index) {
+        return (PVariable) this.variablesTuple.get(index);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IExpressionEvaluator.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IExpressionEvaluator.java
new file mode 100644
index 00000000..686999f7
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IExpressionEvaluator.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+/**
+ * An expression evaluator is used to execute arbitrary Java code during pattern matching. In order to include the
+ * evaluation in the planning seemlessly it is expected from the evaluator implementors to report all used PVariables by
+ * name.
+ * 
+ * @author Zoltan Ujhelyi
+ * 
+ */
+public interface IExpressionEvaluator {
+
+    /**
+     * A textual description of the expression. Used only for debug purposes, but must not be null.
+     */
+    String getShortDescription();
+
+    /**
+     * All input parameter names should be reported correctly.
+     */
+    Iterable<String> getInputParameterNames();
+
+    /**
+     * The expression evaluator code
+     * 
+     * @param provider
+     *            the value provider is an engine-specific way of reading internal variable tuples to evaluate the
+     *            expression with
+     * @return the result of the expression: in case of predicate evaluation the return value must be true or false;
+     *         otherwise the result can be an arbitrary object. No null values should be returned.
+     * @throws Exception
+     */
+    Object evaluateExpression(IValueProvider provider) throws Exception;
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IMultiQueryReference.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IMultiQueryReference.java
new file mode 100644
index 00000000..8f647c64
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IMultiQueryReference.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2022, Tamas Szabo, GitHub
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import java.util.Collection;
+
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * A {@link PConstraint} that implements this interface refers to a list of PQueries.
+ * 
+ * @author Tamas Szabo
+ * @since 2.8
+ *
+ */
+public interface IMultiQueryReference {
+
+    Collection<PQuery> getReferredQueries();
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IQueryReference.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IQueryReference.java
new file mode 100644
index 00000000..9ee05b39
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IQueryReference.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import java.util.Collections;
+import java.util.List;
+
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * A {@link PConstraint} that implements this interface refers to a {@link PQuery}.
+ * 
+ * @author Zoltan Ujhelyi
+ *
+ */
+public interface IQueryReference extends IMultiQueryReference {
+
+    PQuery getReferredQuery();
+
+    /**
+     * @since 2.8
+     */
+    @Override
+    default List<PQuery> getReferredQueries() {
+        return Collections.singletonList(getReferredQuery());
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IRelationEvaluator.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IRelationEvaluator.java
new file mode 100644
index 00000000..e4c396d8
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IRelationEvaluator.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2022, Tamas Szabo, GitHub
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import java.util.List;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * Implementations of this interface take an arbitrary number of input relations with their contents and compute the
+ * tuples of a single output relation.
+ * 
+ * @author Tamas Szabo
+ * @since 2.8
+ *
+ */
+public interface IRelationEvaluator {
+
+    /**
+     * A textual description of the evaluator. Used only for debug purposes, but must not be null.
+     */
+    String getShortDescription();
+
+    /**
+     * The relation evaluator code. For performance reasons, it is expected that the returned set is a mutable
+     * collection, and the caller must be allowed to actually perform mutations!
+     */
+    Set<Tuple> evaluateRelation(List<Set<Tuple>> inputs) throws Exception;
+
+    /**
+     * For each input relation that this evaluator requires, this method returns the expected arities of the relations in order.
+     */
+    List<Integer> getInputArities();
+
+    /**
+     * Returns the arity of the output relation that this evaluator computes.
+     */
+    int getOutputArity();
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/ITypeConstraint.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/ITypeConstraint.java
new file mode 100644
index 00000000..b72035a8
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/ITypeConstraint.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+import java.util.Set;
+
+/**
+ * Common superinterface of enumerable and deferred type constraints.
+ * @author Bergmann Gabor
+ *
+ */
+public interface ITypeConstraint extends ITypeInfoProviderConstraint {
+
+    public abstract TypeJudgement getEquivalentJudgement();
+    
+    /**
+     * Static internal utility class for implementations of {@link ITypeConstraint}s.
+     * @author Bergmann Gabor
+     */
+    public static class TypeConstraintUtil {
+        
+        private TypeConstraintUtil() {
+            // Hiding constructor for utility class
+        }
+        
+        public static Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context, IInputKey inputKey, Tuple variablesTuple) {
+            final Map<Set<PVariable>, Set<PVariable>> result = new HashMap<Set<PVariable>, Set<PVariable>>();
+            
+            Set<Entry<Set<Integer>, Set<Integer>>> dependencies = context.getFunctionalDependencies(inputKey).entrySet();
+            for (Entry<Set<Integer>, Set<Integer>> dependency : dependencies) {
+                result.put(
+                        transcribeVariables(dependency.getKey(), variablesTuple), 
+                        transcribeVariables(dependency.getValue(), variablesTuple)
+                );
+            }
+
+            return result;
+        }
+
+        private static Set<PVariable> transcribeVariables(Set<Integer> indices, Tuple variablesTuple) {
+            Set<PVariable> result = new HashSet<PVariable>();
+            for (Integer index : indices) {
+                result.add((PVariable) variablesTuple.get(index));
+            }
+            return result;
+        }
+
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/ITypeInfoProviderConstraint.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/ITypeInfoProviderConstraint.java
new file mode 100644
index 00000000..ff127d38
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/ITypeInfoProviderConstraint.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+public interface ITypeInfoProviderConstraint extends PConstraint {
+
+    /**
+     * Returns type information implied by this constraint.
+     * 
+     */
+    public Set<TypeJudgement> getImpliedJudgements(IQueryMetaContext context);
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IValueProvider.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IValueProvider.java
new file mode 100644
index 00000000..d959adc4
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/IValueProvider.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+/**
+ * Helper interface to get values from a tuple of variables. All pattern matching engines are expected to implement this
+ * to handle their internal structures.
+ * 
+ * @author Zoltan Ujhelyi
+ * 
+ */
+public interface IValueProvider {
+
+    /**
+     * Returns the value of the selected variable
+     * @param variableName
+     * @return the value of the variable; never null
+     * @throws IllegalArgumentException if the variable is not defined
+     */
+    Object getValue(String variableName);
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/InitializablePQuery.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/InitializablePQuery.java
new file mode 100644
index 00000000..a82d12ec
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/InitializablePQuery.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.psystem.annotations.PAnnotation;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PProblem;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * Adds extra methods to the PQuery interface to initialize its contents.
+ *
+ * @author Zoltan Ujhelyi
+ *
+ */
+public interface InitializablePQuery extends PQuery {
+
+    /**
+     * Sets the query status. Only applicable if the pattern is still {@link PQueryStatus#UNINITIALIZED uninitialized}.
+     *
+     * @param status the new status
+     */
+    void setStatus(PQueryStatus status);
+    
+    /**
+     * Adds a detected error. Only applicable if the pattern is still {@link PQueryStatus#UNINITIALIZED uninitialized}.
+     *
+     * @param problem the new problem
+     */
+    void addError(PProblem problem);
+
+    /**
+     * Sets up the bodies of the pattern. Only applicable if the pattern is still {@link PQueryStatus#UNINITIALIZED
+     * uninitialized}.
+     *
+     * @param bodies
+     * @throws ViatraQueryRuntimeException
+     */
+    void initializeBodies(Set<PBody> bodies);
+
+    /**
+     * Adds an annotation to the specification. Only applicable if the pattern is still
+     * {@link PQueryStatus#UNINITIALIZED uninitialized}.
+     *
+     * @param annotation
+     */
+    void addAnnotation(PAnnotation annotation);
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/KeyedEnumerablePConstraint.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/KeyedEnumerablePConstraint.java
new file mode 100644
index 00000000..91eea817
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/KeyedEnumerablePConstraint.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+public abstract class KeyedEnumerablePConstraint<KeyType> extends EnumerablePConstraint {
+
+    protected KeyType supplierKey;
+
+    public KeyedEnumerablePConstraint(PBody pBody, Tuple variablesTuple,
+            KeyType supplierKey) {
+        super(pBody, variablesTuple);
+        this.supplierKey = supplierKey;
+    }
+
+    @Override
+    protected String toStringRestRest() {
+        return supplierKey == null ? "$any(null)" : keyToString();
+    }
+
+    protected abstract String keyToString();
+
+    public KeyType getSupplierKey() {
+        return supplierKey;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PBody.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PBody.java
new file mode 100644
index 00000000..c38dc23a
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PBody.java
@@ -0,0 +1,289 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.planning.helpers.TypeHelper;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.ConstantValue;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PDisjunction;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery.PQueryStatus;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * A set of constraints representing a pattern body
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public class PBody implements PTraceable {
+    
+    public static final String VIRTUAL_VARIABLE_PREFIX = ".virtual";
+    private static final String VIRTUAL_VARIABLE_PATTERN = VIRTUAL_VARIABLE_PREFIX + "{%d}";
+    
+    private PQuery query;
+
+    /**
+     * If null, then parent query status is reused
+     */
+    private PQueryStatus status = PQueryStatus.UNINITIALIZED;
+
+    private Set<PVariable> allVariables;
+    private Set<PVariable> uniqueVariables;
+    private List<ExportedParameter> symbolicParameters;
+    private Map<Object, PVariable> variablesByName;
+    private Set<PConstraint> constraints;
+    private int nextVirtualNodeID;
+    private PDisjunction containerDisjunction;
+
+    public PBody(PQuery query) {
+        super();
+        this.query = query;
+        allVariables = new LinkedHashSet<>();
+        uniqueVariables = new LinkedHashSet<>();
+        variablesByName = new HashMap<>();
+        constraints = new LinkedHashSet<>();
+    }
+
+    /**
+     * @return whether the submission of the new variable was successful
+     */
+    private boolean addVariable(PVariable var) {
+        checkMutability();
+        Object name = var.getName();
+        if (!variablesByName.containsKey(name)) {
+            allVariables.add(var);
+            if (var.isUnique())
+                uniqueVariables.add(var);
+            variablesByName.put(name, var);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Use this method to add a newly created constraint to the pSystem.
+     * 
+     * @return whether the submission of the new constraint was successful
+     */
+    boolean registerConstraint(PConstraint constraint) {
+        checkMutability();
+        return constraints.add(constraint);
+    }
+
+    /**
+     * Use this method to remove an obsolete constraint from the pSystem.
+     * 
+     * @return whether the removal of the constraint was successful
+     */
+    boolean unregisterConstraint(PConstraint constraint) {
+        checkMutability();
+        return constraints.remove(constraint);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <ConstraintType> Set<ConstraintType> getConstraintsOfType(Class<ConstraintType> constraintClass) {
+        Set<ConstraintType> result = new HashSet<ConstraintType>();
+        for (PConstraint pConstraint : constraints) {
+            if (constraintClass.isInstance(pConstraint))
+                result.add((ConstraintType) pConstraint);
+        }
+        return result;
+    }
+
+    public PVariable newVirtualVariable() {
+        checkMutability();
+        String name;
+        do {
+            
+            name = String.format(VIRTUAL_VARIABLE_PATTERN, nextVirtualNodeID++);
+        } while (variablesByName.containsKey(name));
+        PVariable var = new PVariable(this, name, true);
+        addVariable(var);
+        return var;
+    }
+    
+    public PVariable newVirtualVariable(String name) {
+        checkMutability();
+        Preconditions.checkArgument(!variablesByName.containsKey(name), "ID %s already used for a virtual variable", name);
+        PVariable var = new PVariable(this, name, true);
+        addVariable(var);
+        return var;
+    }
+
+    public PVariable newConstantVariable(Object value) {
+        checkMutability();
+        PVariable virtual = newVirtualVariable();
+        new ConstantValue(this, virtual, value);
+        return virtual;
+    }
+
+    public Set<PVariable> getAllVariables() {
+        return allVariables;
+    }
+
+    public Set<PVariable> getUniqueVariables() {
+        return uniqueVariables;
+    }
+
+    private PVariable getVariableByName(Object name) {
+        return variablesByName.get(name).getUnifiedIntoRoot();
+    }
+
+    /**
+     * Find a PVariable by name
+     * 
+     * @param name
+     * @return the found variable
+     * @throws IllegalArgumentException
+     *             if no PVariable is found with the selected name
+     */
+    public PVariable getVariableByNameChecked(Object name) {
+        if (!variablesByName.containsKey(name))
+            throw new IllegalArgumentException(String.format("Cannot find PVariable %s", name));
+        return getVariableByName(name);
+    }
+
+    /**
+     * Finds and returns a PVariable by name. If no PVariable exists with the name in the body, a new one is created. If
+     * the name of the variable starts with {@value #VIRTUAL_VARIABLE_PREFIX}, the created variable will be considered
+     * virtual.
+     * 
+     * @param name
+     * @return a PVariable with the selected name; never null
+     */
+    public PVariable getOrCreateVariableByName(String name) {
+        checkMutability();
+        if (!variablesByName.containsKey(name)) {
+            addVariable(new PVariable(this, name, name.startsWith(VIRTUAL_VARIABLE_PREFIX)));
+        }
+        return getVariableByName(name);
+    }
+
+    public Set<PConstraint> getConstraints() {
+        return constraints;
+    }
+
+    public PQuery getPattern() {
+        return query;
+    }
+
+    void noLongerUnique(PVariable pVariable) {
+        assert (!pVariable.isUnique());
+        uniqueVariables.remove(pVariable);
+    }
+
+    /**
+     * Returns the symbolic parameters of the body. </p>
+     * 
+     * <p>
+     * <strong>Warning</strong>: if two PVariables are unified, the returned list changes. If you want to have a stable
+     * version, consider using {@link #getSymbolicParameters()}.
+     * 
+     * @return a non-null, but possibly empty list
+     */
+    public List<PVariable> getSymbolicParameterVariables() {
+        return getSymbolicParameters().stream().map(ExportedParameter::getParameterVariable)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Returns the exported parameter constraints of the body.
+     * 
+     * @return a non-null, but possibly empty list
+     */
+    public List<ExportedParameter> getSymbolicParameters() {
+        if (symbolicParameters == null) 
+            symbolicParameters = new ArrayList<>();
+        return symbolicParameters;
+    }
+
+    /**
+     * Sets the exported parameter constraints of the body, if this instance is mutable.
+     * @param symbolicParameters the new value
+     */
+    public void setSymbolicParameters(List<ExportedParameter> symbolicParameters) {
+        checkMutability();
+        this.symbolicParameters = new ArrayList<>(symbolicParameters);
+    }
+
+    /**
+     * Sets a specific status for the body. If set, the parent PQuery status will not be checked; if set to null, its corresponding PQuery
+     * status is checked for mutability.
+     * 
+     * @param status
+     *            the status to set
+     */
+    public void setStatus(PQueryStatus status) {
+        this.status = status;
+    }
+
+    public boolean isMutable() {
+        if (status == null) {
+            return query.isMutable();
+        } else {
+            return status.equals(PQueryStatus.UNINITIALIZED);
+        }
+    }
+    
+    void checkMutability() {
+        if (status == null) {
+            query.checkMutability();
+        } else {
+            Preconditions.checkState(status.equals(PQueryStatus.UNINITIALIZED), "Initialized queries are not mutable");
+        }
+    }
+
+    /**
+     * Returns the disjunction the body is contained with. This disjunction may either be the
+     * {@link PQuery#getDisjunctBodies() canonical disjunction of the corresponding query} or something equivalent.
+     * 
+     * @return the container disjunction of the body. Can be null if body is not in a disjunction yet.
+     */
+    public PDisjunction getContainerDisjunction() {
+        return containerDisjunction;
+    }
+
+    /**
+     * @param containerDisjunction the containerDisjunction to set
+     */
+    public void setContainerDisjunction(PDisjunction containerDisjunction) {
+        Preconditions.checkArgument(query.equals(containerDisjunction.getQuery()), "Disjunction of pattern %s incompatible with body %s", containerDisjunction.getQuery().getFullyQualifiedName(), query.getFullyQualifiedName());
+        Preconditions.checkState(this.containerDisjunction == null, "Disjunction is already set.");
+        this.containerDisjunction = containerDisjunction;
+    }
+
+    /**
+     * All unary input keys directly prescribed by constraints, grouped by variable.
+     * <p> to supertype inference or subsumption applied at this point.
+     */
+    public Map<PVariable, Set<TypeJudgement>> getAllUnaryTypeRestrictions(IQueryMetaContext context) {
+        Map<PVariable, Set<TypeJudgement>> currentRestrictions = allUnaryTypeRestrictions.get(context);
+        if (currentRestrictions == null) {
+            currentRestrictions = TypeHelper.inferUnaryTypes(getConstraints(), context);
+            allUnaryTypeRestrictions.put(context, currentRestrictions);
+        }
+        return currentRestrictions;
+    }
+    private WeakHashMap<IQueryMetaContext, Map<PVariable, Set<TypeJudgement>>> allUnaryTypeRestrictions = new WeakHashMap<IQueryMetaContext, Map<PVariable,Set<TypeJudgement>>>();   
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PConstraint.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PConstraint.java
new file mode 100644
index 00000000..ae2c4632
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PConstraint.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.psystem.analysis.QueryAnalyzer;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+public interface PConstraint extends PTraceable {
+
+    /**
+     * @since 2.1
+     * @return the query body this constraint belongs to
+     */
+    public PBody getBody();
+
+    /**
+     * All variables affected by this constraint.
+     */
+    public Set<PVariable> getAffectedVariables();
+
+    /**
+     * The set of variables whose potential values can be enumerated (once all non-deduced variables have known values).  
+     */
+    public Set<PVariable> getDeducedVariables();
+    
+    /**
+     * A (preferably minimal) cover of known functional dependencies between variables.
+     * @noreference Use {@link QueryAnalyzer} instead to properly handle dependencies of pattern calls. 
+     * @return non-trivial functional dependencies in the form of {variables} --> {variables}, where dependencies with the same lhs are unified.   
+     */
+    public Map<Set<PVariable>,Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context);  
+
+    public void replaceVariable(PVariable obsolete, PVariable replacement);
+
+    public void delete();
+
+    public void checkSanity();
+
+    /**
+     * Returns an integer ID that is guaranteed to increase strictly monotonously for constraints within a pBody.
+     */
+    public abstract int getMonotonousID();
+    
+
+    /**
+     * A comparator that orders constraints by their {@link #getMonotonousID() monotonous identifiers}. Should only used
+     * for tiebreaking in other comparators.
+     * 
+     * @since 2.0
+     */
+    public static final Comparator<PConstraint> COMPARE_BY_MONOTONOUS_ID = (arg0, arg1) -> arg0.getMonotonousID() - arg1.getMonotonousID();
+
+    
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PTraceable.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PTraceable.java
new file mode 100644
index 00000000..f0241a9c
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PTraceable.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Dénes Harmath, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+/**
+ * Marker interface for PSystem elements that can be traced.
+ * @since 1.6
+ */
+public interface PTraceable {
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PVariable.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PVariable.java
new file mode 100644
index 00000000..b6ea4861
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/PVariable.java
@@ -0,0 +1,203 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author Gabor Bergmann
+ *
+ */
+public class PVariable {
+    private PBody pBody;
+    /**
+     * The name of the pattern variable. This is the unique key of the pattern node.
+     */
+    private String name;
+    /**
+     * virtual pVariables are nodes that do not correspond to actual pattern variables; they represent constants or Term
+     * substitutes
+     */
+    private boolean virtual;
+
+    /**
+     * Set of constraints that mention this variable
+     */
+    private Set<PConstraint> referringConstraints;
+
+    /**
+     * Determines whether there are any constraints that can deduce this variable
+     */
+    private Boolean deducable;
+
+    /**
+     * Another PVariable this variable has been unified into. Please use the other variable instead of this. Null iff
+     * this is still a first-class variable.
+     */
+    private PVariable unifiedInto;
+
+    PVariable(PBody pBody, String name) {
+        this(pBody, name, false);
+    }
+
+    PVariable(PBody pBody, String name, boolean virtual) {
+        super();
+        this.pBody = pBody;
+        this.name = name;
+        this.virtual = virtual;
+        // this.exportedParameter = false;
+        this.referringConstraints = new HashSet<PConstraint>();
+        this.unifiedInto = null;
+        this.deducable = false;
+    }
+
+    /**
+     * Replaces this variable with a given other, resulting in their unification. This variable will no longer be
+     * unique.
+     *
+     * @param replacement
+     */
+    public void unifyInto(PVariable replacement) {
+        pBody.checkMutability();
+        replacementCheck();
+        replacement = replacement.getUnifiedIntoRoot();
+
+        if (this.equals(replacement))
+            return;
+
+        if (!this.isVirtual() && replacement.isVirtual()) {
+            replacement.unifyInto(this);
+        } else {
+            // replacement.referringConstraints.addAll(this.referringConstraints);
+            // replacement.exportedParameter |= this.exportedParameter;
+            replacement.virtual &= this.virtual;
+            if (replacement.deducable != null && this.deducable != null)
+                replacement.deducable |= this.deducable;
+            else
+                replacement.deducable = null;
+            Set<PConstraint> snapshotConstraints = // avoid ConcurrentModificationX
+                    new HashSet<PConstraint>(this.referringConstraints);
+            for (PConstraint constraint : snapshotConstraints) {
+                constraint.replaceVariable(this, replacement);
+            }
+            // replacementCheck() will fail from this point
+            this.unifiedInto = replacement;
+            pBody.noLongerUnique(this);
+        }
+    }
+
+    /**
+     * Determines whether there are any constraints that can deduce this variable
+     */
+    public boolean isDeducable() {
+        replacementCheck();
+        if (deducable == null) {
+            deducable = false;
+            for (PConstraint pConstraint : getReferringConstraints()) {
+                if (pConstraint.getDeducedVariables().contains(this)) {
+                    deducable = true;
+                    break;
+                }
+            }
+        }
+        return deducable;
+    }
+
+    /**
+     * Register that this variable is referred by the given constraint.
+     *
+     * @param constraint
+     */
+    public void refer(PConstraint constraint) {
+        pBody.checkMutability();
+        replacementCheck();
+        deducable = null;
+        referringConstraints.add(constraint);
+    }
+
+    /**
+     * Register that this variable is no longer referred by the given constraint.
+     *
+     * @param constraint
+     */
+    public void unrefer(PConstraint constraint) {
+        pBody.checkMutability();
+        replacementCheck();
+        deducable = null;
+        referringConstraints.remove(constraint);
+    }
+
+    /**
+     * @return the name of the pattern variable. This is the unique key of the pattern node.
+     */
+    public String getName() {
+        replacementCheck();
+        return name;
+    }
+
+    /**
+     * @return the virtual
+     */
+    public boolean isVirtual() {
+        replacementCheck();
+        return virtual;
+    }
+
+    /**
+     * @return the referringConstraints
+     */
+    public Set<PConstraint> getReferringConstraints() {
+        replacementCheck();
+        return referringConstraints;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <ConstraintType> Set<ConstraintType> getReferringConstraintsOfType(Class<ConstraintType> constraintClass) {
+        replacementCheck();
+        Set<ConstraintType> result = new HashSet<ConstraintType>();
+        for (PConstraint pConstraint : referringConstraints) {
+            if (constraintClass.isInstance(pConstraint))
+                result.add((ConstraintType) pConstraint);
+        }
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        // replacementCheck();
+        return name;// + ":PatternNode";
+    }
+
+    public PVariable getDirectUnifiedInto() {
+        return unifiedInto;
+    }
+
+    public PVariable getUnifiedIntoRoot() {
+        PVariable nextUnified = unifiedInto;
+        PVariable oldUnifiedInto = this;
+        while (nextUnified != null) {
+            oldUnifiedInto = nextUnified;
+            nextUnified = oldUnifiedInto.getDirectUnifiedInto();
+        }
+        return oldUnifiedInto; // unifiedInto;
+    }
+
+    public boolean isUnique() {
+        return unifiedInto == null;
+    }
+
+    private void replacementCheck() {
+        if (unifiedInto != null)
+            throw new IllegalStateException("Illegal usage of variable " + name + " which has been replaced with "
+                    + unifiedInto.name);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/TypeJudgement.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/TypeJudgement.java
new file mode 100644
index 00000000..4447b225
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/TypeJudgement.java
@@ -0,0 +1,153 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.context.InputKeyImplication;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+
+/**
+ * A judgement that means that the given tuple of variables will represent a tuple of values that is a member of the extensional relation identified by the given input key.
+ * @author Bergmann Gabor
+ *
+ */
+public class TypeJudgement {
+    
+    private IInputKey inputKey;
+    private Tuple variablesTuple;
+    /**
+     * @param inputKey
+     * @param variablesTuple
+     */
+    public TypeJudgement(IInputKey inputKey, Tuple variablesTuple) {
+        super();
+        this.inputKey = inputKey;
+        this.variablesTuple = variablesTuple;
+    }
+    public IInputKey getInputKey() {
+        return inputKey;
+    }
+    public Tuple getVariablesTuple() {
+        return variablesTuple;
+    }
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+                + ((inputKey == null) ? 0 : inputKey.hashCode());
+        result = prime * result
+                + ((variablesTuple == null) ? 0 : variablesTuple.hashCode());
+        return result;
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (!(obj instanceof TypeJudgement))
+            return false;
+        TypeJudgement other = (TypeJudgement) obj;
+        if (inputKey == null) {
+            if (other.inputKey != null)
+                return false;
+        } else if (!inputKey.equals(other.inputKey))
+            return false;
+        if (variablesTuple == null) {
+            if (other.variablesTuple != null)
+                return false;
+        } else if (!variablesTuple.equals(other.variablesTuple))
+            return false;
+        return true;
+    }
+    
+    public Set<TypeJudgement> getDirectlyImpliedJudgements(IQueryMetaContext context) {
+        Set<TypeJudgement> results = new HashSet<TypeJudgement>();
+        results.add(this);
+        
+        Collection<InputKeyImplication> implications = context.getImplications(this.inputKey);
+        for (InputKeyImplication inputKeyImplication : implications) {
+            results.add(
+                transcribeImplication(inputKeyImplication)
+            );
+        }
+        
+        return results;
+    }
+    
+    /**
+     * @since 1.6
+     */
+    public Set<TypeJudgement> getWeakenedAlternativeJudgements(IQueryMetaContext context) {
+        Set<TypeJudgement> results = new HashSet<TypeJudgement>();
+        
+        Collection<InputKeyImplication> implications = context.getWeakenedAlternatives(this.inputKey);
+        for (InputKeyImplication inputKeyImplication : implications) {
+            results.add(
+                transcribeImplication(inputKeyImplication)
+            );
+        }
+        
+        return results;
+    }
+    
+    /**
+     * @since 2.0
+     */
+    public Map<TypeJudgement, Set<TypeJudgement>> getConditionalImpliedJudgements(IQueryMetaContext context) {
+        return context.getConditionalImplications(this.inputKey).entrySet().stream().collect(Collectors.toMap(
+                entry -> transcribeImplication(entry.getKey()),
+                entry -> entry.getValue().stream().map(this::transcribeImplication).collect(Collectors.toSet())));
+    }
+    
+    
+    
+    private TypeJudgement transcribeImplication(InputKeyImplication inputKeyImplication) {
+        return new TypeJudgement(
+                inputKeyImplication.getImpliedKey(), 
+                transcribeVariablesToTuple(inputKeyImplication.getImpliedIndices())
+        );
+    }
+    private Tuple transcribeVariablesToTuple(List<Integer> indices) {
+        Object[] elements = new Object[indices.size()];
+        for (int i = 0; i < indices.size(); ++i)
+            elements[i] = variablesTuple.get(indices.get(i));
+        return Tuples.flatTupleOf(elements);
+    }
+
+    @Override
+    public String toString() {
+        return "TypeJudgement:" + inputKey.getPrettyPrintableName() + "@" + variablesTuple.toString();
+    }
+    
+    /**
+     * Creates this judgement as a direct type constraint in the given PBody under construction.
+     * <p> pre: the variables tuple must be formed of variables of that PBody.
+     * @since 1.6
+     */
+    public PConstraint createConstraintFor(PBody pBody) {
+        if (inputKey.isEnumerable()) {
+            return new TypeConstraint(pBody, variablesTuple, inputKey);
+        } else {
+            return new TypeFilterConstraint(pBody, variablesTuple, inputKey);
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/VariableDeferredPConstraint.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/VariableDeferredPConstraint.java
new file mode 100644
index 00000000..8ea6bb93
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/VariableDeferredPConstraint.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem;
+
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+
+/**
+ * A kind of deferred constraint that can only be checked when a set of deferring variables are all present in a plan.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public abstract class VariableDeferredPConstraint extends DeferredPConstraint {
+
+    public VariableDeferredPConstraint(PBody pBody,
+            Set<PVariable> affectedVariables) {
+        super(pBody, affectedVariables);
+    }
+
+    public abstract Set<PVariable> getDeferringVariables();
+
+    /**
+     * Refine further if needed
+     */
+    @Override
+    public boolean isReadyAt(SubPlan plan, IQueryMetaContext context) {
+        return plan.getVisibleVariables().containsAll(getDeferringVariables());
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/AbstractMemorylessAggregationOperator.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/AbstractMemorylessAggregationOperator.java
new file mode 100644
index 00000000..63a37bbe
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/AbstractMemorylessAggregationOperator.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.aggregations;
+
+/**
+ * 
+ * An aggregation operator that does not store interim results beyond the final aggregated value.
+ * @author Gabor Bergmann
+ * @since 1.4
+ */
+public abstract class AbstractMemorylessAggregationOperator<Domain, AggregateResult> 
+    implements IMultisetAggregationOperator<Domain, AggregateResult, AggregateResult> 
+{
+
+    @Override
+    public AggregateResult getAggregate(AggregateResult result) {
+        return result;
+    }
+
+    @Override
+    public AggregateResult clone(AggregateResult original) {
+        return original;
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/AggregatorType.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/AggregatorType.java
new file mode 100644
index 00000000..4cc40a2b
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/AggregatorType.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.aggregations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import tools.refinery.viatra.runtime.matchers.aggregators.count;
+
+/**
+ * The aggregator type annotation describes the type constraints for the selected aggregator. In version 1.4, two kinds of
+ * aggregators are supported:
+ * 
+ * <ol>
+ * <li>An aggregator that does not consider any parameter value from the call ({@link count}), just calculates the
+ * number of matches. This is represented by a single {@link Void} and a single corresponding return type.</li>
+ * <li>An aggregator that considers a single parameter from the call, and executes some aggregate operations over it.
+ * Such an aggregate operation can be defined over multiple types, where each possible parameter type has a corresponding return type declared.</li>
+ * </ol>
+ * 
+ * <strong>Important!</strong> The parameterTypes and returnTypes arrays must have
+ * <ul>
+ * <li>The same number of classes defined each.</li>
+ * <li>Items are corresponded by index.</li>
+ * <li>Items should represent data types</li>
+ * </ul>
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 1.4
+ *
+ */
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface AggregatorType {
+
+    Class<?>[] parameterTypes();
+
+    Class<?>[] returnTypes();
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/BoundAggregator.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/BoundAggregator.java
new file mode 100644
index 00000000..e6972544
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/BoundAggregator.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.aggregations;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.common.JavaTransitiveInstancesKey;
+
+/**
+ * Augments an aggregator operator with type bindings for the type of values being aggregated and the aggregate result.
+ * <p> In case of <em>count</em>, the operator should be null.
+ * @author Gabor Bergmann
+ * @since 1.4
+ */
+public class BoundAggregator {
+    private final IMultisetAggregationOperator<?, ?, ?> operator;
+    private final Class<?> domainType;
+    private final Class<?> aggregateResultType;
+
+    public BoundAggregator(IMultisetAggregationOperator<?, ?, ?> operator, 
+            Class<?> domainType,
+            Class<?> aggregateResultType) {
+        super();
+        this.operator = operator;
+        this.domainType = domainType;
+        this.aggregateResultType = aggregateResultType;
+    }
+
+    public IMultisetAggregationOperator<?, ?, ?> getOperator() {
+        return operator;
+    }
+
+    public Class<?> getDomainType() {
+        return domainType;
+    }
+
+    public Class<?> getAggregateResultType() {
+        return aggregateResultType;
+    }
+
+    public IInputKey getDomainTypeAsInputKey() {
+        return toJavaInputKey(domainType);
+    }
+
+    public IInputKey getAggregateResultTypeAsInputKey() {
+        return toJavaInputKey(aggregateResultType);
+    }
+
+    private static IInputKey toJavaInputKey(Class<?> type) {
+        if (type==null) {
+            return null;
+        } else { 
+            return new JavaTransitiveInstancesKey(type);
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/IAggregatorFactory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/IAggregatorFactory.java
new file mode 100644
index 00000000..c970bd6a
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/IAggregatorFactory.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Zoltan Ujhelyi, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.aggregations;
+
+/**
+ * 
+ * Describes an aggregation operator keyword, potentially with type polymorphism. The actual runtime
+ * {@link IMultisetAggregationOperator} that implements the aggregation logic may depend on the type context.
+ * 
+ * <p>
+ * Implementors are suggested to use lower-case classnames (as it will end up in the language) and are required use the
+ * annotation {@link AggregatorType} to indicate type inference rules.
+ * 
+ * <p>
+ * <strong>Important!</strong> Implemented aggregators must be (1) deterministic (2) pure and (3)support incremental
+ * value updates in the internal operation.
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 1.4
+ */
+
+public interface IAggregatorFactory {
+
+    /**
+     * Given type parameters selected from {@link AggregatorType} annotations, returns a run-time aggregator operator
+     * that is bound to the actual types.
+     * 
+     * @param domainClass
+     *            Java type of the values that are being aggregated
+     * @return the actual run-time aggregator logic, with type bindings
+     */
+    public BoundAggregator getAggregatorLogic(Class<?> domainClass);
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/IMultisetAggregationOperator.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/IMultisetAggregationOperator.java
new file mode 100644
index 00000000..3bc22274
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/aggregations/IMultisetAggregationOperator.java
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.aggregations;
+
+import java.util.Collection;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.aggregators.ExtremumOperator;
+
+/**
+ * A single column aggregator is used to incrementally compute the aggregate of a multiset of values according to an aggregator operator.
+ * 
+ * <p> The operator provides two methods of computation: <ul>
+ *  <li>Stateless aggregation of an explicit multiset, provided by {@link #aggregateStatelessly(Collection)}.</li>
+ *  <li>Incremental aggregation, provided by {@link #createNeutral()}, {@link #update(Object, Object, boolean)}, {@link #isNeutral(Object)}, {@link #getAggregate(Object)}.    
+ * </ul>
+ * 
+ * <p> In case of incremental computation, the aggregable multiset is conceptual; it is not represented by an explicit Collection<Domain> object, but its update operations are tracked.  
+ * 
+ * <p> In case of incremental computation, internal results, potentially distinct from the final aggregate result, may be stored in a helper data structure called <b>accumulator</b>.
+ * The goal of this distinction is that the final result may not be sufficient for incremental updates (see e.g. {@link ExtremumOperator}).
+ * 
+ * @author Gabor Bergmann
+ *
+ * @param <Domain> the type of elements to be aggregated.
+ * @param <Accumulator> the type used to store the interim results of the aggregate computation, 
+ *  that may be incrementally refreshed upon updates to the multiset, and that can easily yield the final result.
+ * @param <AggregateResult> the type of the final result of the aggregation to be output.
+ * 
+ * @since 1.4
+ */
+public interface IMultisetAggregationOperator<Domain, Accumulator, AggregateResult> {
+    
+    /**
+     * A textual description of the operator.
+     */
+    String getShortDescription();
+    
+    /**
+     * A name or identifier of the operator.
+     */
+    String getName();
+    
+    /**
+     * @return the neutral element, i.e. the interim result of aggregating an empty multiset.
+     */
+    Accumulator createNeutral();
+    
+    /**
+     * @return true if the interim result is equivalent to the neutral element, as if there are no values in the multiset.
+     * Must return true if the multiset is empty.
+     */
+    boolean isNeutral(Accumulator result);
+
+    /**
+     * @return an updated intermediate result, 
+     *  changed to reflect that a given object was added to / removed from the multiset 
+     *      (as indicated by the parameter isInsertion)
+     */
+    Accumulator update(Accumulator oldResult, Domain updateValue, boolean isInsertion);
+    
+    /**
+     * @return the aggregate result obtained from the given intermediate result. 
+     * May be null to indicate that the current multiset cannot be aggregated (e.g. 0 elements have no minimum).
+     */
+    AggregateResult getAggregate(Accumulator result);
+
+    /**
+     * Calculates the aggregate results from a given stream of values; all values are considered as inserted
+     * @return the aggregate result, or null if no result can be calculated (e.g. because of an empty stream)
+     * @since 2.0
+     */
+    AggregateResult aggregateStream(Stream<Domain> stream);
+    
+    /**
+     * Clones the given accumulator (with all its internal contents).
+     */
+    default Accumulator clone(Accumulator original) {
+        throw new UnsupportedOperationException();
+    }
+    
+    /**
+     * Combines the given aggregate result and accumulator into a single aggregate result. 
+     */
+    default AggregateResult combine(AggregateResult left, Accumulator right) {
+        throw new UnsupportedOperationException();
+    }
+    
+    default boolean contains(Domain value, Accumulator accumulator) {
+        throw new UnsupportedOperationException();
+    }
+    
+    /**
+     * Pretty prints the contents of the given accumulator. 
+     */
+    default String prettyPrint(final Accumulator accumulator) {
+        return accumulator.toString();
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/analysis/QueryAnalyzer.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/analysis/QueryAnalyzer.java
new file mode 100644
index 00000000..e3f28cff
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/analysis/QueryAnalyzer.java
@@ -0,0 +1,194 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.analysis;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryBackendContext;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.planning.helpers.FunctionalDependencyHelper;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.annotations.PAnnotation;
+import tools.refinery.viatra.runtime.matchers.psystem.annotations.ParameterReference;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * Object responsible for computing and caching static query analysis results.
+ * <p> Any client can instantiate this to statically analyze queries. 
+ * Query backends should share an instance obtained via {@link IQueryBackendContext} to save resources.
+ * <p> Precondition: all involved queries must be initialized.
+ * @noinstantiate Considered unstable API; subject to change in future versions. 
+ * Either use the analyzer provided by {@link IQueryBackendContext}, or anticipate 
+ * potential future breakage when instantiating your own analyzer.
+ * @author Gabor Bergmann
+ * @since 1.5
+ */
+public final class QueryAnalyzer {
+    
+    private IQueryMetaContext metaContext;
+
+    public QueryAnalyzer(IQueryMetaContext metaContext) {
+        this.metaContext = metaContext;
+    }
+
+    // Functional dependencies
+    
+    /**
+     * Maps query and strictness to functional dependencies 
+     */
+    private Map<PQuery, Map<Set<Integer>, Set<Integer>>> strictFunctionalDependencyGuarantees =  
+            new HashMap<>();
+    private Map<PQuery, Map<Set<Integer>, Set<Integer>>> softFunctionalDependencyGuarantees =  
+            new HashMap<>();
+
+    /**
+     * Functional dependency information, expressed on query parameters, that the match set of the query is guaranteed to respect. 
+     * <p> The type dependencies shall be expressed on the <i>parameter index</i> integers, NOT the {@link PParameter} object.
+     * @return a non-null map of functional dependencies on parameters that can be processed by {@link FunctionalDependencyHelper}
+     * @param strict if true, only "hard" dependencies are taken into account that are strictly enforced by the model representation; 
+     *  if false, user-provided soft dependencies (@FunctionalDependency) are included as well, that are anticipated but not guaranteed by the storage mechanism;
+     *  use true if superfluous dependencies may taint the correctness of a computation, false if they would merely impact performance
+     * @since 1.5
+     */
+    public Map<Set<Integer>, Set<Integer>> getProjectedFunctionalDependencies(PQuery query, boolean strict) {
+        Map<PQuery, Map<Set<Integer>, Set<Integer>>> guaranteeStore =  strict ? strictFunctionalDependencyGuarantees : softFunctionalDependencyGuarantees;
+        Map<Set<Integer>, Set<Integer>> dependencies = guaranteeStore.get(query);
+        //  Why not computeIfAbsent? See Bug 532507
+        //      Invoked method #computeFunctionalDependencies may trigger functional dependency computation for called queries;
+        //      and may thus recurs back into #getProjectedFunctionalDependencies, causing a ConcurrentModificationException
+        //      if the called query has not been previously analyzed.
+        //
+        //      Note: if patterns are recursive, the empty accumulator will be found in the store 
+        //          (this yields a safe lower estimate and guarantees termination for #getProjectedFunctionalDependencies)
+        //          But this case probably will not occur due to recursive queries having a disjunction at some point, 
+        //          and thus ignored by #computeFunctionalDependencies  
+        if (dependencies == null) {
+            dependencies = new HashMap<>(); // accumulator
+            guaranteeStore.put(query, dependencies);
+            computeFunctionalDependencies(dependencies, query, strict);
+        }
+        return dependencies;
+    }
+
+    private void computeFunctionalDependencies(Map<Set<Integer>, Set<Integer>> accumulator, PQuery query, boolean strict) {
+        Set<PBody> bodies = query.getDisjunctBodies().getBodies();            
+        if (bodies.size() == 1) { // no support for recursion or disjunction
+
+            PBody body = bodies.iterator().next();
+            
+            // collect parameter variables
+            Map<PVariable, Integer> parameters = body.getSymbolicParameters().stream()
+                    .collect(Collectors.toMap(ExportedParameter::getParameterVariable,
+                            param -> query.getParameters().indexOf(param.getPatternParameter())));
+            
+            // collect all internal dependencies
+            Map<Set<PVariable>, Set<PVariable>> internalDependencies = 
+                    getFunctionalDependencies(body.getConstraints(), strict);
+            
+            // project onto parameter variables
+            Map<Set<PVariable>, Set<PVariable>> projectedDeps = 
+                    FunctionalDependencyHelper.projectDependencies(internalDependencies, parameters.keySet());
+            
+            // translate into indices
+            for (Entry<Set<PVariable>, Set<PVariable>> entry : projectedDeps.entrySet()) {
+                Set<Integer> left = new HashSet<Integer>();
+                Set<Integer> right = new HashSet<Integer>();
+                for (PVariable pVariable : entry.getKey()) {
+                    left.add(parameters.get(pVariable));
+                }
+                for (PVariable pVariable : entry.getValue()) {
+                    right.add(parameters.get(pVariable));
+                }
+                accumulator.put(left, right);
+            }
+            
+        } else {
+            // Disjunctive case, no dependencies are inferred
+            // TODO: we can still salvage the intersection of dependencies IF 
+            // - all bodies have disjoint match sets
+            // - and we avoid recursion
+        }
+        
+        // add annotation-based soft dependencies (regardless of number of bodies)
+        if (!strict) {
+            outer:
+                for (PAnnotation annotation : query.getAnnotationsByName("FunctionalDependency")) {
+                    Set<Integer> lefts = new HashSet<Integer>();
+                    Set<Integer> rights = new HashSet<Integer>();
+                    
+                    for (Object object : annotation.getAllValues("forEach")) {
+                        ParameterReference parameter = (ParameterReference) object;
+                        Integer position = query.getPositionOfParameter(parameter.getName());
+                        if (position == null) continue outer;
+                        lefts.add(position);
+                    }
+                    for (Object object : annotation.getAllValues("unique")) {
+                        ParameterReference parameter = (ParameterReference) object;
+                        Integer position = query.getPositionOfParameter(parameter.getName());
+                        if (position == null) continue outer;
+                        rights.add(position);
+                    }
+                    
+                    FunctionalDependencyHelper.includeDependency(accumulator, lefts, rights);
+                }
+        }
+    }
+
+    /**
+     * Functional dependency information, expressed on PVariables within a body, that the selected constraints imply. 
+     * @return a non-null map of functional dependencies on PVariables that can be processed by {@link FunctionalDependencyHelper}
+     * @param constraints the set of constraints whose consequences will be analyzed
+     * @param strict if true, only "hard" dependencies are taken into account that are strictly enforced by the model representation; 
+     *  if false, user-provided soft dependencies (@FunctionalDependency) are included as well, that are anticipated but not guaranteed by the storage mechanism;
+     *  use true if superfluous dependencies may taint the correctness of a computation, false if they would merely impact performance
+     * @since 1.5
+     */
+   public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(Set<? extends PConstraint> constraints, boolean strict) {
+        Map<Set<PVariable>, Set<PVariable>> accumulator = new HashMap<Set<PVariable>, Set<PVariable>>();
+        for (PConstraint pConstraint : constraints){
+            if (pConstraint instanceof PositivePatternCall) {
+                // use query analysis results instead
+                PositivePatternCall call = (PositivePatternCall) pConstraint;
+                PQuery query = call.getSupplierKey();
+                Map<Set<Integer>, Set<Integer>> paramDependencies = getProjectedFunctionalDependencies(query, strict);
+                for (Entry<Set<Integer>, Set<Integer>> entry : paramDependencies.entrySet()) {
+                    Set<PVariable> lefts = new HashSet<PVariable>();
+                    Set<PVariable> rights = new HashSet<PVariable>();
+                    
+                    for (Integer index : entry.getKey()) {
+                        lefts.add(call.getVariableInTuple(index));
+                    }
+                    for (Integer index : entry.getValue()) {
+                        rights.add(call.getVariableInTuple(index));
+                    }
+                    
+                    FunctionalDependencyHelper.includeDependency(accumulator, 
+                            lefts, rights);
+                }
+            } else {
+                // delegate to PConstraint
+                FunctionalDependencyHelper.includeDependencies(accumulator, 
+                        pConstraint.getFunctionalDependencies(metaContext));
+            }
+        }
+        return accumulator;
+    }
+
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/annotations/PAnnotation.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/annotations/PAnnotation.java
new file mode 100644
index 00000000..c4fbe0e9
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/annotations/PAnnotation.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.annotations;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.BiConsumer;
+
+import org.eclipse.collections.api.multimap.MutableMultimap;
+import org.eclipse.collections.impl.multimap.list.FastListMultimap;
+
+/**
+ * A container describing query annotations
+ * @author Zoltan Ujhelyi
+ *
+ */
+public class PAnnotation {
+
+    private final String name;
+    private MutableMultimap<String, Object> attributes = FastListMultimap.newMultimap();
+
+    public PAnnotation(String name) {
+        this.name = name;
+
+    }
+
+    /**
+     * Adds an attribute to the annotation
+     * @param attributeName
+     * @param value
+     */
+    public void addAttribute(String attributeName, Object value) {
+        attributes.put(attributeName, value);
+    }
+
+    /**
+     * Return the name of the annotation
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Returns the value of the first occurrence of an attribute
+     * @param attributeName
+     * @return the attribute value, or null, if attribute is not available
+     * @since 2.0
+     */
+    public Optional<Object> getFirstValue(String attributeName) {
+        return getAllValues(attributeName).stream().findFirst();
+    }
+    
+    /**
+     * Returns the value of the first occurrence of an attribute
+     * @param attributeName
+     * @return the attribute value, or null, if attribute is not available
+     * @since 2.0
+     */
+    public <T> Optional<T> getFirstValue(String attributeName, Class<T> clazz) {
+        return getAllValues(attributeName).stream().filter(clazz::isInstance).map(clazz::cast).findFirst();
+    }
+
+    /**
+     * Returns all values of a selected attribute
+     * @param attributeName
+     * @return a non-null, but possibly empty list of attributes
+     */
+    public List<Object> getAllValues(String attributeName) {
+        return attributes.get(attributeName).toList();
+    }
+    
+    /**
+     * Executes a consumer over all attributes. A selected attribute name (key) can appear (and thus consumed) multiple times.
+     * @since 2.0
+     */
+    public void forEachValue(BiConsumer<String, Object> consumer) {
+        attributes.forEachKeyValue(consumer::accept);
+    }
+
+    /**
+     * Returns a set of all attribute names used in this annotation
+     * @since 2.1
+     */
+    public Set<String> getAllAttributeNames() {
+        return attributes.keySet().toSet();
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/annotations/ParameterReference.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/annotations/ParameterReference.java
new file mode 100644
index 00000000..c67e9046
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/annotations/ParameterReference.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.annotations;
+
+/**
+ * An annotation parameter referencing a query parameter by name. Does not check whether the parameter exists.
+ *
+ * @author Zoltan Ujhelyi
+ *
+ */
+public class ParameterReference {
+
+    final String name;
+
+    public ParameterReference(String name) {
+        super();
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/AggregatorConstraint.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/AggregatorConstraint.java
new file mode 100644
index 00000000..56f86e89
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/AggregatorConstraint.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.psystem.ITypeInfoProviderConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
+import tools.refinery.viatra.runtime.matchers.psystem.aggregations.BoundAggregator;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+
+/**
+ * The PSystem representation of an aggregation.
+ * 
+ * @author Tamas Szabo
+ * @since 1.4
+ */
+public class AggregatorConstraint extends PatternCallBasedDeferred implements ITypeInfoProviderConstraint {
+
+    protected PVariable resultVariable;
+    private BoundAggregator aggregator;
+    protected int aggregatedColumn;
+
+    public AggregatorConstraint(BoundAggregator aggregator, PBody pBody, Tuple actualParametersTuple, PQuery query,
+            PVariable resultVariable, int aggregatedColumn) {
+        super(pBody, actualParametersTuple, query, Collections.singleton(resultVariable));
+        this.resultVariable = resultVariable;
+        this.aggregatedColumn = aggregatedColumn;
+        this.aggregator = aggregator;
+    }
+
+    public int getAggregatedColumn() {
+        return this.aggregatedColumn;
+    }
+
+    public BoundAggregator getAggregator() {
+        return this.aggregator;
+    }
+
+    @Override
+    public Set<PVariable> getDeducedVariables() {
+        return Collections.singleton(resultVariable);
+    }
+
+    @Override
+    public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context) {
+        final Map<Set<PVariable>, Set<PVariable>> result = new HashMap<Set<PVariable>, Set<PVariable>>();
+        result.put(getDeferringVariables(), getDeducedVariables());
+        return result;
+    }
+
+    @Override
+    protected void doDoReplaceVariables(PVariable obsolete, PVariable replacement) {
+        if (resultVariable.equals(obsolete))
+            resultVariable = replacement;
+    }
+
+    @Override
+    protected Set<PVariable> getCandidateQuantifiedVariables() {
+        return actualParametersTuple.<PVariable> getDistinctElements();
+    }
+
+    @Override
+    protected String toStringRest() {
+        return query.getFullyQualifiedName() + "@" + actualParametersTuple.toString() + "->"
+                + resultVariable.toString();
+    }
+
+    public PVariable getResultVariable() {
+        return resultVariable;
+    }
+
+    @Override
+    public Set<TypeJudgement> getImpliedJudgements(IQueryMetaContext context) {
+        Set<TypeJudgement> result = new HashSet<TypeJudgement>();
+        IInputKey aggregateResultType = aggregator.getAggregateResultTypeAsInputKey();
+        if (aggregateResultType != null) {
+            result.add(new TypeJudgement(aggregateResultType, Tuples.staticArityFlatTupleOf(resultVariable)));
+        }
+        return result;
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/BaseTypeSafeConstraint.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/BaseTypeSafeConstraint.java
new file mode 100644
index 00000000..7bc949a8
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/BaseTypeSafeConstraint.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+
+import java.util.Collections;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
+import tools.refinery.viatra.runtime.matchers.psystem.VariableDeferredPConstraint;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+public abstract class BaseTypeSafeConstraint extends
+        VariableDeferredPConstraint {
+    
+    protected Set<PVariable> inputVariables;
+    protected PVariable outputVariable;
+
+    public PVariable getOutputVariable() {
+        return outputVariable;
+    }
+
+    /**
+     * @param pBody
+     * @param inputVariables
+     * @param outputVariable null iff no output (check-only)
+     */
+    public BaseTypeSafeConstraint(PBody pBody,
+            Set<PVariable> inputVariables, final PVariable outputVariable) {
+        super(pBody, 
+                (outputVariable == null) ? 
+                        inputVariables : 
+                            Stream.concat(inputVariables.stream(), Stream.of(outputVariable)).collect(Collectors.toSet())
+                    );
+        this.inputVariables = inputVariables;
+        this.outputVariable = outputVariable;
+    }
+
+    @Override
+    public Set<PVariable> getDeducedVariables() {
+        if (outputVariable == null) 
+            return Collections.emptySet(); 
+        else
+            return Collections.singleton(outputVariable);
+    }
+
+    @Override
+    public Set<PVariable> getDeferringVariables() {
+        return inputVariables;
+    }
+
+    @Override
+    public boolean isReadyAt(SubPlan plan, IQueryMetaContext context) {
+        if (super.isReadyAt(plan, context)) {
+            return checkTypeSafety(plan, context) == null;
+        }
+        return false;
+    }
+
+    /**
+     * Checks whether all type restrictions are already enforced on affected variables.
+     * 
+     * @param plan
+     * @return a variable whose type safety is not enforced yet, or null if the plan is typesafe
+     */
+    public PVariable checkTypeSafety(SubPlan plan, IQueryMetaContext context) {
+        Set<TypeJudgement> impliedJudgements = plan.getAllImpliedTypeJudgements(context);
+        
+        for (PVariable pVariable : inputVariables) {
+            Set<TypeJudgement> allTypeRestrictionsForVariable = pBody.getAllUnaryTypeRestrictions(context).get(pVariable);
+            if (allTypeRestrictionsForVariable != null && !impliedJudgements.containsAll(allTypeRestrictionsForVariable))
+                return pVariable;
+        }
+        return null;
+    }
+    
+    @Override
+    protected void doReplaceVariable(PVariable obsolete, PVariable replacement) {
+        if (inputVariables.remove(obsolete)) 
+            inputVariables.add(replacement);
+        if (outputVariable == obsolete) 
+            outputVariable = replacement;
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/Equality.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/Equality.java
new file mode 100644
index 00000000..b978b62c
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/Equality.java
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.planning.SubPlan;
+import tools.refinery.viatra.runtime.matchers.psystem.DeferredPConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+public class Equality extends DeferredPConstraint {
+
+    private PVariable who;
+    private PVariable withWhom;
+
+    public Equality(PBody pBody, PVariable who, PVariable withWhom) {
+        super(pBody, buildSet(who, withWhom));
+        this.who = who;
+        this.withWhom = withWhom;
+    }
+
+    private static Set<PVariable> buildSet(PVariable who, PVariable withWhom) {
+        Set<PVariable> set = new HashSet<PVariable>();
+        set.add(who);
+        set.add(withWhom);
+        return set;
+    }
+
+    /**
+     * An equality is moot if it compares the a variable with itself.
+     * 
+     * @return true, if the equality is moot
+     */
+    public boolean isMoot() {
+        return who.equals(withWhom);
+    }
+
+    @Override
+    public void doReplaceVariable(PVariable obsolete, PVariable replacement) {
+        if (obsolete.equals(who))
+            who = replacement;
+        if (obsolete.equals(withWhom))
+            withWhom = replacement;
+    }
+
+    @Override
+    protected String toStringRest() {
+        return who.getName() + "=" + withWhom.getName();
+    }
+
+    public PVariable getWho() {
+        return who;
+    }
+
+    public PVariable getWithWhom() {
+        return withWhom;
+    }
+
+    @Override
+    public Set<PVariable> getDeducedVariables() {
+        return Collections.emptySet();
+    }
+    
+    @Override
+    public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context) {
+        final Map<Set<PVariable>, Set<PVariable>> result = new HashMap<Set<PVariable>, Set<PVariable>>();
+        result.put(Collections.singleton(who), Collections.singleton(withWhom));
+        result.put(Collections.singleton(withWhom), Collections.singleton(who));
+        return result;
+    }
+
+    @Override
+    public boolean isReadyAt(SubPlan plan, IQueryMetaContext context) {
+        return plan.getVisibleVariables().contains(who) && plan.getVisibleVariables().contains(withWhom);
+        // will be replaced by || if copierNode is available;
+        // until then, LayoutHelper.unifyVariablesAlongEqualities(PSystem<PatternDescription, StubHandle, Collector>) is
+        // recommended.
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/ExportedParameter.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/ExportedParameter.java
new file mode 100644
index 00000000..80706792
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/ExportedParameter.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+
+import java.util.Collections;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.VariableDeferredPConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * @author Gabor Bergmann
+ *
+ */
+public class ExportedParameter extends VariableDeferredPConstraint {
+    PVariable parameterVariable;
+    final String parameterName;
+    final PParameter patternParameter;
+
+    /**
+     * @since 1.4
+     */
+    public ExportedParameter(PBody pBody, PVariable parameterVariable, PParameter patternParameter) {
+        super(pBody, Collections.singleton(parameterVariable));
+        this.parameterVariable = parameterVariable;
+        this.patternParameter = patternParameter;
+        parameterName = patternParameter.getName();
+    }
+
+    @Override
+    public void doReplaceVariable(PVariable obsolete, PVariable replacement) {
+        if (obsolete.equals(parameterVariable))
+            parameterVariable = replacement;
+    }
+
+    @Override
+    protected String toStringRest() {
+        Object varName = parameterVariable.getName();
+        return parameterName.equals(varName) ? parameterName : parameterName + "(" + varName + ")";
+    }
+
+    @Override
+    public Set<PVariable> getDeducedVariables() {
+        return Collections.emptySet();
+    }
+
+    /**
+     * The name of the parameter; usually, it is expected that {@link #getParameterVariable()} is more useful, except
+     * maybe for debugging purposes.
+     * 
+     * @return a non-null name of the parameter
+     */
+    public String getParameterName() {
+        return parameterName;
+    }
+
+    public PVariable getParameterVariable() {
+        return parameterVariable;
+    }
+
+    /**
+     * @since 1.4
+     */
+    public PParameter getPatternParameter() {
+        if (patternParameter == null) {
+            PQuery query = pBody.getPattern();
+            Integer index = query.getPositionOfParameter(parameterName);
+            if (index == null) {
+                throw new IllegalStateException(String.format("Pattern %s does not have a parameter named %s",
+                        query.getFullyQualifiedName(), parameterName));
+            }
+            return query.getParameters().get(index);
+        } else {
+            return patternParameter;
+        }
+    }
+
+    @Override
+    public Set<PVariable> getDeferringVariables() {
+        return Collections.singleton(parameterVariable);
+    }
+
+    @Override
+    public void checkSanity() {
+        super.checkSanity();
+        if (!parameterVariable.isDeducable()) {
+            String[] args = { parameterName };
+            String msg = "Impossible to match pattern: "
+                    + "exported pattern variable {1} can not be determined based on the pattern constraints. "
+                    + "HINT: certain constructs (e.g. negative patterns or check expressions) cannot output symbolic parameters.";
+            String shortMsg = "Could not deduce value of parameter";
+            throw new QueryProcessingException(msg, args, shortMsg, null);
+        }
+
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/ExpressionEvaluation.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/ExpressionEvaluation.java
new file mode 100644
index 00000000..06688c36
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/ExpressionEvaluation.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+
+/**
+ * @author Zoltan Ujhelyi
+ *
+ */
+public class ExpressionEvaluation extends BaseTypeSafeConstraint {
+
+    private IExpressionEvaluator evaluator;
+    private boolean isUnwinding;
+
+    public ExpressionEvaluation(PBody pBody, IExpressionEvaluator evaluator, PVariable outputVariable) {
+        this(pBody, evaluator, outputVariable, false);
+    }
+
+    /**
+     * @since 2.4
+     */
+    public ExpressionEvaluation(PBody pBody, IExpressionEvaluator evaluator, PVariable outputVariable,
+            boolean isUnwinding) {
+        super(pBody, getPVariablesOfExpression(pBody, evaluator), outputVariable);
+        this.evaluator = evaluator;
+        this.isUnwinding = isUnwinding;
+    }
+
+    /**
+     * @since 2.4
+     */
+    public boolean isUnwinding() {
+        return isUnwinding;
+    }
+
+    public IExpressionEvaluator getEvaluator() {
+        return evaluator;
+    }
+
+    @Override
+    protected String toStringRest() {
+        return Tuples.flatTupleOf(new ArrayList<PVariable>(inputVariables).toArray()).toString() + "|="
+                + evaluator.getShortDescription();
+    }
+
+    @Override
+    public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context) {
+        if (outputVariable == null)
+            return Collections.emptyMap();
+        else
+            return Collections.singletonMap(inputVariables, Collections.singleton(outputVariable));
+    }
+
+    private static Set<PVariable> getPVariablesOfExpression(PBody pBody, IExpressionEvaluator evaluator) {
+        // use a linked set, so that the variables will come in the order of the parameters
+        Set<PVariable> result = new LinkedHashSet<PVariable>();
+        for (String name : evaluator.getInputParameterNames()) {
+            PVariable variable = pBody.getOrCreateVariableByName(name);
+            result.add(variable);
+        }
+        return result;
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/Inequality.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/Inequality.java
new file mode 100644
index 00000000..5cac33dc
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/Inequality.java
@@ -0,0 +1,151 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.VariableDeferredPConstraint;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+public class Inequality extends VariableDeferredPConstraint {
+
+    private PVariable who;
+    private PVariable withWhom;
+
+    /**
+     * The inequality constraint is weak if it can be ignored when who is the same as withWhom, or if any if them is
+     * undeducible.
+     */
+    private boolean weak;
+
+    public Inequality(PBody pBody, PVariable who, PVariable withWhom) {
+        this(pBody, who, withWhom, false);
+    }
+
+    public Inequality(PBody pBody, PVariable who, PVariable withWhom,
+            boolean weak) {
+        super(pBody, new HashSet<>(Arrays.asList(who, withWhom) ));
+        this.who = who;
+        this.withWhom = withWhom;
+        this.weak = weak;
+    }
+
+    // private Inequality(
+    // PSystem<PatternDescription, StubHandle, ?> pSystem,
+    // PVariable subject, Set<PVariable> inequals)
+    // {
+    // super(pSystem, include(inequals, subject));
+    // this.subject = subject;
+    // this.inequals = inequals;
+    // }
+
+    // private static HashSet<PVariable> include(Set<PVariable> inequals, PVariable subject) {
+    // HashSet<PVariable> hashSet = new HashSet<PVariable>(inequals);
+    // hashSet.add(subject);
+    // return hashSet;
+    // }
+
+    @Override
+    public Set<PVariable> getDeferringVariables() {
+        return getAffectedVariables();
+    }
+
+    // private static int[] mapIndices(Map<Object, Integer> variablesIndex, Set<PVariable> keys) {
+    // int[] result = new int[keys.size()];
+    // int k = 0;
+    // for (PVariable key : keys) {
+    // result[k++] = variablesIndex.get(key);
+    // }
+    // return result;
+    // }
+
+    // @Override
+    // public IFoldablePConstraint getIncorporator() {
+    // return incorporator;
+    // }
+    //
+    // @Override
+    // public void registerIncorporatationInto(IFoldablePConstraint incorporator) {
+    // this.incorporator = incorporator;
+    // }
+    //
+    // @Override
+    // public boolean incorporate(IFoldablePConstraint other) {
+    // if (other instanceof Inequality<?, ?>) {
+    // Inequality other2 = (Inequality) other;
+    // if (subject.equals(other2.subject)) {
+    // Set<PVariable> newInequals = new HashSet<PVariable>(inequals);
+    // newInequals.addAll(other2.inequals);
+    // return new Inequality<PatternDescription, StubHandle>(buildable, subject, newInequals);
+    // }
+    // } else return false;
+    // }
+
+    @Override
+    protected String toStringRest() {
+        return who.toString() + (isWeak() ? "!=?" : "!=") + withWhom.toString();
+    }
+
+    @Override
+    public void doReplaceVariable(PVariable obsolete, PVariable replacement) {
+        if (obsolete.equals(who))
+            who = replacement;
+        if (obsolete.equals(withWhom))
+            withWhom = replacement;
+    }
+
+    @Override
+    public Set<PVariable> getDeducedVariables() {
+        return Collections.emptySet();
+    }
+
+    /**
+     * The inequality constraint is weak if it can be ignored when who is the same as withWhom, or if any if them is
+     * undeducible.
+     * 
+     * @return the weak
+     */
+    public boolean isWeak() {
+        return weak;
+    }
+
+    /**
+     * A weak inequality constraint is eliminable if who is the same as withWhom, or if any if them is undeducible.
+     */
+    public boolean isEliminable() {
+        return isWeak() && (who.equals(withWhom) || !who.isDeducable() || !withWhom.isDeducable());
+    }
+
+    /**
+     * Eliminates a weak inequality constraint if it can be ignored when who is the same as withWhom, or if any if them
+     * is undeducible.
+     */
+    public void eliminateWeak() {
+        if (isEliminable())
+            delete();
+    }
+
+    public PVariable getWho() {
+        return who;
+    }
+
+    public PVariable getWithWhom() {
+        return withWhom;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/NegativePatternCall.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/NegativePatternCall.java
new file mode 100644
index 00000000..87d9d9fc
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/NegativePatternCall.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+
+import java.util.Collections;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+public class NegativePatternCall extends PatternCallBasedDeferred {
+
+    public NegativePatternCall(PBody pBody, Tuple actualParametersTuple, PQuery query) {
+        super(pBody, actualParametersTuple, query);
+    }
+
+    @Override
+    public Set<PVariable> getDeducedVariables() {
+        return Collections.emptySet();
+    }
+
+    /**
+     * @return all variables that may potentially be quantified they are not used anywhere else
+     */
+    @Override
+    protected Set<PVariable> getCandidateQuantifiedVariables() {
+        return getAffectedVariables();
+    }
+
+    @Override
+    protected void doDoReplaceVariables(PVariable obsolete, PVariable replacement) {
+    }
+
+    @Override
+    protected String toStringRest() {
+        return "!" + query.getFullyQualifiedName() + "@" + actualParametersTuple.toString();
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/PatternCallBasedDeferred.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/PatternCallBasedDeferred.java
new file mode 100644
index 00000000..93eeffec
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/PatternCallBasedDeferred.java
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.VariableDeferredPConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * @author Gabor Bergmann
+ *
+ */
+public abstract class PatternCallBasedDeferred extends VariableDeferredPConstraint implements IQueryReference {
+
+    protected Tuple actualParametersTuple;
+
+    protected abstract void doDoReplaceVariables(PVariable obsolete, PVariable replacement);
+
+    protected abstract Set<PVariable> getCandidateQuantifiedVariables();
+
+    protected PQuery query;
+    private Set<PVariable> deferringVariables;
+
+    public PatternCallBasedDeferred(PBody pBody, Tuple actualParametersTuple,
+            PQuery pattern, Set<PVariable> additionalAffectedVariables) {
+        super(pBody, union(actualParametersTuple.<PVariable> getDistinctElements(), additionalAffectedVariables));
+        this.actualParametersTuple = actualParametersTuple;
+        this.query = pattern;
+    }
+
+    public PatternCallBasedDeferred(PBody pBody, Tuple actualParametersTuple,
+            PQuery pattern) {
+        this(pBody, actualParametersTuple, pattern, Collections.<PVariable> emptySet());
+    }
+
+    private static Set<PVariable> union(Set<PVariable> a, Set<PVariable> b) {
+        Set<PVariable> result = new HashSet<PVariable>();
+        result.addAll(a);
+        result.addAll(b);
+        return result;
+    }
+
+    @Override
+    public Set<PVariable> getDeferringVariables() {
+        if (deferringVariables == null) {
+            deferringVariables = new HashSet<PVariable>();
+            for (PVariable var : getCandidateQuantifiedVariables()) {
+                if (var.isDeducable())
+                    deferringVariables.add(var);
+            }
+        }
+        return deferringVariables;
+    }
+
+    @Override
+    public void checkSanity() {
+        super.checkSanity();
+        for (Object obj : this.actualParametersTuple.getDistinctElements()) {
+            PVariable var = (PVariable) obj;
+            if (!getDeferringVariables().contains(var)) {
+                // so this is a free variable of the NAC / aggregation?
+                for (PConstraint pConstraint : var.getReferringConstraints()) {
+                    if (pConstraint != this
+                            && !(pConstraint instanceof Equality && ((Equality) pConstraint).isMoot()))
+                        throw new QueryProcessingException (
+                                "Variable {1} of constraint {2} is not a positively determined part of the pattern, yet it is also affected by {3}.",
+                                new String[] { var.toString(), this.toString(), pConstraint.toString() },
+                                "Read-only variable can not be deduced", null);
+                }
+            }
+        }
+
+    }
+
+//    public SubPlan getSidePlan(IOperationCompiler compiler) throws QueryPlannerException {
+//        SubPlan sidePlan = compiler.patternCallPlan(actualParametersTuple, query);
+//        sidePlan = BuildHelper.enforceVariableCoincidences(compiler, sidePlan);
+//        return sidePlan;
+//    }
+
+    @Override
+    protected void doReplaceVariable(PVariable obsolete, PVariable replacement) {
+        if (deferringVariables != null) {
+            // FAIL instead of hopeless attempt to fix
+            // if (deferringVariables.remove(obsolete)) deferringVariables.add(replacement);
+            throw new IllegalStateException("Cannot replace variables on " + this
+                    + " when deferring variables have already been identified.");
+        }
+        actualParametersTuple = actualParametersTuple.replaceAll(obsolete, replacement);
+        doDoReplaceVariables(obsolete, replacement);
+    }
+
+    public Tuple getActualParametersTuple() {
+        return actualParametersTuple;
+    }
+
+    @Override
+    public PQuery getReferredQuery() {
+        return query;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/PatternMatchCounter.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/PatternMatchCounter.java
new file mode 100644
index 00000000..0c40d91e
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/PatternMatchCounter.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * @author Gabor Bergmann
+ */
+public class PatternMatchCounter extends PatternCallBasedDeferred {
+
+    private PVariable resultVariable;
+
+    public PatternMatchCounter(PBody pBody, Tuple actualParametersTuple,
+            PQuery query, PVariable resultVariable) {
+        super(pBody, actualParametersTuple, query, Collections.singleton(resultVariable));
+        this.resultVariable = resultVariable;
+    }
+
+    @Override
+    public Set<PVariable> getDeducedVariables() {
+        return Collections.singleton(resultVariable);
+    }
+    
+    @Override
+    public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context) {
+        final Map<Set<PVariable>, Set<PVariable>> result = new HashMap<Set<PVariable>, Set<PVariable>>();
+        result.put(getDeferringVariables(), getDeducedVariables());
+        return result;
+    }
+
+    @Override
+    protected void doDoReplaceVariables(PVariable obsolete, PVariable replacement) {
+        if (resultVariable.equals(obsolete))
+            resultVariable = replacement;
+    }
+
+    @Override
+    protected Set<PVariable> getCandidateQuantifiedVariables() {
+        return actualParametersTuple.<PVariable> getDistinctElements();
+    }
+
+
+    @Override
+    protected String toStringRest() {
+        return query.getFullyQualifiedName() + "@" + actualParametersTuple.toString() + "->"
+                + resultVariable.toString();
+    }
+
+    public PVariable getResultVariable() {
+        return resultVariable;
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/RelationEvaluation.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/RelationEvaluation.java
new file mode 100644
index 00000000..336a83fb
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/RelationEvaluation.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2022, Tamas Szabo, GitHub
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+
+import java.util.List;
+
+import tools.refinery.viatra.runtime.matchers.psystem.EnumerablePConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.IMultiQueryReference;
+import tools.refinery.viatra.runtime.matchers.psystem.IRelationEvaluator;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * A constraint which prescribes the evaluation of custom Java logic that takes an arbitrary number of input relations
+ * and produces one output relation. Contrast this to {@link ExpressionEvaluation}, which produces a single output value
+ * given an input tuple.
+ * 
+ * The assumption is that the relation evaluation logic is not incremental, that is, it can only perform from-scratch
+ * computation of the output relation given the complete input relations. To this end, the relation evaluator always
+ * receives the complete input relations with all their contents as input. However, the evaluator engine makes sure that
+ * the output of the relation evaluation is at least "seemingly" incremental. This means that the underlying computation
+ * network computes the delta on the output compared to the previous output and only propagates the delta further.
+ * 
+ * @author Tamas Szabo
+ * 
+ * @since 2.8
+ *
+ */
+public class RelationEvaluation extends EnumerablePConstraint implements IMultiQueryReference {
+
+    private final IRelationEvaluator evaluator;
+    private final List<PQuery> inputQueries;
+
+    public RelationEvaluation(final PBody body, final Tuple variablesTuple, final List<PQuery> inputQueries,
+            final IRelationEvaluator evaluator) {
+        super(body, variablesTuple);
+        this.evaluator = evaluator;
+        this.inputQueries = inputQueries;
+    }
+
+    public IRelationEvaluator getEvaluator() {
+        return this.evaluator;
+    }
+
+    @Override
+    public List<PQuery> getReferredQueries() {
+        return this.inputQueries;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/TypeFilterConstraint.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/TypeFilterConstraint.java
new file mode 100644
index 00000000..8b6e29ef
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicdeferred/TypeFilterConstraint.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.basicdeferred;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.psystem.ITypeConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
+import tools.refinery.viatra.runtime.matchers.psystem.VariableDeferredPConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * Represents a non-enumerable type constraint that asserts that values substituted for the given tuple of variables 
+ *      form a tuple that belongs to a (typically non-enumerable) extensional relation identified by an {@link IInputKey}.
+ * 
+ * <p> The InputKey is typically not enumerable. If it is enumerable, use {@link TypeConstraint} instead, so that the PConstraint carries over the property of enumerability.
+ * 
+ * @author Bergmann Gabor
+ *
+ */
+public class TypeFilterConstraint extends VariableDeferredPConstraint implements
+        ITypeConstraint {
+
+    private Tuple variablesTuple;
+    private IInputKey inputKey;
+    
+    private TypeJudgement equivalentJudgement;
+
+    
+    public TypeFilterConstraint(PBody pBody, Tuple variablesTuple, IInputKey inputKey) {
+        super(pBody, variablesTuple.<PVariable> getDistinctElements());
+        this.equivalentJudgement = new TypeJudgement(inputKey, variablesTuple);
+
+        this.variablesTuple = variablesTuple;
+        this.inputKey = inputKey;
+        
+        if (variablesTuple.getSize() != inputKey.getArity())
+            throw new IllegalArgumentException(
+                    this.getClass().getSimpleName() + 
+                    " applied for variable tuple " + variablesTuple + " having wrong arity for input key " + 
+                            inputKey);
+   }
+
+    
+    
+    public Tuple getVariablesTuple() {
+        return variablesTuple;
+    }
+
+    public IInputKey getInputKey() {
+        return inputKey;
+    }
+
+    @Override
+    public TypeJudgement getEquivalentJudgement() {
+        return equivalentJudgement;
+    }
+
+    @Override
+    protected void doReplaceVariable(PVariable obsolete, PVariable replacement) {
+        variablesTuple = variablesTuple.replaceAll(obsolete, replacement);
+        this.equivalentJudgement = new TypeJudgement(inputKey, variablesTuple);
+    }
+
+    @Override
+    public Set<TypeJudgement> getImpliedJudgements(IQueryMetaContext context) {
+        return Collections.singleton(equivalentJudgement);
+    }
+
+    @Override
+    public Set<PVariable> getDeducedVariables() {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public Set<PVariable> getDeferringVariables() {
+        return getAffectedVariables();
+    }
+
+    @Override
+    protected String toStringRest() {
+        return inputKey.getPrettyPrintableName() + "@" + variablesTuple;
+    }
+    
+    @Override
+    public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context) {
+        return TypeConstraintUtil.getFunctionalDependencies(context, inputKey, variablesTuple);
+    }
+
+    
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/AbstractTransitiveClosure.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/AbstractTransitiveClosure.java
new file mode 100644
index 00000000..7bbf7118
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/AbstractTransitiveClosure.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
+import tools.refinery.viatra.runtime.matchers.psystem.ITypeInfoProviderConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.KeyedEnumerablePConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * @since 2.0
+ */
+public abstract class AbstractTransitiveClosure extends KeyedEnumerablePConstraint<PQuery> implements IQueryReference, ITypeInfoProviderConstraint {
+
+    public AbstractTransitiveClosure(PBody pBody, Tuple variablesTuple, PQuery supplierKey) {
+        super(pBody, variablesTuple, supplierKey);
+    }
+
+    @Override
+    public PQuery getReferredQuery() {
+        return supplierKey;
+    }
+
+    /**
+     * @since 1.3
+     */
+    @Override
+    public Set<TypeJudgement> getImpliedJudgements(IQueryMetaContext context) {
+        return PositivePatternCall.getTypesImpliedByCall(supplierKey, variablesTuple);
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/BinaryReflexiveTransitiveClosure.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/BinaryReflexiveTransitiveClosure.java
new file mode 100644
index 00000000..e3dae240
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/BinaryReflexiveTransitiveClosure.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Zoltan Ujhelyi, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * For a binary base pattern over an enumerable universe type, computes the reflexive transitive closure (base)*
+ * 
+ * @author Gabor Bergmann, Zoltan Ujhelyi
+ * @since 2.0
+ */
+public class BinaryReflexiveTransitiveClosure extends AbstractTransitiveClosure {
+
+    private final IInputKey universeType;
+
+    public BinaryReflexiveTransitiveClosure(PBody pBody, Tuple variablesTuple,
+            PQuery pattern, IInputKey universeType) {
+        super(pBody, variablesTuple, pattern);
+        this.universeType = universeType;
+    }
+
+    @Override
+    protected String keyToString() {
+        return supplierKey.getFullyQualifiedName() + "*";
+    }
+
+    /**
+     * Returns the type whose instances should be returned as 0-long paths. 
+     * @since 2.0
+     */
+    public IInputKey getUniverseType() {
+        return universeType;
+    }
+
+    @Override
+    public void checkSanity() {
+        if (!universeType.isEnumerable() || universeType.getArity() != 1) {
+            throw new QueryProcessingException(
+                    String.format("Invalid universe type %s - it should be enumerable and must have an arity of 1.",
+                            universeType.getPrettyPrintableName()),
+                    pBody.getPattern());
+        }
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/BinaryTransitiveClosure.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/BinaryTransitiveClosure.java
new file mode 100644
index 00000000..716d043b
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/BinaryTransitiveClosure.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * For a binary base pattern, computes the irreflexive transitive closure (base)+
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public class BinaryTransitiveClosure extends AbstractTransitiveClosure {
+
+    public BinaryTransitiveClosure(PBody pBody, Tuple variablesTuple,
+            PQuery pattern) {
+        super(pBody, variablesTuple, pattern);
+    }
+
+    @Override
+    protected String keyToString() {
+        return supplierKey.getFullyQualifiedName() + "+";
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/Connectivity.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/Connectivity.java
new file mode 100644
index 00000000..10da2e21
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/Connectivity.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+
+public enum Connectivity {
+        WEAK,
+        STRONG;
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/ConstantValue.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/ConstantValue.java
new file mode 100644
index 00000000..251146c8
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/ConstantValue.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.psystem.KeyedEnumerablePConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+
+/**
+ * @author Gabor Bergmann
+ * 
+ */
+public class ConstantValue extends KeyedEnumerablePConstraint<Object> {
+
+    private PVariable variable;
+
+    public ConstantValue(PBody pBody, PVariable variable, Object value) {
+        super(pBody, Tuples.staticArityFlatTupleOf(variable), value);
+        this.variable = variable;
+    }
+
+    @Override
+    protected String keyToString() {
+        return supplierKey.toString();
+    }
+    
+    /**
+     * @since 1.7
+     */
+    public PVariable getVariable() {
+        return variable;
+    }
+    
+    @Override
+    public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context) {
+        final Map<Set<PVariable>, Set<PVariable>> result = new HashMap<Set<PVariable>, Set<PVariable>>();
+        final Set<PVariable> emptySet = Collections.emptySet(); // a constant value is functionally determined by everything
+        result.put(emptySet, Collections.singleton(getVariableInTuple(0)));
+        return result;
+    }
+
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/PositivePatternCall.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/PositivePatternCall.java
new file mode 100644
index 00000000..25ab34b4
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/PositivePatternCall.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.psystem.IQueryReference;
+import tools.refinery.viatra.runtime.matchers.psystem.ITypeInfoProviderConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.KeyedEnumerablePConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+
+/**
+ * @author Gabor Bergmann
+ *
+ */
+public class PositivePatternCall extends KeyedEnumerablePConstraint<PQuery> implements IQueryReference, ITypeInfoProviderConstraint {
+
+    public PositivePatternCall(PBody pBody, Tuple variablesTuple,
+            PQuery pattern) {
+        super(pBody, variablesTuple, pattern);
+    }
+
+    @Override
+    protected String keyToString() {
+        return supplierKey.getFullyQualifiedName();
+    }
+
+    // Note: #getFunctionalDependencies is intentionally not implemented - use QueryAnalyzer instead!
+//    @Override
+//    public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context) {
+//        return super.getFunctionalDependencies(context);
+//    }
+
+    @Override
+    public PQuery getReferredQuery() {
+        return supplierKey;
+    }
+
+    @Override
+    public Set<TypeJudgement> getImpliedJudgements(IQueryMetaContext context) {
+        return getTypesImpliedByCall(supplierKey, variablesTuple);
+    }
+
+    /**
+     * @since 1.3
+     */
+    public static Set<TypeJudgement> getTypesImpliedByCall(PQuery calledQuery, Tuple actualParametersTuple) {
+        Set<TypeJudgement> result = new HashSet<TypeJudgement>();
+        for (TypeJudgement parameterJudgement : calledQuery.getTypeGuarantees()) {                      
+            IInputKey inputKey = parameterJudgement.getInputKey();
+            Tuple judgementIndexTuple = parameterJudgement.getVariablesTuple();
+            
+            Object[] judgementVariables = new Object[judgementIndexTuple.getSize()];
+            for (int i=0; i<judgementVariables.length; ++i)
+                judgementVariables[i] = actualParametersTuple.get((int) judgementIndexTuple.get(i));
+            
+            result.add(new TypeJudgement(inputKey, Tuples.flatTupleOf(judgementVariables))); 
+        }
+        return result;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/RepresentativeElectionConstraint.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/RepresentativeElectionConstraint.java
new file mode 100644
index 00000000..b97ff55f
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/RepresentativeElectionConstraint.java
@@ -0,0 +1,43 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.psystem.*;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+import java.util.Set;
+
+public class RepresentativeElectionConstraint extends KeyedEnumerablePConstraint<PQuery>
+                implements IQueryReference, ITypeInfoProviderConstraint {
+        private final Connectivity connectivity;
+
+        public RepresentativeElectionConstraint(PBody pBody, Tuple variablesTuple, PQuery supplierKey,
+                                                                                        Connectivity connectivity) {
+                super(pBody, variablesTuple, supplierKey);
+                this.connectivity = connectivity;
+        }
+
+        public Connectivity getConnectivity() {
+                return connectivity;
+        }
+
+        @Override
+        public PQuery getReferredQuery() {
+                return supplierKey;
+        }
+
+        @Override
+        public Set<TypeJudgement> getImpliedJudgements(IQueryMetaContext context) {
+                return PositivePatternCall.getTypesImpliedByCall(supplierKey, variablesTuple);
+        }
+
+        @Override
+        protected String keyToString() {
+                return supplierKey.getFullyQualifiedName() + "#" + connectivity + "#representative";
+        }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/TypeConstraint.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/TypeConstraint.java
new file mode 100644
index 00000000..2ca54cc0
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/basicenumerables/TypeConstraint.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.basicenumerables;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.psystem.ITypeConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.KeyedEnumerablePConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+
+/**
+ * Represents an enumerable type constraint that asserts that values substituted for the given tuple of variables 
+ *      form a tuple that belongs to an enumerable extensional relation identified by an {@link IInputKey}.
+ *
+ * <p> The InputKey must be enumerable!
+ *
+ * @author Zoltan Ujhelyi
+ *
+ */
+public class TypeConstraint extends KeyedEnumerablePConstraint<IInputKey> implements ITypeConstraint {
+    
+    private TypeJudgement equivalentJudgement;
+    
+    public TypeConstraint(PBody pBody, Tuple variablesTuple, IInputKey inputKey) {
+        super(pBody, variablesTuple, inputKey);
+        this.equivalentJudgement = new TypeJudgement(inputKey, variablesTuple);
+        
+        if (! inputKey.isEnumerable())
+            throw new IllegalArgumentException(
+                    this.getClass().getSimpleName() + 
+                    " applicable for enumerable input keys only; received instead " + 
+                            inputKey);
+        if (variablesTuple.getSize() != inputKey.getArity())
+            throw new IllegalArgumentException(
+                    this.getClass().getSimpleName() + 
+                    " applied for variable tuple " + variablesTuple + " having wrong arity for input key " + 
+                            inputKey);
+    }
+
+    @Override
+    protected String keyToString() {
+        return supplierKey.getPrettyPrintableName();
+    }
+    
+    @Override
+    public TypeJudgement getEquivalentJudgement() {
+        return equivalentJudgement;
+    }
+
+    @Override
+    public Set<TypeJudgement> getImpliedJudgements(IQueryMetaContext context) {
+        return Collections.singleton(equivalentJudgement);
+        //return equivalentJudgement.getDirectlyImpliedJudgements(context);
+    }
+    
+    @Override
+    public Map<Set<PVariable>, Set<PVariable>> getFunctionalDependencies(IQueryMetaContext context) {
+        return TypeConstraintUtil.getFunctionalDependencies(context, supplierKey, variablesTuple);
+    }
+
+    @Override
+    public void doReplaceVariable(PVariable obsolete, PVariable replacement) {
+        super.doReplaceVariable(obsolete, replacement);
+        this.equivalentJudgement = new TypeJudgement(getSupplierKey(), variablesTuple);
+    }
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/BasePQuery.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/BasePQuery.java
new file mode 100644
index 00000000..2c03a894
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/BasePQuery.java
@@ -0,0 +1,231 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.queries;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
+import tools.refinery.viatra.runtime.matchers.psystem.annotations.PAnnotation;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * Default implementation of PQuery.
+ * 
+ * @author Bergmann Gabor
+ */
+public abstract class BasePQuery implements PQuery {
+
+        protected PQueryStatus status = PQueryStatus.UNINITIALIZED;
+        /**
+     * @since 2.0
+     */
+        protected final PVisibility visibility;
+        protected List<PProblem> pProblems = new ArrayList<PProblem>();
+        private List<PAnnotation> annotations = new ArrayList<PAnnotation>();
+        private QueryEvaluationHint evaluationHints = new QueryEvaluationHint(null, (IQueryBackendFactory)null);
+        PDisjunction canonicalDisjunction;
+        private List<String> parameterNames = null; // Lazy initialization
+        
+        /** For traceability only. */
+        private List<Object> wrappingQuerySpecifications = new ArrayList<Object>(1);
+
+        @Override
+        public Integer getPositionOfParameter(String parameterName) {
+                ensureInitialized();
+            int index = getParameterNames().indexOf(parameterName);
+            return index != -1 ? index : null;
+        }
+
+        protected void setStatus(PQueryStatus newStatus) {
+            this.status = newStatus;
+        }
+
+        protected void addError(PProblem problem) {
+                status = PQueryStatus.ERROR;
+            pProblems.add(problem);
+        }
+
+        @Override
+        public PQueryStatus getStatus() {
+            return status;
+        }
+
+        @Override
+        public List<PProblem> getPProblems() {
+                return Collections.unmodifiableList(pProblems);
+        }
+
+        @Override
+        public boolean isMutable() {
+            return status.equals(PQueryStatus.UNINITIALIZED) || status.equals(PQueryStatus.INITIALIZING);
+        }
+
+        @Override
+        public void checkMutability() {
+            Preconditions.checkState(isMutable(), "Cannot edit query definition %s", getFullyQualifiedName());
+        }
+
+        /**
+     * @since 1.5
+     */
+        public void setEvaluationHints(QueryEvaluationHint hints) {
+            checkMutability();
+            this.evaluationHints = hints;
+        }
+
+        @Override
+        public QueryEvaluationHint getEvaluationHints() {
+                ensureInitialized();
+                return evaluationHints;
+                // TODO instead of field, compute something from annotations?
+        }
+
+        protected void addAnnotation(PAnnotation annotation) {
+            checkMutability();
+            annotations.add(annotation);
+        }
+
+        @Override
+        public List<PAnnotation> getAllAnnotations() {
+                ensureInitialized();
+            return new ArrayList<>(annotations);
+        }
+
+        private Stream<PAnnotation> getAnnotationStreamByName(final String name) {
+            ensureInitialized();
+        return annotations.stream().filter(Objects::nonNull).filter(annotation -> Objects.equals(name, annotation.getName()));
+        }
+        
+        @Override
+        public List<PAnnotation> getAnnotationsByName(final String annotationName) {
+                return getAnnotationStreamByName(annotationName).collect(Collectors.toList());
+        }
+
+        @Override
+        public Optional<PAnnotation> getFirstAnnotationByName(String annotationName) {
+            return getAnnotationStreamByName(annotationName).findFirst();
+        }
+
+        @Override
+        public List<String> getParameterNames() {
+                ensureInitialized();
+                if (parameterNames == null) {
+                    parameterNames = getParameters().stream().map(PParameter::getName).collect(Collectors.toList()); 
+                }
+            return parameterNames;
+        }
+
+        @Override
+        public Set<PQuery> getDirectReferredQueries() {
+                ensureInitialized();
+            return canonicalDisjunction.getDirectReferredQueries();
+        }
+
+        @Override
+        public Set<PQuery> getAllReferredQueries() {
+            ensureInitialized();
+            return canonicalDisjunction.getAllReferredQueries();
+        }
+
+
+        @Override
+        public List<Object> publishedAs() {
+                return wrappingQuerySpecifications;
+        }
+        
+        @Override
+        public Set<TypeJudgement> getTypeGuarantees() {
+            ensureInitialized();
+                Set<TypeJudgement> result = new HashSet<TypeJudgement>();
+                
+                List<PParameter> parameters = getParameters();
+                for (int i=0; i<parameters.size(); ++i) {
+                        PParameter parameter = parameters.get(i);
+                        IInputKey declaredUnaryType = parameter.getDeclaredUnaryType();
+                        if (declaredUnaryType != null) {
+                                result.add(new TypeJudgement(declaredUnaryType, Tuples.staticArityFlatTupleOf(i)));
+                        }
+                }
+                
+                return result;
+        }
+        
+        /**
+     * @since 2.0
+     */
+        public BasePQuery(PVisibility visibility) {
+                super();
+                this.visibility = visibility;
+        }
+
+        @Override
+        public PDisjunction getDisjunctBodies() {
+                ensureInitialized();
+            Preconditions.checkState(!status.equals(PQueryStatus.ERROR), "Query %s contains errors.", getFullyQualifiedName());
+            return canonicalDisjunction;
+        }
+
+        @Override
+        public final void ensureInitialized() {
+            try {
+            if (status.equals(PQueryStatus.UNINITIALIZED)) {
+                setStatus(PQueryStatus.INITIALIZING);
+                setBodies(doGetContainedBodies());
+                setStatus(PQueryStatus.OK);
+            }
+            } catch (QueryInitializationException e) {
+                addError(new PProblem(e, e.getShortMessage()));
+                throw e;
+            }
+        }
+
+        protected final void setBodies(Set<PBody> bodies) {
+            canonicalDisjunction = new PDisjunction(this, bodies);
+            for (PBody body : canonicalDisjunction.getBodies()) {
+                body.setStatus(null);
+            }
+            setStatus(PQueryStatus.OK);
+        }
+
+        /**
+         * Creates and returns the bodies of the query. If recalled again, a new instance is created.
+         * 
+         * @return
+         * @throws ViatraQueryRuntimeException
+         */
+        protected abstract Set<PBody> doGetContainedBodies();
+
+        @Override
+        public String toString() {
+            return String.format("PQuery<%s>=%s", getFullyQualifiedName(), super.toString());
+        }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public PVisibility getVisibility() {
+        return visibility;
+    }
+        
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PDisjunction.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PDisjunction.java
new file mode 100644
index 00000000..eae4eacf
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PDisjunction.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.queries;
+
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+
+/**
+ * 
+ * A disjunction is a set of bodies representing separate conditions. A {@link PQuery} has a single, canonical
+ * PDisjunction, that can be replaced using rewriter
+ * 
+ * @author Zoltan Ujhelyi
+ * 
+ */
+public class PDisjunction {
+
+    private Set<PBody> bodies;
+    private PQuery query;
+
+    public PDisjunction(Set<PBody> bodies) {
+        this(bodies.iterator().next().getPattern(), bodies);
+    }
+
+    public PDisjunction(PQuery query, Set<PBody> bodies) {
+        super();
+        this.query = query;
+        this.bodies = Collections.unmodifiableSet(new LinkedHashSet<>(bodies));
+        this.bodies.forEach(body -> body.setContainerDisjunction(this));
+    }
+
+    /**
+     * Returns an immutable set of bodies that consists of this disjunction
+     * 
+     * @return the bodies
+     */
+    public Set<PBody> getBodies() {
+        return bodies;
+    }
+
+    /**
+     * Returns the corresponding query specification. May be null if not set.
+     */
+    public PQuery getQuery() {
+        return query;
+    }
+
+    /**
+     * Returns all queries directly referred in the constraints. They are all required to evaluate this query
+     * 
+     * @return a non-null, but possibly empty list of query definitions
+     */
+    public Set<PQuery> getDirectReferredQueries() {
+        return this.getBodies().stream().
+                flatMap(PQueries.directlyReferencedQueriesFunction()). // flatten stream of streams
+                collect(Collectors.toCollection(LinkedHashSet::new));
+    }
+
+    /**
+     * Returns all queries required to evaluate this query (transitively).
+     * 
+     * @return a non-null, but possibly empty list of query definitions
+     */
+    public Set<PQuery> getAllReferredQueries() {
+        Set<PQuery> processedQueries = new LinkedHashSet<>();
+        processedQueries.add(this.getQuery());
+        Set<PQuery> foundQueries = getDirectReferredQueries();
+        Set<PQuery> newQueries = new LinkedHashSet<>(foundQueries);
+    
+        while(!processedQueries.containsAll(newQueries)) {
+            PQuery query = newQueries.iterator().next();
+            processedQueries.add(query);
+            newQueries.remove(query);
+            Set<PQuery> referred = query.getDirectReferredQueries();
+            referred.removeAll(processedQueries);
+            foundQueries.addAll(referred);
+            newQueries.addAll(referred);
+        }
+        return foundQueries;
+    }
+    
+    /**
+     * Decides whether a disjunction is mutable. A disjunction is mutable if all its contained bodies are mutable.
+     * 
+     */
+    public boolean isMutable() {
+        for (PBody body : bodies) {
+            if (!body.isMutable()) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PParameter.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PParameter.java
new file mode 100644
index 00000000..07165aa2
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PParameter.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.queries;
+
+import java.util.Objects;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+
+/**
+ * A descriptor for declared PQuery parameters. A parameter has a name, a declared type and a direction constraint
+ *
+ * @author Zoltan Ujhelyi
+ *
+ */
+public class PParameter {
+
+    private final String name;
+    private final String typeName;
+    private final IInputKey declaredUnaryType;
+    private final PParameterDirection direction;
+
+    public PParameter(String name) {
+        this(name, (String) null);
+    }
+
+    public PParameter(String name, String typeName) {
+        this(name, typeName, (IInputKey) null);
+    }
+
+    public PParameter(String name, String typeName, IInputKey declaredUnaryType) {
+        this(name, typeName, declaredUnaryType, PParameterDirection.INOUT);
+    }
+
+    /**
+     * @since 1.4
+     */
+    public PParameter(String name, String typeName, IInputKey declaredUnaryType, PParameterDirection direction) {
+        super();
+        this.name = name;
+        this.typeName = typeName;
+        this.declaredUnaryType = declaredUnaryType;
+        this.direction = direction;
+
+        if (declaredUnaryType != null && declaredUnaryType.getArity() != 1) {
+            throw new IllegalArgumentException(
+                    "PParameter declared type must be unary instead of " + declaredUnaryType.getPrettyPrintableName());
+        }
+    }
+
+    /**
+     * @return the direction
+     * @since 1.4
+     */
+    public PParameterDirection getDirection() {
+        return direction;
+    }
+
+    /**
+     * @return the name of the parameter
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Returns a textual representation of the declared type of the parameter
+     * 
+     * @return the type description, or null if not available
+     */
+    public String getTypeName() {
+        return typeName;
+    }
+
+    /**
+     * Yield an {@link IInputKey} representation of the type declared for this parameter.
+     * 
+     * @return the unary type that was declared on this parameter in the query header, or null if not available
+     */
+    public IInputKey getDeclaredUnaryType() {
+        return declaredUnaryType;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof PParameter) {
+            return Objects.equals(name, ((PParameter) obj).name)
+                    && Objects.equals(typeName, ((PParameter) obj).typeName)
+                    && Objects.equals(declaredUnaryType, ((PParameter) obj).declaredUnaryType)
+                    && Objects.equals(direction, ((PParameter) obj).direction);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, typeName, declaredUnaryType);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PParameterDirection.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PParameterDirection.java
new file mode 100644
index 00000000..c94d4797
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PParameterDirection.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQueryLabs
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.queries;
+
+/**
+ * Values of this enum describe a constraint to the calling of patterns regarding its parameters.
+ * 
+ * @author Grill Balázs
+ * @since 1.4
+ *
+ */
+public enum PParameterDirection {
+
+    /**
+     * Default value, no additional constraint is applied
+     */
+    INOUT,
+    
+    /**
+     * The parameters marked with this constraints shall be set to a value before calling the pattern
+     */
+    IN,
+    
+    /**
+     * The parameters marked with this constraints shall not be set to a value before calling the pattern
+     */
+    OUT
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PProblem.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PProblem.java
new file mode 100644
index 00000000..1fe4f541
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PProblem.java
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.queries;
+
+import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+
+/**
+ * Represents an error that was detected while the {@link PQuery} object was built from a source.
+ * @author Bergmann Gabor
+ *
+ */
+public class PProblem {
+
+    private final String shortMessage;
+    private final String location; 
+    private final Exception exception;
+
+    public PProblem(String shortMessage) {
+        this(null, shortMessage, null, null);
+    }
+    /**
+     * @since 2.0
+     */
+    public PProblem(String shortMessage, Integer line, Integer column) {
+        this(null, shortMessage, line, column);
+    }
+    public PProblem(QueryProcessingException exception) {
+        this(exception, exception.getShortMessage(), null, null);
+    }
+    public PProblem(Exception exception, String shortMessage) {
+        this(exception, shortMessage, null, null);
+    }
+    
+    /**
+     * @since 2.0
+     */
+    public PProblem(Exception exception, String shortMessage, Integer line, Integer column) {
+        this.shortMessage = shortMessage;
+        this.exception = exception;
+        if (line == null) {
+            location = "Unspecified location";
+        } else if (column == null) {
+            location = String.format("Line %d", line);
+        } else {
+            location = String.format("Line %d Column %d", line, column);
+        }
+    }
+
+    public String getShortMessage() {
+        return shortMessage;
+    }
+    public Exception getException() {
+        return exception;
+    }
+    /**
+     * @since 2.0
+     */
+    public String getLocation() {
+        return location;
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQueries.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQueries.java
new file mode 100644
index 00000000..56f8ca76
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQueries.java
@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.queries;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.psystem.IMultiQueryReference;
+import tools.refinery.viatra.runtime.matchers.psystem.ITypeConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery.PQueryStatus;
+
+/**
+ * Utility class for using PQueries in functional/streaming collection operations effectively
+ *
+ * @author Zoltan Ujhelyi
+ *
+ */
+public final class PQueries {
+
+    /**
+     * Hidden constructor for utility class
+     */
+    private PQueries() {
+    }
+
+    /**
+     * Predicate checking for the status of selected queries
+     *
+     */
+    public static Predicate<PQuery> queryStatusPredicate(final PQueryStatus status) {
+        return query -> query.getStatus().equals(status);
+    }
+
+    /**
+     * Enumerates referred queries (without duplicates) for the given body
+     */
+    public static Function<PBody, Stream<PQuery>> directlyReferencedQueriesFunction() {
+        return body -> (body.getConstraintsOfType(IMultiQueryReference.class).stream()
+                .flatMap(e -> e.getReferredQueries().stream()).distinct());
+    }
+
+    /**
+     * Enumerates directly referred extensional relations (without duplicates) in the canonical form of the given query
+     * 
+     * @param enumerablesOnly
+     *                            only enumerable type constraints are considered
+     * @since 2.0
+     */
+    public static Stream<IInputKey> directlyRequiredTypesOfQuery(PQuery query, boolean enumerablesOnly) {
+        return directlyRequiredTypesOfDisjunction(query.getDisjunctBodies(), enumerablesOnly);
+    }
+
+    /**
+     * Enumerates directly referred extensional relations (without duplicates) for the given formulation of a query.
+     * 
+     * @param enumerablesOnly
+     *                            only enumerable type constraints are considered
+     * @since 2.0
+     */
+    public static Stream<IInputKey> directlyRequiredTypesOfDisjunction(PDisjunction disjunctBodies,
+            boolean enumerablesOnly) {
+        Class<? extends ITypeConstraint> filterClass = enumerablesOnly ? TypeConstraint.class : ITypeConstraint.class;
+        return disjunctBodies.getBodies().stream().flatMap(body -> body.getConstraintsOfType(filterClass).stream())
+                .map(constraint -> constraint.getEquivalentJudgement().getInputKey()).distinct();
+    }
+
+    /**
+     * @since 1.4
+     */
+    public static Predicate<PParameter> parameterDirectionPredicate(final PParameterDirection direction) {
+        return input -> input.getDirection() == direction;
+    }
+
+    /**
+     * Returns all {@link PTraceable}s contained in the given {@link PQuery}: itself, its bodies and their constraints.
+     * 
+     * @since 1.6
+     */
+    public static Set<PTraceable> getTraceables(PQuery query) {
+        final Set<PTraceable> traceables = new HashSet<>();
+        traceables.add(query);
+        query.getDisjunctBodies().getBodies().forEach(body -> {
+            traceables.add(body);
+            body.getConstraints().forEach(traceables::add);
+        });
+        return traceables;
+    }
+
+    /**
+     * Calculates the simple name related from a given qualified name by finding the part after the last '.' character.
+     * 
+     * @since 2.0
+     */
+    public static String calculateSimpleName(String qualifiedName) {
+        return qualifiedName.substring(qualifiedName.lastIndexOf('.') + 1);
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQuery.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQuery.java
new file mode 100644
index 00000000..a909c650
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQuery.java
@@ -0,0 +1,154 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.queries;
+
+import java.util.List;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.ViatraQueryRuntimeException;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackend;
+import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendHintProvider;
+import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
+import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
+
+/**
+ * Internal representation of a query / graph pattern (using a constraint system formalism), 
+ * to be interpreted by a query evaluator ({@link IQueryBackend}). 
+ * End-users of VIATRA Query should access a query as an IQuerySpecification instead. 
+ * 
+ * <p>
+ * PQuerys are definitions of queries usable inside pattern descriptions. Such description always has (a non-null) name. The query
+ * itself is defined as a (non-empty) set of {@link PBody} instances, the result is the disjunction of the single
+ * {@link PBody} instances. </p>
+ * <p>
+ * A PQuery might be constructed from erroneous patterns or might be uninitialized - this is represented by its status.
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 0.8.0
+ * @noimplement This interface is not intended to be implemented by clients. Use {@link BasePQuery} as a base class instead.
+ */
+public interface PQuery extends PQueryHeader, PTraceable {
+
+    // TODO rewritten as / rewritten from traceability to PDisjunction?
+    
+    /**
+     * @author Zoltan Ujhelyi
+     * 
+     */
+    public enum PQueryStatus {
+        /**
+         * Marks that the query definition is not initialized
+         */
+        UNINITIALIZED,
+        /**
+         * Marks that the query definition is being initialized
+         * @since 1.4
+         */
+        INITIALIZING,
+        /**
+         * The query definition was successfully initialized
+         */
+        OK,
+        /**
+         * The query definition was initialized, but some issues were present
+         */
+        WARNING,
+        /**
+         * The query definition was not successfully initialized because of an error
+         */
+        ERROR
+    }
+
+    /**
+     * Returns all bodies associated with the query in their canonical form. If called multiple times, the same set with
+     * the same contents will be returned.
+     * 
+     */
+    PDisjunction getDisjunctBodies();
+
+    /**
+     * Returns all queries directly referred in the constraints. They are all required to evaluate this query
+     * 
+     * @return a non-null, but possibly empty list of query definitions
+     */
+    Set<PQuery> getDirectReferredQueries();
+
+    /**
+     * Returns all queries required to evaluate this query (transitively).
+     * 
+     * @return a non-null, but possibly empty list of query definitions
+     */
+    Set<PQuery> getAllReferredQueries();
+
+    /**
+     * Returns the initialization status of the definition
+     * 
+     */
+    PQueryStatus getStatus();
+    
+    /**
+     * Returns a list describing the problems that were found in this query.
+     * 
+     * <p> TODO: formulate invariant connecting {@link #getPProblems()} and {@link #getStatus()}.
+     * 
+     * @return a non-null, but possibly empty list of problems
+     */
+    List<PProblem> getPProblems();
+
+    /**
+     * Before a modification operation is executed, a mutability check is performed (via the {@link #getStatus()}
+     * implementation, and in case of problems an {@link IllegalStateException} is thrown.
+     */
+    void checkMutability();
+
+    /**
+     * An option to check mutability of the query. It can be used to avoid getting an {@link IllegalStateException} by
+     * the execution of {@link #checkMutability()}.
+     * 
+     * @return true if the query specification is still editable
+     */
+    boolean isMutable();
+
+    /**
+     * Optional hints regarding the query evaluation strategy, to be interpreted by the query engine.
+     * <p> To ensure the possibility of external overrides, 
+     *  the evaluation engine should not directly consult this field, 
+     *  but use an {@link IQueryBackendHintProvider} instead.
+     */
+    public QueryEvaluationHint getEvaluationHints();
+
+    
+    /**
+     * Type information, expressed on query parameters, that all matches of the query are guaranteed to respect. 
+     * <p> At the very minimum, this should include the declared types of the parameters.
+     * <p> The type judgement tuples shall contain the <i>parameter index</i>, NOT the {@link PParameter} object.
+     * 
+     * @return a non-null set of type judgements that the query guarantees for its matches
+     */
+    public Set<TypeJudgement> getTypeGuarantees();
+
+    /**
+     * If the query definition is uninitialized, initializes it.
+     * @throws ViatraQueryRuntimeException if initialization of query specification fails
+     */
+    public abstract void ensureInitialized();
+    
+    /**
+     * Returns the end-user query specification API objects that wrap this query.
+     * 
+     * <p> Intended for traceability and debug purposes, not part of normal operation. 
+     * Returned list is intended to be appended during query specification construction time.
+     * 
+     * @return a non-null, but possibly empty list of query specification objects;
+     */
+    List<Object> publishedAs();
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQueryHeader.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQueryHeader.java
new file mode 100644
index 00000000..f3671934
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PQueryHeader.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.queries;
+
+import java.util.List;
+import java.util.Optional;
+
+import tools.refinery.viatra.runtime.matchers.psystem.annotations.PAnnotation;
+
+/**
+ * Represents header information (metainfo) about a query. 
+ * <p> To be implemented both by IQuerySpecifications intended for end users, 
+ * and the internal query representation {@link PQuery}.
+ * 
+ * 
+ * @author Bergmann Gabor
+ * @since 0.9
+ */
+public interface PQueryHeader {
+
+    /**
+     * Identifies the pattern for which matchers can be instantiated.
+     */
+    public String getFullyQualifiedName();
+
+    /**
+     * Return the list of parameter names
+     * 
+     * @return a non-null, but possibly empty list of parameter names
+     */
+    public List<String> getParameterNames();
+
+    /**
+     * Returns a list of parameter descriptions
+     * 
+     * @return a non-null, but possibly empty list of parameter descriptions
+     */
+    public List<PParameter> getParameters();
+
+    /**
+     * Returns the index of a named parameter
+     * 
+     * @param parameterName
+     * @return the index, or null of no such parameter is available
+     */
+    public Integer getPositionOfParameter(String parameterName);
+
+    /**
+     * Returns a parameter by name if exists
+     * @since 2.1
+     */
+    default Optional<PParameter> getParameter(String parameterName) {
+        return Optional.ofNullable(getPositionOfParameter(parameterName))
+            .map(getParameters()::get);
+    }
+    
+    /**
+     * Returns the list of annotations specified for this query
+     * 
+     * @return a non-null, but possibly empty list of annotations
+     */
+    public List<PAnnotation> getAllAnnotations();
+
+    /**
+     * Returns the list of annotations with a specified name
+     * 
+     * @param annotationName
+     * @return a non-null, but possibly empty list of annotations
+     */
+    public List<PAnnotation> getAnnotationsByName(String annotationName);
+
+    /**
+     * Returns the first annotation with a specified name
+     * 
+     * @since 2.0
+     */
+    public Optional<PAnnotation> getFirstAnnotationByName(String annotationName);
+    
+    /**
+     * Returns the visibility information about the query.
+     * @since 2.0
+     */
+    public PVisibility getVisibility();
+    
+    /**
+     * Returns the non-qualified name of the query. By default this means returning the qualified name after the last
+     * '.' character.
+     * 
+     * @since 2.0
+     */
+    public default String getSimpleName() {
+        return PQueries.calculateSimpleName(getFullyQualifiedName());
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PVisibility.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PVisibility.java
new file mode 100644
index 00000000..7cb312bd
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/PVisibility.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.queries;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @since 2.0
+ *
+ */
+public enum PVisibility {
+
+    /**
+     * A public (default) visibility means a pattern can be called at any time.
+     */
+    PUBLIC,
+    /**
+     * A private query is not expected to be called directly, only by a different query matcher. 
+     */
+    PRIVATE,
+    /**
+     * A query that is only used inside a single caller query and is not visible outside its container query. Such
+     * patterns must also fulfill the following additional constraints:
+     * 
+     * <ul>
+     * <li>An embedded query must have only a single body.</li>
+     * <li>An embedded query must not be recursice.</li>
+     * </ul>
+     */
+    EMBEDDED
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/QueryInitializationException.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/QueryInitializationException.java
new file mode 100644
index 00000000..470d7287
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/queries/QueryInitializationException.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.queries;
+
+import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+
+/**
+ * Represent an exception that occurred while initializing the specification of a query. 
+ * @author Bergmann Gabor
+ * @since 0.9
+ *
+ */
+public class QueryInitializationException extends QueryProcessingException {
+
+    public QueryInitializationException(String message, String[] context, String shortMessage, Object patternDescription,
+            Throwable cause) {
+        super(message, context, shortMessage, patternDescription, cause);
+    }
+
+    public QueryInitializationException(String message, String[] context, String shortMessage, Object patternDescription) {
+        super(message, context, shortMessage, patternDescription);
+    }
+
+    private static final long serialVersionUID = 9106033062252951489L;
+
+
+    
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/AbstractRewriterTraceSource.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/AbstractRewriterTraceSource.java
new file mode 100644
index 00000000..276b2b42
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/AbstractRewriterTraceSource.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Grill Balázs, IncQueryLabs
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import java.util.Objects;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
+
+/**
+ * @since 1.6
+ *
+ */
+public class AbstractRewriterTraceSource {
+
+    private IRewriterTraceCollector traceCollector = NopTraceCollector.INSTANCE;
+    
+    public void setTraceCollector(IRewriterTraceCollector traceCollector) {
+        this.traceCollector = Objects.requireNonNull(traceCollector);
+    }
+    
+    public IPTraceableTraceProvider getTraces() {
+        return traceCollector;
+    }
+    
+    protected IRewriterTraceCollector getTraceCollector() {
+        return traceCollector;
+    }
+    
+    /**
+     * Mark the given derivative to be originated from the given original constraint.
+     * @since 1.6
+     */
+    protected void addTrace(PTraceable original, PTraceable derivative){
+        traceCollector.addTrace(original, derivative);
+    }
+    
+    /**
+     * Indicate that the given derivative is removed from the resulting query, thus its trace
+     * information should be removed also.
+     * @since 1.6
+     */
+    protected void derivativeRemoved(PConstraint derivative, IDerivativeModificationReason reason){
+        traceCollector.derivativeRemoved(derivative, reason);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/ConstraintRemovalReason.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/ConstraintRemovalReason.java
new file mode 100644
index 00000000..237a762d
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/ConstraintRemovalReason.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Grill Balázs, IncQueryLabs
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+/**
+ * Common reasons for removing constraint through rewriters
+ *
+ * @noreference This enum is not intended to be referenced by clients.
+ */
+public enum ConstraintRemovalReason implements IDerivativeModificationReason {
+
+    MOOT_EQUALITY,
+    WEAK_INEQUALITY_SELF_LOOP,
+    TYPE_SUBSUMED,
+    DUPLICATE
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/DefaultFlattenCallPredicate.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/DefaultFlattenCallPredicate.java
new file mode 100644
index 00000000..3b5d7390
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/DefaultFlattenCallPredicate.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Marton Bur, Zoltan Ujhelyi, Akos Horvath, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+
+/**
+ * @author Marton Bur
+ *
+ */
+public class DefaultFlattenCallPredicate implements IFlattenCallPredicate {
+
+    @Override
+    public boolean shouldFlatten(PositivePatternCall positivePatternCall) {
+        return true;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/FlattenerCopier.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/FlattenerCopier.java
new file mode 100644
index 00000000..06b8d372
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/FlattenerCopier.java
@@ -0,0 +1,129 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Marton Bur, Akos Horvath, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.Equality;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * This rewriter class can add new equality constraints to the copied body
+ * 
+ * @author Marton Bur
+ *
+ */
+class FlattenerCopier extends PBodyCopier {
+
+    private final Map<PositivePatternCall, CallInformation> calls;
+
+    private static class CallInformation {
+        final PBody body;
+        final Map<PVariable, PVariable> variableMapping;
+        
+        private CallInformation(PBody body) {
+            this.body = body;
+            this.variableMapping = new HashMap<>();
+        }
+    }
+    
+    public FlattenerCopier(PQuery query, Map<PositivePatternCall, PBody> callsToFlatten) {
+        super(query);
+        this.calls = callsToFlatten.entrySet().stream().collect(Collectors.toMap(Entry::getKey, entry -> new CallInformation(entry.getValue())));
+    }
+    
+    protected void copyVariable(PositivePatternCall contextPatternCall, PVariable variable, String newName) {
+        PVariable newPVariable = body.getOrCreateVariableByName(newName);
+        calls.get(contextPatternCall).variableMapping.put(variable, newPVariable);
+        variableMapping.put(variable, newPVariable);
+    }
+
+    /**
+     * Merge all variables and constraints from the body called through the given pattern call to a target body. If
+     * multiple bodies are merged into a single one, use the renamer and filter options to avoid collisions.
+     * 
+     * @param sourceBody
+     * @param namingTool
+     * @param filter
+     */
+    public void mergeBody(PositivePatternCall contextPatternCall, IVariableRenamer namingTool,
+            IConstraintFilter filter) {
+
+        PBody sourceBody = calls.get(contextPatternCall).body;
+
+        // Copy variables
+        Set<PVariable> allVariables = sourceBody.getAllVariables();
+        for (PVariable pVariable : allVariables) {
+            if (pVariable.isUnique()) {
+                copyVariable(contextPatternCall, pVariable,
+                        namingTool.createVariableName(pVariable, sourceBody.getPattern()));
+            }
+        }
+
+        // Copy constraints which are not filtered
+        Set<PConstraint> constraints = sourceBody.getConstraints();
+        for (PConstraint pConstraint : constraints) {
+            if (!(pConstraint instanceof ExportedParameter) && !filter.filter(pConstraint)) {
+                copyConstraint(pConstraint);
+            }
+        }
+    }
+
+    @Override
+    protected void copyPositivePatternCallConstraint(PositivePatternCall positivePatternCall) {
+
+        if (!calls.containsKey(positivePatternCall)) {
+            // If the call was not flattened, copy the constraint
+            super.copyPositivePatternCallConstraint(positivePatternCall);
+        } else {
+            PBody calledBody = Objects.requireNonNull(calls.get(positivePatternCall).body);
+            Preconditions.checkArgument(positivePatternCall.getReferredQuery().equals(calledBody.getPattern()));
+
+            List<PVariable> symbolicParameters = calledBody.getSymbolicParameterVariables();
+            Object[] elements = positivePatternCall.getVariablesTuple().getElements();
+            for (int i = 0; i < elements.length; i++) {
+                // Create equality constraints between the caller PositivePatternCall and the corresponding body
+                // parameter variables
+                createEqualityConstraint((PVariable) elements[i], symbolicParameters.get(i), positivePatternCall);
+            }
+
+        }
+    }
+
+    private void createEqualityConstraint(PVariable pVariable1, PVariable pVariable2,
+            PositivePatternCall contextPatternCall) {
+        PVariable who = variableMapping.get(pVariable1);
+        PVariable withWhom = calls.get(contextPatternCall).variableMapping.get(pVariable2);
+        addTrace(contextPatternCall, new Equality(body, who, withWhom));
+    }
+
+    @Override
+    protected void copyExpressionEvaluationConstraint(final ExpressionEvaluation expressionEvaluation) {
+        Map<PVariable, PVariable> variableMapping = this.variableMapping.entrySet().stream()
+                .filter(input -> expressionEvaluation.getPSystem().getAllVariables().contains(input.getKey()))
+                .collect(Collectors.toMap(Entry::getKey, Entry::getValue));
+        
+        PVariable mappedOutputVariable = variableMapping.get(expressionEvaluation.getOutputVariable());
+        addTrace(expressionEvaluation, new ExpressionEvaluation(body, new VariableMappingExpressionEvaluatorWrapper(expressionEvaluation.getEvaluator(), variableMapping), mappedOutputVariable, expressionEvaluation.isUnwinding()));
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IConstraintFilter.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IConstraintFilter.java
new file mode 100644
index 00000000..518b9c64
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IConstraintFilter.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Zoltan Ujhelyi, Marton Bur, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+
+/**
+ * Helper interface to exclude constraints from PBody copy processes
+ * 
+ * @author Marton Bur
+ * 
+ */
+public interface IConstraintFilter {
+    /**
+     * Returns true, if the given constraint should be filtered (thus should not be copied)
+     * 
+     * @param constraint
+     *            to check
+     * @return true, if the constraint should be filtered
+     */
+    boolean filter(PConstraint constraint);
+    
+    public static class ExportedParameterFilter implements IConstraintFilter {
+        
+        @Override
+        public boolean filter(PConstraint constraint) {
+            return constraint instanceof ExportedParameter;
+        }
+        
+    }
+    
+    public static class AllowAllFilter implements IConstraintFilter {
+        
+        @Override
+        public boolean filter(PConstraint constraint) {
+            // Nothing is filtered
+            return false;
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IDerivativeModificationReason.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IDerivativeModificationReason.java
new file mode 100644
index 00000000..dbd6a78d
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IDerivativeModificationReason.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Grill Balázs, IncQueryLabs
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+/**
+ * This is a role indication interface, implementations may provide a reason about
+ * why a modification is made during PQuery normalization.
+ * @since 1.6
+ *
+ */
+public interface IDerivativeModificationReason {
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IFlattenCallPredicate.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IFlattenCallPredicate.java
new file mode 100644
index 00000000..7e224e98
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IFlattenCallPredicate.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Marton Bur, Zoltan Ujhelyi, Akos Horvath, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+
+
+/**
+ * Interface used by the PQueryFlattener to decide which positive pattern calls to flatten
+ * 
+ * @author Marton Bur
+ *
+ */
+public interface IFlattenCallPredicate {
+    
+    /**
+     * Decides whether the called query by the pattern call should be flattened into the caller or not.
+     * 
+     * @param positivePatternCall
+     *            the pattern call
+     * @return true if the call should be flattened
+     */
+    boolean shouldFlatten(PositivePatternCall positivePatternCall);
+    
+    /**
+     * Flattens only if all operand predicates vote for flattening.
+     * @author Gabor Bergmann
+     * @since 2.1
+     */
+    public static class And implements IFlattenCallPredicate {
+        private IFlattenCallPredicate[] operands;
+        public And(IFlattenCallPredicate... operands) {
+            this.operands = operands;
+        }
+        
+        @Override
+        public boolean shouldFlatten(PositivePatternCall positivePatternCall) {
+            for (IFlattenCallPredicate operand : operands) {
+                if (!operand.shouldFlatten(positivePatternCall)) return false;
+            }
+            return true;
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IPTraceableTraceProvider.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IPTraceableTraceProvider.java
new file mode 100644
index 00000000..84da4d1b
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IPTraceableTraceProvider.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Grill Balázs, IncQueryLabs
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * This interface provides methods to trace the {@link PTraceable}s of a transformed {@link PQuery} produced by
+ * a {@link PDisjunctionRewriter}. In case the associated rewriter is a composite (a.k.a. {@link PDisjunctionRewriterCacher}),
+ * this trace provider handles traces end-to-end, hiding all the intermediate transformation steps.
+ * 
+ * @since 1.6
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface IPTraceableTraceProvider {
+
+    /**
+     * Find and return the canonical {@link PTraceable}s in the original query which are the sources of the given derivative
+     * {@link PTraceable} according to the transformation.
+     * 
+     * @param derivative a {@link PTraceable} which is contained by the {@link PQuery} produced by the associated rewriter
+     * @since 2.0
+     */
+    public Stream<PTraceable> getCanonicalTraceables(PTraceable derivative);
+    
+    /**
+     * Find and return the {@link PTraceable}s in the rewritten query which are the destinations of the given source
+     * {@link PTraceable} according to the transformation.
+     * 
+     * @param source a {@link PTraceable} which is contained by a {@link PQuery} before rewriting
+     * @since 2.0
+     */
+    public Stream<PTraceable> getRewrittenTraceables(PTraceable source);
+    
+    /**
+     * Returns whether the given traceable element has been removed by every rewriter for a reason.
+     */
+    public boolean isRemoved(PTraceable traceable);
+
+    /**
+     * Returns the reasons for which the traceable element has been removed by the rewriters.
+     * @return the reasons of removal during rewriting
+     * @since 2.0
+     */
+    public Stream<IDerivativeModificationReason> getRemovalReasons(PTraceable traceable);
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IRewriterTraceCollector.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IRewriterTraceCollector.java
new file mode 100644
index 00000000..70771ea7
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IRewriterTraceCollector.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Grill Balázs, IncQueryLabs
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
+
+/**
+ * This is the internal API of {@link IPTraceableTraceProvider} expected to be used by
+ * copier and rewriter implementations.
+ * 
+ * @since 1.6
+ * @noreference This interface is not intended to be referenced by clients.
+ */
+public interface IRewriterTraceCollector extends IPTraceableTraceProvider {
+
+    /**
+     * Mark the given derivative to be originated from the given original constraint.
+     */
+    public void addTrace(PTraceable origin, PTraceable derivative);
+    
+    /**
+     * Indicate that the given derivative is removed from the resulting query, thus its trace
+     * information should be removed also.
+     */
+    public void derivativeRemoved(PTraceable derivative, IDerivativeModificationReason reason);
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IVariableRenamer.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IVariableRenamer.java
new file mode 100644
index 00000000..ce446e0d
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/IVariableRenamer.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Zoltan Ujhelyi, Marton Bur, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * Helper interface to ease the naming of the new variables during flattening
+ * 
+ * @author Marton Bur
+ * 
+ */
+public interface IVariableRenamer {
+    /**
+     * Creates a variable name based on a given variable and a given query. It only creates a String, doesn't set
+     * anything.
+     * 
+     * @param pVariable
+     * @param query
+     * @return the new variable name as a String
+     */
+    String createVariableName(PVariable pVariable, PQuery query);
+    
+    public class SameName implements IVariableRenamer {
+        @Override
+        public String createVariableName(PVariable pVariable, PQuery query) {
+            return pVariable.getName();
+        }
+    }
+    
+    public class HierarchicalName implements IVariableRenamer {
+
+        private int callCount;
+
+        public void setCallCount(int callCount) {
+            this.callCount = callCount;
+        }
+
+        @Override
+        public String createVariableName(PVariable pVariable, PQuery query) {
+            // make sure to keep the "_" prefix before anonymous variables
+            String newVarName = getShortName(query) + "<" + callCount + ">" + "_" + pVariable.getName();
+            return pVariable.getName().startsWith("_") ? "_" + newVarName : newVarName ;
+        }
+        
+        private String getShortName(PQuery query) {
+            String fullyQualifiedName = query.getFullyQualifiedName();
+            int beginIndex = fullyQualifiedName.lastIndexOf('.') + 1;
+            return fullyQualifiedName.substring(beginIndex);
+        }
+    }
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/MappingTraceCollector.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/MappingTraceCollector.java
new file mode 100644
index 00000000..7429fc60
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/MappingTraceCollector.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Grill Balázs, IncQueryLabs
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+import tools.refinery.viatra.runtime.matchers.util.IMemoryView;
+import tools.refinery.viatra.runtime.matchers.util.IMultiLookup;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * Multimap-based implementation to contain and query traces
+ * 
+ * @since 1.6
+ *
+ */
+public class MappingTraceCollector implements IRewriterTraceCollector {
+
+    /**
+     * Traces from derivative to original
+     */
+    private final IMultiLookup<PTraceable, PTraceable> traces = CollectionsFactory.createMultiLookup(Object.class, MemoryType.SETS, Object.class);
+
+    /**
+     * Traces from original to derivative
+     */
+    private final IMultiLookup<PTraceable, PTraceable> inverseTraces = CollectionsFactory.createMultiLookup(Object.class, MemoryType.SETS, Object.class);
+    
+    /**
+     * Reasons for removing {@link PTraceable}s
+     */
+    private final Map<PTraceable, IDerivativeModificationReason> removals = new HashMap<>();
+    
+    /**
+     * Decides whether {@link PTraceable} is removed
+     */
+    private final Predicate<PTraceable> removed = removals::containsKey;
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public Stream<PTraceable> getCanonicalTraceables(PTraceable derivative) {
+        return findTraceEnds(derivative, traces).stream();
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public Stream<PTraceable> getRewrittenTraceables(PTraceable source) {
+        return findTraceEnds(source, inverseTraces).stream();
+    }
+
+    /**
+     * Returns the end of trace chains starting from the given {@link PTraceable} along the given trace edges. 
+     */
+    private Set<PTraceable> findTraceEnds(PTraceable traceable, IMultiLookup<PTraceable, PTraceable> traceRecords) {
+        if (traceable instanceof PQuery) { // PQueries are preserved
+            return Collections.singleton(traceable);
+        }
+        Set<PTraceable> visited = new HashSet<>();
+        Set<PTraceable> result = new HashSet<>();
+        Queue<PTraceable> queue = new LinkedList<>();
+        queue.add(traceable);
+        while(!queue.isEmpty()){
+            PTraceable aDerivative = queue.poll();
+            // Track visited elements to avoid infinite loop via directed cycles in traces
+            visited.add(aDerivative);
+            IMemoryView<PTraceable> nextOrigins = traceRecords.lookup(aDerivative);
+            if (nextOrigins == null){
+                // End of trace chain
+                result.add(aDerivative);
+            } else {
+                // Follow traces
+                for(PTraceable nextOrigin : nextOrigins){
+                    if (!visited.contains(nextOrigin)){
+                        queue.add(nextOrigin);
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public void addTrace(PTraceable original, PTraceable derivative){
+        traces.addPairOrNop(derivative, original);
+        inverseTraces.addPairOrNop(original, derivative);
+        // Even if this element was marked as removed earlier, now we replace it with another constraint!
+        removals.remove(original);
+    }
+    
+    @Override
+    public void derivativeRemoved(PTraceable derivative, IDerivativeModificationReason reason){
+        Preconditions.checkState(!removals.containsKey(derivative), "Traceable %s removed multiple times", derivative);
+        // XXX the derivative must not be removed from the trace chain, as some rewriters, e.g. the normalizer keeps trace links to deleted elements 
+        if (!inverseTraces.lookupExists(derivative)) {
+            // If there already exists a trace link, this removal means an update
+            removals.put(derivative, reason);
+        }
+    }
+
+    @Override
+    public boolean isRemoved(PTraceable traceable) {
+        return getRewrittenTraceables(traceable).allMatch(removed);
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public Stream<IDerivativeModificationReason> getRemovalReasons(PTraceable traceable) {
+        return getRewrittenTraceables(traceable).filter(removed).map(removals::get);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/NeverFlattenCallPredicate.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/NeverFlattenCallPredicate.java
new file mode 100644
index 00000000..96c0b205
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/NeverFlattenCallPredicate.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+
+/**
+ * @author Grill Balázs
+ * @since 1.4
+ *
+ */
+public class NeverFlattenCallPredicate implements IFlattenCallPredicate {
+
+
+    @Override
+    public boolean shouldFlatten(PositivePatternCall positivePatternCall) {
+        return false;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/NopTraceCollector.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/NopTraceCollector.java
new file mode 100644
index 00000000..15cf577e
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/NopTraceCollector.java
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Grill Balázs, IncQueryLabs
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PTraceable;
+
+/**
+ * This implementation does not store any traces and scales to NOP for every traceability feature.
+ * @since 1.6
+ *
+ */
+public class NopTraceCollector implements IRewriterTraceCollector {
+
+    public static final IRewriterTraceCollector INSTANCE = new NopTraceCollector();
+    
+    private NopTraceCollector() {
+        // Private constructor to force using the common instance
+    }
+    
+    /**
+     * @since 2.0
+     */
+    @Override
+    public Stream<PTraceable> getCanonicalTraceables(PTraceable derivative) {
+        return Stream.empty();
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public Stream<PTraceable> getRewrittenTraceables(PTraceable source) {
+        return Stream.empty();
+    }
+
+
+    @Override
+    public void addTrace(PTraceable origin, PTraceable derivative) {
+        // ignored
+    }
+
+    @Override
+    public void derivativeRemoved(PTraceable derivative, IDerivativeModificationReason reason) {
+        // ignored
+    }
+
+    @Override
+    public boolean isRemoved(PTraceable traceable) {
+        return false;
+    }
+
+    /**
+     * @since 2.0
+     */
+    @Override
+    public Stream<IDerivativeModificationReason> getRemovalReasons(PTraceable traceable) {
+        return Stream.empty();
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PBodyCopier.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PBodyCopier.java
new file mode 100644
index 00000000..10ab19c8
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PBodyCopier.java
@@ -0,0 +1,307 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Marton Bur, Akos Horvath, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * Copyright (c) 2023 The Refinery Authors <https://refinery.tools>
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+import tools.refinery.viatra.runtime.matchers.psystem.EnumerablePConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.*;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.*;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PParameter;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IConstraintFilter.AllowAllFilter;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IVariableRenamer.SameName;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * This class can create a new PBody for a PQuery. The result body contains a copy of given variables and constraints.
+ *
+ * @author Marton Bur
+ *
+ */
+public class PBodyCopier extends AbstractRewriterTraceSource {
+
+    /**
+     * The created body
+     */
+    protected PBody body;
+    /**
+     * Mapping between the original and the copied variables
+     */
+    protected Map<PVariable, PVariable> variableMapping = new HashMap<>();
+
+    public Map<PVariable, PVariable> getVariableMapping() {
+        return variableMapping;
+    }
+
+    /**
+     * @since 1.6
+     */
+    public PBodyCopier(PBody body, IRewriterTraceCollector traceCollector) {
+        this.body = new PBody(body.getPattern());
+        setTraceCollector(traceCollector);
+
+        // do the actual copying
+        mergeBody(body);
+    }
+
+    /**
+     * @since 1.6
+     */
+    public PBodyCopier(PQuery query) {
+        this.body = new PBody(query);
+    }
+
+    public void mergeBody(PBody sourceBody) {
+        mergeBody(sourceBody, new SameName(), new AllowAllFilter());
+    }
+
+    /**
+     * Merge all variables and constraints from a source body to a target body. If multiple bodies are merged into a
+     * single one, use the renamer and filter options to avoid collisions.
+     */
+    public void mergeBody(PBody sourceBody, IVariableRenamer namingTool, IConstraintFilter filter) {
+
+        // Copy variables
+        Set<PVariable> allVariables = sourceBody.getAllVariables();
+        for (PVariable pVariable : allVariables) {
+            if (pVariable.isUnique()) {
+                copyVariable(pVariable, namingTool.createVariableName(pVariable, sourceBody.getPattern()));
+            }
+        }
+
+        // Copy exported parameters
+        this.body.setSymbolicParameters(sourceBody.getSymbolicParameters().stream()
+                .map(this::copyExportedParameterConstraint).collect(Collectors.toList()));
+
+        // Copy constraints which are not filtered
+        Set<PConstraint> constraints = sourceBody.getConstraints();
+        for (PConstraint pConstraint : constraints) {
+            if (!(pConstraint instanceof ExportedParameter) && !filter.filter(pConstraint)) {
+                copyConstraint(pConstraint);
+            }
+        }
+
+        // Add trace between original and copied body
+        addTrace(sourceBody, body);
+    }
+
+    protected void copyVariable(PVariable variable, String newName) {
+        PVariable newPVariable = body.getOrCreateVariableByName(newName);
+        variableMapping.put(variable, newPVariable);
+    }
+
+    /**
+     * Returns the body with the copied variables and constraints. The returned body is still uninitialized.
+     */
+    public PBody getCopiedBody() {
+        return body;
+    }
+
+    protected void copyConstraint(PConstraint constraint) {
+        if (constraint instanceof ExportedParameter) {
+            copyExportedParameterConstraint((ExportedParameter) constraint);
+        } else if (constraint instanceof Equality) {
+            copyEqualityConstraint((Equality) constraint);
+        } else if (constraint instanceof Inequality) {
+            copyInequalityConstraint((Inequality) constraint);
+        } else if (constraint instanceof TypeConstraint) {
+            copyTypeConstraint((TypeConstraint) constraint);
+        } else if (constraint instanceof TypeFilterConstraint) {
+            copyTypeFilterConstraint((TypeFilterConstraint) constraint);
+        } else if (constraint instanceof ConstantValue) {
+            copyConstantValueConstraint((ConstantValue) constraint);
+        } else if (constraint instanceof PositivePatternCall) {
+            copyPositivePatternCallConstraint((PositivePatternCall) constraint);
+        } else if (constraint instanceof NegativePatternCall) {
+            copyNegativePatternCallConstraint((NegativePatternCall) constraint);
+        } else if (constraint instanceof BinaryTransitiveClosure) {
+            copyBinaryTransitiveClosureConstraint((BinaryTransitiveClosure) constraint);
+                } else if (constraint instanceof RepresentativeElectionConstraint) {
+                        copyRepresentativeElectionConstraint((RepresentativeElectionConstraint) constraint);
+        } else if (constraint instanceof RelationEvaluation) {
+            copyRelationEvaluationConstraint((RelationEvaluation) constraint);
+        } else if (constraint instanceof BinaryReflexiveTransitiveClosure) {
+            copyBinaryReflexiveTransitiveClosureConstraint((BinaryReflexiveTransitiveClosure) constraint);
+        } else if (constraint instanceof PatternMatchCounter) {
+            copyPatternMatchCounterConstraint((PatternMatchCounter) constraint);
+        } else if (constraint instanceof AggregatorConstraint) {
+            copyAggregatorConstraint((AggregatorConstraint) constraint);
+        } else if (constraint instanceof ExpressionEvaluation) {
+            copyExpressionEvaluationConstraint((ExpressionEvaluation) constraint);
+        } else {
+            throw new QueryProcessingException("Unknown PConstraint {0} encountered while copying PBody",
+                    new String[] { constraint.getClass().getName() }, "Unknown PConstraint", body.getPattern());
+        }
+    }
+
+    protected ExportedParameter copyExportedParameterConstraint(ExportedParameter exportedParameter) {
+        PVariable mappedPVariable = variableMapping.get(exportedParameter.getParameterVariable());
+        PParameter parameter = exportedParameter.getPatternParameter();
+        ExportedParameter newExportedParameter;
+        newExportedParameter = new ExportedParameter(body, mappedPVariable, parameter);
+        body.getSymbolicParameters().add(newExportedParameter);
+        addTrace(exportedParameter, newExportedParameter);
+        return newExportedParameter;
+    }
+
+    protected void copyEqualityConstraint(Equality equality) {
+        PVariable who = equality.getWho();
+        PVariable withWhom = equality.getWithWhom();
+        addTrace(equality, new Equality(body, variableMapping.get(who), variableMapping.get(withWhom)));
+    }
+
+    protected void copyInequalityConstraint(Inequality inequality) {
+        PVariable who = inequality.getWho();
+        PVariable withWhom = inequality.getWithWhom();
+        addTrace(inequality, new Inequality(body, variableMapping.get(who), variableMapping.get(withWhom)));
+    }
+
+    protected void copyTypeConstraint(TypeConstraint typeConstraint) {
+        PVariable[] mappedVariables = extractMappedVariables(typeConstraint);
+        Tuple variablesTuple = Tuples.flatTupleOf((Object[]) mappedVariables);
+        addTrace(typeConstraint, new TypeConstraint(body, variablesTuple, typeConstraint.getSupplierKey()));
+    }
+
+    protected void copyTypeFilterConstraint(TypeFilterConstraint typeConstraint) {
+        PVariable[] mappedVariables = extractMappedVariables(typeConstraint);
+        Tuple variablesTuple = Tuples.flatTupleOf((Object[]) mappedVariables);
+        addTrace(typeConstraint, new TypeFilterConstraint(body, variablesTuple, typeConstraint.getInputKey()));
+    }
+
+    protected void copyConstantValueConstraint(ConstantValue constantValue) {
+        PVariable pVariable = (PVariable) constantValue.getVariablesTuple().getElements()[0];
+        addTrace(constantValue,
+                new ConstantValue(body, variableMapping.get(pVariable), constantValue.getSupplierKey()));
+    }
+
+    protected void copyPositivePatternCallConstraint(PositivePatternCall positivePatternCall) {
+        PVariable[] mappedVariables = extractMappedVariables(positivePatternCall);
+        Tuple variablesTuple = Tuples.flatTupleOf((Object[]) mappedVariables);
+        addTrace(positivePatternCall,
+                new PositivePatternCall(body, variablesTuple, positivePatternCall.getReferredQuery()));
+    }
+
+    protected void copyNegativePatternCallConstraint(NegativePatternCall negativePatternCall) {
+        PVariable[] mappedVariables = extractMappedVariables(negativePatternCall);
+        Tuple variablesTuple = Tuples.flatTupleOf((Object[]) mappedVariables);
+        addTrace(negativePatternCall,
+                new NegativePatternCall(body, variablesTuple, negativePatternCall.getReferredQuery()));
+    }
+
+    protected void copyBinaryTransitiveClosureConstraint(BinaryTransitiveClosure binaryTransitiveClosure) {
+        PVariable[] mappedVariables = extractMappedVariables(binaryTransitiveClosure);
+        Tuple variablesTuple = Tuples.flatTupleOf((Object[]) mappedVariables);
+        addTrace(binaryTransitiveClosure,
+                new BinaryTransitiveClosure(body, variablesTuple, binaryTransitiveClosure.getReferredQuery()));
+    }
+
+        protected void copyRepresentativeElectionConstraint(RepresentativeElectionConstraint constraint) {
+                var mappedVariables = extractMappedVariables(constraint);
+                var variablesTuple = Tuples.flatTupleOf((Object[]) mappedVariables);
+                addTrace(constraint, new RepresentativeElectionConstraint(body, variablesTuple, constraint.getReferredQuery(),
+                                constraint.getConnectivity()));
+        }
+
+    /**
+     * @since 2.8
+     */
+    protected void copyRelationEvaluationConstraint(RelationEvaluation relationEvaluation) {
+        PVariable[] mappedVariables = extractMappedVariables(relationEvaluation);
+        Tuple variablesTuple = Tuples.flatTupleOf((Object[]) mappedVariables);
+        addTrace(relationEvaluation, new RelationEvaluation(body, variablesTuple, relationEvaluation.getReferredQueries(),
+                relationEvaluation.getEvaluator()));
+    }
+
+    /**
+     * @since 2.0
+     */
+    protected void copyBinaryReflexiveTransitiveClosureConstraint(
+            BinaryReflexiveTransitiveClosure binaryReflexiveTransitiveClosure) {
+        PVariable[] mappedVariables = extractMappedVariables(binaryReflexiveTransitiveClosure);
+        Tuple variablesTuple = Tuples.flatTupleOf((Object[]) mappedVariables);
+        addTrace(binaryReflexiveTransitiveClosure,
+                new BinaryReflexiveTransitiveClosure(body, variablesTuple,
+                        binaryReflexiveTransitiveClosure.getReferredQuery(),
+                        binaryReflexiveTransitiveClosure.getUniverseType()));
+    }
+
+    protected void copyPatternMatchCounterConstraint(PatternMatchCounter patternMatchCounter) {
+        PVariable[] mappedVariables = extractMappedVariables(patternMatchCounter);
+        PVariable mappedResultVariable = variableMapping.get(patternMatchCounter.getResultVariable());
+        Tuple variablesTuple = Tuples.flatTupleOf((Object[]) mappedVariables);
+        addTrace(patternMatchCounter, new PatternMatchCounter(body, variablesTuple,
+                patternMatchCounter.getReferredQuery(), mappedResultVariable));
+    }
+
+    /**
+     * @since 1.4
+     */
+    protected void copyAggregatorConstraint(AggregatorConstraint constraint) {
+        PVariable[] mappedVariables = extractMappedVariables(constraint);
+        PVariable mappedResultVariable = variableMapping.get(constraint.getResultVariable());
+        Tuple variablesTuple = Tuples.flatTupleOf((Object[]) mappedVariables);
+        addTrace(constraint, new AggregatorConstraint(constraint.getAggregator(), body, variablesTuple,
+                constraint.getReferredQuery(), mappedResultVariable, constraint.getAggregatedColumn()));
+    }
+
+    protected void copyExpressionEvaluationConstraint(ExpressionEvaluation expressionEvaluation) {
+        PVariable mappedOutputVariable = variableMapping.get(expressionEvaluation.getOutputVariable());
+        addTrace(expressionEvaluation, new ExpressionEvaluation(body,
+                new VariableMappingExpressionEvaluatorWrapper(expressionEvaluation.getEvaluator(), variableMapping),
+                mappedOutputVariable, expressionEvaluation.isUnwinding()));
+    }
+
+    /**
+     * For positive pattern calls
+     *
+     * @param positivePatternCall
+     * @return the mapped variables to the pattern's parameters
+     */
+    protected PVariable[] extractMappedVariables(EnumerablePConstraint enumerablePConstraint) {
+        Object[] pVariables = enumerablePConstraint.getVariablesTuple().getElements();
+        return mapVariableList(pVariables);
+    }
+
+    /**
+     * For negative and count pattern calls.
+     *
+     * @param patternMatchCounter
+     * @return the mapped variables to the pattern's parameters
+     */
+    private PVariable[] extractMappedVariables(PatternCallBasedDeferred patternCallBasedDeferred) {
+        Object[] pVariables = patternCallBasedDeferred.getActualParametersTuple().getElements();
+        return mapVariableList(pVariables);
+    }
+
+    /**
+     * For type filters.
+     */
+    private PVariable[] extractMappedVariables(TypeFilterConstraint typeFilterConstraint) {
+        Object[] pVariables = typeFilterConstraint.getVariablesTuple().getElements();
+        return mapVariableList(pVariables);
+    }
+
+    private PVariable[] mapVariableList(Object[] pVariables) {
+        List<PVariable> list = new ArrayList<PVariable>();
+        for (int i = 0; i < pVariables.length; i++) {
+            PVariable mappedVariable = variableMapping.get(pVariables[i]);
+            list.add(mappedVariable);
+        }
+        return list.toArray(new PVariable[0]);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PBodyNormalizer.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PBodyNormalizer.java
new file mode 100644
index 00000000..90943129
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PBodyNormalizer.java
@@ -0,0 +1,310 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2010 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.IQueryMetaContext;
+import tools.refinery.viatra.runtime.matchers.planning.QueryProcessingException;
+import tools.refinery.viatra.runtime.matchers.planning.helpers.TypeHelper;
+import tools.refinery.viatra.runtime.matchers.psystem.ITypeConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.ITypeInfoProviderConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.TypeJudgement;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.Equality;
+import tools.refinery.viatra.runtime.matchers.psystem.basicdeferred.Inequality;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PDisjunction;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery.PQueryStatus;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory;
+
+/**
+ * A disjunction rewriter for creating a normalized form of specification, unifying variables and running basic sanity
+ * checks. This rewriter does not copy but modifies directly the original specification, requiring a mutable
+ * disjunction.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public class PBodyNormalizer extends PDisjunctionRewriter {
+
+    private IQueryMetaContext context;
+
+    public PBodyNormalizer(IQueryMetaContext context) {
+        this.context = context;
+    }
+
+    /**
+     * Returns whether unary constraint elimination is enabled. This behavior can be customized by creating a subclass
+     * with a custom implementation.
+     * 
+     * @since 1.6
+     */
+    protected boolean shouldCalculateImpliedTypes(PQuery query) {
+        return true;
+    }
+
+    /**
+     * Returns whether 'weakened alternative' suggestions of the context shall be expanded as additional PConstraints. 
+     * This behavior can be customized by creating a subclass
+     * with a custom implementation.
+     * 
+     * @since 1.6
+     */
+    protected boolean shouldExpandWeakenedAlternatives(PQuery query) {
+        return false;
+    }
+
+    @Override
+    public PDisjunction rewrite(PDisjunction disjunction) {
+        Set<PBody> normalizedBodies = new LinkedHashSet<>();
+        for (PBody body : disjunction.getBodies()) {
+            PBodyCopier copier = new PBodyCopier(body, getTraceCollector());
+            PBody modifiedBody = copier.getCopiedBody();
+            normalizeBody(modifiedBody);
+            normalizedBodies.add(modifiedBody);
+            modifiedBody.setStatus(PQueryStatus.OK);
+        }
+        return new PDisjunction(normalizedBodies);
+    }
+
+    public void setContext(IQueryMetaContext context) {
+        this.context = context;
+    }
+
+    /**
+     * Provides a normalized version of the pattern body. May return a different version than the original version if
+     * needed.
+     * 
+     * @param body
+     */
+    public PBody normalizeBody(PBody body) {
+        try {
+            return normalizeBodyInternal(body);
+        } catch (QueryProcessingException e) {
+            throw new RewriterException("Error during rewriting: {1}", new String[] { e.getMessage() },
+                    e.getShortMessage(), body.getPattern(), e);
+        }
+    }
+
+    PBody normalizeBodyInternal(PBody body) {
+        // UNIFICATION AND WEAK INEQUALITY ELIMINATION
+        unifyVariablesAlongEqualities(body);
+        eliminateWeakInequalities(body);
+        removeMootEqualities(body);
+
+        // ADDING WEAKENED ALTERNATIVES
+        if (shouldExpandWeakenedAlternatives(body.getPattern())) {
+            expandWeakenedAlternativeConstraints(body);
+        }
+        
+        // CONSTRAINT ELIMINATION WITH TYPE INFERENCE
+        if (shouldCalculateImpliedTypes(body.getPattern())) {
+            eliminateInferrableTypes(body, context);
+        } else {
+            // ELIMINATE DUPLICATE TYPE CONSTRAINTS
+            eliminateDuplicateTypeConstraints(body);
+        }
+
+        
+        // PREVENTIVE CHECKS
+        checkSanity(body);
+        return body;
+    }
+    
+    private void removeMootEqualities(PBody body) {
+        Set<Equality> equals = body.getConstraintsOfType(Equality.class);
+        for (Equality equality : equals) {
+            if (equality.isMoot()) {
+                equality.delete();
+                derivativeRemoved(equality, ConstraintRemovalReason.MOOT_EQUALITY);
+            }
+        }
+    }
+
+    /**
+     * Unifies allVariables along equalities so that they can be handled as one.
+     * 
+     * @param body
+     */
+    void unifyVariablesAlongEqualities(PBody body) {
+        Set<Equality> equals = body.getConstraintsOfType(Equality.class);
+        for (Equality equality : equals) {
+            if (!equality.isMoot()) {
+                equality.getWho().unifyInto(equality.getWithWhom());
+            }
+        }
+    }
+
+    /**
+     * Eliminates weak inequalities if they are not substantiated.
+     * 
+     * @param body
+     */
+    void eliminateWeakInequalities(PBody body) {
+        for (Inequality inequality : body.getConstraintsOfType(Inequality.class)){
+            if (inequality.isEliminable()){
+                inequality.eliminateWeak();
+                derivativeRemoved(inequality, ConstraintRemovalReason.WEAK_INEQUALITY_SELF_LOOP);
+            }
+        }
+    }
+
+    /**
+     * Eliminates all type constraints that are inferrable from other constraints.
+     */
+    void eliminateInferrableTypes(final PBody body, IQueryMetaContext context) {
+        Set<TypeJudgement> subsumedByRetainedConstraints = new HashSet<TypeJudgement>();
+        LinkedList<ITypeConstraint> allTypeConstraints = new LinkedList<ITypeConstraint>();
+        for (PConstraint pConstraint : body.getConstraints()) {
+            if (pConstraint instanceof ITypeConstraint) {
+                allTypeConstraints.add((ITypeConstraint) pConstraint);
+            } else if (pConstraint instanceof ITypeInfoProviderConstraint) {
+                // non-type constraints are all retained
+                final Set<TypeJudgement> directJudgements = ((ITypeInfoProviderConstraint) pConstraint)
+                        .getImpliedJudgements(context);
+                subsumedByRetainedConstraints = TypeHelper.typeClosure(subsumedByRetainedConstraints, directJudgements,
+                        context);
+            }
+        }
+        Comparator<ITypeConstraint> eliminationOrder = (o1, o2) -> {
+            IInputKey type1 = o1.getEquivalentJudgement().getInputKey();
+            IInputKey type2 = o2.getEquivalentJudgement().getInputKey();
+            
+            int result = context.getSuggestedEliminationOrdering().compare(type1, type2);
+            return (result == 0) 
+                    ? PConstraint.COMPARE_BY_MONOTONOUS_ID.compare(o1, o2) 
+                    : result;
+        }; 
+                
+        Collections.sort(allTypeConstraints, eliminationOrder);
+        Queue<ITypeConstraint> potentialConstraints = allTypeConstraints; // rename for better comprehension
+
+        while (!potentialConstraints.isEmpty()) {
+            ITypeConstraint candidate = potentialConstraints.poll();
+
+            boolean isSubsumed = subsumedByRetainedConstraints.contains(candidate.getEquivalentJudgement());
+            if (!isSubsumed) {
+                Set<TypeJudgement> typeClosure = subsumedByRetainedConstraints;
+                for (ITypeConstraint subsuming : potentialConstraints) { // the remaining ones
+                    final Set<TypeJudgement> directJudgements = subsuming.getImpliedJudgements(context);
+                    typeClosure = TypeHelper.typeClosure(typeClosure, directJudgements, context);
+
+                    if (typeClosure.contains(candidate.getEquivalentJudgement())) {
+                        isSubsumed = true;
+                        break;
+                    }
+                }
+            }
+            if (isSubsumed) { // eliminated
+                candidate.delete();
+                derivativeRemoved(candidate, ConstraintRemovalReason.TYPE_SUBSUMED);
+            } else { // retained
+                subsumedByRetainedConstraints = TypeHelper.typeClosure(subsumedByRetainedConstraints,
+                        candidate.getImpliedJudgements(context), context);
+            }
+        }
+    }
+
+    /**
+     * Inserts "weakened alternative" constraints suggested by the meta context that aid in coming up with a query plan.
+     */
+    void expandWeakenedAlternativeConstraints(PBody body) {
+        Set<TypeJudgement> allJudgements = new HashSet<TypeJudgement>();
+        Set<TypeJudgement> newJudgementsToAdd = new HashSet<TypeJudgement>();
+        Queue<TypeJudgement> judgementsToProcess = new LinkedList<TypeJudgement>();
+        Map<TypeJudgement, List<PConstraint>> traceability = CollectionsFactory.createMap();
+        
+        for (ITypeConstraint typeConstraint : body.getConstraintsOfType(ITypeConstraint.class)) {
+            TypeJudgement equivalentJudgement = typeConstraint.getEquivalentJudgement();
+            judgementsToProcess.add(equivalentJudgement);
+            allJudgements.add(equivalentJudgement);
+            traceability.computeIfAbsent(equivalentJudgement, k-> new ArrayList<>()).add(typeConstraint);
+        }
+        
+        while (!judgementsToProcess.isEmpty()) {
+            TypeJudgement judgement = judgementsToProcess.poll();
+            for (TypeJudgement alternativeJudgement : judgement.getWeakenedAlternativeJudgements(context)) {
+                if (allJudgements.add(alternativeJudgement)) {
+                    newJudgementsToAdd.add(alternativeJudgement);
+                    judgementsToProcess.add(alternativeJudgement);
+                    traceability.merge(
+                            alternativeJudgement, 
+                            traceability.getOrDefault(judgement, new ArrayList<>()),
+                            (old,further) -> {old.addAll(further); return old;}
+                    );
+                }
+            }
+        }
+        
+        for (TypeJudgement typeJudgement : newJudgementsToAdd) {
+            PConstraint newConstraint = typeJudgement.createConstraintFor(body);
+            for (PConstraint source : traceability.getOrDefault(typeJudgement, Collections.emptyList())) {
+                addTrace(source, newConstraint);
+            }
+        }        
+    }
+    
+    private Object getConstraintKey(PConstraint constraint) {
+        if (constraint instanceof ITypeConstraint) {
+            return ((ITypeConstraint) constraint).getEquivalentJudgement();
+        }
+        // Do not check duplication for any other types
+        return constraint;
+    }
+    
+    void eliminateDuplicateTypeConstraints(PBody body) {
+        Map<Object, PConstraint> constraints = new HashMap<>();
+        for (PConstraint constraint : body.getConstraints()) {
+            Object key = getConstraintKey(constraint);
+            // Retain first found instance of a constraint
+            if (!constraints.containsKey(key)) {
+                constraints.put(key, constraint);
+            }
+        }
+
+        // Retain collected constraints, remove everything else
+        Iterator<PConstraint> iterator = body.getConstraints().iterator();
+        Collection<PConstraint> toRetain = constraints.values(); 
+        while(iterator.hasNext()){
+            PConstraint next = iterator.next();
+            if (!toRetain.contains(next)){
+                derivativeRemoved(next, ConstraintRemovalReason.DUPLICATE);
+                iterator.remove();
+            }
+        }
+    }
+    
+    /**
+     * Verifies the sanity of all constraints. Should be issued as a preventive check before layouting.
+     * 
+     * @param body
+     * @throws RetePatternBuildException
+     */
+    void checkSanity(PBody body) {
+        for (PConstraint pConstraint : body.getConstraints())
+            pConstraint.checkSanity();
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PDisjunctionRewriter.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PDisjunctionRewriter.java
new file mode 100644
index 00000000..c844ccf7
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PDisjunctionRewriter.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PDisjunction;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * An abstract base class for creating alternative representations for PDisjunctions.
+ * @author Zoltan Ujhelyi
+ *
+ */
+public abstract class PDisjunctionRewriter extends AbstractRewriterTraceSource{
+    
+    public abstract PDisjunction rewrite(PDisjunction disjunction);
+    
+    public PDisjunction rewrite(PQuery query) {
+        return rewrite(query.getDisjunctBodies());
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PDisjunctionRewriterCacher.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PDisjunctionRewriterCacher.java
new file mode 100644
index 00000000..eb5422ca
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PDisjunctionRewriterCacher.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.WeakHashMap;
+
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PDisjunction;
+
+/**
+ * A rewriter that stores the previously computed results of a rewriter or a rewriter chain.
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 1.0
+ */
+public class PDisjunctionRewriterCacher extends PDisjunctionRewriter {
+
+    private final List<PDisjunctionRewriter> rewriterChain;
+    private WeakHashMap<PDisjunction, PDisjunction> cachedResults =
+            new WeakHashMap<PDisjunction, PDisjunction>();
+
+    private void setupTraceCollectorInChain(){
+        IRewriterTraceCollector collector = getTraceCollector();
+        for(PDisjunctionRewriter rewriter: rewriterChain){
+            rewriter.setTraceCollector(collector);
+        }
+    }
+    
+    public PDisjunctionRewriterCacher(PDisjunctionRewriter rewriter) {
+        rewriterChain = Collections.singletonList(rewriter);
+    }
+    
+    public PDisjunctionRewriterCacher(PDisjunctionRewriter... rewriters) {
+        rewriterChain = new ArrayList<>(Arrays.asList(rewriters));
+    }
+    
+    public PDisjunctionRewriterCacher(List<PDisjunctionRewriter> rewriterChain) {
+        this.rewriterChain = new ArrayList<>(rewriterChain);
+    }
+    
+    @Override
+    public PDisjunction rewrite(PDisjunction disjunction) {
+        if (!cachedResults.containsKey(disjunction)) {
+            PDisjunction rewritten = disjunction;
+            setupTraceCollectorInChain();
+            for (PDisjunctionRewriter rewriter : rewriterChain) {
+                rewritten = rewriter.rewrite(rewritten);
+            }
+            
+            cachedResults.put(disjunction, rewritten);
+        }
+        return cachedResults.get(disjunction);
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PQueryFlattener.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PQueryFlattener.java
new file mode 100644
index 00000000..76311d8f
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/PQueryFlattener.java
@@ -0,0 +1,253 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Marton Bur, Akos Horvath, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PDisjunction;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery.PQueryStatus;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IConstraintFilter.AllowAllFilter;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IConstraintFilter.ExportedParameterFilter;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IVariableRenamer.HierarchicalName;
+import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IVariableRenamer.SameName;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+import tools.refinery.viatra.runtime.matchers.util.Sets;
+
+/**
+ * This rewriter class holds the query flattening logic
+ * 
+ * @author Marton Bur
+ * 
+ */
+public class PQueryFlattener extends PDisjunctionRewriter {
+
+    /**
+     * Utility function to produce the permutation of every possible mapping of values.
+     * 
+     * @param values
+     * @return
+     */
+    private static <K, V> Set<Map<K, V>> permutation(Map<K, Set<V>> values) {
+        // An ordering of keys is defined here which will help restoring the appropriate values after the execution of
+        // the cartesian product
+        List<K> keyList = new ArrayList<>(values.keySet());
+
+        // Produce list of value sets with the ordering defined by keyList
+        List<Set<V>> valuesList = new ArrayList<Set<V>>(keyList.size());
+        for (K key : keyList) {
+            valuesList.add(values.get(key));
+        }
+
+        // Cartesian product will obey ordering of the list
+        Set<List<V>> valueMappings = Sets.cartesianProduct(valuesList);
+
+        // Build result
+        Set<Map<K, V>> result = new LinkedHashSet<>();
+        for (List<V> valueList : valueMappings) {
+            Map<K, V> map = new HashMap<>();
+            for (int i = 0; i < keyList.size(); i++) {
+                map.put(keyList.get(i), valueList.get(i));
+            }
+            result.add(map);
+        }
+
+        return result;
+    }
+
+    private IFlattenCallPredicate flattenCallPredicate;
+
+    public PQueryFlattener(IFlattenCallPredicate flattenCallPredicate) {
+        this.flattenCallPredicate = flattenCallPredicate;
+    }
+
+    @Override
+    public PDisjunction rewrite(PDisjunction disjunction) {
+        PQuery query = disjunction.getQuery();
+
+        // Check for recursion
+        Set<PQuery> allReferredQueries = disjunction.getAllReferredQueries();
+        for (PQuery referredQuery : allReferredQueries) {
+            if (referredQuery.getAllReferredQueries().contains(referredQuery)) {
+                throw new RewriterException("Recursive queries are not supported, can't flatten query named \"{1}\"",
+                        new String[] { query.getFullyQualifiedName() }, "Unsupported recursive query", query);
+            }
+        }
+
+        return this.doFlatten(disjunction);
+    }
+
+    /**
+     * Return the list of dependencies (including the root) in chronological order
+     * 
+     * @param rootDisjunction
+     * @return
+     */
+    private List<PDisjunction> disjunctionDependencies(PDisjunction rootDisjunction) {
+        // Disjunctions are first collected into a list usign a depth-first approach,
+        // which can be iterated backwards while removing duplicates
+        Deque<PDisjunction> stack = new ArrayDeque<>();
+        LinkedList<PDisjunction> list = new LinkedList<>();
+        stack.push(rootDisjunction);
+        list.add(rootDisjunction);
+
+        while (!stack.isEmpty()) {
+            PDisjunction disjunction = stack.pop();
+            // Collect dependencies
+            for (PBody pBody : disjunction.getBodies()) {
+                for (PConstraint constraint : pBody.getConstraints()) {
+                    if (constraint instanceof PositivePatternCall) {
+                        PositivePatternCall positivePatternCall = (PositivePatternCall) constraint;
+                        if (flattenCallPredicate.shouldFlatten(positivePatternCall)) {
+                            // If the above preconditions meet, the call should be flattened
+                            PDisjunction calledDisjunction = positivePatternCall.getReferredQuery().getDisjunctBodies();
+                            stack.push(calledDisjunction);
+                            list.add(calledDisjunction);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Remove duplicates (keeping the last instance) and reverse order
+        Set<PDisjunction> visited = new HashSet<PDisjunction>();
+        List<PDisjunction> result = new ArrayList<PDisjunction>(list.size());
+        
+        list.descendingIterator().forEachRemaining(item -> {
+            if (!visited.contains(item)) {
+                result.add(item);
+                visited.add(item);
+            }
+            
+        });
+
+        return result;
+    }
+
+    /**
+     * This function holds the actual flattening logic for a PQuery
+     * 
+     * @param rootDisjunction
+     *            to be flattened
+     * @return the flattened bodies of the pQuery
+     */
+    private PDisjunction doFlatten(PDisjunction rootDisjunction) {
+
+        Map<PDisjunction, Set<PBody>> flatBodyMapping = new HashMap<>();
+
+        List<PDisjunction> dependencies = disjunctionDependencies(rootDisjunction);
+
+        for (PDisjunction disjunction : dependencies) {
+            Set<PBody> flatBodies = new LinkedHashSet<>();
+            for (PBody body : disjunction.getBodies()) {
+                if (isFlatteningNeeded(body)) {
+                    Map<PositivePatternCall, Set<PBody>> flattenedBodies = new HashMap<>();
+                    for (PConstraint pConstraint : body.getConstraints()) {
+
+                        if (pConstraint instanceof PositivePatternCall) {
+                            PositivePatternCall positivePatternCall = (PositivePatternCall) pConstraint;
+                            if (flattenCallPredicate.shouldFlatten(positivePatternCall)) {
+                                // If the above preconditions meet, do the flattening and return the disjoint bodies
+                                PDisjunction calledDisjunction = positivePatternCall.getReferredQuery()
+                                        .getDisjunctBodies();
+
+                                Set<PBody> flattenedBodySet = flatBodyMapping.get(calledDisjunction);
+                                Preconditions.checkArgument(!flattenedBodySet.isEmpty());
+                                flattenedBodies.put(positivePatternCall, flattenedBodySet);
+                            }
+                        }
+                    }
+                    flatBodies.addAll(createSetOfFlatPBodies(body, flattenedBodies));
+                } else {
+                    flatBodies.add(prepareFlatPBody(body));
+                }
+            }
+            flatBodyMapping.put(disjunction, flatBodies);
+        }
+
+        return new PDisjunction(rootDisjunction.getQuery(), flatBodyMapping.get(rootDisjunction));
+    }
+
+    /**
+     * Creates the flattened bodies based on the caller body and the called (and already flattened) disjunctions
+     * 
+     * @param pBody
+     *            the body to flatten
+     * @param flattenedDisjunctions
+     *            the
+     * @param flattenedCalls
+     * @return
+     */
+    private Set<PBody> createSetOfFlatPBodies(PBody pBody, Map<PositivePatternCall, Set<PBody>> flattenedCalls) {
+        PQuery pQuery = pBody.getPattern();
+
+        Set<Map<PositivePatternCall, PBody>> conjunctedCalls = permutation(flattenedCalls);
+
+        // The result set containing the merged conjuncted bodies
+        Set<PBody> conjunctedBodies = new HashSet<>();
+
+        for (Map<PositivePatternCall, PBody> calledBodies : conjunctedCalls) {
+            FlattenerCopier copier = createBodyCopier(pQuery, calledBodies);
+
+            int i = 0;
+            HierarchicalName hierarchicalNamingTool = new HierarchicalName();
+            for (PositivePatternCall patternCall : calledBodies.keySet()) {
+                // Merge each called body
+                hierarchicalNamingTool.setCallCount(i++);
+                copier.mergeBody(patternCall, hierarchicalNamingTool, new ExportedParameterFilter());
+            }
+
+            // Merge the caller's constraints to the conjunct body
+            copier.mergeBody(pBody);
+
+            PBody copiedBody = copier.getCopiedBody();
+            copiedBody.setStatus(PQueryStatus.OK);
+            conjunctedBodies.add(copiedBody);
+        }
+
+        return conjunctedBodies;
+    }
+
+    private FlattenerCopier createBodyCopier(PQuery query, Map<PositivePatternCall, PBody> calledBodies) {
+        FlattenerCopier flattenerCopier = new FlattenerCopier(query, calledBodies);
+        flattenerCopier.setTraceCollector(getTraceCollector());
+        return flattenerCopier;
+    }
+
+    private PBody prepareFlatPBody(PBody pBody) {
+        PBodyCopier copier = createBodyCopier(pBody.getPattern(), Collections.<PositivePatternCall, PBody> emptyMap());
+        copier.mergeBody(pBody, new SameName(), new AllowAllFilter());
+        // the copying of the body here is necessary for only one containing PDisjunction can be assigned to a PBody
+        return copier.getCopiedBody();
+    }
+
+    private boolean isFlatteningNeeded(PBody pBody) {
+        // Check if the body contains positive pattern call AND if it should be flattened
+        for (PConstraint pConstraint : pBody.getConstraints()) {
+            if (pConstraint instanceof PositivePatternCall) {
+                return flattenCallPredicate.shouldFlatten((PositivePatternCall) pConstraint);
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/RewriterException.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/RewriterException.java
new file mode 100644
index 00000000..d0fc286b
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/RewriterException.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2014, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import tools.refinery.viatra.runtime.matchers.psystem.queries.QueryInitializationException;
+
+/**
+ * An exception to wrap various issues during PDisjunction rewriting.
+ * @author Zoltan Ujhelyi
+ *
+ */
+public class RewriterException extends QueryInitializationException {
+
+    private static final long serialVersionUID = -4703825954995497932L;
+
+    public RewriterException(String message, String[] context, String shortMessage, Object patternDescription,
+            Throwable cause) {
+        super(message, context, shortMessage, patternDescription, cause);
+    }
+
+    public RewriterException(String message, String[] context, String shortMessage, Object patternDescription) {
+        super(message, context, shortMessage, patternDescription);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/SurrogateQueryRewriter.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/SurrogateQueryRewriter.java
new file mode 100644
index 00000000..71459558
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/SurrogateQueryRewriter.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import tools.refinery.viatra.runtime.matchers.context.IInputKey;
+import tools.refinery.viatra.runtime.matchers.context.surrogate.SurrogateQueryRegistry;
+import tools.refinery.viatra.runtime.matchers.psystem.PBody;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import tools.refinery.viatra.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PDisjunction;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery.PQueryStatus;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuples;
+
+/**
+ * @author Zoltan Ujhelyi
+ *
+ */
+public class SurrogateQueryRewriter extends PDisjunctionRewriter {
+
+    @Override
+    public PDisjunction rewrite(PDisjunction disjunction) {
+        Set<PBody> replacedBodies = new LinkedHashSet<>();
+        for (PBody body : disjunction.getBodies()) {
+            PBodyCopier copier = new PBodyCopier(body, getTraceCollector()) {
+                
+                @Override
+                protected void copyTypeConstraint(TypeConstraint typeConstraint) {
+                    PVariable[] mappedVariables = extractMappedVariables(typeConstraint);
+                    Tuple variablesTuple = Tuples.flatTupleOf((Object[])mappedVariables);       
+                    final IInputKey supplierKey = typeConstraint.getSupplierKey();
+                    if(SurrogateQueryRegistry.instance().hasSurrogateQueryFQN(supplierKey)) {
+                        PQuery surrogateQuery = SurrogateQueryRegistry.instance().getSurrogateQuery(supplierKey);
+                        if (surrogateQuery == null) {
+                            throw new IllegalStateException(
+                                        String.format("Surrogate query for feature %s not found", 
+                                                        supplierKey.getPrettyPrintableName()));
+                        }
+                        addTrace(typeConstraint, new PositivePatternCall(getCopiedBody(), variablesTuple, surrogateQuery));
+                    } else {
+                        addTrace(typeConstraint, new TypeConstraint(getCopiedBody(), variablesTuple, supplierKey));
+                    }
+                }
+            };
+            PBody modifiedBody = copier.getCopiedBody();
+            replacedBodies.add(modifiedBody);
+            modifiedBody.setStatus(PQueryStatus.OK);
+        }
+        return new PDisjunction(replacedBodies);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/VariableMappingExpressionEvaluatorWrapper.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/VariableMappingExpressionEvaluatorWrapper.java
new file mode 100644
index 00000000..10337979
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/psystem/rewriters/VariableMappingExpressionEvaluatorWrapper.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Grill Balázs, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.psystem.rewriters;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.psystem.IExpressionEvaluator;
+import tools.refinery.viatra.runtime.matchers.psystem.IValueProvider;
+import tools.refinery.viatra.runtime.matchers.psystem.PVariable;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * A wrapper for {@link IExpressionEvaluator} which is capable of correctly mapping variable names used by the
+ * expression.
+ * 
+ * @author Grill Balázs
+ *
+ */
+class VariableMappingExpressionEvaluatorWrapper implements IExpressionEvaluator {
+
+    private final IExpressionEvaluator wrapped;
+    private final Map<String, String> variableMapping;
+    
+    public VariableMappingExpressionEvaluatorWrapper(IExpressionEvaluator wrapped,
+            Map<PVariable, PVariable> variableMapping) {
+        
+        // Support to rewrap an already wrapped expression.
+        boolean rewrap = wrapped instanceof VariableMappingExpressionEvaluatorWrapper;
+        this.wrapped = rewrap ? ((VariableMappingExpressionEvaluatorWrapper)wrapped).wrapped : wrapped;
+
+        // Instead of just saving the reference of the mapping, save the actual (trimmed) state of the mapping as it
+        // may change during copying (especially during flattening). A LinkedHashMap is used to retain ordering of
+        // original parameter names iterator.
+        this.variableMapping = new LinkedHashMap<>();
+
+        // Index map by variable names
+        Map<String, PVariable> names = new HashMap<>();
+        for (PVariable originalVar : variableMapping.keySet()) {
+            names.put(originalVar.getName(), originalVar);
+        }
+        
+        // In case of rewrapping, current names are contained by the previous mapping
+        Map<String, String> previousMapping = null;
+        if (rewrap){
+            previousMapping = ((VariableMappingExpressionEvaluatorWrapper)wrapped).variableMapping;
+        }
+
+        // Populate mapping
+        for (String inputParameterName : this.wrapped.getInputParameterNames()) {
+            String parameterName = rewrap ? previousMapping.get(inputParameterName) : inputParameterName;
+            Preconditions.checkArgument(parameterName != null);
+            PVariable original = names.get(parameterName);
+            Preconditions.checkArgument(original != null);
+            PVariable mapped = variableMapping.get(original);
+            if (mapped != null){
+                this.variableMapping.put(inputParameterName, mapped.getName());
+            }
+        }
+    }
+
+    @Override
+    public String getShortDescription() {
+        return wrapped.getShortDescription();
+    }
+
+    @Override
+    public Iterable<String> getInputParameterNames() {
+        return variableMapping.values();
+    }
+
+    @Override
+    public Object evaluateExpression(final IValueProvider provider) throws Exception {
+        return wrapped.evaluateExpression(variableName -> {
+            String mappedVariableName = variableMapping.get(variableName);
+            Preconditions.checkArgument(mappedVariableName != null, "Could not find variable %s", variableName);
+            return provider.getValue(mappedVariableName);
+        });
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/AbstractTuple.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/AbstractTuple.java
new file mode 100644
index 00000000..a26d9193
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/AbstractTuple.java
@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * Common implementation methods for immutable and volatile tuples. The class should not be used directly in client
+ * code, except for the definition of new tuple implementations.
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ */
+public abstract class AbstractTuple implements ITuple {
+
+    /**
+     * As the tuple is supposed to be immutable, do not modify the returned array.
+     * 
+     * @return the array containing all elements of this Tuple
+     */
+    @Override
+    public Object[] getElements() {
+        Object[] allElements = new Object[getSize()];
+        for (int i = 0; i < allElements.length; ++i)
+            allElements[i] = get(i);
+        return allElements;
+    }
+
+    /**
+     * @return the set containing all distinct elements of this Tuple, cast as type T
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> Set<T> getDistinctElements() {
+        Set<T> result = new HashSet<T>();
+        Object[] elements = getElements();
+        for (Object object : elements) {
+            result.add((T) object);
+        }
+        return result;
+    }
+
+    /**
+     * Calculates an inverted index of the elements of this pattern. For each element, the index of the (last)
+     * occurrence is calculated.
+     * 
+     * @return the inverted index mapping each element of this pattern to its index in the array
+     */
+    @Override
+    public Map<Object, Integer> invertIndex() {
+        Map<Object, Integer> result = new HashMap<Object, Integer>();
+        for (int i = 0; i < getSize(); i++)
+            result.put(get(i), i);
+        return result;
+    }
+
+    /**
+     * Calculates an inverted index of the elements of this pattern. For each element, the index of all of its
+     * occurrences is calculated.
+     * 
+     * @return the inverted index mapping each element of this pattern to its index in the array
+     */
+    @Override
+    public Map<Object, List<Integer>> invertIndexWithMupliplicity() {
+        Map<Object, List<Integer>> result = new HashMap<Object, List<Integer>>();
+        for (int i = 0; i < getSize(); i++) {
+            Object value = get(i);
+            List<Integer> indices = result.computeIfAbsent(value, v -> new ArrayList<>());
+            indices.add(i);
+        }
+        return result;
+    }
+
+    /**
+     * @since 1.7
+     */
+    protected IndexOutOfBoundsException raiseIndexingError(int index) {
+        return new IndexOutOfBoundsException(
+                String.format("No value at position %d for %s instance %s", index, getClass().getSimpleName(), this));
+    }
+
+    /**
+     * Compares the elements stored in this tuple to another tuple
+     */
+    protected boolean internalEquals(ITuple other) {
+        if (getSize() != other.getSize())
+            return false;
+        boolean result = true;
+        for (int i = 0; result && i < getSize(); ++i) {
+            Object ours = get(i);
+            Object theirs = other.get(i);
+            result = result && Objects.equals(ours, theirs);
+        }
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder s = new StringBuilder();
+        s.append("T(");
+        for (Object o : getElements()) {
+            s.append(o == null ? "null" : o.toString());
+            s.append(';');
+        }
+        s.append(')');
+        return s.toString();
+    }
+
+    /**
+     * @since 1.7
+     */
+    protected int doCalcHash() {
+        final int PRIME = 31;
+        int hash = 1;
+        for (int i = 0; i < getSize(); i++) {
+            hash = PRIME * hash;
+            Object element = get(i);
+            if (element != null)
+                hash += element.hashCode();
+        }
+        return hash;
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/BaseFlatTuple.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/BaseFlatTuple.java
new file mode 100644
index 00000000..6f46b763
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/BaseFlatTuple.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+/**
+ * Base class for all flat tuple implementations.
+ * Flat tuples store all elements locally (do not reference other tuples).
+ * 
+ * @author Gabor Bergmann
+ * @since 1.7
+ */
+public abstract class BaseFlatTuple extends Tuple {
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/BaseLeftInheritanceTuple.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/BaseLeftInheritanceTuple.java
new file mode 100644
index 00000000..03f9ea89
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/BaseLeftInheritanceTuple.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+/**
+ * Common functionality of left inheritance tuple implementations.
+ * 
+ * <p>Left inheritance tuples inherit their first few elements from another tuple, 
+ * and extend it with additional "local" elements.
+ * 
+ * @author Gabor Bergmann
+ * @since 1.7
+ */
+public abstract class BaseLeftInheritanceTuple extends Tuple {
+
+    /**
+     * The number of elements that aren't stored locally, but inherited from an ancestor Tuple instead.
+     */
+    protected final int inheritedIndex;
+    /**
+     * This object contains the same elements as the ancestor on the first inheritedIndex positions
+     */
+    protected final Tuple ancestor;
+    
+    /**
+     * @param ancestor
+     */
+    public BaseLeftInheritanceTuple(Tuple ancestor) {
+        super();
+        this.ancestor = ancestor;
+        this.inheritedIndex = ancestor.getSize();
+    }
+
+    /**
+     * @return the number of local (non-inherited) elements
+     */
+    public abstract int getLocalSize();
+    
+    /**
+     * Optimized equals calculation (prediction: true, since hash values match)
+     */    
+    @Override
+    protected boolean internalEquals(ITuple other) {
+        if (other instanceof BaseLeftInheritanceTuple) {
+            BaseLeftInheritanceTuple blit = (BaseLeftInheritanceTuple) other;
+            if (blit.inheritedIndex == this.inheritedIndex) {
+                if (this.ancestor.equals(blit.ancestor)) {
+                    return localEquals(blit);
+                } else return false;
+            }
+        }
+        return super.internalEquals(other);
+    }
+
+    /**
+     * Checks the equivalence of local elements only, after ancestor tuple has been determined to be equal.
+     */
+    protected abstract boolean localEquals(BaseLeftInheritanceTuple other);
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple.java
new file mode 100644
index 00000000..8bbb0ac2
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.Arrays;
+
+/**
+ * Default Tuple implementation, with statically unknown arity.
+ * @author Gabor Bergmann 
+ */
+public final class FlatTuple extends BaseFlatTuple {
+
+    /**
+     * Array of substituted values. DO NOT MODIFY! Use Constructor to build a new instance instead.
+     */
+    private final Object[] elements;
+
+    /**
+     * Creates a FlatTuple instance, fills it with the given array.
+     * <p> Users should consider calling {@link Tuples#flatTupleOf(Object...)} instead to save memory on low-arity tuples.
+     * 
+     * @param elements
+     *            array of substitution values 
+     */
+    protected FlatTuple(Object... elements) {
+        this.elements = Arrays.copyOf(elements, elements.length);
+        calcHash();
+    }
+
+    @Override
+    public Object get(int index) {
+        return elements[index];
+    }
+
+    @Override
+    public int getSize() {
+        return elements.length;
+    }
+
+    @Override
+    public Object[] getElements() {
+        return elements;
+    }
+
+    @Override
+    protected boolean internalEquals(ITuple other) {
+        if (other instanceof FlatTuple) {
+            return Arrays.equals(elements, ((FlatTuple) other).elements);
+        } else
+            return super.internalEquals(other);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple0.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple0.java
new file mode 100644
index 00000000..93f412b7
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple0.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+/**
+ * Flat tuple with statically known arity of 0.
+ * 
+ * @author Gabor Bergmann
+ * @since 1.7
+ *
+ */
+public final class FlatTuple0 extends BaseFlatTuple {
+    protected static final FlatTuple0 INSTANCE = new FlatTuple0();
+
+    private FlatTuple0() {
+        calcHash();
+    }
+    
+    @Override
+    public int getSize() {
+        return 0;
+    }
+
+    @Override
+    public Object get(int index) {
+        throw raiseIndexingError(index);
+    }
+
+    private static final Object[] NULLARY_ARRAY = new Object[0];
+    
+    @Override
+    public Object[] getElements() {
+        return NULLARY_ARRAY;
+    }
+    
+    @Override
+    protected boolean internalEquals(ITuple other) {
+        return 0 == other.getSize();
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple1.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple1.java
new file mode 100644
index 00000000..b3b1c312
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple1.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.Objects;
+
+/**
+ * Flat tuple with statically known arity of 1.
+ * 
+ * @author Gabor Bergmann
+ * @since 1.7
+ *
+ */
+public final class FlatTuple1 extends BaseFlatTuple {
+    private final Object element0;
+
+    protected FlatTuple1(Object element0) {
+        this.element0 = element0;
+        calcHash();
+    }
+
+    @Override
+    public int getSize() {
+        return 1;
+    }
+
+    @Override
+    public Object get(int index) {
+        if (index == 0) return element0;
+        else throw raiseIndexingError(index);
+    }
+
+    @Override
+    protected boolean internalEquals(ITuple other) {
+        return 1 == other.getSize() &&
+                Objects.equals(element0, other.get(0));
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple2.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple2.java
new file mode 100644
index 00000000..2dcfd718
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple2.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.Objects;
+
+/**
+ * Flat tuple with statically known arity of 2.
+ * 
+ * @author Gabor Bergmann
+ * @since 1.7
+ *
+ */
+public final class FlatTuple2 extends BaseFlatTuple {
+    private final Object element0;
+    private final Object element1;
+
+    protected FlatTuple2(Object element0, Object element1) {
+        this.element0 = element0;
+        this.element1 = element1;
+        calcHash();
+   }
+
+    @Override
+    public int getSize() {
+        return 2;
+    }
+
+    @Override
+    public Object get(int index) {
+        switch(index) {
+        case 0 : return element0;
+        case 1 : return element1;
+        default: throw raiseIndexingError(index);
+        }
+    }
+    
+    @Override
+    protected boolean internalEquals(ITuple other) {
+        return 2 == other.getSize() &&
+                Objects.equals(element0, other.get(0)) &&
+                Objects.equals(element1, other.get(1));
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple3.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple3.java
new file mode 100644
index 00000000..50cee57e
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple3.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.Objects;
+
+/**
+ * Flat tuple with statically known arity of 3.
+ * 
+ * @author Gabor Bergmann
+ * @since 1.7
+ *
+ */
+public final class FlatTuple3 extends BaseFlatTuple {
+    private final Object element0;
+    private final Object element1;
+    private final Object element2;
+    
+    protected FlatTuple3(Object element0, Object element1, Object element2) {
+        this.element0 = element0;
+        this.element1 = element1;
+        this.element2 = element2;
+        calcHash();
+    }
+
+    @Override
+    public int getSize() {
+        return 3;
+    }
+
+    @Override
+    public Object get(int index) {
+        switch (index) {
+        case 0: return element0;
+        case 1: return element1;
+        case 2: return element2;
+        default: throw raiseIndexingError(index);
+        }
+    }
+    
+    @Override
+    protected boolean internalEquals(ITuple other) {
+        return 3 == other.getSize() &&
+                Objects.equals(element0, other.get(0)) &&
+                Objects.equals(element1, other.get(1)) &&
+                Objects.equals(element2, other.get(2));
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple4.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple4.java
new file mode 100644
index 00000000..024c94f4
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/FlatTuple4.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.Objects;
+
+/**
+ * Flat tuple with statically known arity of 4.
+ * 
+ * @author Gabor Bergmann
+ * @since 1.7
+ *
+ */
+public final class FlatTuple4 extends BaseFlatTuple {
+    private final Object element0;
+    private final Object element1;
+    private final Object element2;
+    private final Object element3;
+
+    protected FlatTuple4(Object element0, Object element1, Object element2, Object element3) {
+        this.element0 = element0;
+        this.element1 = element1;
+        this.element2 = element2;
+        this.element3 = element3;
+        calcHash();
+    }
+    
+    @Override
+    public int getSize() {
+        return 4;
+    }
+
+    @Override
+    public Object get(int index) {
+        switch(index) {
+        case 0: return element0;
+        case 1: return element1;
+        case 2: return element2;
+        case 3: return element3;
+        default: throw raiseIndexingError(index);
+        }
+    }
+    
+    @Override
+    protected boolean internalEquals(ITuple other) {
+        return 4 == other.getSize() &&
+                Objects.equals(element0, other.get(0)) &&
+                Objects.equals(element1, other.get(1)) &&
+                Objects.equals(element2, other.get(2)) &&
+                Objects.equals(element3, other.get(3));
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/IModifiableTuple.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/IModifiableTuple.java
new file mode 100644
index 00000000..f5dab2a5
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/IModifiableTuple.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+/**
+ * A tuple that allows modifying the underlying value. Should not be used for non-volatile tuples.
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ */
+public interface IModifiableTuple extends ITuple {
+
+    /**
+     * Sets the selected value for a tuple
+     * 
+     * @pre: 0 <= index < getSize()
+     * 
+     */
+    void set(int index, Object value);
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/ITuple.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/ITuple.java
new file mode 100644
index 00000000..92014781
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/ITuple.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Represents both mutable and immutable tuples
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ *
+ */
+public interface ITuple {
+
+    /**
+     * @pre: 0 <= index < getSize()
+     * 
+     * @return the element at the specified index
+     */
+    Object get(int index);
+
+    /**
+     * As the tuple is supposed to be immutable, do not modify the returned array.
+     * @return the array containing all elements of this Tuple
+     */
+    Object[] getElements();
+
+    /**
+     * @return the set containing all distinct elements of this Tuple, cast as type T
+     */
+    <T> Set<T> getDistinctElements();
+
+    /**
+     * @return number of elements
+     */
+    int getSize();
+    
+    /**
+     * Calculates an inverted index of the elements of this pattern. For each element, the index of the (last)
+     * occurrence is calculated.
+     * 
+     * @return the inverted index mapping each element of this pattern to its index in the array
+     */
+    Map<Object, Integer> invertIndex();
+
+    /**
+     * Calculates an inverted index of the elements of this pattern. For each element, the index of all of its
+     * occurrences is calculated.
+     * 
+     * @return the inverted index mapping each element of this pattern to its index in the array
+     */
+    Map<Object, List<Integer>> invertIndexWithMupliplicity();
+
+    Tuple toImmutable();
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple.java
new file mode 100644
index 00000000..dcdfc376
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple.java
@@ -0,0 +1,172 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+/**
+ * 
+ * Tuple that inherits another tuple on the left.
+ * 
+ * @author Gabor Bergmann
+ * 
+ */
+public final class LeftInheritanceTuple extends BaseLeftInheritanceTuple {
+    /**
+     * Array of substituted values above inheritedIndex. DO NOT MODIFY! Use Constructor to build a new instance instead.
+     */
+    private final Object[] localElements;
+
+    //
+    // /**
+    // * Creates a Tuple instance, fills it with the given array.
+    // * @pre: no elements are null
+    // * @param elements array of substitution values
+    // */
+    // public Tuple(Object[] elements)
+    // {
+    // this.localElements = elements;
+    // this.ancestor=null;
+    // this.inheritedIndex = 0;
+    // calcHash();
+    // }
+
+    
+    
+    /**
+     * Creates a Tuple instance, lets it inherit from an ancestor, extends it with a given array. @pre: no elements are
+     * null
+     * 
+     * @param localElements
+     *            array of substitution values 
+     */
+    LeftInheritanceTuple(Tuple ancestor, Object[] localElements) {
+        super(ancestor);
+        this.localElements = localElements;
+        calcHash();
+    }
+
+    //
+    // /**
+    // * Creates a Tuple instance of size one, fills it with the given object.
+    // * @pre: o!=null
+    // * @param o the single substitution
+    // */
+    // public Tuple(Object o)
+    // {
+    // localElements = new Object [1];
+    // localElements[0] = o;
+    // this.ancestor=null;
+    // this.inheritedIndex = 0;
+    // calcHash();
+    // }
+    //
+    // /**
+    // * Creates a Tuple instance of size two, fills it with the given objects.
+    // * @pre: o1!=null, o2!=null
+    // */
+    // public Tuple(Object o1, Object o2)
+    // {
+    // localElements = new Object [2];
+    // localElements[0] = o1;
+    // localElements[1] = o2;
+    // this.ancestor=null;
+    // this.inheritedIndex = 0;
+    // calcHash();
+    // }
+    //
+    // /**
+    // * Creates a Tuple instance of size three, fills it with the given
+    // objects.
+    // * @pre: o1!=null, o2!=null, o3!=null
+    // */
+    // public Tuple(Object o1, Object o2, Object o3)
+    // {
+    // localElements = new Object [3];
+    // localElements[0] = o1;
+    // localElements[1] = o2;
+    // localElements[2] = o3;
+    // this.ancestor=null;
+    // this.inheritedIndex = 0;
+    // calcHash();
+    // }
+
+    /**
+     * @return number of elements
+     */
+    public int getSize() {
+        return inheritedIndex + localElements.length;
+    }
+    
+    @Override
+    public int getLocalSize() {
+        return localElements.length;
+    }
+
+    /**
+     * @pre: 0 <= index < getSize()
+     * 
+     * @return the element at the specified index
+     */
+    public Object get(int index) {
+        return (index < inheritedIndex) ? ancestor.get(index) : localElements[index - inheritedIndex];
+    }
+
+    /**
+     * Optimized hash calculation
+     */
+    @Override
+    void calcHash() {
+        final int PRIME = 31;
+        cachedHash = ancestor.hashCode();
+        for (int i = 0; i < localElements.length; i++) {
+            cachedHash = PRIME * cachedHash;
+            Object element = localElements[i];
+            if (element != null)
+                cachedHash += element.hashCode();
+        }
+    }
+
+    /**
+     * Optimized equals calculation (prediction: true, since hash values match)
+     */    
+    @Override
+    protected boolean localEquals(BaseLeftInheritanceTuple other) {
+        if (other instanceof LeftInheritanceTuple) {
+            LeftInheritanceTuple lit = (LeftInheritanceTuple)other;
+            return Arrays.equals(this.localElements, lit.localElements);
+        } else {
+            if (localElements.length != other.getLocalSize())
+                return false;
+            int index = inheritedIndex;
+            for (int i = 0; i<localElements.length; ++i) {
+                if (! Objects.equals(localElements[i], other.get(index++))) 
+                    return false;
+            }
+            return true;
+        }
+    }
+
+    // public int compareTo(Object arg0) {
+    // Tuple other = (Tuple) arg0;
+    //
+    // int retVal = cachedHash - other.cachedHash;
+    // if (retVal==0) retVal = elements.length - other.elements.length;
+    // for (int i=0; retVal==0 && i<elements.length; ++i)
+    // {
+    // if (elements[i] == null && other.elements[i] != null) retVal = -1;
+    // else if (other.elements[i] == null) retVal = 1;
+    // else retVal = elements[i].compareTo(other.elements[i]);
+    // }
+    // return retVal;
+    // }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple1.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple1.java
new file mode 100644
index 00000000..61123176
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple1.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.Objects;
+
+/**
+ * @author Gabor Bergmann
+ * @since 1.7
+ */
+public final class LeftInheritanceTuple1 extends BaseLeftInheritanceTuple {
+    /**
+     * A single substituted value after inheritedIndex. 
+     */
+    private final Object localElement;
+
+    /**
+     * @param ancestor
+     * @param localElement
+     */
+    protected LeftInheritanceTuple1(Tuple ancestor, Object localElement) {
+        super(ancestor);
+        this.localElement = localElement;
+        calcHash();
+    }
+    
+    /**
+     * @return number of elements
+     */
+    public int getSize() {
+        return inheritedIndex + 1;
+    }
+
+    @Override
+    public int getLocalSize() {
+        return 1;
+    }
+
+    /**
+     * @pre: 0 <= index < getSize()
+     * 
+     * @return the element at the specified index
+     */
+    public Object get(int index) {
+        int local = index - inheritedIndex;
+        if (local < 0) 
+            return ancestor.get(index);
+        else if (local == 0) return localElement;
+        else throw raiseIndexingError(index);
+    }
+
+    /**
+     * Optimized hash calculation
+     */
+    @Override
+    void calcHash() {
+        final int PRIME = 31;
+        cachedHash = ancestor.hashCode();
+        cachedHash = PRIME * cachedHash;
+        if (localElement != null) cachedHash += localElement.hashCode();
+    }
+
+    /**
+     * Optimized equals calculation (prediction: true, since hash values match)
+     */    
+    @Override
+    protected boolean localEquals(BaseLeftInheritanceTuple other) {
+        if (other instanceof LeftInheritanceTuple1) {
+            LeftInheritanceTuple1 lit = (LeftInheritanceTuple1)other;
+            return Objects.equals(this.localElement, lit.localElement);
+        } else {
+            return (1 == other.getLocalSize()) && 
+                    Objects.equals(localElement, other.get(inheritedIndex));
+        }
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple2.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple2.java
new file mode 100644
index 00000000..e9fb98e8
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple2.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.Objects;
+
+/**
+ * @author Gabor Bergmann
+ * @since 1.7
+ */
+public final class LeftInheritanceTuple2 extends BaseLeftInheritanceTuple {
+    private final Object localElement0;
+    private final Object localElement1;
+    
+    protected LeftInheritanceTuple2(Tuple ancestor, Object localElement0, Object localElement1) {
+        super(ancestor);
+        this.localElement0 = localElement0;
+        this.localElement1 = localElement1;
+        calcHash();
+    }
+
+    @Override
+    public int getLocalSize() {
+        return 2;
+    }
+    
+    @Override
+    public int getSize() {
+        return inheritedIndex + 2;
+    }
+
+    @Override
+    public Object get(int index) {
+        int local = index - inheritedIndex;
+        if (local < 0) 
+            return ancestor.get(index);
+        else if (local == 0) return localElement0;
+        else if (local == 1) return localElement1;
+        else throw raiseIndexingError(index);
+    }
+
+    /**
+     * Optimized hash calculation
+     */
+    @Override
+    void calcHash() {
+        final int PRIME = 31;
+        cachedHash = ancestor.hashCode();
+        cachedHash = PRIME * cachedHash;
+        if (localElement0 != null) cachedHash += localElement0.hashCode();
+        cachedHash = PRIME * cachedHash;
+        if (localElement1 != null) cachedHash += localElement1.hashCode();
+    }
+
+    @Override
+    protected boolean localEquals(BaseLeftInheritanceTuple other) {
+        if (other instanceof LeftInheritanceTuple2) {
+            LeftInheritanceTuple2 lit = (LeftInheritanceTuple2)other;
+            return Objects.equals(this.localElement0, lit.localElement0) &&
+                    Objects.equals(this.localElement1, lit.localElement1);
+        } else {
+            return (2 == other.getLocalSize()) && 
+                    Objects.equals(localElement0, other.get(inheritedIndex)) && 
+                    Objects.equals(localElement1, other.get(inheritedIndex + 1));
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple3.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple3.java
new file mode 100644
index 00000000..e61d196f
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple3.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.Objects;
+
+/**
+ * @author Gabor Bergmann
+ * @since 1.7
+ */
+public final class LeftInheritanceTuple3 extends BaseLeftInheritanceTuple {
+    private final Object localElement0;
+    private final Object localElement1;
+    private final Object localElement2;
+
+    protected LeftInheritanceTuple3(Tuple ancestor, Object localElement0, Object localElement1, Object localElement2) {
+        super(ancestor);
+        this.localElement0 = localElement0;
+        this.localElement1 = localElement1;
+        this.localElement2 = localElement2;
+        calcHash();
+    }
+    
+    @Override
+    public int getLocalSize() {
+        return 3;
+    }
+    
+    @Override
+    public int getSize() {
+        return inheritedIndex + 3;
+    }
+
+    @Override
+    public Object get(int index) {
+        int local = index - inheritedIndex;
+        if (local < 0) 
+            return ancestor.get(index);
+        else if (local == 0) return localElement0;
+        else if (local == 1) return localElement1;
+        else if (local == 2) return localElement2;
+        else throw raiseIndexingError(index);
+    }
+
+    /**
+     * Optimized hash calculation
+     */
+    @Override
+    void calcHash() {
+        final int PRIME = 31;
+        cachedHash = ancestor.hashCode();
+        cachedHash = PRIME * cachedHash;
+        if (localElement0 != null) cachedHash += localElement0.hashCode();
+        cachedHash = PRIME * cachedHash;
+        if (localElement1 != null) cachedHash += localElement1.hashCode();
+        cachedHash = PRIME * cachedHash;
+        if (localElement2 != null) cachedHash += localElement2.hashCode();
+    }
+
+    @Override
+    protected boolean localEquals(BaseLeftInheritanceTuple other) {
+        if (other instanceof LeftInheritanceTuple3) {
+            LeftInheritanceTuple3 lit = (LeftInheritanceTuple3)other;
+            return Objects.equals(this.localElement0, lit.localElement0) &&
+                    Objects.equals(this.localElement1, lit.localElement1) &&
+                    Objects.equals(this.localElement2, lit.localElement2);
+        } else {
+            return (3 == other.getLocalSize()) && 
+                    Objects.equals(localElement0, other.get(inheritedIndex)) && 
+                    Objects.equals(localElement1, other.get(inheritedIndex + 1)) && 
+                    Objects.equals(localElement2, other.get(inheritedIndex + 2));
+        }
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple4.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple4.java
new file mode 100644
index 00000000..4e50f1e1
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/LeftInheritanceTuple4.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.Objects;
+
+/**
+ * @author Gabor Bergmann
+ * @since 1.7
+ */
+public final class LeftInheritanceTuple4 extends BaseLeftInheritanceTuple {
+    private final Object localElement0;
+    private final Object localElement1;
+    private final Object localElement2;
+    private final Object localElement3;
+
+    protected LeftInheritanceTuple4(Tuple ancestor, Object localElement0, Object localElement1, Object localElement2,
+            Object localElement3) {
+        super(ancestor);
+        this.localElement0 = localElement0;
+        this.localElement1 = localElement1;
+        this.localElement2 = localElement2;
+        this.localElement3 = localElement3;
+        calcHash();
+    }
+
+    @Override
+    public int getLocalSize() {
+        return 4;
+    }
+    
+    @Override
+    public int getSize() {
+        return inheritedIndex + 4;
+    }
+
+    @Override
+    public Object get(int index) {
+        int local = index - inheritedIndex;
+        if (local < 0) 
+            return ancestor.get(index);
+        else if (local == 0) return localElement0;
+        else if (local == 1) return localElement1;
+        else if (local == 2) return localElement2;
+        else if (local == 3) return localElement3;
+        else throw raiseIndexingError(index);
+    }
+
+    /**
+     * Optimized hash calculation
+     */
+    @Override
+    void calcHash() {
+        final int PRIME = 31;
+        cachedHash = ancestor.hashCode();
+        cachedHash = PRIME * cachedHash;
+        if (localElement0 != null) cachedHash += localElement0.hashCode();
+        cachedHash = PRIME * cachedHash;
+        if (localElement1 != null) cachedHash += localElement1.hashCode();
+        cachedHash = PRIME * cachedHash;
+        if (localElement2 != null) cachedHash += localElement2.hashCode();
+        cachedHash = PRIME * cachedHash;
+        if (localElement3 != null) cachedHash += localElement3.hashCode();
+    }
+
+    @Override
+    protected boolean localEquals(BaseLeftInheritanceTuple other) {
+        if (other instanceof LeftInheritanceTuple4) {
+            LeftInheritanceTuple4 lit = (LeftInheritanceTuple4)other;
+            return Objects.equals(this.localElement0, lit.localElement0) &&
+                    Objects.equals(this.localElement1, lit.localElement1) &&
+                    Objects.equals(this.localElement2, lit.localElement2) &&
+                    Objects.equals(this.localElement3, lit.localElement3);
+        } else {
+            return (4 == other.getLocalSize()) && 
+                    Objects.equals(localElement0, other.get(inheritedIndex)) && 
+                    Objects.equals(localElement1, other.get(inheritedIndex + 1)) && 
+                    Objects.equals(localElement2, other.get(inheritedIndex + 2)) && 
+                    Objects.equals(localElement3, other.get(inheritedIndex + 3));
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/MaskedTuple.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/MaskedTuple.java
new file mode 100644
index 00000000..a5d1991c
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/MaskedTuple.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2009 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+/**
+ * A tuple that transparently provides a masked (transformed) view of another tuple.
+ * 
+ * @author Gabor Bergmann
+ * @since 2.0
+ * 
+ */
+public class MaskedTuple extends Tuple {
+
+    Tuple wrapped;
+    TupleMask mask;
+
+    public MaskedTuple(Tuple wrapped, TupleMask mask) {
+        super();
+        // if (wrapped instanceof MaskedTuple) {
+        // MaskedTuple parent = (MaskedTuple)wrapped;
+        // this.wrapped = parent.wrapped;
+        // this.mask = mask.transform(parent.mask);
+        // }
+        // else
+        //{
+            this.wrapped = wrapped;
+            this.mask = mask;
+        //}
+    }
+
+    @Override
+    public Object get(int index) {
+        return wrapped.get(mask.indices[index]);
+    }
+
+    @Override
+    public int getSize() {
+        return mask.indices.length;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/Tuple.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/Tuple.java
new file mode 100644
index 00000000..d94f545f
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/Tuple.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+/**
+ * Immutable tuple. Obtain instances via utility class {@link Tuples}.
+ * @author Gabor Bergmann
+ * 
+ */
+public abstract class Tuple extends AbstractTuple {
+
+    /**
+     * Caches precalculated hash value
+     */
+    protected int cachedHash;
+
+    /**
+     * Creates a Tuple instance Derivatives should call calcHash()
+     */
+    protected Tuple() {
+        // calcHash();
+    }
+
+    /**
+     * Hash calculation. Overrides should keep semantics.
+     */
+    void calcHash() {
+        cachedHash = doCalcHash();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj instanceof ITuple) {
+            final ITuple other = (ITuple) obj;
+            return cachedHash == other.hashCode() && internalEquals(other);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        // Calculated by #calcHash
+        return cachedHash;
+    }
+
+    public Tuple replaceAll(Object obsolete, Object replacement) {
+        Object[] oldElements = getElements();
+        Object[] newElements = new Object[oldElements.length];
+        for (int i = 0; i < oldElements.length; ++i) {
+            newElements[i] = obsolete.equals(oldElements[i]) ? replacement : oldElements[i];
+        }
+        return Tuples.flatTupleOf(newElements);
+    }
+
+    @Override
+    public Tuple toImmutable() {
+        return this;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMask.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMask.java
new file mode 100644
index 00000000..49c55fef
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMask.java
@@ -0,0 +1,560 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.OptionalInt;
+import java.util.Set;
+
+/**
+ * 
+ * Specifies select indices of a tuple. If viewed through this mask (see {@link #transform(ITuple)}), the signature of the pattern will consist of its
+ * individual substitutions at the given positions, in the exact same order as they appear in indices[].
+ * 
+ * @author Gabor Bergmann
+ */
+public class TupleMask {
+    /**
+     * indices[i] specifies the index of the substitution in the original tuple that occupies the i-th place in the
+     * masked signature.
+     */
+    public final int[] indices;
+    /**
+     * the size of the tuple this mask is applied to
+     */
+    public int sourceWidth;
+    /**
+     * indicesSorted is indices, sorted in ascending order. 
+     * null by default, call {@link #ensureIndicesSorted()} before using
+     */
+    int[] indicesSorted;
+    
+    /**
+     * true if no index occurs twice; computed on demand by {@link #isNonrepeating()}
+     */
+    Boolean isNonrepeating;
+
+    /**
+     * Creates a TupleMask instance with the given indices array
+     * <p> indicesSorted and isNonrepeating may be OPTIONALLY given if known.
+     * @since 2.0
+     */
+    protected TupleMask(int[] indices, int sourceWidth, int[] indicesSorted, Boolean isNonrepeating) {
+        this.indices = indices;
+        this.sourceWidth = sourceWidth;
+        this.indicesSorted = indicesSorted;
+        this.isNonrepeating = isNonrepeating;
+    }
+    
+    /**
+     * Creates a TupleMask instance that selects given positions.
+     * The mask takes ownership of the array selectedIndices, the client must not modify it afterwards.
+     * 
+     * <p> indicesSorted and isNonrepeating may be OPTIONALLY given if known.
+     * @since 2.0
+     */
+    protected static TupleMask fromSelectedIndicesInternal(
+            int[] selectedIndices, int sourceArity,
+            int[] indicesSorted, Boolean isNonrepeating) 
+    {
+        if (selectedIndices.length == 0) // is it nullary?
+            return new TupleMask0(sourceArity);
+        
+        // is it identity?
+        boolean identity = sourceArity == selectedIndices.length;
+        if (identity) {
+            for (int k=0; k < sourceArity; ++k) {
+                if (selectedIndices[k] != k) {
+                    identity = false;
+                    break;
+                }
+            }            
+        }
+        if (identity)
+            return new TupleMaskIdentity(selectedIndices, sourceArity);
+         
+        // generic case
+        return new TupleMask(selectedIndices, sourceArity, indicesSorted, isNonrepeating);
+    }
+    
+    /**
+     * Creates a TupleMask instance that selects given positions in monotonically increasing order.
+     * The mask takes ownership of the array selectedIndices, the client must not modify it afterwards.
+     * @since 2.0
+     */
+    protected static TupleMask fromSelectedMonotonicIndicesInternal(int[] selectedIndices, int sourceArity)
+    {
+        return fromSelectedIndicesInternal(selectedIndices, sourceArity, selectedIndices /* also sorted */, true);
+    }
+
+    /**
+     * Creates a TupleMask instance of the given size that maps the first 'size' elements intact
+     */
+    public static TupleMask linear(int size, int sourceWidth) {
+        if (size == sourceWidth) return new TupleMaskIdentity(sourceWidth);
+        int[] indices = constructLinearSequence(size);
+        return fromSelectedMonotonicIndicesInternal(indices, sourceWidth);
+    }
+
+    /**
+     * An array containing the first {@link size} nonnegative integers in order
+     * @since 2.0
+     */
+    protected static int[] constructLinearSequence(int size) {
+        int[] indices = new int[size];
+        for (int i = 0; i < size; i++)
+            indices[i] = i;
+        return indices;
+    }
+
+    /**
+     * Creates a TupleMask instance of the given size that maps every single element intact
+     */
+    public static TupleMask identity(int size) {
+        return new TupleMaskIdentity(size);   
+    }
+
+    /**
+     * Creates a TupleMask instance of the given size that does not emit output.
+     */
+    public static TupleMask empty(int sourceWidth) {
+        return linear(0, sourceWidth);
+    }
+
+    /**
+     * Creates a TupleMask instance that maps the tuple intact save for a single element at the specified index which is
+     * omitted
+     */
+    public static TupleMask omit(int omission, int sourceWidth) {
+        int size = sourceWidth - 1;
+        int[] indices = new int[size];
+        for (int i = 0; i < omission; i++)
+            indices[i] = i;
+        for (int i = omission; i < size; i++)
+            indices[i] = i + 1;
+        return fromSelectedMonotonicIndicesInternal(indices, sourceWidth);
+    }
+
+    
+    /**
+     * Creates a TupleMask instance that selects positions where keep is true
+     * @since 1.7
+     */
+    public static TupleMask fromKeepIndicators(boolean[] keep) {
+        int size = 0;
+        for (int k = 0; k < keep.length; ++k)
+            if (keep[k])
+                size++;
+        if (size == keep.length) return new TupleMaskIdentity(size);
+        int[] indices = new int[size];
+        int l = 0;
+        for (int k = 0; k < keep.length; ++k)
+            if (keep[k])
+                indices[l++] = k;
+        return fromSelectedMonotonicIndicesInternal(indices, keep.length);
+    }
+    
+    /**
+     * Creates a TupleMask instance that selects given positions.
+     * @since 1.7
+     */
+    public static TupleMask fromSelectedIndices(int sourceArity, Collection<Integer> selectedIndices) {
+        int[] selected = integersToIntArray(selectedIndices);
+        return fromSelectedIndicesInternal(selected, sourceArity, null, null);
+    }
+    /**
+     * Creates a TupleMask instance that selects given positions.
+     * @since 1.7
+     */
+    public static TupleMask fromSelectedIndices(int sourceArity, int[] selectedIndices) {
+        return fromSelectedIndicesInternal(Arrays.copyOf(selectedIndices, selectedIndices.length), sourceArity, null, null);
+    }
+    /**
+     * Creates a TupleMask instance that selects non-null positions of a given tuple
+     * @since 1.7
+     */
+    public static TupleMask fromNonNullIndices(ITuple tuple) {
+        List<Integer> indices = new ArrayList<>();
+        for (int i=0; i < tuple.getSize(); i++) {
+            if (tuple.get(i) != null) {
+                indices.add(i);
+            }
+        }
+        if (indices.size() == tuple.getSize()) return new TupleMaskIdentity(indices.size());
+        return fromSelectedMonotonicIndicesInternal(integersToIntArray(indices), tuple.getSize());
+    }
+    /**
+     * @since 1.7
+     */
+    public static int[] integersToIntArray(Collection<Integer> selectedIndices) {
+        int[] selected = new int[selectedIndices.size()];
+        int k=0;
+        for (Integer integer : selectedIndices) {
+            selected[k++] = integer;
+        }
+        return selected;
+    }
+
+
+    /**
+     * Creates a TupleMask instance that moves an element from one index to other, shifting the others if neccessary.
+     */
+    public static TupleMask displace(int from, int to, int sourceWidth) {
+        if (from == to) return new TupleMaskIdentity(sourceWidth);
+        int[] indices = new int[sourceWidth];
+        for (int i = 0; i < sourceWidth; i++)
+            if (i == to)
+                indices[i] = from;
+            else if (i >= from && i < to)
+                indices[i] = i + 1;
+            else if (i > to && i <= from)
+                indices[i] = i - 1;
+            else
+                indices[i] = i;
+        return fromSelectedIndicesInternal(indices, sourceWidth, null, true);
+    }
+
+    /**
+     * Creates a TupleMask instance that selects a single element of the tuple.
+     */
+    public static TupleMask selectSingle(int selected, int sourceWidth) {
+        int[] indices = { selected };
+        return fromSelectedMonotonicIndicesInternal(indices, sourceWidth);
+    }
+
+    /**
+     * Creates a TupleMask instance that selects whatever is selected by left, and appends whatever is selected by
+     * right. PRE: left and right have the same sourcewidth
+     */
+    public static TupleMask append(TupleMask left, TupleMask right) {
+        int leftLength = left.indices.length;
+        int rightLength = right.indices.length;
+        int[] indices = new int[leftLength + rightLength];
+        for (int i = 0; i < leftLength; ++i)
+            indices[i] = left.indices[i];
+        for (int i = 0; i < rightLength; ++i)
+            indices[i + leftLength] = right.indices[i];
+        return fromSelectedIndicesInternal(indices, left.sourceWidth, null, null);
+    }
+
+    /**
+     * Generates indicesSorted from indices on demand
+     */
+    void ensureIndicesSorted() {
+        if (indicesSorted == null) {
+            indicesSorted = new int[indices.length];
+            List<Integer> list = new LinkedList<Integer>();
+            for (int i = 0; i < indices.length; ++i)
+                list.add(indices[i]);
+            java.util.Collections.sort(list);
+            int i = 0;
+            for (Integer a : list)
+                indicesSorted[i++] = a;
+        }
+    }
+    
+    
+    
+    /**
+     * Returns the first index of the source that is not selected by the mask, or empty if all indices are selected.
+     * <p> PRE: mask indices are all different
+     * @since 2.0
+     */
+    public OptionalInt getFirstOmittedIndex() {
+        ensureIndicesSorted();
+        int column = 0; 
+        while (column < getSize() && indicesSorted[column] == column) column++;
+        if (column < getSourceWidth()) return OptionalInt.of(column);
+        else return OptionalInt.empty();
+    }
+
+
+    /**
+     * Returns a selected masked value from the selected tuple.
+     * @pre: 0 <= index < getSize() 
+     * @since 1.7
+     */
+    public Object getValue(ITuple original, int index) {
+        return original.get(indices[index]);
+    }
+    
+    /**
+     * Sets the selected value in the original tuple based on the mask definition
+     * 
+     * @pre: 0 <= index < getSize()
+     * @since 1.7
+     */
+    public void set(IModifiableTuple tuple, int index, Object value) {
+        tuple.set(indices[index], value);
+    }
+    
+    /**
+     * Generates an immutable, masked view of the original tuple.
+     * <p> The new tuple will have arity {@link #getSize()}, 
+     *  and will consist of the elements of the original tuple, at positions indicated by this mask.
+     * @since 1.7
+     */
+    public Tuple transform(ITuple original) {
+        switch (indices.length) {
+        case 0:
+            return FlatTuple0.INSTANCE;
+        case 1:
+            return new FlatTuple1(original.get(indices[0]));
+        case 2:
+            return new FlatTuple2(original.get(indices[0]), original.get(indices[1]));
+        case 3:
+            return new FlatTuple3(original.get(indices[0]), original.get(indices[1]), original.get(indices[2]));
+        case 4:
+            return new FlatTuple4(original.get(indices[0]), original.get(indices[1]), original.get(indices[2]), original.get(indices[3]));
+        default:
+            Object signature[] = new Object[indices.length];
+            for (int i = 0; i < indices.length; ++i)
+                signature[i] = original.get(indices[i]);
+            return new FlatTuple(signature);
+        }
+    }
+    
+    /**
+     * @return true iff no two selected indices are the same
+     * @since 2.0
+     */
+    public boolean isNonrepeating() {
+        if (isNonrepeating == null) {
+            ensureIndicesSorted();
+            int previous = -1;
+            int i;
+            for (i = 0; i < sourceWidth && previous != indicesSorted[i]; ++i) {
+                previous = indicesSorted[i];
+            }
+            isNonrepeating = (i == sourceWidth); // if not, stopped due to detected repetition
+        }
+        return isNonrepeating;
+    }
+    
+    /**
+     * Returns a tuple `result` that satisfies `this.transform(result).equals(masked)`. Positions of the result tuple
+     * that are not determined this way will be filled with null.
+     * 
+     * @pre: all indices of the mask must be different, i.e {@link #isNonrepeating()} must return true
+     * @since 1.7
+     */
+    public Tuple revertFrom(ITuple masked) {
+        Object[] signature = new Object[sourceWidth];
+        for (int i = 0; i < indices.length; ++i)
+            signature[indices[i]] = masked.get(i);
+        return Tuples.flatTupleOf(signature);
+    }
+    
+    /**
+     * Returns a tuple `result`, same arity as the original tuple, that satisfies 
+     *   `this.transform(result).equals(this.transform(tuple))`. 
+     * Positions of the result tuple that are not determined this way will be filled with null. 
+     * <p> In other words, a copy of the original tuple is returned, 
+     *   with null substituted at each position that is <em>not</em> selected by this mask.
+     * 
+     * @pre: all indices of the mask must be different, i.e {@link #isNonrepeating()} must return true
+     * @since 2.1
+     */
+    public Tuple keepSelectedIndices(ITuple original) {
+        Object[] signature = new Object[sourceWidth];
+        for (int i = 0; i < indices.length; ++i)
+            signature[indices[i]] = original.get(indices[i]);
+        return Tuples.flatTupleOf(signature);
+    }
+
+    /**
+     * Generates an immutable, masked view of the original tuple.
+     * <p> The list will have arity {@link #getSize()}, 
+     *  and will consist of the elements of the original tuple, at positions indicated by this mask.
+     */
+    public <T> List<T> transform(List<T> original) {
+        List<T> signature = new ArrayList<T>(indices.length);
+        for (int i = 0; i < indices.length; ++i)
+            signature.add(original.get(indices[i]));
+        return signature;
+    }
+
+    /**
+     * Transforms a given mask directly, instead of transforming tuples that were transformed by the other mask.
+     * 
+     * @return a mask that cascades the effects this mask after the mask provided as parameter.
+     */
+    public TupleMask transform(TupleMask mask) {
+        int[] cascadeIndices = new int[indices.length];
+        for (int i = 0; i < indices.length; ++i)
+            cascadeIndices[i] = mask.indices[indices[i]];
+        return fromSelectedIndicesInternal(cascadeIndices, mask.sourceWidth, null, null);
+    }
+
+    // /**
+    // * Generates a complementer mask that maps those elements that were
+    // untouched by the original mask.
+    // * Ordering is left intact.
+    // * A Tuple is used for reference concerning possible equalities among
+    // elements.
+    // */
+    // public TupleMask complementer(Tuple reference)
+    // {
+    // HashSet<Object> touched = new HashSet<Object>();
+    // LinkedList<Integer> untouched = new LinkedList<Integer>();
+    //
+    // for (int index : indices) touched.add(reference.get(index));
+    // for (int index=0; index<reference.getSize(); ++index)
+    // {
+    // if (touched.add(reference.get(index))) untouched.addLast(index);
+    // }
+    //
+    // int[] complementer = new int[untouched.size()];
+    // int k = 0;
+    // for (Integer integer : untouched) complementer[k++] = integer;
+    // return new TupleMask(complementer, reference.getSize());
+    // }
+
+    /**
+     * Combines two substitutions. The new pattern will contain all substitutions of masked and unmasked, assuming that
+     * the elements of masked indicated by this mask are already matched against unmasked.
+     * 
+     * POST: the result will start with an exact copy of unmasked
+     * 
+     * @param unmasked
+     *            primary pattern substitution that is left intact.
+     * @param masked
+     *            secondary pattern substitution that is transformed to the end of the result.
+     * @param useInheritance
+     *            whether to use inheritance or copy umasked into result instead.
+     * @param asComplementer
+     *            whether this mask maps from the masked Tuple to the tail of the result or to the unmasked one.
+     * @return new pattern that is a combination of unmasked and masked.
+     */
+    public Tuple combine(Tuple unmasked, Tuple masked, boolean useInheritance, boolean asComplementer) {
+
+        int combinedLength = asComplementer ? indices.length : masked.getSize() - indices.length;
+        if (!useInheritance)
+            combinedLength += unmasked.getSize();
+        Object combined[] = new Object[combinedLength];
+
+        int cPos = 0;
+        if (!useInheritance) {
+            for (int i = 0; i < unmasked.getSize(); ++i)
+                combined[cPos++] = unmasked.get(i);
+        }
+
+        if (asComplementer) {
+            for (int i = 0; i < indices.length; ++i)
+                combined[cPos++] = masked.get(indices[i]);
+        } else {
+            ensureIndicesSorted();
+            int mPos = 0;
+            for (int i = 0; i < masked.getSize(); ++i)
+                if (mPos < indicesSorted.length && i == indicesSorted[mPos])
+                    mPos++;
+                else
+                    combined[cPos++] = masked.get(i);
+        }
+
+        return useInheritance ? Tuples.leftInheritanceTupleOf(unmasked, combined) : Tuples.flatTupleOf(combined);
+    }
+
+    @Override
+    public int hashCode() {
+        final int PRIME = 31;
+        int result = sourceWidth;
+        for (int i : indices)
+            result = PRIME * result + i;
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        final TupleMask other = (TupleMask) obj;
+        if (sourceWidth != other.sourceWidth)
+            return false;
+        if (indices.length != other.indices.length)
+            return false;
+        for (int k = 0; k < indices.length; k++)
+            if (indices[k] != other.indices[k])
+                return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder s = new StringBuilder();
+        s.append("M(" + sourceWidth + "->");
+        for (int i : indices) {
+            s.append(i);
+            s.append(',');
+        }
+        s.append(')');
+        return s.toString();
+    }
+    
+    /**
+     * Returns the size of the masked tuples described by this mask
+     * @since 1.7 
+     */
+    public int getSize() {
+        return indices.length;
+    }
+
+    /**
+     * Returns the size of the original tuples handled by this mask
+     * @since 1.7
+     */
+    public int getSourceWidth() {
+        return sourceWidth;
+    }
+    
+    
+    /**
+     * @return true iff this mask is a no-op
+     * @since 2.0
+     */
+    public boolean isIdentity() {
+        // Contract: if identity mask, a specialized subclass is constructed instead 
+        return false;
+    }
+    
+    /**
+     * Transforms the given list by applying the mask and putting all results into a set; keeping only a single element
+     * in case of the mapping result in duplicate values.
+     * 
+     * @since 1.7
+     */
+    public <T> Set<T> transformUnique(List<T> original) {
+        Set<T> signature = new HashSet<>();
+        for (int i = 0; i < indices.length; ++i)
+            signature.add(original.get(indices[i]));
+        return signature;
+    }
+
+    /**
+     * @return the list of selected indices
+     * @since 2.1
+     */
+    public List<Integer> getIndicesAsList() {
+        List<Integer> result = new ArrayList<Integer>(indices.length);
+        for (int i = 0; i < indices.length; ++i)
+            result.add(indices[i]);
+        return result;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMask0.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMask0.java
new file mode 100644
index 00000000..5a0c79ff
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMask0.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Gabor Bergmann
+ * @since 1.7
+ */
+public final class TupleMask0 extends TupleMask {
+    
+    private final static int[] EMPTY_ARRAY = {};
+
+    /**
+     * PRE: indices.length == 0
+     */
+    TupleMask0(int sourceWidth) {
+        super(EMPTY_ARRAY, sourceWidth, EMPTY_ARRAY, true);
+    }
+    
+    @Override
+    public <T> List<T> transform(List<T> original) {
+        return Collections.emptyList();
+    }
+    
+    @Override
+    public Tuple transform(ITuple original) {
+        return Tuples.staticArityFlatTupleOf();
+    }
+
+    @Override
+    public TupleMask transform(TupleMask mask) {
+        return new TupleMask0(mask.sourceWidth);
+    }
+
+    @Override
+    public Tuple combine(Tuple unmasked, Tuple masked, boolean useInheritance, boolean asComplementer) {
+        if (asComplementer)
+            return unmasked;
+        else
+            return super.combine(unmasked, masked, useInheritance, asComplementer);
+    }
+    
+    @Override
+    public boolean isIdentity() {
+        return 0 == sourceWidth;
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMaskIdentity.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMaskIdentity.java
new file mode 100644
index 00000000..62746587
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleMaskIdentity.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.List;
+
+/**
+ * @author Gabor Bergmann
+ * @since 1.7
+ */
+public final class TupleMaskIdentity extends TupleMask {
+
+    TupleMaskIdentity(int sourceWidth) {
+        this(constructLinearSequence(sourceWidth), sourceWidth);
+    }
+    TupleMaskIdentity(int[] indices, int sourceWidth) {
+        super(indices, sourceWidth, indices, true);
+    }
+
+    @Override
+    public <T> List<T> transform(List<T> original) {
+        return original;
+    }
+    
+    @Override
+    public Tuple transform(ITuple original) {
+        return original.toImmutable();
+    }
+    
+    @Override
+    public TupleMask transform(TupleMask mask) {
+        return mask;
+    }
+
+    @Override
+    public Tuple revertFrom(ITuple masked) {
+        return masked.toImmutable();
+    }
+    
+    @Override
+    public boolean isIdentity() {
+        return true;
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleValueProvider.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleValueProvider.java
new file mode 100644
index 00000000..79193516
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/TupleValueProvider.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.psystem.IValueProvider;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ */
+public class TupleValueProvider implements IValueProvider {
+
+    final ITuple tuple;
+    final Map<String, Integer> indexMapping;
+    
+    /**
+     * Wraps a tuple with an index mapping
+     * @param tuple
+     * @param indexMapping
+     */
+    public TupleValueProvider(ITuple tuple, Map<String, Integer> indexMapping) {
+        super();
+        this.tuple = tuple;
+        this.indexMapping = indexMapping;
+    }
+
+    @Override
+    public Object getValue(String variableName) {
+        Integer index = indexMapping.get(variableName);
+        if (index == null) {
+            throw new IllegalArgumentException(String.format("Variable %s is not present in mapping.", variableName));
+        }
+        Object value = tuple.get(index);
+        if (value == null) {
+            throw new IllegalArgumentException(String.format("Variable %s is not found using index %d.", variableName, index));
+        }
+        return value;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/Tuples.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/Tuples.java
new file mode 100644
index 00000000..5e41d7d8
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/Tuples.java
@@ -0,0 +1,157 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+/**
+ * Common static factory utilities for tuples.
+ * 
+ * @author Gabor Bergmann
+ * @since 1.7
+ */
+public class Tuples {
+
+    private Tuples() {
+        // Empty utility class constructor
+    }
+    
+    /**
+     * Creates a flat tuple consisting of the given elements. 
+     * For low-arity tuples, specialized implementations 
+     * (such as {@link FlatTuple2}) will be instantiated.
+     * 
+     * <p> In case the exact arity is <i>statically</i> known, 
+     * it may be more efficient for the client to instantiate 
+     * the appropriate specialized implementation 
+     * (via {@link #staticArityFlatTupleOf(Object, Object)} etc.
+     * or {@link #wideFlatTupleOf(Object...)}),
+     * instead of invoking this method. 
+     * This method does a runtime arity check, and therefore 
+     * also appropriate if the arity is determined at runtime. 
+     */
+    public static Tuple flatTupleOf(Object... elements) {
+        switch (elements.length) {
+        case 0:
+            return FlatTuple0.INSTANCE;
+        case 1:
+            return new FlatTuple1(elements[0]);
+        case 2:
+            return new FlatTuple2(elements[0], elements[1]);
+        case 3:
+            return new FlatTuple3(elements[0], elements[1], elements[2]);
+        case 4:
+            return new FlatTuple4(elements[0], elements[1], elements[2], elements[3]);
+        default:
+            return new FlatTuple(elements);
+        }
+    }
+    /**
+     * Creates a left inheritance tuple that extends an ancestor tuple 
+     *  by the given "local" elements. 
+     * For locally low-arity tuples, specialized implementations 
+     * (such as {@link LeftInheritanceTuple2}) will be instantiated.
+     * 
+     * <p> In case the exact arity is <i>statically</i> known, 
+     * it may be more efficient for the client to instantiate 
+     * the appropriate specialized implementation 
+     * (via {@link #staticArityLeftInheritanceTupleOf(Object, Object)} etc.
+     * or {@link #wideLeftInheritanceTupleOf(Object...)}),
+     * instead of invoking this method. 
+     * This method does a runtime arity check, and therefore 
+     * also appropriate if the arity is determined at runtime. 
+     */
+    public static Tuple leftInheritanceTupleOf(Tuple ancestor, Object... localElements) {
+        switch (localElements.length) {
+        case 0:
+            return ancestor;
+        case 1:
+            return new LeftInheritanceTuple1(ancestor, localElements[0]);
+        case 2:
+            return new LeftInheritanceTuple2(ancestor, localElements[0], localElements[1]);
+        case 3:
+            return new LeftInheritanceTuple3(ancestor, localElements[0], localElements[1], localElements[2]);
+        case 4:
+            return new LeftInheritanceTuple4(ancestor, localElements[0], localElements[1], localElements[2], localElements[3]);
+        default:
+            return new LeftInheritanceTuple(ancestor, localElements);
+        }
+    }
+
+    /**
+     * Creates a flat tuple consisting of no elements. 
+     */
+    public static Tuple staticArityFlatTupleOf() {
+        return FlatTuple0.INSTANCE;
+    }
+    /**
+     * Creates a flat tuple consisting of the given single element. 
+     */
+    public static Tuple staticArityFlatTupleOf(Object element) {
+        return new FlatTuple1(element);
+    }
+    /**
+     * Creates a flat tuple consisting of the given elements. 
+     */
+    public static Tuple staticArityFlatTupleOf(Object element0, Object element1) {
+        return new FlatTuple2(element0, element1);
+    }
+    /**
+     * Creates a flat tuple consisting of the given elements. 
+     */
+    public static Tuple staticArityFlatTupleOf(Object element0, Object element1, Object element2) {
+        return new FlatTuple3(element0, element1, element2);
+    }
+    /**
+     * Creates a flat tuple consisting of the given elements. 
+     */
+    public static Tuple staticArityFlatTupleOf(Object element0, Object element1, Object element2, Object element3) {
+        return new FlatTuple4(element0, element1, element2, element3);
+    }
+    /**
+     * Creates a flat tuple consisting of the given elements. 
+     * <p> Invoke this only if it is statically known that the tuple will be wide. 
+     * Otherwise, use {@link #flatTupleOf(Object...)}.
+     */
+    public static Tuple wideFlatTupleOf(Object... elements) {
+        return new FlatTuple(elements);
+    }
+    
+    /**
+     * Creates a left inheritance tuple consisting of the given single local element. 
+     */
+    public static Tuple staticArityLeftInheritanceTupleOf(Tuple ancestor, Object element) {
+        return new LeftInheritanceTuple1(ancestor, element);
+    }
+    /**
+     * Creates a left inheritance tuple consisting of the given local elements. 
+     */
+    public static Tuple staticArityLeftInheritanceTupleOf(Tuple ancestor, Object element0, Object element1) {
+        return new LeftInheritanceTuple2(ancestor, element0, element1);
+    }
+    /**
+     * Creates a left inheritance tuple consisting of the given local elements. 
+     */
+    public static Tuple staticArityLeftInheritanceTupleOf(Tuple ancestor, Object element0, Object element1, Object element2) {
+        return new LeftInheritanceTuple3(ancestor, element0, element1, element2);
+    }
+    /**
+     * Creates a left inheritance tuple consisting of the given local elements. 
+     */
+    public static Tuple staticArityLeftInheritanceTupleOf(Tuple ancestor, Object element0, Object element1, Object element2, Object element3) {
+        return new LeftInheritanceTuple4(ancestor, element0, element1, element2, element3);
+    }
+    /**
+     * Creates a left inheritance tuple consisting of the given local elements. 
+     * <p> Invoke this only if it is statically known that the tuple will be wide. 
+     * Otherwise, use {@link #leftInheritanceTupleOf(Tuple, Object...)}.
+     */
+    public static Tuple wideLeftInheritanceTupleOf(Tuple ancestor, Object... elements) {
+        return new LeftInheritanceTuple(ancestor, elements);
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileMaskedTuple.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileMaskedTuple.java
new file mode 100644
index 00000000..f683d544
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileMaskedTuple.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * This class provides a volatile tuple view with a given mask of a given tuple instance. If the masked tuple changes,
+ * the view updates as well.
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ *
+ */
+public class VolatileMaskedTuple extends VolatileTuple {
+
+    protected final TupleMask mask;
+    protected ITuple source;
+
+    public VolatileMaskedTuple(ITuple source, TupleMask mask) {
+        this.source = source;
+        this.mask = mask;
+    }
+
+    public VolatileMaskedTuple(TupleMask mask) {
+        this(null, mask);
+    }
+    
+    public void updateTuple(ITuple newSource) {
+        source = newSource;
+    }
+    
+    @Override
+    public Object get(int index) {
+        Preconditions.checkState(source != null, "Source tuple is not set."); 
+        return mask.getValue(source, index);
+    }
+
+    @Override
+    public int getSize() {
+        return mask.getSize();
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileModifiableMaskedTuple.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileModifiableMaskedTuple.java
new file mode 100644
index 00000000..92306c6e
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileModifiableMaskedTuple.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * A masked tuple implementation that allows modifying the backing tuple.
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ *
+ */
+public class VolatileModifiableMaskedTuple extends VolatileMaskedTuple implements IModifiableTuple {
+
+    private IModifiableTuple modifiableTuple;
+
+    public VolatileModifiableMaskedTuple(IModifiableTuple source, TupleMask mask) {
+        super(source, mask);
+        modifiableTuple = source;
+    }
+
+    public VolatileModifiableMaskedTuple(TupleMask mask) {
+        this(null, mask);
+    }
+    
+    @Override
+    public void updateTuple(ITuple newSource) {
+        Preconditions.checkArgument(newSource instanceof IModifiableTuple, "Provided tuple does not support updates");
+        this.updateTuple((IModifiableTuple)newSource);
+    }
+    
+    public void updateTuple(IModifiableTuple newSource) {
+        super.updateTuple(newSource);
+        modifiableTuple = newSource;
+    }
+
+    @Override
+    public void set(int index, Object value) {
+        mask.set(modifiableTuple, index, value);
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileTuple.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileTuple.java
new file mode 100644
index 00000000..699105a5
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/tuple/VolatileTuple.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017 Zoltan Ujhelyi, IncQuery Labs
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.tuple;
+
+/**
+ * Mutable tuple without explicit modification commands. In practical terms, the values stored in a volatile tuple can
+ * be changed without any notification.
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ * 
+ */
+public abstract class VolatileTuple extends AbstractTuple {
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (!(obj instanceof ITuple))
+            return false;
+        final ITuple other = (ITuple) obj;
+        return internalEquals(other);
+    }
+
+    @Override
+    public int hashCode() {
+        return doCalcHash();
+    }
+
+    /**
+     * Creates an immutable tuple from the values stored in the tuple. The created tuple will not be updated when the
+     * current tuple changes.
+     */
+    @Override
+    public Tuple toImmutable() {
+        return Tuples.flatTupleOf(getElements());
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Accuracy.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Accuracy.java
new file mode 100644
index 00000000..338990ab
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Accuracy.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+/**
+ * The degree of accuracy of a cardinality estimate
+ * @author Gabor Bergmann
+ * @since 2.1
+ */
+public enum Accuracy {
+    EXACT_COUNT,
+    BEST_UPPER_BOUND,
+    BEST_LOWER_BOUND,
+    APPROXIMATION;
+    
+    /**
+     * Partial order comparison.
+     */
+    public boolean atLeastAsPreciseAs(Accuracy other) {
+        switch (this) {
+        case EXACT_COUNT: return true;
+        case APPROXIMATION: return APPROXIMATION == other;
+        case BEST_UPPER_BOUND: return BEST_UPPER_BOUND == other || APPROXIMATION == other; 
+        case BEST_LOWER_BOUND: return BEST_LOWER_BOUND == other || APPROXIMATION == other; 
+        default: throw new IllegalArgumentException();
+        }
+    }
+    
+    /**
+     * @return another accuracy value that is anti-monotonic to this one, 
+     * i.e. an accuracy that should be used in the denominator to obtain a fraction with this accuracy
+     */
+    public Accuracy reciprocal() {
+        switch(this) {
+        case APPROXIMATION: return APPROXIMATION;
+        case BEST_UPPER_BOUND: return BEST_LOWER_BOUND;
+        case BEST_LOWER_BOUND: return BEST_UPPER_BOUND;
+        case EXACT_COUNT: return EXACT_COUNT;
+        default: throw new IllegalArgumentException();
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Clearable.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Clearable.java
new file mode 100644
index 00000000..1b09aec6
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Clearable.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.util;
+
+/**
+ * @author Gabor Bergmann
+ * @since 1.7
+ *         An instance of clearable pattern memory.
+ */
+public interface Clearable {
+    /**
+     * Clear all partial matchings stored in memory
+     * 
+     */
+    void clear();
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/CollectionsFactory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/CollectionsFactory.java
new file mode 100644
index 00000000..590a1ec3
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/CollectionsFactory.java
@@ -0,0 +1,188 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.function.Function;
+
+/**
+ * Factory class used as an accessor to Collections implementations. 
+ * @author istvanrath
+ */
+public final class CollectionsFactory
+{
+    
+    /**
+     * Instantiates a new empty map.
+     * @since 1.7
+     */
+    public static <K, V> Map<K, V> createMap() {
+        return FRAMEWORK.createMap();
+    }
+
+    /**
+     * Instantiates a new map with the given initial contents.
+     * @since 1.7
+     */
+    public static <K, V> Map<K, V> createMap(Map<K, V> initial) {
+        return FRAMEWORK.createMap(initial);
+    }
+    
+    /**
+     * Instantiates a new tree map. 
+     * @since 2.3
+     */
+    public static <K, V> TreeMap<K, V> createTreeMap() {
+        return FRAMEWORK.createTreeMap();
+    }
+    
+    /**
+     * Instantiates a new empty set.
+     * @since 1.7
+     */
+    public static <E> Set<E> createSet() {
+        return FRAMEWORK.createSet();
+    }
+
+    /**
+     * Instantiates a new set with the given initial contents.
+     * @since 1.7
+     */
+    public static <E> Set<E> createSet(Collection<E> initial) {
+        return FRAMEWORK.createSet(initial);
+    }
+
+    /**
+     * Instantiates an empty set; the key parameter is used to allow using this as a method reference as a
+     * {@link Function}, e.g. in {@link Map#computeIfAbsent(Object, Function)}.
+     * 
+     * @param key
+     *            the value of this parameter is ignored
+     * @since 2.0
+     */
+    public static <T> Set<T> emptySet(Object key) {
+        return FRAMEWORK.createSet();
+    }
+
+    /**
+     * Instantiates a new empty multiset.
+     * @since 1.7
+     */
+    public static <T> IMultiset<T> createMultiset() {
+        return FRAMEWORK.createMultiset();
+    }
+
+    /**
+     * Instantiates an empty multiset; the key parameter is used to allow using this as a method reference as a
+     * {@link Function}, e.g. in {@link Map#computeIfAbsent(Object, Function)}.
+     * 
+     * @param key
+     *            the value of this parameter is ignored
+     * @since 2.0
+     */
+    public static <T> IMultiset<T> emptyMultiset(Object key) {
+        return FRAMEWORK.createMultiset();
+    }
+    
+    /**
+     * Instantiates a new empty delta bag.
+     * @since 1.7
+     */
+    public static <T> IDeltaBag<T> createDeltaBag() {
+        return FRAMEWORK.createDeltaBag();
+    }
+
+    /**
+     * Instantiates a new list that is optimized for registering observers / callbacks.
+     * @since 1.7
+     */
+    public static <O> List<O> createObserverList() {
+        return FRAMEWORK.createObserverList();
+    }
+    
+    /**
+     * Instantiates a size-optimized multimap from keys to sets of values.
+     * <p>For a single key, many values can be associated according to the given bucket semantics.
+     * <p>The keys and values are stored as type fromKeys resp. ofValues; 
+     *  currently Object.class and Long.class are supported.
+     * @since 2.0
+     */
+    public static <K, V> IMultiLookup<K, V> createMultiLookup(
+            Class<? super K> fromKeys, MemoryType toBuckets, Class<? super V> ofValues) {
+        return FRAMEWORK.createMultiLookup(fromKeys, toBuckets, ofValues);
+    }
+    
+    /**
+     * Instantiates a memory storing values.
+     * <p>For a single key, many values can be associated according to the given memory semantics.
+     * <p>The values are stored as type 'values'; 
+     *  currently Object.class and Long.class are supported.
+     * @since 2.0
+     */
+    public static <T> IMemory<T> createMemory(
+            Class<? super T> values, MemoryType memoryType) {
+        return FRAMEWORK.createMemory(values, memoryType);
+    }
+    
+   /**
+    * The type of {@link IMemory}
+     * @since 2.0
+     * TODO add delta as type
+     */
+   public enum MemoryType {
+       /**
+        * A single key-value pair is stored at most once
+        */
+       SETS,
+       /**
+        * Duplicate key-value pairs allowed
+        */
+       MULTISETS
+   }
+   
+    /**
+     * The collections framework of the current configuration.
+     * @since 1.7
+     */
+    private static final ICollectionsFramework FRAMEWORK = new EclipseCollectionsFactory();
+    
+    /**
+     * Interface abstracting over a collections technology that provides custom collection implementations.
+     * @since 1.7
+     */
+    public static interface ICollectionsFramework {
+        
+        public abstract <K,V> Map<K,V> createMap();
+        public abstract <K,V> Map<K,V> createMap(Map<K,V> initial);
+        /**
+         * @since 2.3
+         */
+        public abstract <K, V> TreeMap<K, V> createTreeMap();
+        public abstract <E> Set<E> createSet();
+        public abstract <E> Set<E> createSet(Collection<E> initial);
+        public abstract <T> IMultiset<T> createMultiset();
+        public abstract <T> IDeltaBag<T> createDeltaBag();
+        public abstract <O> List<O> createObserverList();
+        
+        /**
+         * @since 2.0
+         */
+        public abstract <K, V> IMultiLookup<K, V> createMultiLookup(
+                Class<? super K> fromKeys, MemoryType toBuckets, Class<? super V> ofValues);
+        /**
+         * @since 2.0
+         */
+        public abstract <T> IMemory<T> createMemory(Class<? super T> values, MemoryType memoryType);
+    }
+                
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Direction.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Direction.java
new file mode 100644
index 00000000..88f7ec00
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Direction.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+/**
+ * Indicates whether a propagated update event signals the insertion or deletion of an element
+ * 
+ * @author Gabor Bergmann
+ */
+public enum Direction {
+    INSERT, DELETE;
+
+    /**
+     * @since 2.4
+     */
+    public Direction opposite() {
+        switch (this) {
+        case INSERT:
+            return DELETE;
+        default:
+            return INSERT;
+        }
+    }
+
+    /**
+     * @since 2.4
+     */
+    public char asSign() {
+        switch (this) {
+        case INSERT:
+            return '+';
+        default:
+            return '-';
+        }
+    }
+    
+    /**
+     * Returns the direction that is the product of this direction and the other direction.
+     *  
+     * DELETE x DELETE = INSERT
+     * DELETE x INSERT = DELETE
+     * INSERT x DELETE = DELETE
+     * INSERT x INSERT = INSERT 
+     * @since 2.4
+     */
+    public Direction multiply(final Direction other) {
+        switch (this) {
+        case DELETE:
+            return other.opposite();
+        default:
+            return other;
+        }
+    }
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsBagMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsBagMemory.java
new file mode 100644
index 00000000..e24b2448
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsBagMemory.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2004-2008 Gabor Bergmann and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.Iterator;
+import java.util.Set;
+import java.util.function.BiConsumer;
+
+import org.eclipse.collections.impl.map.mutable.primitive.ObjectIntHashMap;
+
+/**
+ * Eclipse Collections-based multiset for tuples. Can contain duplicate occurrences of the same matching.
+ * 
+ * <p>Inherits Eclipse Collections' Object-to-Int primitive hashmap and counts the number of occurrences of each value. 
+ * Element is deleted if # of occurences drops to 0.
+ * 
+ * @author Gabor Bergmann.
+ * @since 1.7
+ * @noreference
+ */
+public abstract class EclipseCollectionsBagMemory<T> extends ObjectIntHashMap<T> implements IMemory<T> {
+
+    public EclipseCollectionsBagMemory() {
+        super();
+    }
+
+    @Override
+    public int getCount(T value) {
+        return super.getIfAbsent(value, 0);
+    }
+    @Override
+    public int getCountUnsafe(Object value) {
+        return super.getIfAbsent(value, 0);
+    }
+    @Override
+    public boolean containsNonZero(T value) {
+        return super.containsKey(value);
+    }
+    @Override
+    public boolean containsNonZeroUnsafe(Object value) {
+        return super.containsKey(value);
+    }
+
+    @Override
+    public void clearAllOf(T value) {
+        super.remove(value);
+    }
+
+
+    @Override
+    public Iterator<T> iterator() {
+        return super.keySet().iterator();
+    }
+
+    @Override
+    public String toString() {
+        return "TM" + super.toString();
+    }
+    
+    @Override
+    public Set<T> distinctValues() {
+        return super.keySet();
+    }
+
+    @Override
+    public void forEachEntryWithMultiplicities(BiConsumer<T, Integer> entryConsumer) {
+        super.forEachKeyValue(entryConsumer::accept);
+    }
+    
+    @Override
+    public int hashCode() {
+        return IMemoryView.hashCode(this);
+    }
+    @Override
+    public boolean equals(Object obj) {
+        return IMemoryView.equals(this, obj);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsDeltaBag.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsDeltaBag.java
new file mode 100644
index 00000000..94ec33cd
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsDeltaBag.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+/**
+ * @author Gabor Bergmann
+ * @since 1.7
+ */
+public class EclipseCollectionsDeltaBag<T> extends EclipseCollectionsBagMemory<T> implements IDeltaBag<T> {
+    
+    @Override
+    public boolean addOne(T value) {
+        return addSigned(value, +1);
+    }
+    
+    @Override
+    public boolean addSigned(T value, int count) {
+        int oldCount = super.getIfAbsent(value, 0);
+        int newCount = oldCount + count;
+        
+        boolean becomesZero = newCount == 0;
+        if (becomesZero)
+            super.removeKey(value);
+        else 
+            super.put(value, newCount);
+       
+        return becomesZero || oldCount == 0;
+    }
+    
+    
+    @Override
+    public boolean removeOne(T value) {
+        return addSigned(value, -1);
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsFactory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsFactory.java
new file mode 100644
index 00000000..5a623c9b
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsFactory.java
@@ -0,0 +1,159 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import org.eclipse.collections.api.map.MutableMap;
+import org.eclipse.collections.impl.factory.Maps;
+import org.eclipse.collections.impl.factory.Sets;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.ICollectionsFramework;
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+
+/**
+ * @author Gabor Bergmann
+ * @since 1.7
+ * @noreference This class is not intended to be referenced by clients.
+ */
+public class EclipseCollectionsFactory implements ICollectionsFramework {
+
+    @Override
+    public <K, V> Map<K, V> createMap() {
+        return Maps.mutable.empty();
+    }
+    
+    @Override
+    public <K, V> Map<K, V> createMap(Map<K, V> initial) {
+        MutableMap<K, V> result = Maps.mutable.ofInitialCapacity(initial.size());
+        result.putAll(initial);
+        return result;
+    }
+    
+    @Override
+    public <K, V> TreeMap<K, V> createTreeMap() {
+        // eclipse collections is doing the same
+        return new TreeMap<>();
+    }
+
+    @Override
+    public <E> Set<E> createSet() {
+        return Sets.mutable.empty();
+    }
+
+    @Override
+    public <E> Set<E> createSet(Collection<E> initial) {
+        return Sets.mutable.ofAll(initial);
+    }
+    
+    @Override
+    public <T> IMultiset<T> createMultiset() {
+        return new EclipseCollectionsMultiset<T>();
+    }
+    
+    @Override
+    public <T> IDeltaBag<T> createDeltaBag() {
+        return new EclipseCollectionsDeltaBag<T>();
+    }
+    
+    @Override
+    public <O> List<O> createObserverList() {
+        return new ArrayList<O>(1); // keep concurrent modification exceptions for error detection
+        // Lists.mutable.empty
+
+    }
+    
+    @Override
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public <K, V> IMultiLookup<K, V> createMultiLookup(
+            Class<? super K> fromKeys, 
+            MemoryType toBuckets,
+            Class<? super V> ofValues) 
+    {
+        boolean longKeys = Long.class.equals(fromKeys);
+        boolean objectKeys = Object.class.equals(fromKeys);
+        if (! (longKeys || objectKeys)) throw new IllegalArgumentException(fromKeys.getName());
+        boolean longValues = Long.class.equals(ofValues);
+        boolean objectValues = Object.class.equals(ofValues);
+        if (! (longValues || objectValues)) throw new IllegalArgumentException(ofValues.getName());
+        
+        if (longKeys) { // K == java.lang.Long
+            if (longValues) { // V == java.lang.Long
+                switch(toBuckets) {
+                case MULTISETS:
+                    return (IMultiLookup<K, V>) new EclipseCollectionsMultiLookup.FromLongs.ToMultisets.OfLongs();
+                case SETS:
+                    return (IMultiLookup<K, V>) new EclipseCollectionsMultiLookup.FromLongs.ToSets.OfLongs();
+                default:
+                    throw new IllegalArgumentException(toBuckets.toString());
+                }
+            } else { // objectValues
+                switch(toBuckets) {
+                case MULTISETS:
+                    return new EclipseCollectionsMultiLookup.FromLongs.ToMultisets.OfObjects();
+                case SETS:
+                    return new EclipseCollectionsMultiLookup.FromLongs.ToSets.OfObjects();
+                default:
+                    throw new IllegalArgumentException(toBuckets.toString());
+                }
+            }
+        } else { // objectKeys
+            if (longValues) { // V == java.lang.Long
+                switch(toBuckets) {
+                case MULTISETS:
+                    return new EclipseCollectionsMultiLookup.FromObjects.ToMultisets.OfLongs();
+                case SETS:
+                    return new EclipseCollectionsMultiLookup.FromObjects.ToSets.OfLongs();
+                default:
+                    throw new IllegalArgumentException(toBuckets.toString());
+                }
+            } else { // objectValues
+                switch(toBuckets) {
+                case MULTISETS:
+                    return new EclipseCollectionsMultiLookup.FromObjects.ToMultisets.OfObjects();
+                case SETS:
+                    return new EclipseCollectionsMultiLookup.FromObjects.ToSets.OfObjects();
+                default:
+                    throw new IllegalArgumentException(toBuckets.toString());
+                }
+            }
+        }
+    }
+    
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> IMemory<T> createMemory(Class<? super T> values, MemoryType memoryType) {
+        if (Long.class.equals(values)) { // T == java.lang.Long
+            switch(memoryType) {
+            case MULTISETS:
+                return (IMemory<T>) new EclipseCollectionsLongMultiset();
+            case SETS:
+                return (IMemory<T>) new EclipseCollectionsLongSetMemory();
+            default:
+                throw new IllegalArgumentException(memoryType.toString());
+            }
+        } else { // objectValues
+            switch(memoryType) {
+            case MULTISETS:
+                return new EclipseCollectionsMultiset<>();
+            case SETS:
+                return new EclipseCollectionsSetMemory<>();
+            default:
+                throw new IllegalArgumentException(memoryType.toString());
+            }
+        }
+    }
+    
+
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsLongMultiset.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsLongMultiset.java
new file mode 100644
index 00000000..88773c5d
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsLongMultiset.java
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.Iterator;
+import java.util.Set;
+import java.util.function.BiConsumer;
+
+import org.eclipse.collections.impl.map.mutable.primitive.LongIntHashMap;
+
+/**
+ * @author Gabor Bergmann
+ * @since 2.0
+ * <p> TODO refactor common methods with {@link EclipseCollectionsMultiset}
+ * <p> TODO refactor into LongBagMemory etc.
+ */
+public class EclipseCollectionsLongMultiset extends LongIntHashMap implements IMultiset<Long> {
+
+    @Override
+    public boolean addOne(Long value) {
+        int oldCount = super.getIfAbsent(value, 0);
+
+        super.put(value, oldCount + 1);
+
+        return oldCount == 0;
+    }
+
+    @Override
+    public boolean addSigned(Long value, int count) {
+        int oldCount = super.getIfAbsent(value, 0);
+        int newCount = oldCount + count;
+        
+        boolean becomesZero = newCount == 0;
+        if (newCount < 0)
+            throw new IllegalStateException(String.format(
+                    "Cannot remove %d occurrences of value '%s' as only %d would remain in %s", 
+                    count, value, newCount, this));
+        else if (becomesZero)
+            super.removeKey(value);
+        else // (newCount > 0)
+            super.put(value, newCount);
+       
+        return becomesZero || oldCount == 0;
+    }
+
+    @Override
+    public boolean removeOne(Long value) {
+        return removeOneInternal(value, true);
+    }
+    /**
+     * @since 2.3
+     */
+    @Override
+    public boolean removeOneOrNop(Long value) {
+        return removeOneInternal(value, false);
+    }
+    
+    
+    /**
+     * @since 2.3
+     */
+    protected boolean removeOneInternal(Long value, boolean throwIfImpossible) {
+        int oldCount = super.getIfAbsent(value, 0);
+        if (oldCount == 0) {
+            if (throwIfImpossible) throw new IllegalStateException(String.format(
+                    "Cannot remove value '%s' that is not contained in %s", 
+                    value, this));
+            else return false;
+        }
+        
+        int rest = oldCount - 1;
+        boolean empty = rest == 0;
+
+        if (!empty) {
+            super.put(value, rest);
+        } else {
+            super.remove(value);
+        }
+
+        return empty;
+    }
+
+    @Override
+    public void clearAllOf(Long value) {
+        super.remove(value);
+    }
+
+    @Override
+    public int getCount(Long value) {
+        return super.getIfAbsent(value, 0);
+    }
+    @Override
+    public int getCountUnsafe(Object value) {
+        return value instanceof Long ? getCount((Long) value) : 0;
+    }
+
+    @Override
+    public boolean containsNonZero(Long value) {
+        return super.containsKey(value);
+    }
+    
+    @Override
+    public boolean containsNonZeroUnsafe(Object value) {
+        return value instanceof Long && containsNonZero((Long) value);
+    }
+
+    @Override
+    public Iterator<Long> iterator() {
+        return EclipseCollectionsLongSetMemory.iteratorOf(super.keySet());
+    }
+
+    @Override
+    public boolean addPositive(Long value, int count) {
+        if (count < 0) {
+            throw new IllegalArgumentException("The count value must be positive!");
+        }
+
+        int oldCount = super.getIfAbsent(value, 0);
+
+        super.put(value, oldCount + count);
+
+        return oldCount == 0;
+    }
+
+    @Override
+    public Set<Long> distinctValues() {
+        return new EclipseCollectionsLongSetMemory.SetWrapper(super.keySet());
+    }
+
+    @Override
+    public void forEachEntryWithMultiplicities(BiConsumer<Long, Integer> entryConsumer) {
+        super.forEachKeyValue(entryConsumer::accept);
+    }
+    
+    @Override
+    public int hashCode() {
+        return IMemoryView.hashCode(this);
+    }
+    @Override
+    public boolean equals(Object obj) {
+        return IMemoryView.equals(this, obj);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsLongSetMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsLongSetMemory.java
new file mode 100644
index 00000000..fceb54fc
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsLongSetMemory.java
@@ -0,0 +1,212 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.eclipse.collections.api.LongIterable;
+import org.eclipse.collections.api.iterator.LongIterator;
+import org.eclipse.collections.api.set.primitive.LongSet;
+import org.eclipse.collections.impl.set.mutable.primitive.LongHashSet;
+
+/**
+ * @author Gabor Bergmann
+ * @since 2.0
+ */
+public class EclipseCollectionsLongSetMemory extends LongHashSet implements ISetMemory<Long> {
+
+    @Override
+    public boolean addOne(Long value) {
+        return super.add(value);
+    }
+
+    @Override
+    public boolean addSigned(Long value, int count) {
+        if (count == 1) return addOne(value);
+        else if (count == -1) return removeOne(value); 
+        else throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean removeOne(Long value) {
+        // Kept for binary compatibility
+        return ISetMemory.super.removeOne(value);
+    }
+    
+    /**
+     * @since 2.3
+     */
+    @Override
+    public boolean removeOneOrNop(Long value) {
+        return super.remove(value);
+    }
+
+    @Override
+    public void clearAllOf(Long value) {
+        super.remove(value);
+    }
+
+    @Override
+    public int getCount(Long value) {
+        return super.contains(value) ? 1 : 0;
+    }
+    
+    @Override
+    public int getCountUnsafe(Object value) {
+        return value instanceof Long ? getCount((Long) value) : 0;
+    }
+
+    @Override
+    public boolean containsNonZero(Long value) {
+        return super.contains(value);
+    }
+    
+    @Override
+    public boolean containsNonZeroUnsafe(Object value) {
+        return value instanceof Long && containsNonZero((Long) value);
+    }
+
+    @Override
+    public Iterator<Long> iterator() {
+        return iteratorOf(this);
+    }
+
+    @Override
+    public Set<Long> distinctValues() {
+        return new SetWrapper(this);
+    }
+    
+    @Override
+    public boolean isEmpty() {
+        return super.isEmpty();
+    }
+    
+    /**
+     * Helper for iterating a LongIterable
+     */
+    public static Iterator<Long> iteratorOf(LongIterable wrapped) {
+        return new Iterator<Long>() {
+            LongIterator longIterator = wrapped.longIterator();
+
+            @Override
+            public boolean hasNext() {
+                return longIterator.hasNext();
+            }
+
+            @Override
+            public Long next() {
+                return longIterator.next();
+            }
+        };
+    }
+    
+    @Override
+    public int hashCode() {
+        return IMemoryView.hashCode(this);
+    }
+    @Override
+    public boolean equals(Object obj) {
+        return IMemoryView.equals(this, obj);
+    }
+
+    
+    /**
+     * Helper that presents a primitive collection as a Set view
+     * @author Gabor Bergmann
+     */
+    public static final class SetWrapper implements Set<Long> {
+        private LongSet wrapped;
+
+        /**
+         * @param wrapped
+         */
+        public SetWrapper(LongSet wrapped) {
+            this.wrapped = wrapped;
+        }
+
+        @Override
+        public int size() {
+            return wrapped.size();
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return wrapped.isEmpty();
+        }
+
+        @Override
+        public boolean contains(Object o) {
+            return o instanceof Long &&  wrapped.contains((Long)o);
+        }
+
+        @Override
+        public Iterator<Long> iterator() {
+            return iteratorOf(wrapped);
+        }
+
+        @Override
+        public boolean containsAll(Collection<?> c) {
+            for (Object object : c) {
+                if (contains(object))
+                    return true;
+            }
+            return false;
+        }
+
+        @Override
+        public Object[] toArray() {
+            return toArray(new Long[wrapped.size()]);
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public <T> T[] toArray(T[] a) {
+            int k = 0;
+            LongIterator iterator = wrapped.longIterator();
+            while (iterator.hasNext()) 
+                a[k++] = (T) Long.valueOf(iterator.next());
+            return a;
+        }
+
+        @Override
+        public boolean add(Long e) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean remove(Object o) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean addAll(Collection<? extends Long> c) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean retainAll(Collection<?> c) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean removeAll(Collection<?> c) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void clear() {
+            throw new UnsupportedOperationException();
+        }
+        
+        
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsMultiLookup.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsMultiLookup.java
new file mode 100644
index 00000000..394135c9
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsMultiLookup.java
@@ -0,0 +1,226 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import org.eclipse.collections.impl.map.mutable.UnifiedMap;
+import org.eclipse.collections.impl.map.mutable.primitive.LongObjectHashMap;
+import tools.refinery.viatra.runtime.matchers.util.MarkedMemory.MarkedMultiset;
+import tools.refinery.viatra.runtime.matchers.util.MarkedMemory.MarkedSet;
+
+import java.util.Set;
+import java.util.stream.Stream;
+
+
+
+/**
+ * Eclipse Collections-based realizations of {@link IMultiLookup}
+ *
+ * @author Gabor Bergmann
+ * @since 2.0
+ */
+class EclipseCollectionsMultiLookup {
+
+    private EclipseCollectionsMultiLookup() {/* Hidden utility class constructor */}
+
+    private static class MarkedSetImpl<Value> extends EclipseCollectionsSetMemory<Value> implements MarkedMemory.MarkedSet<Value> {}
+    private static class MarkedMultisetImpl<Value> extends EclipseCollectionsMultiset<Value> implements MarkedMemory.MarkedMultiset<Value> {}
+    private static class MarkedLongSetImpl extends EclipseCollectionsLongSetMemory implements MarkedMemory.MarkedSet<Long> {}
+    private static class MarkedLongMultisetImpl extends EclipseCollectionsLongMultiset implements MarkedMemory.MarkedMultiset<Long> {}
+
+    public abstract static class FromObjects<Key, Value, Bucket extends MarkedMemory<Value>>
+        extends UnifiedMap<Key, Object> implements IMultiLookupAbstract<Key, Value, Bucket> {
+
+        @Override
+        public boolean equals(Object obj) {
+            return IMultiLookup.equals(this, obj);
+        }
+        @Override
+        public int hashCode() {
+            return IMultiLookup.hashCode(this);
+        }
+
+
+        @Override
+        public Object lowLevelPutIfAbsent(Key key, Value value) {
+            return super.putIfAbsent(key, value);
+        }
+
+        @Override
+        public Object lowLevelGet(Key key) {
+            return super.get(key);
+        }
+
+        @Override
+        public Object lowLevelGetUnsafe(Object key) {
+            return super.get(key);
+        }
+
+        @Override
+        public Object lowLevelRemove(Key key) {
+            return super.remove(key);
+        }
+
+        @Override
+        public void lowLevelPut(Key key, Object valueOrBucket) {
+            super.put(key, valueOrBucket);
+        }
+        @Override
+        public Iterable<Object> lowLevelValues() {
+            return super.values();
+        }
+        @Override
+        public Set<Key> lowLevelKeySet() {
+            return super.keySet();
+        }
+        @Override
+        public int lowLevelSize() {
+            return super.size();
+        }
+
+        @Override
+        public Stream<Key> distinctKeysStream() {
+            // may be more efficient than the default spliterator
+            return super.keySet().stream();
+        }
+
+        public abstract static class ToSets<Key, Value> extends FromObjects<Key, Value, MarkedSet<Value>>
+            implements IMultiLookupAbstract.ToSetsAbstract<Key, Value>
+        {
+            public static class OfObjects<Key, Value> extends ToSets<Key, Value> {
+                @Override
+                public MarkedSet<Value> createMarkedSet() {
+                    return new MarkedSetImpl<Value>();
+                }
+            }
+
+            public static class OfLongs<Key> extends ToSets<Key, Long> {
+                @Override
+                public MarkedSet<Long> createMarkedSet() {
+                    return new MarkedLongSetImpl();
+                }
+            }
+
+        }
+
+        public abstract static class ToMultisets<Key, Value> extends FromObjects<Key, Value, MarkedMultiset<Value>>
+            implements IMultiLookupAbstract.ToMultisetsAbstract<Key, Value>
+        {
+            public static class OfObjects<Key, Value> extends ToMultisets<Key, Value> {
+                @Override
+                public MarkedMultiset<Value> createMarkedMultiset() {
+                    return new MarkedMultisetImpl<Value>();
+                }
+            }
+
+            public static class OfLongs<Key> extends ToMultisets<Key, Long> {
+                @Override
+                public MarkedMultiset<Long> createMarkedMultiset() {
+                    return new MarkedLongMultisetImpl();
+                }
+            }
+
+        }
+
+    }
+
+    public abstract static class FromLongs<Value, Bucket extends MarkedMemory<Value>>
+    extends LongObjectHashMap<Object> implements IMultiLookupAbstract<Long, Value, Bucket> {
+
+        @Override
+        public boolean equals(Object obj) {
+            return IMultiLookup.equals(this, obj);
+        }
+        @Override
+        public int hashCode() {
+            return IMultiLookup.hashCode(this);
+        }
+
+        @Override
+        public Object lowLevelPutIfAbsent(Long key, Value value) {
+            Object old = super.get(key);
+            if (old == null) super.put(key, value);
+            return old;
+        }
+
+        @Override
+        public Object lowLevelGet(Long key) {
+            return super.get(key);
+        }
+
+        @Override
+        public Object lowLevelGetUnsafe(Object key) {
+            return key instanceof Long ? super.get((Long)key) : null;
+        }
+
+        @Override
+        public Object lowLevelRemove(Long key) {
+            return super.remove(key);
+        }
+
+        @Override
+        public void lowLevelPut(Long key, Object valueOrBucket) {
+            super.put(key, valueOrBucket);
+        }
+        @Override
+        public Iterable<Object> lowLevelValues() {
+            return super.values();
+        }
+        @Override
+        public int lowLevelSize() {
+            return super.size();
+        }
+        @Override
+        public Iterable<Long> lowLevelKeySet() {
+            return () -> EclipseCollectionsLongSetMemory.iteratorOf(FromLongs.super.keysView());
+        }
+
+    public abstract static class ToSets<Value> extends FromLongs<Value, MarkedSet<Value>>
+        implements IMultiLookupAbstract.ToSetsAbstract<Long, Value>
+    {
+        public static class OfObjects<Value> extends ToSets<Value> {
+            @Override
+            public MarkedSet<Value> createMarkedSet() {
+                return new MarkedSetImpl<Value>();
+            }
+        }
+
+        public static class OfLongs extends ToSets<Long> {
+            @Override
+            public MarkedSet<Long> createMarkedSet() {
+                return new MarkedLongSetImpl();
+            }
+        }
+
+    }
+
+    public abstract static class ToMultisets<Value> extends FromLongs<Value, MarkedMultiset<Value>>
+        implements IMultiLookupAbstract.ToMultisetsAbstract<Long, Value>
+    {
+        public static class OfObjects<Value> extends ToMultisets<Value> {
+            @Override
+            public MarkedMultiset<Value> createMarkedMultiset() {
+                return new MarkedMultisetImpl<Value>();
+            }
+        }
+
+        public static class OfLongs extends ToMultisets<Long> {
+            @Override
+            public MarkedMultiset<Long> createMarkedMultiset() {
+                return new MarkedLongMultisetImpl();
+            }
+        }
+
+    }
+
+    }
+
+
+}
+
+
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsMultiset.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsMultiset.java
new file mode 100644
index 00000000..46977c8b
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsMultiset.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+/**
+ * @author Gabor Bergmann
+ * @since 1.7
+ */
+public class EclipseCollectionsMultiset<T> extends EclipseCollectionsBagMemory<T> implements IMultiset<T> {
+
+    @Override
+    public boolean addOne(T value) {
+        int oldCount = super.getIfAbsent(value, 0);
+
+        super.put(value, oldCount + 1);
+
+        return oldCount == 0;
+    }
+
+    @Override
+    public boolean addPositive(T value, int count) {
+        if (count < 0) {
+            throw new IllegalArgumentException("The count value must be positive!");
+        }
+
+        int oldCount = super.getIfAbsent(value, 0);
+
+        super.put(value, oldCount + count);
+
+        return oldCount == 0;
+    }
+    
+    @Override
+    public boolean addSigned(T value, int count) {
+        int oldCount = super.getIfAbsent(value, 0);
+        int newCount = oldCount + count;
+        
+        boolean becomesZero = newCount == 0;
+        if (newCount < 0)
+            throw new IllegalStateException(String.format(
+                    "Cannot remove %d occurrences of value '%s' as only %d would remain in %s", 
+                    count, value, newCount, this));
+        else if (becomesZero)
+            super.removeKey(value);
+        else // (newCount > 0)
+            super.put(value, newCount);
+       
+        return becomesZero || oldCount == 0;
+    }
+    
+    
+    @Override
+    public boolean removeOne(T value) {
+        return removeOneInternal(value, true);
+    }
+    
+    @Override
+    public boolean removeOneOrNop(T value) {
+        return removeOneInternal(value, false);
+    }
+
+    /**
+     * @since 2.3
+     */
+    protected boolean removeOneInternal(T value, boolean throwIfImpossible) {
+        int oldCount = super.getIfAbsent(value, 0);
+        if (oldCount == 0) {
+            if (throwIfImpossible) throw new IllegalStateException(String.format(
+                    "Cannot remove value '%s' that is not contained in %s", 
+                    value, this));
+            else return false;
+        }
+        
+        int rest = oldCount - 1;
+        boolean empty = rest == 0;
+
+        if (!empty) {
+            super.put(value, rest);
+        } else {
+            super.remove(value);
+        }
+
+        return empty;
+    }
+    
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsSetMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsSetMemory.java
new file mode 100644
index 00000000..92f65246
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EclipseCollectionsSetMemory.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.Set;
+
+import org.eclipse.collections.impl.set.mutable.UnifiedSet;
+
+/**
+ * @author Gabor Bergmann
+ * @since 2.0
+ */
+public class EclipseCollectionsSetMemory<Value> extends UnifiedSet<Value> implements ISetMemory<Value> {
+    @Override
+    public int getCount(Value value) {
+        return super.contains(value) ? 1 : 0;
+    }
+    @Override
+    public int getCountUnsafe(Object value) {
+        return super.contains(value) ? 1 : 0;
+    }
+    @Override
+    public boolean containsNonZero(Value value) {
+        return super.contains(value);
+    }
+    
+    @Override
+    public boolean containsNonZeroUnsafe(Object value) {
+        return super.contains(value);
+    }
+
+    @Override
+    public boolean addOne(Value value) {
+        return super.add(value);
+    }
+
+    @Override
+    public boolean addSigned(Value value, int count) {
+        if (count == 1) return addOne(value);
+        else if (count == -1) return removeOne(value); 
+        else throw new IllegalStateException();
+    }
+    
+    @Override
+    public boolean removeOne(Value value) {
+        // Kept for binary compatibility
+        return ISetMemory.super.removeOne(value);
+    }
+    
+    @Override
+    public boolean removeOneOrNop(Value value) {
+        return super.remove(value);
+    }
+
+    @Override
+    public void clearAllOf(Value value) {
+        super.remove(value);
+    }
+
+    @Override
+    public Set<Value> distinctValues() {
+        return this;
+    }
+    
+    @Override
+    public Value theContainedVersionOf(Value value) {
+        return super.get(value);
+    }
+    
+    @Override
+    @SuppressWarnings("unchecked")
+    public Value theContainedVersionOfUnsafe(Object value) {
+        if (super.contains(value)) 
+            return super.get((Value)value);
+        else return null;
+    }
+    
+    @Override
+    public int hashCode() {
+        return IMemoryView.hashCode(this);
+    }
+    @Override
+    public boolean equals(Object obj) {
+        return IMemoryView.equals(this, obj);
+    }
+
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EmptyMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EmptyMemory.java
new file mode 100644
index 00000000..a17b3a3f
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/EmptyMemory.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Set;
+
+/**
+ * A singleton immutable empty memory. 
+ * @author Gabor Bergmann
+ * @since 2.0
+ *
+ */
+public class EmptyMemory<T> implements IMemoryView<T> {
+
+    @SuppressWarnings("rawtypes")
+    private static final EmptyMemory INSTANCE = new EmptyMemory();
+    
+    @SuppressWarnings("unchecked")
+    public static <T> EmptyMemory<T> instance() {
+        return INSTANCE;
+    }
+    
+    
+    
+    /**
+     * Singleton; hidden constructor
+     */
+    private EmptyMemory() {
+        super();
+    }
+
+    @Override
+    public Iterator<T> iterator() {
+        return Collections.<T>emptySet().iterator();
+    }
+
+    @Override
+    public int getCount(T value) {
+        return 0;
+    }
+
+    @Override
+    public int getCountUnsafe(Object value) {
+        return 0;
+    }
+
+    @Override
+    public boolean containsNonZero(T value) {
+        return false;
+    }
+
+    @Override
+    public boolean containsNonZeroUnsafe(Object value) {
+        return false;
+    }
+
+    @Override
+    public int size() {
+        return 0;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return true;
+    }
+
+    @Override
+    public Set<T> distinctValues() {
+        return Collections.emptySet();
+    }
+    
+    @Override
+    public int hashCode() {
+        return IMemoryView.hashCode(this);
+    }
+    @Override
+    public boolean equals(Object obj) {
+        return IMemoryView.equals(this, obj);
+    }
+
+    @Override
+    public String toString() {
+        return "{}";
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/ICache.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/ICache.java
new file mode 100644
index 00000000..8c2e54ad
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/ICache.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.function.Supplier;
+
+/**
+ * A cache is a simple key-value pair that stores calculated values for specific key objects
+ * 
+ * <p>
+ * <b>NOTE</b> These caches are not expected to be used outside query backend implementations 
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ * @noreference This interface is not intended to be referenced by clients.
+ */
+public interface ICache {
+
+    /**
+     * Return a selected value for the key object. If the value is not available in the cache yet, the given provider is
+     * called once
+     * @since 2.0
+     */
+    <T> T getValue(Object key, Class<? extends T> clazz, Supplier<T> valueProvider);
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IDeltaBag.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IDeltaBag.java
new file mode 100644
index 00000000..99a4cb3b
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IDeltaBag.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+/**
+ * An {@link IMemory} that represents the difference between two states of a set or {@link IMultiset}, and therefore
+ *  may contain values with a negative multiplicity.
+ * 
+ * @author Gabor Bergmann
+ * @since 1.7
+ */
+public interface IDeltaBag<T> extends IMemory<T> {
+    
+    @Override
+    default boolean removeOneOrNop(T value) {
+        // makes no difference for delta bags
+        return removeOne(value);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMemory.java
new file mode 100644
index 00000000..ea788e53
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMemory.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+/**
+ * A memory containing a positive or negative number of equal() copies for some values.
+ * During iterations, each distinct value is iterated only once.
+ * 
+ * <p> Refined by: <ul> 
+ *  <li>{@link IMultiset}, which always contains values with a nonnegative multiplicity. </li>
+ *  <li>{@link IDeltaBag}, which may contain values with negative multiplicity. </li>
+ *  <li>{@link ISetMemory}, which is just a set (allowed multiplicities: 0 and 1). </li>
+ * </ul>
+ * 
+ * @author Gabor Bergmann
+ * @since 1.7
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface IMemory<T> extends IMemoryView<T>, Clearable {
+
+    /**
+     * Adds one value occurrence to the memory.
+     * 
+     * @return true if the tuple was not present before in the memory, or
+     *      (in case of {@link IDeltaBag}) is no longer present in the memory 
+     */
+    boolean addOne(T value);
+
+    /**
+     * Adds the given number of occurrences to the memory. The count value may or may not be negative.
+     * <p> Precondition if {@link IMultiset}: at least the given amount of occurrences exist, if count is negative.
+     * <p> Precondition if {@link ISetMemory}: count is +1 or -1, the latter is only allowed if the set contains the value.
+     * 
+     * @param count
+     *            the number of occurrences
+     * @return true if the tuple was not present before in the memory, or is no longer present in the memory
+     * @throws IllegalStateException if {@link IMultiset} or {@link ISetMemory} and the number of occurrences in the memory would underflow to negative
+     */
+    boolean addSigned(T value, int count);
+
+    /**
+     * Removes one occurrence of the given value from the memory.
+     * <p> Precondition if {@link IMultiset} or {@link ISetMemory}: the value must have a positive amount of occurrences in the memory.
+     * 
+     * @return true if this was the the last occurrence of the value, or
+     *      (in case of {@link IDeltaBag}) is the first negative occurrence of the value 
+     * @throws IllegalStateException if {@link IMultiset} or {@link ISetMemory} and value had no occurrences in the memory
+     */
+    boolean removeOne(T value);
+    
+    /**
+     * Removes one occurrence of the given value from the memory, if possible.
+     * 
+     * <p> Memory is unchanged and false is returned if 
+     *   {@link IMultiset} or {@link ISetMemory} and value had no occurrences in the memory
+     * 
+     * @return true if this was the the last occurrence of the value, or
+     *      (in case of {@link IDeltaBag}) is the first negative occurrence of the value 
+     *      
+     * @since 2.3
+     */
+    boolean removeOneOrNop(T value);
+
+    /**
+     * Removes all occurrences of the given value from the memory.
+     */
+    void clearAllOf(T value);
+
+    /**
+     * Empties out the memory. 
+     */
+    @Override
+    void clear();
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMemoryView.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMemoryView.java
new file mode 100644
index 00000000..add575c6
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMemoryView.java
@@ -0,0 +1,205 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+/**
+ * A read-only view on a memory containing a positive or negative number of equal() copies for some values.
+ * During iterations, each distinct value is iterated only once.
+ * 
+ * <p> See {@link IMemory}.
+ * 
+ * <p> Implementors must provide semantic (not identity-based) hashCode() and equals() using the static helpers {@link #hashCode(IMemoryView)} and {@link #equals(IMemoryView, Object)} here.
+ * 
+ * @author Gabor Bergmann
+ *
+ * @since 2.0
+ */
+public interface IMemoryView<T> extends Iterable<T> {
+
+    /**
+     * Returns the number of occurrences of the given value.
+     * 
+     * @return the number of occurrences
+     */
+    int getCount(T value);
+
+    /**
+     * Returns the number of occurrences of the given value (which may be of any type).
+     * 
+     * @return the number of occurrences
+     */
+    int getCountUnsafe(Object value);
+
+    /**
+     * @return true if the given value is contained with a nonzero multiplicity
+     */
+    boolean containsNonZero(T value);
+
+    /**
+     * @return true if the given value (which may be of any type) is contained with a nonzero multiplicity
+     */
+    boolean containsNonZeroUnsafe(Object value);
+        
+    /**
+     * @return the number of distinct values 
+     */
+    int size();
+
+    /**
+     * 
+     * @return iff contains at least one value with non-zero occurrences
+     */
+    boolean isEmpty();
+
+    /**
+     * The set of distinct values
+     */
+    Set<T> distinctValues();
+    
+
+    /**
+     * Where supported, returns the stored element that is equal to the given value, or null if none.
+     * Useful for canonicalization in case of non-identity equals(). 
+     * 
+     * <p> For collections that do not support canonicalization, simply returns the argument if contained, null if none.
+     * 
+     * @return a value equal to the argument if such a value is stored, or null if none
+     */
+    default T theContainedVersionOf(T value) {
+        if (containsNonZero(value)) return value; else return null;
+    }
+
+    /**
+     * Where supported, returns the stored element that is equal to the given value (of any type), 
+     * or null if none. 
+     * Useful for canonicalization in case of non-identity equals(). 
+     * 
+     * <p> For collections that do not support canonicalization, simply returns the argument if contained, null if none.
+     *
+     * @return a value equal to the argument if such a value is stored, or null if none
+     */
+    @SuppressWarnings("unchecked")
+    default T theContainedVersionOfUnsafe(Object value) {
+        if (containsNonZeroUnsafe(value)) return (T) value; else return null;
+    }
+    
+
+    /**
+     * @return an unmodifiable view of contained values with their multiplicities
+     */
+    default Iterable<Map.Entry<T, Integer>> entriesWithMultiplicities() {
+        return () -> {
+            Iterator<T> wrapped = distinctValues().iterator();
+            return new Iterator<Map.Entry<T, Integer>> () {
+                @Override
+                public boolean hasNext() {
+                    return wrapped.hasNext();
+                }
+
+                @Override
+                public Map.Entry<T, Integer> next() {
+                    T key = wrapped.next();
+                    int count = getCount(key);
+                    return new Map.Entry<T, Integer>(){
+                        @Override
+                        public T getKey() {
+                            return key;
+                        }
+
+                        @Override
+                        public Integer getValue() {
+                            return count;
+                        }
+
+                        @Override
+                        public Integer setValue(Integer value) {
+                            throw new UnsupportedOperationException();
+                        }
+                        
+                        @Override
+                        public String toString() {
+                            return String.format("%d of %s", count, key);
+                        }
+                        
+                    };
+                }
+                
+            };
+        };
+    }
+    
+    /**
+     * Process contained values with their multiplicities
+     */
+    default void forEachEntryWithMultiplicities(BiConsumer<T, Integer> entryConsumer) {
+        for (T value : distinctValues()) {
+            entryConsumer.accept(value, getCount(value));
+        }
+    }
+    
+    
+    /**
+     * For compatibility with legacy code relying on element-to-integer maps. 
+     * @return an unmodifiable view of contained values with their multiplicities
+     */
+    public default Map<T, Integer> asMap() {
+        return new MemoryViewBackedMapView<>(this);
+    }
+    
+    /**
+     * For compatibility with legacy code relying on element-to-integer maps. 
+     * @return an unmodifiable view of contained values with their multiplicities
+     */
+    public static <T> IMemoryView<T> fromMap(Map<T, Integer> wrapped) {
+        return new MapBackedMemoryView<>(wrapped);
+    }
+    
+    /**
+     * @return a stream of values, iterable once
+     * @since 2.1
+     */
+    public default Stream<T> asStream() {
+        return StreamSupport.stream(spliterator(), false);
+    }
+    
+    /**
+     * Provides semantic equality comparison.
+     */
+    public static <T> boolean equals(IMemoryView<T> self, Object obj) {
+        if (obj instanceof IMemoryView<?>) {
+            IMemoryView<?> other = (IMemoryView<?>) obj;
+            if (other.size() != self.size()) return false;
+            for (Entry<?, Integer> entry : other.entriesWithMultiplicities()) {
+                if ( !entry.getValue().equals(self.getCountUnsafe(entry.getKey())))
+                    return false;
+            }
+            return true;
+        }
+        return false;
+    }
+    
+    /**
+     * Provides semantic hashCode() comparison.
+     */
+    public static <T> int hashCode(IMemoryView<T> memory) {
+        int hashCode = 0;
+        for (T value : memory.distinctValues()) {
+            hashCode += value.hashCode() ^ Integer.hashCode(memory.getCount(value));
+        }
+        return hashCode;
+    }
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiLookup.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiLookup.java
new file mode 100644
index 00000000..1ce1d2c9
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiLookup.java
@@ -0,0 +1,216 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.stream.Stream;
+
+import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory.MemoryType;
+
+/**
+ * A multi-map that associates sets / multisets / delta sets of values to each key.
+ * 
+ * <p> Implementors must provide semantic (not identity-based) hashCode() and equals() using the static helpers {@link #hashCode(IMultiLookup)} and {@link #equals(IMultiLookup, Object)} here.
+ * 
+ * @author Gabor Bergmann
+ * @since 2.0
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface IMultiLookup<Key, Value> {
+    
+    /**
+     * Returns true if this collection is empty, false otherwise.
+     * @since 2.2
+     */
+    boolean isEmpty();
+    
+    
+    /**
+     * Returns true if there are any values associated with the given key.
+     * @param key a key for which associated values are sought
+     * @since 2.3
+     */
+    boolean lookupExists(Key key);
+
+    /**
+     * Returns a (read-only) bucket of values associated with the given key.
+     * Clients must not modify the returned bucket.
+     * @param key a key for which associated values are sought
+     * @return null if key not found, a bucket of values otherwise
+     */
+    IMemoryView<Value> lookup(Key key);
+    
+    /**
+     * Returns a (read-only) bucket of values associated with the given key.
+     * Clients must not modify the returned bucket.
+     * @param key a key for which associated values are sought
+     * @return a bucket of values, never null
+     */
+    default IMemoryView<Value> lookupOrEmpty(Key key) {
+        IMemoryView<Value> bucket = lookup(key);
+        return bucket == null ? EmptyMemory.instance() : bucket;
+    }
+    
+    /**
+     * Returns a (read-only) bucket of values associated with the given key, while simultaneously removing them.
+     * Clients must not modify the returned bucket.
+     * @param key a key for which associated values are sought
+     * @return a bucket of values, never null
+     * @since 2.3
+     */
+    IMemoryView<Value> lookupAndRemoveAll(Key key);
+    
+    /**
+     * Returns a (read-only) bucket of values associated with the given key, which can be of any type.
+     * Clients must not modify the returned bucket.
+     * @param key a key for which associated values are sought (may or may not be of Key type)
+     * @return null if key not found, a bucket of values otherwise
+     */
+    IMemoryView<Value> lookupUnsafe(Object key);
+    
+    /**
+     * Returns a (read-only) bucket of values associated with the given key.
+     * Clients must not modify the returned bucket.
+     * @param key a key for which associated values are sought (may or may not be of Key type)
+     * @return a bucket of values, never null
+     */
+    default IMemoryView<Value> lookupUnsafeOrEmpty(Object key) {
+        IMemoryView<Value> bucket = lookupUnsafe(key);
+        return bucket == null ? EmptyMemory.instance() : bucket;
+    }
+    
+    
+    
+    /**
+     * @return the set of distinct keys that have values associated.
+     */
+    Iterable<Key> distinctKeys();
+    
+    /**
+     * @return the set of distinct keys that have values associated.
+     * @since 2.3
+     */
+    Stream<Key> distinctKeysStream();
+    
+    /**
+     * @return the number of distinct keys that have values associated.
+     */
+    int countKeys();
+    
+    /**
+     * Iterates once over each distinct value.
+     */
+    Iterable<Value> distinctValues();
+    
+    /**
+     * Iterates once over each distinct value.
+     * @since 2.3
+     */
+    Stream<Value> distinctValuesStream();
+
+    
+    
+    /**
+     * How significant was the change?     * 
+     * @author Gabor Bergmann
+     */
+    public enum ChangeGranularity {
+        /**
+         * First key-value pair with given key inserted, or last pair with given key deleted.
+         * (In case of delta maps, also if last negative key-value pair with given key neutralized.)
+         */
+        KEY, 
+        /**
+         * First occurrence of given key-value pair inserted, or last occurrence of the pair deleted, while key still has values associated.
+         * (In case of delta maps, also if last negative occurrence of key-value pair neutralized.)
+         */
+        VALUE, 
+        /**
+         * Duplicate key-value pair inserted or deleted.
+         */
+        DUPLICATE
+    }
+    
+    /**
+     * Adds key-value pair to the lookup structure, or fails if not possible.
+     * <p> If the addition would cause duplicates but the bucket type does not allow it ({@link MemoryType#SETS}), 
+     *   the operation throws an {@link IllegalStateException}.
+     * @return the granularity of the change
+     * @throws IllegalStateException if addition would cause duplication that is not permitted 
+     */
+    public ChangeGranularity addPair(Key key, Value value);
+    /**
+     * Adds key-value pair to the lookup structure. 
+     * <p> If the addition would cause duplicates but the bucket type does not allow it ({@link MemoryType#SETS}), 
+     *   the operation is silently ignored and {@link ChangeGranularity#DUPLICATE} is returned.
+     * @return the granularity of the change, or {@link ChangeGranularity#DUPLICATE} if addition would result in a duplicate and therefore ignored
+     * @since 2.3
+     */
+    public ChangeGranularity addPairOrNop(Key key, Value value);
+    /**
+     * Removes key-value pair from the lookup structure, or fails if not possible.
+     * <p> When attempting to remove a key-value pair with zero multiplicity from a non-delta bucket type 
+     * ({@link MemoryType#SETS} or {@link MemoryType#MULTISETS}}), an {@link IllegalStateException} is thrown. 
+     * @return the granularity of the change
+     * @throws IllegalStateException if removing non-existing element that is not permitted 
+     */
+    public ChangeGranularity removePair(Key key, Value value);
+    /**
+     * Removes key-value pair from the lookup structure.
+     * <p> When attempting to remove a key-value pair with zero multiplicity from a non-delta bucket type 
+     * ({@link MemoryType#SETS} or {@link MemoryType#MULTISETS}}), 
+     * the operation is silently ignored and {@link ChangeGranularity#DUPLICATE} is returned. 
+     * @return the granularity of the change
+     * @throws IllegalStateException if removing non-existing element that is not permitted 
+     * @since 2.3
+     */
+    public ChangeGranularity removePairOrNop(Key key, Value value);
+    
+    /**
+     * Updates multiplicity of key-value pair by a positive amount.
+     * 
+     * <p> PRE: count > 0
+     * 
+     * @return the granularity of the change
+     * @throws IllegalStateException if addition would cause duplication that is not permitted 
+     */
+    public ChangeGranularity addPairPositiveMultiplicity(Key key, Value value, int count);
+    
+    /**
+     * Empties out the lookup structure.
+     */
+    public void clear();
+    
+    /**
+     * Provides semantic equality comparison.
+     */
+    public static <Key, Value> boolean equals(IMultiLookup<Key, Value> self, Object obj) {
+        if (obj instanceof IMultiLookup<?, ?>) {
+            IMultiLookup<?, ?> other = (IMultiLookup<?, ?>) obj;
+            if (other.countKeys() != self.countKeys()) return false;
+            for (Object key : other.distinctKeys()) {
+                if (! other.lookupUnsafe(key).equals(self.lookupUnsafe(key)))
+                    return false;
+            }
+            return true;
+        }
+        return false;
+    }
+    
+    /**
+     * Provides semantic hashCode() comparison.
+     */
+    public static <Key, Value> int hashCode(IMultiLookup<Key, Value> memory) {
+        int hashCode = 0;
+        for (Key key : memory.distinctKeys()) {
+            hashCode += key.hashCode() ^ memory.lookup(key).hashCode();
+        }
+        return hashCode;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiLookupAbstract.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiLookupAbstract.java
new file mode 100644
index 00000000..8b1944c1
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiLookupAbstract.java
@@ -0,0 +1,485 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import tools.refinery.viatra.runtime.matchers.util.MarkedMemory.MarkedSet;
+
+/**
+ * Specialized multimap implementation that saves memory 
+ *  by storing singleton value objects (multiplicity 1) instead of multiset buckets 
+ *  whenever there is only one value associated with a key.
+ * 
+ * <p> See specialized {@link ToSetsAbstract}, {@link ToMultisetsAbstract} for various bucket types.
+ * 
+ * <p> Implemented as a Key->Object map with invariant: <ul>
+ * <li> key maps to null if associated with no values; 
+ * <li> key maps to a single Value iff it is associated with a single value of multiplicity +1;  
+ * <li> key maps to Bucket otherwise
+ * </ul>
+ * 
+ * Note that due to the above invariant, handling +1 and -1 are asymmetric in case of delta maps.
+ *
+ * <p> Not intended as an API, but rather as a 'base class' for implementors.
+ * Realized as an interface with default implementations, instead of an abstract class, 
+ *  to ensure that implementors can easily choose a base class such as UnifiedMap to augment. 
+ *  
+ *  <p> Implementor should inherit from a Map<Key, Object>-like class (primitive map possible) 
+ *      and bind the lowLevel* methods accordingly.
+ * 
+ * @noreference This interface is not intended to be referenced by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
+ * 
+ * @author Gabor Bergmann
+ * @since 2.0
+ *
+ * 
+ */
+public interface IMultiLookupAbstract<Key, Value, Bucket extends MarkedMemory<Value>> extends IMultiLookup<Key, Value> {
+
+    // the following methods must be bound to a concrete Map<Key,Object>-like structure (primitive implementation allowed)
+
+    /**
+     * Implementor shall bind to the low-level get() or equivalent of the underlying Key-to-Object map
+     */
+    abstract Object lowLevelGet(Key key);
+
+    /**
+     * Implementor shall bind to the low-level get() or equivalent of the underlying Key-to-Object map
+     */
+    abstract Object lowLevelGetUnsafe(Object key);
+    
+    /**
+     * Implementor shall bind to the low-level remove() or equivalent of the underlying Key-to-Object map
+     */
+    abstract Object lowLevelRemove(Key key);
+    
+    /**
+     * Implementor shall bind to the low-level putIfAbsent() or equivalent of the underlying Key-to-Object map
+     */
+    abstract Object lowLevelPutIfAbsent(Key key, Value value);
+
+    /**
+     * Implementor shall bind to the low-level put() or equivalent of the underlying Key-to-Object map
+     */
+    abstract void lowLevelPut(Key key, Object valueOrBucket);
+    
+    /**
+     * Implementor shall bind to the low-level values() or equivalent of the underlying Key-to-Object map
+     */
+    abstract Iterable<Object> lowLevelValues();
+    
+    /**
+     * Implementor shall bind to the low-level keySet() or equivalent of the underlying Key-to-Object map
+     */
+    abstract Iterable<Key> lowLevelKeySet();
+    
+    /**
+     * Implementor shall bind to the low-level size() or equivalent of the underlying Key-to-Object map
+     */
+    abstract int lowLevelSize();
+
+    
+    // generic multi-lookup logic
+   
+    @Override
+    default boolean lookupExists(Key key) {
+        Object object = lowLevelGet(key);
+        return null != object;
+    }
+    
+    @Override
+    public default IMemoryView<Value> lookup(Key key) {
+        Object object = lowLevelGet(key);
+        if (object == null) return null;
+        if (object instanceof MarkedMemory) return (Bucket) object;
+        return yieldSingleton((Value)object);
+    }
+    
+    @Override
+    default IMemoryView<Value> lookupAndRemoveAll(Key key) {
+        Object object = lowLevelRemove(key);
+        if (object == null) return EmptyMemory.instance();
+        if (object instanceof MarkedMemory) return (Bucket) object;
+        return yieldSingleton((Value)object);
+    }
+    
+    @Override
+    public default IMemoryView<Value> lookupUnsafe(Object key) {
+        Object object = lowLevelGetUnsafe(key);
+        if (object == null) return null;
+        if (object instanceof MarkedMemory) return (Bucket) object;
+        return yieldSingleton((Value)object);
+    }
+
+    @Override
+    public default ChangeGranularity addPair(Key key, Value value) {
+        return addPairInternal(key, value, true);
+    }
+    
+    @Override
+    default ChangeGranularity addPairOrNop(Key key, Value value) {
+        return addPairInternal(key, value, false);
+    }
+
+    public default ChangeGranularity addPairInternal(Key key, Value value, boolean throwIfImpossible) {
+        Object old = lowLevelPutIfAbsent(key, value);
+        boolean keyChange = (old == null);
+
+        if (keyChange) { // key was not present
+            return ChangeGranularity.KEY;
+        } else { // key was already present
+            Bucket bucket;
+            if (old instanceof MarkedMemory) { // ... as collection
+                bucket = (Bucket) old;
+            } else { // ... as singleton
+                if (!this.duplicatesAllowed() && Objects.equals(value, old)) {
+                    if (throwIfImpossible) 
+                        throw new IllegalStateException(); 
+                    else 
+                        return ChangeGranularity.DUPLICATE;
+                }
+                bucket = createSingletonBucket((Value) old);
+                lowLevelPut(key, bucket);
+            }
+            // will throw if forbidden duplicate, return false if allowed duplicate
+            if (addToBucket(bucket, value, throwIfImpossible)) {
+                // deltas may become empty or a singleton after addition!
+                if (negativesAllowed()) {
+                    if (bucket.isEmpty()) { 
+                        lowLevelRemove(key);
+                        return ChangeGranularity.KEY;
+                    } else {
+                        handleSingleton(key, bucket);                    
+                        return ChangeGranularity.VALUE;
+                    }                    
+                } else return ChangeGranularity.VALUE; 
+            } else return ChangeGranularity.DUPLICATE;
+        }
+    }
+    
+    @Override
+    // TODO deltas not supproted yet
+    default ChangeGranularity addPairPositiveMultiplicity(Key key, Value value, int count) {
+        if (count == 1) return addPair(key, value);
+        // count > 1, always end up with non-singleton bucket
+        
+        Object old = lowLevelGet(key);
+        boolean keyChange = (old == null);
+        
+        Bucket bucket;
+        if (keyChange) { // ... nothing associated to key yet
+            bucket = createSingletonBucket(value);
+            lowLevelPut(key, bucket);
+            --count; // one less to increment later
+        } else if (old instanceof MarkedMemory) { // ... as collection
+            bucket = (Bucket) old;
+        } else { // ... as singleton
+            bucket = createSingletonBucket((Value) old);
+            lowLevelPut(key, bucket);
+        }
+        
+        boolean newValue = bucket.addSigned(value, count);
+        
+        if (keyChange) return ChangeGranularity.KEY;
+        else if (newValue) return ChangeGranularity.VALUE;
+        else return ChangeGranularity.DUPLICATE;
+    }
+
+    @Override
+    public default ChangeGranularity removePair(Key key, Value value) {
+        return removePairInternal(key, value, true);
+    }
+    
+    @Override
+    default ChangeGranularity removePairOrNop(Key key, Value value) {
+        return removePairInternal(key, value, false);
+    }
+
+    public default ChangeGranularity removePairInternal(Key key, Value value, boolean throwIfImpossible) {
+        Object old = lowLevelGet(key);
+        if (old instanceof MarkedMemory) { // ... as collection
+            @SuppressWarnings("unchecked")
+            Bucket bucket = (Bucket) old;
+            // will throw if removing non-existent, return false if removing duplicate
+            boolean valueChange = removeFromBucket(bucket, value, throwIfImpossible);            
+            handleSingleton(key, bucket);
+            if (valueChange) 
+                return ChangeGranularity.VALUE;
+            else 
+                return ChangeGranularity.DUPLICATE;
+        } else if (value.equals(old)) { // matching singleton
+            lowLevelRemove(key);
+            return ChangeGranularity.KEY;
+        } else { // different singleton, will produce a delta if possible
+            if (negativesAllowed()) {
+                Bucket deltaBucket = createDeltaBucket((Value) old, value); // will throw if no deltas supported
+                lowLevelPut(key, deltaBucket);
+                return ChangeGranularity.VALUE; // no key change                
+            } else {
+                if (throwIfImpossible) 
+                    throw new IllegalStateException(); 
+                else 
+                    return ChangeGranularity.DUPLICATE;
+            }
+        }
+    }
+
+    public default void handleSingleton(Key key, Bucket bucket) {
+        Value remainingSingleton = asSingleton(bucket);
+        if (remainingSingleton != null) { // only one remains
+            lowLevelPut(key, remainingSingleton);
+        }
+    }
+
+    @Override
+    public default Iterable<Value> distinctValues() {
+        return new Iterable<Value>() {
+            private final Iterator<Value> EMPTY_ITERATOR = Collections.<Value>emptySet().iterator(); 
+            @Override
+            public Iterator<Value> iterator() {
+                return new Iterator<Value>() {
+                    Iterator<Object> bucketIterator = lowLevelValues().iterator();
+                    Iterator<Value> elementIterator = EMPTY_ITERATOR;
+                    
+                    @Override
+                    public boolean hasNext() {
+                        return (elementIterator.hasNext() || bucketIterator.hasNext());
+                    }
+                    
+                    @Override
+                    public Value next() {
+                        if (elementIterator.hasNext())
+                            return elementIterator.next();
+                        else if (bucketIterator.hasNext()) {
+                            Object bucket = bucketIterator.next();
+                            if (bucket instanceof MarkedMemory) {
+                                elementIterator = 
+                                        ((MarkedMemory) bucket).distinctValues().iterator();
+                                return elementIterator.next();
+                            } else {
+                                elementIterator = EMPTY_ITERATOR;
+                                return (Value) bucket;
+                            }
+                        } else
+                            throw new NoSuchElementException();
+                    }
+
+                    /**
+                     * Not implemented
+                     */
+                    @Override
+                    public void remove() {
+                        throw new UnsupportedOperationException();
+                    }
+
+                };
+            }
+        };
+    }
+    
+    @Override
+    default Stream<Value> distinctValuesStream() {
+        return StreamSupport.stream(distinctValues().spliterator(), false);
+    }
+    
+    @Override
+    default Iterable<Key> distinctKeys() {
+        return lowLevelKeySet();
+    }
+    
+    @Override
+    default Stream<Key> distinctKeysStream() {
+        return StreamSupport.stream(distinctKeys().spliterator(), false);
+    }
+    
+    @Override
+    default int countKeys() {
+        return lowLevelSize();
+    }
+    
+    // the following methods are customized for bucket type
+
+    /**
+     * @return iff negative multiplicites are allowed
+     */
+    abstract boolean negativesAllowed();
+
+    /**
+     * @return iff larger-than-1 multiplicites are allowed
+     * @since 2.3
+     */
+    abstract boolean duplicatesAllowed();
+    
+    /**
+     * Increases the multiplicity of the value in the bucket.
+     * @return true iff non-duplicate
+     * @throws IllegalStateException if disallowed duplication and throwIfImpossible is specified 
+     */
+    abstract boolean addToBucket(Bucket bucket, Value value, boolean throwIfImpossible);
+
+    /**
+     * Decreases the multiplicity of the value in the bucket.
+     * @return false if removing duplicate value
+     * @throws IllegalStateException if removing non-existing value (unless delta map) and throwIfImpossible is specified
+     */
+    abstract boolean removeFromBucket(Bucket bucket, Value value, boolean throwIfImpossible);
+
+    /**
+     * Checks whether the bucket is a singleton, i.e. it contains a single value with multiplicity +1
+     * @return the singleton value, or null if the bucket is not singleton
+     */
+    abstract Value asSingleton(Bucket bucket);
+
+    /**
+     * @return a new bucket consisting of a sole value
+     */
+    abstract Bucket createSingletonBucket(Value value);
+    /**
+     * @return a read-only bucket consisting of a sole value, to be returned to the user
+     */
+    default IMemoryView<Value> yieldSingleton(Value value) {
+        return new SingletonMemoryView<>(value);
+    }
+
+   /**
+    *  @param positive the previously existing value, or null if the delta is to contain a single negative tuple
+     * @return a new bucket consisting of a delta of two values
+     * @throws IllegalStateException if deltas not supported
+     */
+    abstract Bucket createDeltaBucket(Value positive, Value negative);
+    
+    /**
+     * A multi-lookup whose buckets are sets.
+     * 
+     * <p> Not intended as an API, but rather as a 'base class' for implementors.
+     * Realized as an interface with default implementations, instead of an abstract class, 
+     *  to ensure that implementors can easily choose a base class such as UnifiedMap to augment. 
+     *  
+     *  <p> Implementor should inherit from a Map<Key, Object>-like class (primitive map possible) 
+     *      and bind the lowLevel* methods accordingly.
+     * 
+     * @noreference This interface is not intended to be referenced by clients.
+     * @noimplement This interface is not intended to be implemented by clients.
+     * @author Gabor Bergmann
+     */
+    public static interface ToSetsAbstract<Key, Value> extends IMultiLookupAbstract<Key, Value, MarkedMemory.MarkedSet<Value>> {
+        /**
+         * @return a fresh, empty marked set
+         */
+        public MarkedSet<Value> createMarkedSet();
+
+        @Override
+        public default boolean negativesAllowed() {
+            return false;
+        }
+        @Override
+        default boolean duplicatesAllowed() {
+            return false;
+        }
+
+        @Override
+        public default boolean addToBucket(MarkedSet<Value> bucket, Value value, boolean throwIfImpossible) {
+            if (bucket.addOne(value)) return true; 
+            else if (throwIfImpossible) throw new IllegalStateException();
+            else return false;
+        }
+
+        @Override
+        public default boolean removeFromBucket(MarkedSet<Value> bucket, Value value, boolean throwIfImpossible) {
+            return throwIfImpossible ? bucket.removeOne(value) : bucket.removeOneOrNop(value);
+        }
+
+        @Override
+        public default Value asSingleton(MarkedSet<Value> bucket) {
+            return bucket.size() == 1 ? bucket.iterator().next() : null;
+        }
+
+        @Override
+        public default MarkedSet<Value> createSingletonBucket(Value value) {
+            MarkedSet<Value> result = createMarkedSet();
+            result.addOne(value);
+            return result;
+        }
+
+        @Override
+        public default MarkedSet<Value> createDeltaBucket(Value positive, Value negative) {
+            throw new IllegalStateException();
+        }        
+    }
+    
+    /**
+     * A multi-lookup whose buckets are multisets.
+     * 
+     * <p> Not intended as an API, but rather as a 'base class' for implementors.
+     * Realized as an interface with default implementations, instead of an abstract class, 
+     *  to ensure that implementors can easily choose a base class such as UnifiedMap to augment. 
+     *  
+     *  <p> Implementor should inherit from a Map<Key, Object>-like class (primitive map possible) 
+     *      and bind the lowLevel* methods accordingly.
+     * 
+     * @noreference This interface is not intended to be referenced by clients.
+     * @noimplement This interface is not intended to be implemented by clients.
+     * @author Gabor Bergmann
+     */
+    public static interface ToMultisetsAbstract<Key, Value> extends IMultiLookupAbstract<Key, Value, MarkedMemory.MarkedMultiset<Value>> {
+        /**
+         * @return a fresh, empty marked multiset
+         */
+        public MarkedMemory.MarkedMultiset<Value> createMarkedMultiset();
+
+        @Override
+        public default boolean negativesAllowed() {
+            return false;
+        }
+        @Override
+        default boolean duplicatesAllowed() {
+            return true;
+        }
+
+        @Override
+        public default boolean addToBucket(MarkedMemory.MarkedMultiset<Value> bucket, Value value, boolean throwIfImpossible) {
+            return bucket.addOne(value); 
+        }
+
+        @Override
+        public default boolean removeFromBucket(MarkedMemory.MarkedMultiset<Value> bucket, Value value, boolean throwIfImpossible) {
+            return throwIfImpossible ? bucket.removeOne(value) : bucket.removeOneOrNop(value);
+        }
+
+        @Override
+        public default Value asSingleton(MarkedMemory.MarkedMultiset<Value> bucket) {
+            if (bucket.size() != 1) return null;
+            Value candidate = bucket.iterator().next();
+            return bucket.getCount(candidate) == 1 ? candidate : null;
+        }
+
+        @Override
+        public default MarkedMemory.MarkedMultiset<Value> createSingletonBucket(Value value) {
+            MarkedMemory.MarkedMultiset<Value> result = createMarkedMultiset();
+            result.addOne(value);
+            return result;
+        }
+
+        @Override
+        public default MarkedMemory.MarkedMultiset<Value> createDeltaBucket(Value positive, Value negative) {
+            throw new IllegalStateException();
+        }        
+    }
+    
+    
+    // TODO add ToDeltaBagsAbstract
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiset.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiset.java
new file mode 100644
index 00000000..bdd5d597
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IMultiset.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+/**
+ * An {@link IMemory} that always contains values with a nonnegative multiplicity.
+ * 
+ * <p> In case a write operation caused underflow, an {@link IllegalStateException} is thrown.
+ * 
+ * @author Gabor Bergmann
+ * @since 1.7
+ */
+public interface IMultiset<T> extends IMemory<T> {
+
+    /**
+     * Adds the given number of occurrences to the memory. The count value must be a positive number.
+     * 
+     * @param count
+     *            the number of occurrences
+     * @return true if the tuple was not present before in the memory
+     */
+    boolean addPositive(T value, int count);
+    
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IProvider.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IProvider.java
new file mode 100644
index 00000000..cd25dc95
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/IProvider.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import tools.refinery.viatra.runtime.matchers.psystem.queries.PQuery;
+
+/**
+ * A provider interface useful in various registry instances.
+ * 
+ * @author Zoltan Ujhelyi
+ *
+ */
+public interface IProvider<T> extends Supplier<T>{
+    
+    public final class ProvidedValueFunction implements Function<IProvider<PQuery>, PQuery> {
+        @Override
+        public PQuery apply(IProvider<PQuery> input) {
+            return (input == null) ? null : input.get();
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/ISetMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/ISetMemory.java
new file mode 100644
index 00000000..0c03da48
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/ISetMemory.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.function.BiConsumer;
+
+/**
+ * An {@link IMemory} that always contains values with a 0 or +1 multiplicity.
+ * 
+ * <p> In case a write operation causes underflow or overflow, an {@link IllegalStateException} is thrown.
+ * 
+ * @author Gabor Bergmann
+ * @since 2.0
+ */
+public interface ISetMemory<T> extends IMemory<T> {
+    
+    @Override
+    default void forEachEntryWithMultiplicities(BiConsumer<T, Integer> entryConsumer) {
+        for (T t : this.distinctValues()) entryConsumer.accept(t, 1);
+    }
+    
+
+    @Override
+    default boolean removeOne(T value) {
+        if (!removeOneOrNop(value))
+            throw new IllegalStateException();
+        return true;
+    }
+
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MapBackedMemoryView.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MapBackedMemoryView.java
new file mode 100644
index 00000000..3be078bd
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MapBackedMemoryView.java
@@ -0,0 +1,102 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.function.BiConsumer;
+
+/**
+ * Wraps a Map<T, Integer> (mapping elements to non-zero multiplicities) into an {@link IMemoryView}.
+ * 
+ * @author Gabor Bergmann
+ * @since 2.0
+ */
+public class MapBackedMemoryView<T> implements IMemoryView<T> {
+
+    private Map<T, Integer> wrapped;
+
+    /**
+     * @param wrapped an equivalent map from contained objects to multiplicities
+     */
+    protected MapBackedMemoryView(Map<T, Integer> wrapped) {
+        super();
+        this.wrapped = wrapped;
+    }
+
+    @Override
+    public Iterator<T> iterator() {
+        return wrapped.keySet().iterator();
+    }
+
+    @Override
+    public int getCount(T value) {
+        return getCountUnsafe(value);
+    }
+
+    @Override
+    public int getCountUnsafe(Object value) {
+        Integer count = wrapped.get(value);
+        return count == null ? 0 : count;
+    }
+
+    @Override
+    public boolean containsNonZero(T value) {
+        return wrapped.containsKey(value);
+    }
+
+    @Override
+    public boolean containsNonZeroUnsafe(Object value) {
+        return wrapped.containsKey(value);
+    }
+
+    @Override
+    public int size() {
+        return wrapped.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return wrapped.isEmpty();
+    }
+
+    @Override
+    public Set<T> distinctValues() {
+        return wrapped.keySet();
+    }
+    
+    
+    @Override
+    public void forEachEntryWithMultiplicities(BiConsumer<T, Integer> entryConsumer) {
+        for (Entry<T, Integer> entry : wrapped.entrySet()) {
+            entryConsumer.accept(entry.getKey(), entry.getValue());
+        }
+    }
+    
+    @Override
+    public Iterable<Entry<T, Integer>> entriesWithMultiplicities() {
+        return wrapped.entrySet();
+    }
+    
+    @Override
+    public int hashCode() {
+        return IMemoryView.hashCode(this);
+    }
+    @Override
+    public boolean equals(Object obj) {
+        return IMemoryView.equals(this, obj);
+    }
+    
+    @Override
+    public String toString() {
+        return wrapped.toString();
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MarkedMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MarkedMemory.java
new file mode 100644
index 00000000..d22dcbe7
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MarkedMemory.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQueryLabs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+/**
+ * Internal marker type, must only be instantiated inside implementors of IMultiLookupImpl
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @since 2.0
+ */
+public interface MarkedMemory<Value> extends IMemory<Value> {
+    
+    static interface MarkedSet<Value> extends MarkedMemory<Value> {}
+    static interface MarkedMultiset<Value> extends MarkedMemory<Value> {}
+    static interface MarkedDeltaBag<Value> extends MarkedMemory<Value> {}
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MemoryViewBackedMapView.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MemoryViewBackedMapView.java
new file mode 100644
index 00000000..49711a89
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/MemoryViewBackedMapView.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A partial and read-only Map implementation, mapping elements to multiplicities backed by an {@link IMemoryView}.
+ * 
+ * <p> Not implemented: write methods.
+ * 
+ * <p> Inefficiently implemented: {@link #containsValue(Object)}, {@link #values()}, {@link #entrySet()}.
+ * 
+ * @author Gabor Bergmann
+ * @since 2.0
+ */
+public class MemoryViewBackedMapView<T> implements Map<T, Integer> {
+    
+    private static final String READ_ONLY = "Read only";
+    private final IMemoryView<T> wrapped;
+    
+    /**
+     * @param wrapped a memory view whose contents are to be exposed as an element-to-integer map.
+     */
+    protected MemoryViewBackedMapView(IMemoryView<T> wrapped) {
+        super();
+        this.wrapped = wrapped;
+    }
+
+    @Override
+    public int size() {
+        return wrapped.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return wrapped.isEmpty();
+    }
+
+    @Override
+    public boolean containsKey(Object key) {
+        return wrapped.containsNonZeroUnsafe(key);
+    }
+
+    @Override
+    public boolean containsValue(Object value) {
+        if (value instanceof Integer) {
+            for (Entry<T, Integer> entry : wrapped.entriesWithMultiplicities()) {
+                if (entry.getValue().equals(value)) return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public Integer put(T key, Integer value) {
+        throw new UnsupportedOperationException(READ_ONLY);
+    }
+
+    @Override
+    public Integer get(Object key) {
+        int count = wrapped.getCountUnsafe(key);
+        if (count == 0) return null; else return count;
+    }
+
+    @Override
+    public Integer remove(Object key) {
+        throw new UnsupportedOperationException(READ_ONLY);
+    }
+
+    @Override
+    public void putAll(Map<? extends T, ? extends Integer> m) {
+        throw new UnsupportedOperationException(READ_ONLY);
+    }
+
+    @Override
+    public void clear() {
+        throw new UnsupportedOperationException(READ_ONLY);
+    }
+
+    @Override
+    public Set<T> keySet() {
+        return wrapped.distinctValues();
+    }
+
+    @Override
+    public Collection<Integer> values() {
+        Collection<Integer> result = new ArrayList<>();
+        wrapped.forEachEntryWithMultiplicities((value, count) -> result.add(count));
+        return result;
+    }
+
+    @Override
+    public Set<Entry<T, Integer>> entrySet() {
+        Set<Entry<T, Integer>> result = new HashSet<>();
+        for (Entry<T, Integer> entry : wrapped.entriesWithMultiplicities()) {
+            result.add(entry);
+        }
+        return result;
+    }
+
+
+    @Override
+    public String toString() {
+        return wrapped.toString();
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Preconditions.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Preconditions.java
new file mode 100644
index 00000000..e9e5e3a0
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Preconditions.java
@@ -0,0 +1,208 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.function.Supplier;
+
+/**
+ * This class was motivated by the similar Preconditions class from Guava to provide simple precondition checking
+ * functionality. However, as starting with version 2.0 the runtime of VIATRA Query should not depend on Guava, the
+ * relevant functionality of the Preconditions checking functionality will be implemented here.
+ * 
+ * @author Zoltan Ujhelyi
+ * @since 2.0
+ *
+ */
+public final class Preconditions {
+
+    private Preconditions() {
+        /* Utility class constructor */ }
+
+    /**
+     * Ensures the truth of an expression involving one or more parameters to the calling method.
+     *
+     * @param expression
+     *            a boolean expression
+     * @throws IllegalArgumentException
+     *             if {@code expression} is false
+     */
+    public static void checkArgument(boolean expression) {
+        if (!expression) {
+            throw new IllegalArgumentException();
+        }
+    }
+    
+    /**
+     * Ensures the truth of an expression involving one or more parameters to the calling method.
+     *
+     * @param expression
+     *            a boolean expression
+     * @param errorMessage
+     *            the exception message to use if the check fails
+     * @throws IllegalArgumentException
+     *             if {@code expression} is false
+     */
+    public static void checkArgument(boolean expression, String errorMessage) {
+        if (!expression) {
+            throw new IllegalArgumentException(errorMessage);
+        }
+    }
+
+    /**
+     * Ensures the truth of an expression involving one or more parameters to the calling method.
+     *
+     * @param expression
+     *            a boolean expression
+     * @param errorMessageTemplate
+     *            a template for the exception message should the check fail using the Java Formatter syntax; the same
+     *            as used by {@link String#format(String, Object...)}.
+     * @param errorMessageArgs
+     *            the arguments to be substituted into the message template.
+     * @throws IllegalArgumentException
+     *             if {@code expression} is false
+     * @throws NullPointerException
+     *             if the check fails and either {@code errorMessageTemplate} or {@code errorMessageArgs} is null (don't
+     *             let this happen)
+     */
+    public static void checkArgument(boolean expression, String errorMessageTemplate, Object... errorMessageArgs) {
+        if (!expression) {
+            throw new IllegalArgumentException(String.format(errorMessageTemplate, errorMessageArgs));
+        }
+    }
+    
+    /**
+     * Ensures the truth of an expression involving one or more parameters to the calling method.
+     *
+     * @param expression
+     *            a boolean expression
+     * @param messageSupplier a supplier that is called to calculate the error message if necessary
+     * @throws IllegalArgumentException
+     *             if {@code expression} is false
+     */
+    public static void checkArgument(boolean expression, Supplier<String> messageSupplier) {
+        if (!expression) {
+            throw new IllegalArgumentException(messageSupplier.get());
+        }
+    }
+    
+    /**
+     * Ensures the truth of an expression involving one or more fields of a class.
+     *
+     * @param expression
+     *            a boolean expression
+     * @throws IllegalStateException
+     *             if {@code expression} is false
+     */
+    public static void checkState(boolean expression) {
+        if (!expression) {
+            throw new IllegalStateException();
+        }
+    }
+    
+    /**
+     * Ensures the truth of an expression involving one or more fields of a class.
+     *
+     * @param expression
+     *            a boolean expression
+     * @param errorMessage
+     *            the exception message to use if the check fails
+     * @throws IllegalStateException
+     *             if {@code expression} is false
+     */
+    public static void checkState(boolean expression, String errorMessage) {
+        if (!expression) {
+            throw new IllegalStateException(errorMessage);
+        }
+    }
+
+    /**
+     * Ensures the truth of an expression involving one or more fields of a class.
+     *
+     * @param expression
+     *            a boolean expression
+     * @param errorMessageTemplate
+     *            a template for the exception message should the check fail using the Java Formatter syntax; the same
+     *            as used by {@link String#format(String, Object...)}.
+     * @param errorMessageArgs
+     *            the arguments to be substituted into the message template.
+     * @throws IllegalStateException
+     *             if {@code expression} is false
+     * @throws NullPointerException
+     *             if the check fails and either {@code errorMessageTemplate} or {@code errorMessageArgs} is null (don't
+     *             let this happen)
+     */
+    public static void checkState(boolean expression, String errorMessageTemplate, Object... errorMessageArgs) {
+        if (!expression) {
+            throw new IllegalStateException(String.format(errorMessageTemplate, errorMessageArgs));
+        }
+    }
+    
+    /**
+     * Ensures the truth of an expression involving one or more fields of a class.
+     *
+     * @param expression
+     *            a boolean expression
+     * @param messageSupplier a supplier that is called to calculate the error message if necessary
+     * @throws IllegalStateException
+     *             if {@code expression} is false
+     */
+    public static void checkState(boolean expression, Supplier<String> messageSupplier) {
+        if (!expression) {
+            throw new IllegalStateException(messageSupplier.get());
+        }
+    }
+    
+    /**
+     * Ensures that an index is appropriate for a list or array of given size.
+     * 
+     * @param index
+     * @param size
+     * @throws IndexOutOfBoundsException
+     *             if index is negative or is greater or equal to size
+     */
+    public static void checkElementIndex(int index, int size) {
+        if (index < 0 || index >= size) {
+            throw new IndexOutOfBoundsException();
+        }
+    }
+    
+    /**
+     * Ensures that an index is appropriate for a list or array of given size.
+     * 
+     * @param index
+     * @param size
+     * @param errorMessageTemplate
+     *            a template for the exception message should the check fail using the Java Formatter syntax; the same
+     *            as used by {@link String#format(String, Object...)}.
+     * @param errorMessageArgs
+     *            the arguments to be substituted into the message template.
+     * @throws IndexOutOfBoundsException
+     *             if index is negative or is greater or equal to size
+     */
+    public static void checkElementIndex(int index, int size, String errorMessageTemplate, Object... errorMessageArgs) {
+        if (index < 0 || index >= size) {
+            throw new IndexOutOfBoundsException(String.format(errorMessageTemplate, errorMessageArgs));
+        }
+    }
+    
+    /**
+     * Ensures that an index is appropriate for a list or array of given size.
+     * 
+     * @param index
+     * @param size
+     * @param messageSupplier a supplier that is called to calculate the error message if necessary
+     * @throws IndexOutOfBoundsException
+     *             if index is negative or is greater or equal to size
+     */
+    public static void checkElementIndex(int index, int size, Supplier<String> messageSupplier) {
+        if (index < 0 || index >= size) {
+            throw new IndexOutOfBoundsException(messageSupplier.get());
+        }
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/PurgableCache.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/PurgableCache.java
new file mode 100644
index 00000000..c4e6b5af
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/PurgableCache.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2017, Zoltan Ujhelyi, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Supplier;
+
+/**
+ * @author Zoltan Ujhelyi
+ * @since 1.7
+ * @noreference This class is not intended to be referenced by clients.
+ */
+public class PurgableCache implements ICache {
+
+    Map<Object, Object> storage = new HashMap<>();
+    
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T getValue(Object key, Class<? extends T> clazz, Supplier<T> valueProvider) {
+        if (storage.containsKey(key)) {
+            Object value = storage.get(key);
+            Preconditions.checkState(clazz.isInstance(value), "Cache stores for key %s a value of %s that is incompatible with the requested type %s", key, value, clazz);
+            return (T) value;
+        } else {
+            T value = valueProvider.get();
+            storage.put(key, value);
+            return value;
+        }
+    }
+    
+    /**
+     * Removes all values stored in the cache
+     */
+    public void purge() {
+        storage.clear();
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Sets.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Sets.java
new file mode 100644
index 00000000..3749fe06
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Sets.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Gabor Bergmann - initial API and implementation
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * This class was motivated by the similar Sets class from Guava to provide simple set manipulation
+ * functionality. However, as starting with version 2.3 the runtime of VIATRA Query should not depend on Guava, 
+ * not even internally, the relevant subset of Sets methods will be reimplemented here.
+ * 
+ * <p> The current approach is to delegate to Eclipse Collections wherever possible.
+ * Such glue methods are useful so that downstream clients can avoid directly depending on Eclipse Collections.
+ * 
+ * <p> Without an equivalent from Eclipse Collections, {@link #cartesianProduct(List)} is implemented here from scratch.
+ *  
+ * @author Gabor Bergmann
+ * @since 2.3
+ */
+public final class Sets {
+    
+    /**
+     * @since 2.4
+     */
+    public static <A> Set<A> newSet(Iterable<A> elements) {
+        return org.eclipse.collections.impl.factory.Sets.mutable.ofAll(elements);
+    }
+
+    public static <A> Set<A> intersection(Set<A> left, Set<A> right) {
+        return org.eclipse.collections.impl.factory.Sets.intersect(left, right);
+    }
+
+    public static <A> Set<A> difference(Set<A> left, Set<A> right) {
+        return org.eclipse.collections.impl.factory.Sets.difference(left, right);
+    }
+
+    public static <A> Set<A> union(Set<A> left, Set<A> right) {
+        return org.eclipse.collections.impl.factory.Sets.union(left, right);
+    }
+    
+    public static <A> Set<? extends Set<A>> powerSet(Set<A> set) {
+        return org.eclipse.collections.impl.factory.Sets.powerSet(set);
+    }
+
+    public static <A> Set<List<A>> cartesianProduct(List<? extends Set<? extends A>> setsList) {
+        
+        class Suffix { // simple immutable linked list
+            private A head;
+            private Suffix next;
+
+            public Suffix(A head, Suffix next) {
+                super();
+                this.head = head;
+                this.next = next;
+            }
+
+            public List<A> toList() {
+                ArrayList<A> result = new ArrayList<>();
+                for (Suffix cursor = this; cursor!=null; cursor = cursor.next)
+                    result.add(cursor.head);
+                return result;
+            }
+        }
+        
+        // build result lists from end to start, in the form of suffixes 
+        Stream<Suffix> suffixes = Stream.of((Suffix) null /* empty suffix*/); 
+        for (int i = setsList.size()-1; i>=0; --i) { // iterate sets in reverse order
+            Set<? extends A> set = setsList.get(i);
+            suffixes = suffixes.flatMap(suffix -> set.stream().map(newElement -> new Suffix(newElement, suffix)));
+        }
+        
+        
+        return suffixes.map(Suffix::toList).collect(Collectors.toSet());
+    }
+    
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Signed.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Signed.java
new file mode 100644
index 00000000..8f8bc228
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/Signed.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.Objects;
+
+/**
+ * A piece of data associated with a direction. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public class Signed<Payload extends Comparable<Payload>> {
+
+    private final Payload payload;
+    private final Direction direction;
+
+    public Signed(final Direction direction, final Payload payload) {
+        this.payload = payload;
+        this.direction = direction;
+    }
+
+    public Payload getPayload() {
+        return payload;
+    }
+
+    public Direction getDirection() {
+        return direction;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(direction, payload);
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        } else if (obj == null || this.getClass() != obj.getClass()) {
+            return false;
+        } else {
+            @SuppressWarnings("rawtypes")
+            final Signed other = (Signed) obj;
+            return direction == other.direction && Objects.equals(payload, other.payload);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return this.direction.asSign() + this.payload.toString();
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/SingletonInstanceProvider.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/SingletonInstanceProvider.java
new file mode 100644
index 00000000..cc5963f7
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/SingletonInstanceProvider.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2015, Zoltan Ujhelyi, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+/**
+ * A provider implementation that always returns the same object instance. 
+ * @author Zoltan Ujhelyi
+ */
+public class SingletonInstanceProvider<T> implements IProvider<T>{
+
+    private T instance;
+
+    public SingletonInstanceProvider(T instance) {
+        Preconditions.checkArgument(instance != null, "Instance parameter must not be null.");
+        this.instance = instance;
+    }
+    
+    @Override
+    public T get() {
+        return instance;
+    }
+    
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/SingletonMemoryView.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/SingletonMemoryView.java
new file mode 100644
index 00000000..b303f9ad
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/SingletonMemoryView.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2018, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+/**
+ * An immutable memory view that consists of a single non-null element with multiplicity 1.
+ * @author Gabor Bergmann
+ * @since 2.0
+ */
+public final class SingletonMemoryView<Value> implements IMemoryView<Value> {
+
+    private Value wrapped;
+    private static final int ONE_HASH = Integer.valueOf(1).hashCode();
+
+    public SingletonMemoryView(Value value) {
+        this.wrapped = value;
+    }
+
+    @Override
+    public Iterator<Value> iterator() {
+        return new Iterator<Value>() {
+            boolean hasNext = true;
+            
+            @Override
+            public boolean hasNext() {
+                return hasNext;
+            }
+
+            @Override
+            public Value next() {
+                if (hasNext) {
+                    hasNext = false;
+                    return wrapped;
+                } else throw new NoSuchElementException();
+            }
+        };
+    }
+
+    @Override
+    public int getCount(Value value) {
+        return wrapped.equals(value) ? 1 : 0;
+    }
+
+    @Override
+    public int getCountUnsafe(Object value) {
+        return wrapped.equals(value) ? 1 : 0;
+    }
+
+    @Override
+    public boolean containsNonZero(Value value) {
+        return wrapped.equals(value);
+    }
+
+    @Override
+    public boolean containsNonZeroUnsafe(Object value) {
+        return wrapped.equals(value);
+    }
+
+    @Override
+    public int size() {
+        return 1;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return false;
+    }
+
+    @Override
+    public Set<Value> distinctValues() {
+        return Collections.singleton(wrapped);
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof IMemoryView<?>) {
+            IMemoryView<?> other = (IMemoryView<?>) obj;
+            if (1 != other.size()) return false;
+            if (1 != other.getCountUnsafe(wrapped)) return false;
+            return true;
+        }
+        return false;
+    }
+    
+    @Override
+    public int hashCode() {
+        return wrapped.hashCode() ^ ONE_HASH;
+    }
+
+    @Override
+    public String toString() {
+        return "{" + wrapped + "}";
+    }
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/TimelyMemory.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/TimelyMemory.java
new file mode 100644
index 00000000..90fcad4d
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/TimelyMemory.java
@@ -0,0 +1,517 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.Set;
+import java.util.TreeMap;
+
+import tools.refinery.viatra.runtime.matchers.tuple.ITuple;
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.resumable.Resumable;
+import tools.refinery.viatra.runtime.matchers.util.resumable.UnmaskedResumable;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timeline;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Timelines;
+
+/**
+ * A timely memory implementation that incrementally maintains the {@link Timeline}s of tuples. The memory is capable of
+ * lazy folding (see {@link Resumable}).
+ * 
+ * @author Tamas Szabo
+ * @since 2.3
+ */
+public class TimelyMemory<Timestamp extends Comparable<Timestamp>> implements Clearable, UnmaskedResumable<Timestamp> {
+
+    protected final Map<Tuple, TreeMap<Timestamp, CumulativeCounter>> counters;
+    protected final Map<Tuple, Timeline<Timestamp>> timelines;
+    public final TreeMap<Timestamp, Map<Tuple, FoldingState>> foldingState;
+    protected final Set<Tuple> presentAtInfinity;
+    protected final boolean isLazy;
+    protected final Diff<Timestamp> EMPTY_DIFF = new Diff<Timestamp>();
+
+    public TimelyMemory() {
+        this(false);
+    }
+
+    public TimelyMemory(final boolean isLazy) {
+        this.counters = CollectionsFactory.createMap();
+        this.timelines = CollectionsFactory.createMap();
+        this.presentAtInfinity = CollectionsFactory.createSet();
+        this.isLazy = isLazy;
+        if (isLazy) {
+            this.foldingState = CollectionsFactory.createTreeMap();
+        } else {
+            this.foldingState = null;
+        }
+    }
+
+    @Override
+    public Set<Tuple> getResumableTuples() {
+        if (this.foldingState == null || this.foldingState.isEmpty()) {
+            return Collections.emptySet();
+        } else {
+            return this.foldingState.firstEntry().getValue().keySet();
+        }
+    }
+
+    @Override
+    public Timestamp getResumableTimestamp() {
+        if (this.foldingState == null || this.foldingState.isEmpty()) {
+            return null;
+        } else {
+            return this.foldingState.firstKey();
+        }
+    }
+
+    /**
+     * Registers the given folding state for the specified timestamp and tuple. If there is already a state stored, the
+     * two states will be merged together.
+     */
+    protected void addFoldingState(final Tuple tuple, final FoldingState state, final Timestamp timestamp) {
+        assert state.diff != 0;
+        final Map<Tuple, FoldingState> tupleMap = this.foldingState.computeIfAbsent(timestamp,
+                k -> CollectionsFactory.createMap());
+        tupleMap.compute(tuple, (k, v) -> {
+            return v == null ? state : v.merge(state);
+        });
+    }
+
+    @Override
+    public Map<Tuple, Diff<Timestamp>> resumeAt(final Timestamp timestamp) {
+        Timestamp current = this.getResumableTimestamp();
+        if (current == null) {
+            throw new IllegalStateException("There is othing to fold!");
+        } else if (current.compareTo(timestamp) != 0) {
+            // It can happen that already registered folding states end up having zero diffs,
+            // and we are instructed to continue folding at a timestamp that is higher
+            // than the lowest timestamp with a folding state.
+            // However, we only do garbage collection in doFoldingState, so now it is time to
+            // first clean up those states with zero diffs.
+            while (current != null && current.compareTo(timestamp) < 0) {
+                final Map<Tuple, FoldingState> tupleMap = this.foldingState.remove(current);
+                for (final Entry<Tuple, FoldingState> entry : tupleMap.entrySet()) {
+                    final Tuple key = entry.getKey();
+                    final FoldingState value = entry.getValue();
+                    if (value.diff != 0) {
+                        throw new IllegalStateException("Expected zero diff during garbage collection at " + current
+                                + ", but the diff was " + value.diff + "!");
+                    }
+                    doFoldingStep(key, value, current);
+                }
+                current = this.getResumableTimestamp();
+            }
+            if (current == null || current.compareTo(timestamp) != 0) {
+                throw new IllegalStateException("Expected to continue folding at " + timestamp + "!");
+            }
+        }
+
+        final Map<Tuple, Diff<Timestamp>> diffMap = CollectionsFactory.createMap();
+        final Map<Tuple, FoldingState> tupleMap = this.foldingState.remove(timestamp);
+        for (final Entry<Tuple, FoldingState> entry : tupleMap.entrySet()) {
+            final Tuple key = entry.getKey();
+            final FoldingState value = entry.getValue();
+            diffMap.put(key, doFoldingStep(key, value, timestamp));
+        }
+
+        if (this.foldingState.get(timestamp) != null) {
+            throw new IllegalStateException(
+                    "Folding at " + timestamp + " produced more folding work at the same timestamp!");
+        }
+
+        return diffMap;
+    }
+
+    protected Diff<Timestamp> doFoldingStep(final Tuple tuple, final FoldingState state, final Timestamp timestamp) {
+        final CumulativeCounter counter = getCounter(tuple, timestamp);
+        if (state.diff == 0) {
+            gcCounters(counter, tuple, timestamp);
+            return EMPTY_DIFF;
+        } else {
+            final Diff<Timestamp> resultDiff = new Diff<>();
+            final Timestamp nextTimestamp = this.counters.get(tuple).higherKey(timestamp);
+
+            final int oldCumulative = counter.cumulative;
+
+            counter.cumulative += state.diff;
+
+            computeDiffsLazy(state.diff < 0 ? Direction.DELETE : Direction.INSERT, oldCumulative, counter.cumulative,
+                    timestamp, nextTimestamp, resultDiff);
+
+            gcCounters(counter, tuple, timestamp);
+            updateTimeline(tuple, resultDiff);
+
+            // prepare folding state for next timestamp
+            if (nextTimestamp != null) {
+                // propagate the incoming diff, not the diff stored in counter
+                addFoldingState(tuple, new FoldingState(state.diff), nextTimestamp);
+            }
+
+            return resultDiff;
+        }
+    }
+
+    /**
+     * On-demand initializes and returns the counter for the given tuple and timestamp.
+     */
+    protected CumulativeCounter getCounter(final Tuple tuple, final Timestamp timestamp) {
+        final TreeMap<Timestamp, CumulativeCounter> counterTimeline = this.counters.computeIfAbsent(tuple,
+                k -> CollectionsFactory.createTreeMap());
+
+        final CumulativeCounter counter = counterTimeline.computeIfAbsent(timestamp, k -> {
+            final Entry<Timestamp, CumulativeCounter> previousCounter = counterTimeline.lowerEntry(k);
+            final int previousCumulative = previousCounter == null ? 0 : previousCounter.getValue().cumulative;
+            return new CumulativeCounter(0, previousCumulative);
+        });
+
+        return counter;
+    }
+
+    /**
+     * Garbage collects the counter of the given tuple and timestamp if the new diff is zero.
+     */
+    protected void gcCounters(final CumulativeCounter counter, final Tuple tuple, final Timestamp timestamp) {
+        if (counter.diff == 0) {
+            final TreeMap<Timestamp, CumulativeCounter> counterMap = this.counters.get(tuple);
+            counterMap.remove(timestamp);
+            if (counterMap.isEmpty()) {
+                this.counters.remove(tuple);
+            }
+        }
+    }
+
+    /**
+     * Utility method that computes the timeline diffs in case of lazy memories. The diffs will be inserted into the
+     * input parameter. This method computes diffs for entire plateaus that spans from timestamp to nextTimestamp.
+     * 
+     * Compared to the eager version of this method, the lazy version makes use of both the old and the new cumulative
+     * values because it can happen that the cumulative is incremented by a value that is larger than 1 (as folding
+     * states are merged together). This means that we cant decide whether the cumulative became positive by comparing
+     * the new value to 1.
+     */
+    protected void computeDiffsLazy(final Direction direction, final int oldCumulative, final int newCumulative,
+            final Timestamp timestamp, final Timestamp nextTimestamp, final Diff<Timestamp> diffs) {
+        if (direction == Direction.INSERT) {
+            if (newCumulative == 0) {
+                throw new IllegalStateException("Cumulative count can never be negative!");
+            } else {
+                if (oldCumulative == 0 /* current became positive */) {
+                    // (1) either we sent out a DELETE before and now we need to cancel it,
+                    // (2) or we just INSERT this for the first time
+                    diffs.add(new Signed<>(Direction.INSERT, timestamp));
+                    if (nextTimestamp != null) {
+                        diffs.add(new Signed<>(Direction.DELETE, nextTimestamp));
+                    }
+                } else /* current stays positive */ {
+                    // nothing to do
+                }
+            }
+        } else {
+            if (newCumulative < 0) {
+                throw new IllegalStateException("Cumulative count can never be negative!");
+            } else {
+                if (newCumulative == 0 /* current became zero */) {
+                    diffs.add(new Signed<>(Direction.DELETE, timestamp));
+                    if (nextTimestamp != null) {
+                        diffs.add(new Signed<>(Direction.INSERT, nextTimestamp));
+                    }
+                } else /* current stays positive */ {
+                    // nothing to do
+                }
+            }
+        }
+    }
+
+    /**
+     * Utility method that computes the timeline diffs in case of eager memories. The diffs will be inserted into the
+     * input parameter. This method computes diffs that describe momentary changes instead of plateaus. Returns a
+     * {@link SignChange} that describes how the sign has changed at the given timestamp.
+     */
+    protected SignChange computeDiffsEager(final Direction direction, final CumulativeCounter counter,
+            final SignChange signChangeAtPrevious, final Timestamp timestamp, final Diff<Timestamp> diffs) {
+        if (direction == Direction.INSERT) {
+            if (counter.cumulative == 0) {
+                throw new IllegalStateException("Cumulative count can never be negative!");
+            } else {
+                if (counter.cumulative == 1 /* current became positive */) {
+                    if (signChangeAtPrevious != SignChange.BECAME_POSITIVE) {
+                        // (1) either we sent out a DELETE before and now we need to cancel it,
+                        // (2) or we just INSERT this for the first time
+                        diffs.add(new Signed<>(Direction.INSERT, timestamp));
+                    } else {
+                        // we have already emitted this at the previous timestamp
+                        // both previous and current became positive
+                        throw new IllegalStateException(
+                                "This would mean that the diff at current is 0 " + counter.diff);
+                    }
+
+                    // remember for next timestamp
+                    return SignChange.BECAME_POSITIVE;
+                } else /* current stays positive */ {
+                    if (signChangeAtPrevious == SignChange.BECAME_POSITIVE) {
+                        // we sent out an INSERT before and now the timeline is positive already starting at previous
+                        // we need to cancel the effect of this with a DELETE
+                        diffs.add(new Signed<>(Direction.DELETE, timestamp));
+                    } else {
+                        // this is normal, both previous and current was positive and stays positive
+                    }
+
+                    // remember for next timestamp
+                    return SignChange.IRRELEVANT;
+                }
+            }
+        } else {
+            if (counter.cumulative < 0) {
+                throw new IllegalStateException("Cumulative count can never be negative!");
+            } else {
+                if (counter.cumulative == 0 /* current became zero */) {
+                    if (signChangeAtPrevious != SignChange.BECAME_ZERO) {
+                        // (1) either we sent out a INSERT before and now we need to cancel it,
+                        // (2) or we just DELETE this for the first time
+                        diffs.add(new Signed<>(Direction.DELETE, timestamp));
+                    } else {
+                        // we have already emitted this at the previous timestamp
+                        // both previous and current became zero
+                        throw new IllegalStateException(
+                                "This would mean that the diff at current is 0 " + counter.diff);
+                    }
+
+                    // remember for next timestamp
+                    return SignChange.BECAME_ZERO;
+                } else /* current stays positive */ {
+                    if (signChangeAtPrevious == SignChange.BECAME_ZERO) {
+                        // we sent out a DELETE before and now the timeline is zero already starting at previous
+                        // we need to cancel the effect of this with a INSERT
+                        diffs.add(new Signed<>(Direction.INSERT, timestamp));
+                    } else {
+                        // this is normal, both previous and current was positive and stays positive
+                    }
+
+                    // remember for next timestamp
+                    return SignChange.IRRELEVANT;
+                }
+            }
+        }
+    }
+
+    public Diff<Timestamp> put(final Tuple tuple, final Timestamp timestamp) {
+        if (this.isLazy) {
+            return putLazy(tuple, timestamp);
+        } else {
+            return putEager(tuple, timestamp);
+        }
+    }
+
+    public Diff<Timestamp> remove(final Tuple tuple, final Timestamp timestamp) {
+        if (this.isLazy) {
+            return removeLazy(tuple, timestamp);
+        } else {
+            return removeEager(tuple, timestamp);
+        }
+    }
+
+    protected Diff<Timestamp> putEager(final Tuple tuple, final Timestamp timestamp) {
+        final Diff<Timestamp> resultDiff = new Diff<>();
+        final CumulativeCounter counter = getCounter(tuple, timestamp);
+        ++counter.diff;
+
+        // before the INSERT timestamp, no change at all
+        // it cannot happen that those became positive in this round
+        SignChange signChangeAtPrevious = SignChange.IRRELEVANT;
+
+        final NavigableMap<Timestamp, CumulativeCounter> nextCounters = this.counters.get(tuple).tailMap(timestamp,
+                true);
+        for (final Entry<Timestamp, CumulativeCounter> currentEntry : nextCounters.entrySet()) {
+            final Timestamp currentTimestamp = currentEntry.getKey();
+            final CumulativeCounter currentCounter = currentEntry.getValue();
+            ++currentCounter.cumulative;
+            signChangeAtPrevious = computeDiffsEager(Direction.INSERT, currentCounter, signChangeAtPrevious,
+                    currentTimestamp, resultDiff);
+        }
+
+        gcCounters(counter, tuple, timestamp);
+        updateTimeline(tuple, resultDiff);
+
+        return resultDiff;
+    }
+
+    protected Diff<Timestamp> putLazy(final Tuple tuple, final Timestamp timestamp) {
+        final CumulativeCounter counter = getCounter(tuple, timestamp);
+        counter.diff += 1;
+        // before the INSERT timestamp, no change at all
+        // it cannot happen that those became positive in this round
+        addFoldingState(tuple, new FoldingState(+1), timestamp);
+        return EMPTY_DIFF;
+    }
+
+    protected Diff<Timestamp> removeEager(final Tuple tuple, final Timestamp timestamp) {
+        final Diff<Timestamp> resultDiff = new Diff<>();
+        final CumulativeCounter counter = getCounter(tuple, timestamp);
+        --counter.diff;
+
+        // before the DELETE timestamp, no change at all
+        // it cannot happen that those became zero in this round
+        SignChange signChangeAtPrevious = SignChange.IRRELEVANT;
+
+        final NavigableMap<Timestamp, CumulativeCounter> nextCounters = this.counters.get(tuple).tailMap(timestamp,
+                true);
+        for (final Entry<Timestamp, CumulativeCounter> currentEntry : nextCounters.entrySet()) {
+            final Timestamp currentTimestamp = currentEntry.getKey();
+            final CumulativeCounter currentCounter = currentEntry.getValue();
+            --currentCounter.cumulative;
+            signChangeAtPrevious = computeDiffsEager(Direction.DELETE, currentCounter, signChangeAtPrevious,
+                    currentTimestamp, resultDiff);
+        }
+
+        gcCounters(counter, tuple, timestamp);
+        updateTimeline(tuple, resultDiff);
+
+        return resultDiff;
+    }
+
+    protected Diff<Timestamp> removeLazy(final Tuple tuple, final Timestamp timestamp) {
+        final CumulativeCounter counter = getCounter(tuple, timestamp);
+        counter.diff -= 1;
+        // before the DELETE timestamp, no change at all
+        // it cannot happen that those became zero in this round
+        addFoldingState(tuple, new FoldingState(-1), timestamp);
+        return EMPTY_DIFF;
+    }
+
+    /**
+     * Updates and garbage collects the timeline of the given tuple based on the given timeline diff.
+     */
+    protected void updateTimeline(final Tuple tuple, final Diff<Timestamp> diff) {
+        if (!diff.isEmpty()) {
+            this.timelines.compute(tuple, (k, oldTimeline) -> {
+                this.presentAtInfinity.remove(tuple);
+                final Timeline<Timestamp> timeline = oldTimeline == null ? Timelines.createFrom(diff)
+                        : oldTimeline.mergeAdditive(diff);
+                if (timeline.isPresentAtInfinity()) {
+                    this.presentAtInfinity.add(tuple);
+                }
+                if (timeline.isEmpty()) {
+                    return null;
+                } else {
+                    return timeline;
+                }
+            });
+        }
+    }
+
+    /**
+     * @since 2.8
+     */
+    public Set<Tuple> getTuplesAtInfinity() {
+        return this.presentAtInfinity;
+    }
+
+    /**
+     * Returns the number of tuples that are present at the moment 'infinity'.
+     */
+    public int getCountAtInfinity() {
+        return this.presentAtInfinity.size();
+    }
+
+    /**
+     * Returns true if the given tuple is present at the moment 'infinity'.
+     */
+    public boolean isPresentAtInfinity(final Tuple tuple) {
+        final Timeline<Timestamp> timeline = this.timelines.get(tuple);
+        if (timeline == null) {
+            return false;
+        } else {
+            return timeline.isPresentAtInfinity();
+        }
+    }
+
+    public boolean isEmpty() {
+        return this.counters.isEmpty();
+    }
+
+    public int size() {
+        return this.counters.size();
+    }
+
+    public Set<Tuple> keySet() {
+        return this.counters.keySet();
+    }
+
+    public Map<Tuple, Timeline<Timestamp>> asMap() {
+        return this.timelines;
+    }
+
+    public Timeline<Timestamp> get(final ITuple tuple) {
+        return this.timelines.get(tuple);
+    }
+
+    @Override
+    public void clear() {
+        this.counters.clear();
+        this.timelines.clear();
+        if (this.foldingState != null) {
+            this.foldingState.clear();
+        }
+    }
+
+    public boolean containsKey(final ITuple tuple) {
+        return this.counters.containsKey(tuple);
+    }
+
+    @Override
+    public String toString() {
+        return this.counters + "\n" + this.timelines + "\n" + this.foldingState + "\n";
+    }
+
+    protected static final class CumulativeCounter {
+        protected int diff;
+        protected int cumulative;
+
+        protected CumulativeCounter(final int diff, final int cumulative) {
+            this.diff = diff;
+            this.cumulative = cumulative;
+        }
+
+        @Override
+        public String toString() {
+            return "{diff=" + this.diff + ", cumulative=" + this.cumulative + "}";
+        }
+
+    }
+
+    protected static final class FoldingState {
+        protected final int diff;
+
+        protected FoldingState(final int diff) {
+            this.diff = diff;
+        }
+
+        @Override
+        public String toString() {
+            return "{diff=" + this.diff + "}";
+        }
+
+        /**
+         * The returned result will never be null, even if the resulting diff is zero.
+         */
+        public FoldingState merge(final FoldingState that) {
+            Preconditions.checkArgument(that != null);
+            return new FoldingState(this.diff + that.diff);
+        }
+
+    }
+
+    protected enum SignChange {
+        BECAME_POSITIVE, BECAME_ZERO, IRRELEVANT;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/MaskedResumable.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/MaskedResumable.java
new file mode 100644
index 00000000..ea70e61d
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/MaskedResumable.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util.resumable;
+
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+
+/**
+ * A masked {@link Resumable} implementation, which maintains lazy folding per tuple signature. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public interface MaskedResumable<Timestamp extends Comparable<Timestamp>> extends Resumable<Timestamp> {
+
+    /**
+     * When called, the folding of the state shall be resumed at the given timestamp. The resumable is expected to
+     * do a folding step at the given timestamp only. Afterwards, folding shall be interrupted, even if there is more
+     * folding to do towards higher timestamps.
+     */
+    public Map<Tuple, Map<Tuple, Diff<Timestamp>>> resumeAt(final Timestamp timestamp);
+    
+    /**
+     * Returns the set of signatures for which lazy folding shall be resumed at the next timestamp. 
+     */
+    public Iterable<Tuple> getResumableSignatures();
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/Resumable.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/Resumable.java
new file mode 100644
index 00000000..2861df20
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/Resumable.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util.resumable;
+
+/**
+ * A resumable lazily folds its state towards higher timestamps. Folding shall be done in the increasing order of
+ * timestamps, and it shall be interrupted after each step. The resumable can then be instructed to resume the folding,
+ * one step at a time.
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public interface Resumable<Timestamp extends Comparable<Timestamp>> {
+
+    /**
+     * Returns the smallest timestamp where lazy folding shall be resumed, or null if there is no more folding to do in this
+     * resumable.
+     */
+    public Timestamp getResumableTimestamp();
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/UnmaskedResumable.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/UnmaskedResumable.java
new file mode 100644
index 00000000..1671940b
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/resumable/UnmaskedResumable.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Tamas Szabo, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util.resumable;
+
+import java.util.Map;
+
+import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
+import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
+
+/**
+ * A unmasked {@link Resumable} implementation, which maintains lazy folding without caring about tuple signatures. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public interface UnmaskedResumable<Timestamp extends Comparable<Timestamp>> extends Resumable<Timestamp> {
+
+    /**
+     * When called, the folding of the state shall be resumed at the given timestamp. The resumable is expected to
+     * do a folding step at the given timestamp only. Afterwards, folding shall be interrupted, even if there is more
+     * folding to do towards higher timestamps.
+     */
+    public Map<Tuple, Diff<Timestamp>> resumeAt(final Timestamp timestamp);
+
+    /**
+     * Returns the set of tuples for which lazy folding shall be resumed at the next timestamp. 
+     */
+    public Iterable<Tuple> getResumableTuples();
+    
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/CompactTimeline.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/CompactTimeline.java
new file mode 100644
index 00000000..0532d094
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/CompactTimeline.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util.timeline;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.Signed;
+
+/**
+ * A compact timeline may cosist of an arbitrary amount of moments. 
+ * It is backed by an {@link ArrayList}. 
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public class CompactTimeline<Timestamp extends Comparable<Timestamp>> extends Timeline<Timestamp> {
+
+    protected final List<Timestamp> elements;
+
+    CompactTimeline() {
+        this.elements = new ArrayList<>();
+    }
+    
+    CompactTimeline(final Timestamp timestamp) {
+        this();
+        this.elements.add(timestamp);
+    }
+    
+    CompactTimeline(final List<Timestamp> timestamps) {
+        this.elements = new ArrayList<>(timestamps.size());
+        this.elements.addAll(timestamps);
+    }
+
+    CompactTimeline(final Diff<Timestamp> diff) {
+        this.elements = new ArrayList<>(diff.size());
+        Direction expected = Direction.INSERT;
+        for (Signed<Timestamp> signed : diff) {
+            if (!expected.equals(signed.getDirection())) {
+                throw new IllegalStateException(String.format("Expected direction (%s) constraint violated! %s @%s",
+                        expected, diff, signed.getPayload()));
+            }
+            this.elements.add(signed.getPayload());
+            expected = expected.opposite();
+        }
+    }
+    
+    @Override
+    public Signed<Timestamp> getSigned(final int index) {
+        final Direction direction = index % 2 == 0 ? Direction.INSERT : Direction.DELETE;
+        return new Signed<>(direction, this.getUnsigned(index));
+    }
+
+    @Override
+    public Timestamp getUnsigned(final int index) {
+        if (this.elements.size() <= index) {
+            throw new IllegalArgumentException(
+                    "Timeline size (" + this.size() + ") is smaller than requested index " + index + "!");
+        } else {
+            return this.elements.get(index);
+        }
+    }
+
+    @Override
+    public int size() {
+        return this.elements.size();
+    }
+
+    @Override
+    public boolean isPresentAtInfinity() {
+        // if it has an odd length, then it ends with "INSERT"
+        return this.size() % 2 == 1;
+    }
+
+    @Override
+    public Iterable<Signed<Timestamp>> asChangeSequence() {
+        Iterable<Timestamp> outer = this.elements;
+        return () -> {
+            final Iterator<Timestamp> itr = outer.iterator();
+            return new Iterator<Signed<Timestamp>>() {
+                Direction direction = Direction.INSERT;
+
+                @Override
+                public boolean hasNext() {
+                    return itr.hasNext();
+                }
+
+                @Override
+                public Signed<Timestamp> next() {
+                    final Signed<Timestamp> result = new Signed<Timestamp>(direction, itr.next());
+                    direction = direction.opposite();
+                    return result;
+                }
+            };
+        };
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.elements.isEmpty();
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Diff.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Diff.java
new file mode 100644
index 00000000..cec6049e
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Diff.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util.timeline;
+
+import java.util.ArrayList;
+
+import tools.refinery.viatra.runtime.matchers.util.Signed;
+
+/**
+ * The description of a delta that specifies how a {@link Timeline} changes. It consists of {@link Signed} timestamps that
+ * depict the moments of insertions and deletions on the timeline.
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ * @param <Timestamp>
+ *            the type representing the timestamps
+ */
+public class Diff<Timestamp extends Comparable<Timestamp>> extends ArrayList<Signed<Timestamp>> {
+
+    private static final long serialVersionUID = 3853460426655994160L;
+
+    public Diff() {
+
+    }
+
+    public void appendWithCancellation(Signed<Timestamp> item) {
+        if (this.isEmpty()) {
+            this.add(item);
+        } else {
+            final Signed<Timestamp> last = this.get(this.size() - 1);
+            final int lastMinusItem = last.getPayload().compareTo(item.getPayload());
+            if (lastMinusItem == 0) {
+                if (last.getDirection() != item.getDirection()) {
+                    // cancellation
+                    this.remove(this.size() - 1);
+                } else {
+                    throw new IllegalStateException(
+                            "Trying to insert or delete for the second time at the same timestamp! " + item);
+                }
+            } else if (lastMinusItem > 0) {
+                throw new IllegalStateException(
+                        "Trying to append a timestamp that is smaller than the last one! " + last + " " + item);
+            } else {
+                this.add(item);
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/SingletonTimeline.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/SingletonTimeline.java
new file mode 100644
index 00000000..526a95f5
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/SingletonTimeline.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util.timeline;
+
+import java.util.Collections;
+
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.Signed;
+
+/**
+ * A timeline which solely consists of one timestamp value, representing a single insertion. Intuitively, a singleton
+ * timeline always represents a bump which starts at the given timestamp and lasts till plus infinity.
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public class SingletonTimeline<Timestamp extends Comparable<Timestamp>> extends Timeline<Timestamp> {
+
+    protected final Timestamp start;
+
+    SingletonTimeline(final Timestamp timestamp) {
+        this.start = timestamp;
+    }
+
+    SingletonTimeline(final Diff<Timestamp> diff) {
+        if (diff.size() != 1 || diff.get(0).getDirection() == Direction.DELETE) {
+            throw new IllegalArgumentException("There is only a single (insert) timestamp in the singleton timestamp!");
+        } else {
+            this.start = diff.get(0).getPayload();
+        }
+    }
+
+    @Override
+    public Signed<Timestamp> getSigned(final int index) {
+        return new Signed<>(Direction.INSERT, this.getUnsigned(index));
+    }
+
+    @Override
+    public Timestamp getUnsigned(final int index) {
+        if (index != 0) {
+            throw new IllegalArgumentException("There is only a single (insert) timestamp in the singleton timestamp!");
+        } else {
+            return this.start;
+        }
+    }
+
+    @Override
+    public int size() {
+        return 1;
+    }
+
+    @Override
+    public boolean isPresentAtInfinity() {
+        return true;
+    }
+
+    @Override
+    public Iterable<Signed<Timestamp>> asChangeSequence() {
+        return Collections.singletonList(this.getSigned(0));
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return false;
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Timeline.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Timeline.java
new file mode 100644
index 00000000..9214536c
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Timeline.java
@@ -0,0 +1,146 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util.timeline;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import tools.refinery.viatra.runtime.matchers.util.Direction;
+import tools.refinery.viatra.runtime.matchers.util.Signed;
+
+/**
+ * A timeline describes the life cycle of a piece of data (typically a tuple in a relation) as a sequence of moments.
+ * Even moments represent appearances, odd moments represent disappearances. A timeline is immutable, once created, it
+ * is not possible to extend it with further moments.
+ * 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public abstract class Timeline<Timestamp extends Comparable<Timestamp>> {
+
+    public abstract Iterable<Signed<Timestamp>> asChangeSequence();
+
+    public abstract boolean isPresentAtInfinity();
+
+    public abstract boolean isEmpty();
+
+    public abstract int size();
+
+    public abstract Signed<Timestamp> getSigned(final int index);
+
+    public abstract Timestamp getUnsigned(final int index);
+
+    public Timeline<Timestamp> mergeMultiplicative(final Timeline<Timestamp> that) {
+        final List<Timestamp> result = new ArrayList<>();
+        int thisIdx = 0, thatIdx = 0;
+        Timestamp thisNext = thisIdx < this.size() ? this.getUnsigned(thisIdx) : null;
+        Timestamp thatNext = thatIdx < that.size() ? that.getUnsigned(thatIdx) : null;
+
+        while (thisNext != null || thatNext != null) {
+            int thisMinusThat = 0;
+            if (thisNext != null && thatNext != null) {
+                thisMinusThat = thisNext.compareTo(thatNext);
+            }
+            if (thisNext == null || thisMinusThat > 0) {
+                if (thisIdx % 2 == 1) {
+                    result.add(thatNext);
+                }
+                thatIdx++;
+                thatNext = thatIdx < that.size() ? that.getUnsigned(thatIdx) : null;
+            } else if (thatNext == null || thisMinusThat < 0) {
+                if (thatIdx % 2 == 1) {
+                    result.add(thisNext);
+                }
+                thisIdx++;
+                thisNext = thisIdx < this.size() ? this.getUnsigned(thisIdx) : null;
+            } else {
+                if (thisIdx % 2 == thatIdx % 2) {
+                    result.add(thisNext);
+                }
+                thisIdx++;
+                thatIdx++;
+                thatNext = thatIdx < that.size() ? that.getUnsigned(thatIdx) : null;
+                thisNext = thisIdx < this.size() ? this.getUnsigned(thisIdx) : null;
+            }
+        }
+
+        return Timelines.createFrom(result);
+    }
+
+    /**
+     * Merges this timeline with the given timestamp diff. The expectation is that the resulting timeline starts with an
+     * insertion. The logic is similar to a merge sort; we iterate side-by-side over the timeline and the diff. During
+     * the merge, cancellation can happen if at the same timestamp we observe different signs at the corresponding
+     * timeline and diff elements.
+     */
+    public Timeline<Timestamp> mergeAdditive(final Diff<Timestamp> diff) {
+        final Iterator<Signed<Timestamp>> thisItr = this.asChangeSequence().iterator();
+        final Iterator<Signed<Timestamp>> diffItr = diff.iterator();
+        final List<Timestamp> result = new ArrayList<>();
+        Direction expected = Direction.INSERT;
+        Signed<Timestamp> thisNext = thisItr.hasNext() ? thisItr.next() : null;
+        Signed<Timestamp> diffNext = diffItr.hasNext() ? diffItr.next() : null;
+
+        while (thisNext != null || diffNext != null) {
+            int thisMinusDiff = 0;
+            if (thisNext != null && diffNext != null) {
+                thisMinusDiff = thisNext.getPayload().compareTo(diffNext.getPayload());
+            }
+
+            if (thisNext == null || thisMinusDiff > 0) {
+                if (!expected.equals(diffNext.getDirection())) {
+                    throw new IllegalStateException(
+                            String.format("Expected direction (%s) constraint violated! %s %s @%s", expected, this,
+                                    diff, diffNext.getPayload()));
+                }
+                result.add(diffNext.getPayload());
+                diffNext = diffItr.hasNext() ? diffItr.next() : null;
+                expected = expected.opposite();
+            } else if (diffNext == null || thisMinusDiff < 0) {
+                if (!expected.equals(thisNext.getDirection())) {
+                    throw new IllegalStateException(
+                            String.format("Expected direction (%s) constraint violated! %s %s @%s", expected, this,
+                                    diff, thisNext.getPayload()));
+                }
+                result.add(thisNext.getPayload());
+                thisNext = thisItr.hasNext() ? thisItr.next() : null;
+                expected = expected.opposite();
+            } else {
+                // they cancel out each other
+                if (diffNext.getDirection().equals(thisNext.getDirection())) {
+                    throw new IllegalStateException(String.format("Changes do not cancel out each other! %s %s @%s",
+                            this, diff, thisNext.getPayload()));
+                }
+                diffNext = diffItr.hasNext() ? diffItr.next() : null;
+                thisNext = thisItr.hasNext() ? thisItr.next() : null;
+            }
+        }
+
+        return Timelines.createFrom(result);
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("[");
+        boolean first = true;
+        for (final Signed<Timestamp> element : this.asChangeSequence()) {
+            if (first) {
+                first = false;
+            } else {
+                builder.append(", ");
+            }
+            builder.append(element.toString());
+        }
+        builder.append("]");
+        return builder.toString();
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Timelines.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Timelines.java
new file mode 100644
index 00000000..747fda15
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/matchers/util/timeline/Timelines.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2019, Tamas Szabo, itemis AG, Gabor Bergmann, IncQuery Labs Ltd.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.matchers.util.timeline;
+
+import java.util.List;
+
+/**
+ * Utility class for creating {@link Timeline}s. 
+ * @author Tamas Szabo
+ * @since 2.4
+ */
+public final class Timelines<Timestamp extends Comparable<Timestamp>> {
+
+    public static <Timestamp extends Comparable<Timestamp>> Timeline<Timestamp> createEmpty() {
+        return new CompactTimeline<Timestamp>();
+    }
+    
+    public static <Timestamp extends Comparable<Timestamp>> Timeline<Timestamp> createFrom(
+            final Diff<Timestamp> diffs) {
+        if (diffs.size() == 1) {
+            return new SingletonTimeline<Timestamp>(diffs);
+        } else {
+            return new CompactTimeline<Timestamp>(diffs);
+        }
+    }
+
+    public static <Timestamp extends Comparable<Timestamp>> Timeline<Timestamp> createFrom(
+            final List<Timestamp> timestamps) {
+        if (timestamps.size() == 1) {
+            return new SingletonTimeline<Timestamp>(timestamps.get(0));
+        } else {
+            return new CompactTimeline<Timestamp>(timestamps);
+        }
+    }
+
+    public static <Timestamp extends Comparable<Timestamp>> Timeline<Timestamp> createFrom(final Timestamp timestamp) {
+        return new SingletonTimeline<Timestamp>(timestamp);
+    }
+
+}
diff --git a/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/util/ViatraQueryLoggingUtil.java b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/util/ViatraQueryLoggingUtil.java
new file mode 100644
index 00000000..229801f8
--- /dev/null
+++ b/subprojects/viatra-runtime/src/main/java/tools/refinery/viatra/runtime/util/ViatraQueryLoggingUtil.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2013, Bergmann Gabor, Istvan Rath and Daniel Varro
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.viatra.runtime.util;
+
+import org.apache.log4j.Logger;
+import tools.refinery.viatra.runtime.matchers.util.Preconditions;
+
+/**
+ * Centralized logger of the VIATRA Query runtime.
+ * @author Bergmann Gabor
+ *
+ */
+public class ViatraQueryLoggingUtil {
+
+    private ViatraQueryLoggingUtil() {/*Utility class constructor*/}
+
+    private static Logger externalLogger;
+
+    public static void setExternalLogger(Logger externalLogger) {
+        Preconditions.checkArgument(externalLogger != null, "Must not set up null logger");
+        ViatraQueryLoggingUtil.externalLogger = externalLogger;
+    }
+    /**
+     * Provides a static default logger.
+     */
+    public static Logger getDefaultLogger() {
+        if (defaultRuntimeLogger == null) {
+            Logger parentLogger = externalLogger;
+            if (parentLogger == null) {
+                defaultRuntimeLogger = Logger.getLogger("org.eclipse.viatra");
+            } else {
+                defaultRuntimeLogger = Logger.getLogger(parentLogger.getName() + ".runtime");
+            }
+            if (defaultRuntimeLogger == null)
+                throw new AssertionError("Configuration error: unable to create default VIATRA Query runtime logger.");
+        }
+
+        return defaultRuntimeLogger;
+    }
+
+    private static String getLoggerClassname(Class<?> clazz) {
+        return clazz.getName().startsWith(getDefaultLogger().getName())
+                ? clazz.getName()
+                : getDefaultLogger().getName() + "." + clazz.getName();
+    }
+
+    /**
+     * Provides a class-specific logger that also stores the global logger settings of the VIATRA Query runtime
+     * @param clazz
+     */
+    public static Logger getLogger(Class<?> clazz) {
+        return Logger.getLogger(getLoggerClassname(clazz));
+    }
+
+    /**
+     * Provides a named logger that also stores the global logger settings of the VIATRA Query runtime
+     * @param clazz
+     * @param name a non-empty name to append to the class names
+     * @since 2.5
+     */
+    public static Logger getLogger(Class<?> clazz, String name) {
+        return Logger.getLogger(getLoggerClassname(clazz) + '.' + name);
+    }
+
+    private static Logger defaultRuntimeLogger;
+}