Merge branch 'graphs4value:main' into datastructure

131 files changed, 1041 insertions, 1412 deletions

diff --git a/subprojects/store/build.gradle b/subprojects/store/build.gradle
deleted file mode 100644
index 370d094b..00000000
--- a/subprojects/store/build.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-plugins {
-        id 'refinery-java-library'
-        id 'refinery-jmh'
-}
diff --git a/subprojects/store/build.gradle.kts b/subprojects/store/build.gradle.kts
new file mode 100644
index 00000000..2c485020
--- /dev/null
+++ b/subprojects/store/build.gradle.kts
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+plugins {
+        id("tools.refinery.gradle.java-library")
+        id("tools.refinery.gradle.jmh")
+}
diff --git a/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutBenchmark.java b/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutBenchmark.java
index cdf3d3c8..485fda3d 100644
--- a/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutBenchmark.java
+++ b/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutBenchmark.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.benchmarks;
 
 import java.util.ArrayList;
diff --git a/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutExecutionPlan.java b/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutExecutionPlan.java
index 5484f115..7e89cd06 100644
--- a/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutExecutionPlan.java
+++ b/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutExecutionPlan.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.benchmarks;
 
 import java.util.Random;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/adapter/AbstractModelAdapterBuilder.java b/subprojects/store/src/main/java/tools/refinery/store/adapter/AbstractModelAdapterBuilder.java
index 4c142217..8d3e998e 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/adapter/AbstractModelAdapterBuilder.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/adapter/AbstractModelAdapterBuilder.java
@@ -1,27 +1,48 @@
 package tools.refinery.store.adapter;
-
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.model.ModelStoreBuilder;
 
-public abstract class AbstractModelAdapterBuilder implements ModelAdapterBuilder {
-        private final ModelStoreBuilder storeBuilder;
+public abstract class AbstractModelAdapterBuilder<T extends ModelStoreAdapter> implements ModelAdapterBuilder {
+        private boolean configured;
 
-        protected AbstractModelAdapterBuilder(ModelStoreBuilder storeBuilder) {
-                this.storeBuilder = storeBuilder;
+        @Override
+        public boolean isConfigured() {
+                return configured;
         }
 
-        @Override
-        public <T extends ModelAdapterBuilder> T with(ModelAdapterBuilderFactory<?, ?, T> adapterBuilderFactory) {
-                return storeBuilder.with(adapterBuilderFactory);
+        protected void checkConfigured() {
+                if (!configured) {
+                        throw new IllegalStateException("Model adapter builder was not configured");
+                }
+        }
+
+        protected void checkNotConfigured() {
+                if (configured) {
+                        throw new IllegalStateException("Model adapter builder was already configured");
+                }
+        }
+
+        protected void doConfigure(ModelStoreBuilder storeBuilder) {
+                // Nothing to configure by default.
         }
 
         @Override
-        public ModelStoreBuilder getStoreBuilder() {
-                return storeBuilder;
+        public final void configure(ModelStoreBuilder storeBuilder) {
+                checkNotConfigured();
+                doConfigure(storeBuilder);
+                configured = true;
         }
 
+        protected abstract T doBuild(ModelStore store);
+
         @Override
-        public ModelStore build() {
-                return storeBuilder.build();
+        public final T build(ModelStore store) {
+                checkConfigured();
+                return doBuild(store);
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/adapter/AdapterList.java b/subprojects/store/src/main/java/tools/refinery/store/adapter/AdapterList.java
deleted file mode 100644
index 74bae6f0..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/adapter/AdapterList.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package tools.refinery.store.adapter;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.*;
-import java.util.function.Consumer;
-
-public class AdapterList<T> implements Iterable<T> {
-        private final List<AnyModelAdapterType> adapterTypes;
-        private final List<T> adapters;
-
-        public AdapterList() {
-                adapterTypes = new ArrayList<>();
-                adapters = new ArrayList<>();
-        }
-
-        public AdapterList(int adapterCount) {
-                adapterTypes = new ArrayList<>(adapterCount);
-                adapters = new ArrayList<>(adapterCount);
-        }
-
-        public int size() {
-                return adapters.size();
-        }
-
-        public void add(AnyModelAdapterType adapterType, T adapter) {
-                adapterTypes.add(adapterType);
-                adapters.add(adapter);
-        }
-
-        public <U extends T> Optional<U> tryGet(AnyModelAdapterType adapterType, Class<? extends U> adapterClass) {
-                int size = size();
-                for (int i = 0; i < size; i++) {
-                        if (getType(i).supports(adapterType)) {
-                                return Optional.of(adapterClass.cast(get(i)));
-                        }
-                }
-                return Optional.empty();
-        }
-
-        public <U extends T> U get(AnyModelAdapterType adapterType, Class<U> adapterClass) {
-                return tryGet(adapterType, adapterClass).orElseThrow(() -> new IllegalArgumentException(
-                                "No %s was configured".formatted(adapterType)));
-        }
-
-        public AnyModelAdapterType getType(int i) {
-                return adapterTypes.get(i);
-        }
-
-        public T get(int i) {
-                return adapters.get(i);
-        }
-
-        public Collection<AnyModelAdapterType> getAdapterTypes() {
-                return Collections.unmodifiableCollection(adapterTypes);
-        }
-
-        public Iterable<Entry<T>> withAdapterTypes() {
-                return () -> new Iterator<>() {
-                        private int i = 0;
-
-                        @Override
-                        public boolean hasNext() {
-                                return i < size();
-                        }
-
-                        @Override
-                        public Entry<T> next() {
-                                if (i >= size()) {
-                                        throw new NoSuchElementException();
-                                }
-                                var entry = new Entry<>(getType(i), get(i));
-                                i++;
-                                return entry;
-                        }
-                };
-        }
-
-        @NotNull
-        @Override
-        public Iterator<T> iterator() {
-                return adapters.iterator();
-        }
-
-        @Override
-        public void forEach(Consumer<? super T> action) {
-                adapters.forEach(action);
-        }
-
-        @Override
-        public Spliterator<T> spliterator() {
-                return adapters.spliterator();
-        }
-
-        public record Entry<T>(AnyModelAdapterType adapterType, T adapter) {
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/adapter/AdapterUtils.java b/subprojects/store/src/main/java/tools/refinery/store/adapter/AdapterUtils.java
new file mode 100644
index 00000000..556e99f0
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/adapter/AdapterUtils.java
@@ -0,0 +1,33 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.adapter;
+
+import java.util.Collection;
+import java.util.Optional;
+
+public class AdapterUtils {
+        private AdapterUtils() {
+                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+        }
+
+        public static <T, U extends T> Optional<U> tryGetAdapter(Collection<T> adapters, Class<? extends U> type) {
+                var iterator = adapters.stream().filter(type::isInstance).iterator();
+                if (!iterator.hasNext()) {
+                        return Optional.empty();
+                }
+                var adapter = type.cast(iterator.next());
+                if (iterator.hasNext()) {
+                        throw new IllegalArgumentException("Ambiguous adapter: both %s and %s match %s"
+                                        .formatted(adapter.getClass().getName(), iterator.next().getClass().getName(), type.getName()));
+                }
+                return Optional.of(adapter);
+        }
+
+        public static <T> T getAdapter(Collection<? super T> adapters, Class<T> type) {
+                return tryGetAdapter(adapters, type).orElseThrow(() -> new IllegalArgumentException(
+                                "No %s adapter was configured".formatted(type.getName())));
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/adapter/AnyModelAdapterType.java b/subprojects/store/src/main/java/tools/refinery/store/adapter/AnyModelAdapterType.java
deleted file mode 100644
index 37a247fe..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/adapter/AnyModelAdapterType.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package tools.refinery.store.adapter;
-
-import java.util.Collection;
-
-public sealed interface AnyModelAdapterType permits ModelAdapterType {
-        Class<? extends ModelAdapter> getModelAdapterClass();
-
-        Class<? extends ModelStoreAdapter> getModelStoreAdapterClass();
-
-        Class<? extends ModelAdapterBuilder> getModelAdapterBuilderClass();
-
-        Collection<AnyModelAdapterType> getSupportedAdapterTypes();
-
-        default boolean supports(AnyModelAdapterType targetAdapter) {
-                return getSupportedAdapterTypes().contains(targetAdapter);
-        }
-
-        String getName();
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelAdapter.java b/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelAdapter.java
index aa079e01..672007aa 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelAdapter.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelAdapter.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.adapter;
 
 import tools.refinery.store.model.Model;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelAdapterBuilder.java b/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelAdapterBuilder.java
index 64b3e59f..75e5e07d 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelAdapterBuilder.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelAdapterBuilder.java
@@ -1,17 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.adapter;
 
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.model.ModelStoreBuilder;
 
 public interface ModelAdapterBuilder {
-        ModelStoreAdapter createStoreAdapter(ModelStore store);
+        boolean isConfigured();
 
-        <T extends ModelAdapterBuilder> T with(ModelAdapterBuilderFactory<?, ?, T> adapterBuilderFactory);
+        void configure(ModelStoreBuilder storeBuilder);
 
-        ModelStoreBuilder getStoreBuilder();
-
-        default void configure() {
-        }
-
-        ModelStore build();
+        ModelStoreAdapter build(ModelStore store);
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelAdapterBuilderFactory.java b/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelAdapterBuilderFactory.java
deleted file mode 100644
index 7c9b01bc..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelAdapterBuilderFactory.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package tools.refinery.store.adapter;
-
-import tools.refinery.store.model.ModelStoreBuilder;
-
-public abstract class ModelAdapterBuilderFactory<T1 extends ModelAdapter, T2 extends ModelStoreAdapter,
-                T3 extends ModelAdapterBuilder> extends ModelAdapterType<T1, T2, T3> {
-
-        protected ModelAdapterBuilderFactory(Class<T1> modelAdapterClass, Class<T2> modelStoreAdapterClass,
-                                                                                 Class<T3> modelAdapterBuilderClass) {
-                super(modelAdapterClass, modelStoreAdapterClass, modelAdapterBuilderClass);
-        }
-
-        public abstract T3 createBuilder(ModelStoreBuilder storeBuilder);
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelAdapterType.java b/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelAdapterType.java
deleted file mode 100644
index 82ddeb12..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelAdapterType.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package tools.refinery.store.adapter;
-
-import tools.refinery.store.model.Model;
-import tools.refinery.store.model.ModelStore;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-public abstract non-sealed class ModelAdapterType<T1 extends ModelAdapter, T2 extends ModelStoreAdapter,
-                T3 extends ModelAdapterBuilder> implements AnyModelAdapterType {
-        private final Class<? extends T1> modelAdapterClass;
-        private final Class<? extends T2> modelStoreAdapterClass;
-        private final Class<? extends T3> modelAdapterBuilderClass;
-        private final Set<AnyModelAdapterType> supportedAdapters = new HashSet<>();
-
-        protected ModelAdapterType(Class<T1> modelAdapterClass, Class<T2> modelStoreAdapterClass,
-                                                           Class<T3> modelAdapterBuilderClass) {
-                checkReturnType(modelAdapterClass, modelStoreAdapterClass, "createModelAdapter", Model.class);
-                checkReturnType(modelStoreAdapterClass, modelAdapterBuilderClass, "createStoreAdapter", ModelStore.class);
-                this.modelAdapterClass = modelAdapterClass;
-                this.modelStoreAdapterClass = modelStoreAdapterClass;
-                this.modelAdapterBuilderClass = modelAdapterBuilderClass;
-                supportedAdapters.add(this);
-        }
-
-        private void checkReturnType(Class<?> expectedReturnType, Class<?> ownerClass, String methodName,
-                                                                 Class<?>... argumentTypes) {
-                Method method;
-                try {
-                        method = ownerClass.getMethod(methodName, argumentTypes);
-                } catch (NoSuchMethodException e) {
-                        throw new IllegalStateException("Invalid %s: %s#%s method is required"
-                                        .formatted(this, ownerClass.getName(), methodName), e);
-                }
-                var returnType = method.getReturnType();
-                if (!expectedReturnType.isAssignableFrom(returnType)) {
-                        throw new IllegalStateException("Invalid %s: %s is not assignable from the return type %s of %s#%s"
-                                        .formatted(this, expectedReturnType.getName(), returnType.getCanonicalName(),
-                                                        ownerClass.getName(), methodName));
-                }
-        }
-
-        protected void extendsAdapter(ModelAdapterType<? super T1, ? super T2, ? super T3> superAdapter) {
-                supportedAdapters.addAll(superAdapter.supportedAdapters);
-        }
-
-        @Override
-        public final Class<? extends T1> getModelAdapterClass() {
-                return modelAdapterClass;
-        }
-
-        @Override
-        public final Class<? extends T2> getModelStoreAdapterClass() {
-                return modelStoreAdapterClass;
-        }
-
-        @Override
-        public final Class<? extends T3> getModelAdapterBuilderClass() {
-                return modelAdapterBuilderClass;
-        }
-
-        @Override
-        public Collection<AnyModelAdapterType> getSupportedAdapterTypes() {
-                return Collections.unmodifiableCollection(supportedAdapters);
-        }
-
-        @Override
-        public String getName() {
-                return "%s.ADAPTER".formatted(this.getClass().getName());
-        }
-
-        @Override
-        public String toString() {
-                return getName();
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelStoreAdapter.java b/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelStoreAdapter.java
index 1eb40ada..bc5f7b6b 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelStoreAdapter.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/adapter/ModelStoreAdapter.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.adapter;
 
 import tools.refinery.store.model.Model;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/AnyVersionedMap.java b/subprojects/store/src/main/java/tools/refinery/store/map/AnyVersionedMap.java
index ead79878..01099eb0 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/AnyVersionedMap.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/AnyVersionedMap.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map;
 
 public sealed interface AnyVersionedMap extends Versioned permits VersionedMap {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/ContentHashCode.java b/subprojects/store/src/main/java/tools/refinery/store/map/ContentHashCode.java
index 8deeab23..cbea05e1 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/ContentHashCode.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/ContentHashCode.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map;
 
 public enum ContentHashCode {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/ContinousHashProvider.java b/subprojects/store/src/main/java/tools/refinery/store/map/ContinousHashProvider.java
index 75f1e2ab..8e451230 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/ContinousHashProvider.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/ContinousHashProvider.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map;
 
 import tools.refinery.store.map.internal.Node;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/Cursor.java b/subprojects/store/src/main/java/tools/refinery/store/map/Cursor.java
index b420585c..3bdca104 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/Cursor.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/Cursor.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map;
 
 import java.util.Set;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/CursorAsIterator.java b/subprojects/store/src/main/java/tools/refinery/store/map/CursorAsIterator.java
index 65ae6648..c7e4d279 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/CursorAsIterator.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/CursorAsIterator.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map;
 
 import java.util.Iterator;
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
new file mode 100644
index 00000000..0a94d449
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/Cursors.java
@@ -0,0 +1,41 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.map;
+
+public final class Cursors {
+    private Cursors() {
+        throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
+    }
+
+    public static <K, V> Cursor<K, V> empty() {
+        return new Empty<>();
+    }
+
+    private static class Empty<K, V> implements Cursor<K, V> {
+        private boolean terminated = false;
+
+        @Override
+        public K getKey() {
+            return null;
+        }
+
+        @Override
+        public V getValue() {
+            return null;
+        }
+
+        @Override
+        public boolean isTerminated() {
+            return terminated;
+        }
+
+        @Override
+        public boolean move() {
+            terminated = true;
+            return false;
+        }
+    }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/DiffCursor.java b/subprojects/store/src/main/java/tools/refinery/store/map/DiffCursor.java
index 701f3ec8..4322e041 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/DiffCursor.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/DiffCursor.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map;
 
 public interface DiffCursor<K, V> extends Cursor<K,V> {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/MapAsIterable.java b/subprojects/store/src/main/java/tools/refinery/store/map/MapAsIterable.java
index 6b986732..199b548f 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/MapAsIterable.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/MapAsIterable.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map;
 
 import java.util.Iterator;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/Versioned.java b/subprojects/store/src/main/java/tools/refinery/store/map/Versioned.java
index 6a23e9d5..55720db3 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/Versioned.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/Versioned.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map;
 
 public interface Versioned {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMap.java b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMap.java
index 08ce1dbd..c8226c3e 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMap.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMap.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map;
 
 public non-sealed interface VersionedMap<K, V> extends AnyVersionedMap {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStore.java b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStore.java
index 7768287a..b24c404c 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStore.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStore.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map;
 
 import tools.refinery.store.map.internal.VersionedMapStoreFactoryBuilderImpl;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreConfiguration.java b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreConfiguration.java
index 3856460d..b00cd961 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreConfiguration.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreConfiguration.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map;
 
 public class VersionedMapStoreConfiguration {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreImpl.java b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreImpl.java
index beeed110..a934d59e 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreImpl.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map;
 
 import tools.refinery.store.map.internal.*;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/HashClash.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/HashClash.java
index 0806c486..a357fbce 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/HashClash.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/HashClash.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.internal;
 
 enum HashClash {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/ImmutableNode.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/ImmutableNode.java
index 92446711..d052318f 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/ImmutableNode.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/ImmutableNode.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.internal;
 
 import java.util.Arrays;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapCursor.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapCursor.java
index 7e4f82e8..d42519b2 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapCursor.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapCursor.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.internal;
 
 import tools.refinery.store.map.AnyVersionedMap;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapDiffCursor.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapDiffCursor.java
index 59e8d738..fb1d5d2b 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapDiffCursor.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapDiffCursor.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.internal;
 
 import tools.refinery.store.map.AnyVersionedMap;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MutableNode.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/MutableNode.java
index 81bf6188..bb85deb9 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MutableNode.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/MutableNode.java
@@ -1,10 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.internal;
 
+import tools.refinery.store.map.ContinousHashProvider;
+
 import java.util.Arrays;
 import java.util.Map;
 
-import tools.refinery.store.map.ContinousHashProvider;
-
 public class MutableNode<K, V> extends Node<K, V> {
         int cachedHash;
         protected boolean cachedHashValid;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/Node.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/Node.java
index 3dd332da..4b44f760 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/Node.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/Node.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.internal;
 
 import java.util.Map;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/OldValueBox.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/OldValueBox.java
index 5534c703..354af51d 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/OldValueBox.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/OldValueBox.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.internal;
 
 public class OldValueBox<V>{
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapImpl.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapImpl.java
index 2ceca463..c107f7e0 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapImpl.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.internal;
 
 import tools.refinery.store.map.*;
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 d18ba71d..f906b48a 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
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model;
 
 import tools.refinery.store.representation.AnySymbol;
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 55949d0c..26ad9a69 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
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model;
 
 import tools.refinery.store.map.Cursor;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/InterpretationListener.java b/subprojects/store/src/main/java/tools/refinery/store/model/InterpretationListener.java
index 73950779..6f7b24c1 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/InterpretationListener.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/InterpretationListener.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model;
 
 import tools.refinery.store.tuple.Tuple;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/Model.java b/subprojects/store/src/main/java/tools/refinery/store/model/Model.java
index 6ca1ac7b..d58d91c3 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/Model.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/Model.java
@@ -1,7 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model;
 
 import tools.refinery.store.adapter.ModelAdapter;
-import tools.refinery.store.adapter.ModelAdapterType;
 import tools.refinery.store.map.Versioned;
 import tools.refinery.store.representation.AnySymbol;
 import tools.refinery.store.representation.Symbol;
@@ -25,9 +29,9 @@ public interface Model extends Versioned {
 
         ModelDiffCursor getDiffCursor(long to);
 
-        <T extends ModelAdapter> Optional<T> tryGetAdapter(ModelAdapterType<? extends T, ?, ?> adapterType);
+        <T extends ModelAdapter> Optional<T> tryGetAdapter(Class<? extends T> adapterType);
 
-        <T extends ModelAdapter> T getAdapter(ModelAdapterType<T, ?, ?> adapterType);
+        <T extends ModelAdapter> T getAdapter(Class<T> adapterType);
 
         void addListener(ModelListener listener);
 
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/ModelDiffCursor.java b/subprojects/store/src/main/java/tools/refinery/store/model/ModelDiffCursor.java
index 97bf2039..7b236891 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/ModelDiffCursor.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/ModelDiffCursor.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model;
 
 import tools.refinery.store.map.DiffCursor;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/ModelListener.java b/subprojects/store/src/main/java/tools/refinery/store/model/ModelListener.java
index f67540bb..a9ad8cfd 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/ModelListener.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/ModelListener.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model;
 
 public interface ModelListener {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/ModelStore.java b/subprojects/store/src/main/java/tools/refinery/store/model/ModelStore.java
index 2e7e62c3..b10eb8a4 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/ModelStore.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/ModelStore.java
@@ -1,6 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model;
 
-import tools.refinery.store.adapter.ModelAdapterType;
 import tools.refinery.store.adapter.ModelStoreAdapter;
 import tools.refinery.store.model.internal.ModelStoreBuilderImpl;
 import tools.refinery.store.representation.AnySymbol;
@@ -20,9 +24,9 @@ public interface ModelStore {
 
         ModelDiffCursor getDiffCursor(long from, long to);
 
-        <T extends ModelStoreAdapter> Optional<T> tryGetAdapter(ModelAdapterType<?, ? extends T, ?> adapterType);
+        <T extends ModelStoreAdapter> Optional<T> tryGetAdapter(Class<? extends T> adapterType);
 
-        <T extends ModelStoreAdapter> T getAdapter(ModelAdapterType<?, T, ?> adapterType);
+        <T extends ModelStoreAdapter> T getAdapter(Class<T> adapterType);
 
         static ModelStoreBuilder builder() {
                 return new ModelStoreBuilderImpl();
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 289099da..3a4024b5 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
@@ -1,8 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model;
 
 import tools.refinery.store.adapter.ModelAdapterBuilder;
-import tools.refinery.store.adapter.ModelAdapterBuilderFactory;
-import tools.refinery.store.adapter.ModelAdapterType;
 import tools.refinery.store.representation.AnySymbol;
 import tools.refinery.store.representation.Symbol;
 
@@ -26,11 +29,11 @@ public interface ModelStoreBuilder {
 
         <T> ModelStoreBuilder symbol(Symbol<T> symbol);
 
-        <T extends ModelAdapterBuilder> T with(ModelAdapterBuilderFactory<?, ?, T> adapterBuilderFactory);
+        <T extends ModelAdapterBuilder> ModelStoreBuilder with(T adapterBuilder);
 
-        <T extends ModelAdapterBuilder> Optional<T> tryGetAdapter(ModelAdapterType<?, ?, ? extends T> adapterType);
+        <T extends ModelAdapterBuilder> Optional<T> tryGetAdapter(Class<? extends T> adapterType);
 
-        <T extends ModelAdapterBuilder> T getAdapter(ModelAdapterType<?, ?, T> adapterType);
+        <T extends ModelAdapterBuilder> T getAdapter(Class<T> adapterType);
 
         ModelStore build();
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java b/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java
index 1183b8f2..fdd4425e 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model;
 
 import tools.refinery.store.map.ContinousHashProvider;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java b/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java
index 33059a1b..14116a90 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model;
 
 import tools.refinery.store.map.ContinousHashProvider;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelAction.java b/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelAction.java
index f68859db..dbd95d80 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelAction.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelAction.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model.internal;
 
 public enum ModelAction {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java b/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java
index 9eb438c4..c5475a1a 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java
@@ -1,9 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model.internal;
 
-import tools.refinery.store.adapter.AdapterList;
-import tools.refinery.store.adapter.AnyModelAdapterType;
+import tools.refinery.store.adapter.AdapterUtils;
 import tools.refinery.store.adapter.ModelAdapter;
-import tools.refinery.store.adapter.ModelAdapterType;
 import tools.refinery.store.map.DiffCursor;
 import tools.refinery.store.model.*;
 import tools.refinery.store.representation.AnySymbol;
@@ -16,7 +19,7 @@ public class ModelImpl implements Model {
         private final ModelStore store;
         private long state;
         private Map<? extends AnySymbol, ? extends VersionedInterpretation<?>> interpretations;
-        private final AdapterList<ModelAdapter> adapters;
+        private final List<ModelAdapter> adapters;
         private final List<ModelListener> listeners = new ArrayList<>();
         private boolean uncommittedChanges;
         private ModelAction pendingAction = ModelAction.NONE;
@@ -25,7 +28,7 @@ public class ModelImpl implements Model {
         ModelImpl(ModelStore store, long state, int adapterCount) {
                 this.store = store;
                 this.state = state;
-                adapters = new AdapterList<>(adapterCount);
+                adapters = new ArrayList<>(adapterCount);
         }
 
         void setInterpretations(Map<? extends AnySymbol, ? extends VersionedInterpretation<?>> interpretations) {
@@ -162,17 +165,17 @@ public class ModelImpl implements Model {
         }
 
         @Override
-        public <T extends ModelAdapter> Optional<T> tryGetAdapter(ModelAdapterType<? extends T, ?, ?> adapterType) {
-                return adapters.tryGet(adapterType, adapterType.getModelAdapterClass());
+        public <T extends ModelAdapter> Optional<T> tryGetAdapter(Class<? extends T> adapterType) {
+                return AdapterUtils.tryGetAdapter(adapters, adapterType);
         }
 
         @Override
-        public <T extends ModelAdapter> T getAdapter(ModelAdapterType<T, ?, ?> adapterType) {
-                return adapters.get(adapterType, adapterType.getModelAdapterClass());
+        public <T extends ModelAdapter> T getAdapter(Class<T> adapterType) {
+                return AdapterUtils.getAdapter(adapters, adapterType);
         }
 
-        void addAdapter(AnyModelAdapterType adapterType, ModelAdapter adapter) {
-                adapters.add(adapterType, adapter);
+        void addAdapter(ModelAdapter adapter) {
+                adapters.add(adapter);
         }
 
         @Override
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 79f7195d..aafbe130 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
@@ -1,9 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model.internal;
 
-import tools.refinery.store.adapter.AdapterList;
+import tools.refinery.store.adapter.AdapterUtils;
 import tools.refinery.store.adapter.ModelAdapterBuilder;
-import tools.refinery.store.adapter.ModelAdapterBuilderFactory;
-import tools.refinery.store.adapter.ModelAdapterType;
 import tools.refinery.store.map.VersionedMapStore;
 import tools.refinery.store.map.VersionedMapStoreImpl;
 import tools.refinery.store.model.ModelStore;
@@ -18,7 +21,7 @@ import java.util.*;
 public class ModelStoreBuilderImpl implements ModelStoreBuilder {
         private final Set<AnySymbol> allSymbols = new HashSet<>();
         private final Map<SymbolEquivalenceClass<?>, List<AnySymbol>> equivalenceClasses = new HashMap<>();
-        private final AdapterList<ModelAdapterBuilder> adapters = new AdapterList<>();
+        private final List<ModelAdapterBuilder> adapters = new ArrayList<>();
 
         @Override
         public <T> ModelStoreBuilder symbol(Symbol<T> symbol) {
@@ -33,46 +36,25 @@ public class ModelStoreBuilderImpl implements ModelStoreBuilder {
         }
 
         @Override
-        public <T extends ModelAdapterBuilder> T with(ModelAdapterBuilderFactory<?, ?, T> adapterBuilderFactory) {
-                return adapters.<T>tryGet(adapterBuilderFactory, adapterBuilderFactory.getModelAdapterBuilderClass())
-                                .orElseGet(() -> addAdapter(adapterBuilderFactory));
-        }
-
-        private <T extends ModelAdapterBuilder> T addAdapter(ModelAdapterBuilderFactory<?, ?, T> adapterBuilderFactory) {
-                for (var configuredAdapterType : adapters.getAdapterTypes()) {
-                        var intersection = new HashSet<>(adapterBuilderFactory.getSupportedAdapterTypes());
-                        intersection.retainAll(configuredAdapterType.getSupportedAdapterTypes());
-                        if (!intersection.isEmpty()) {
-                                if (configuredAdapterType.supports(adapterBuilderFactory)) {
-                                        // Impossible to end up here from <code>#with</code>, because we should have returned
-                                        // the existing adapter there instead of adding a new one.
-                                        throw new IllegalArgumentException(
-                                                        "Cannot add %s, because it is already provided by configured adapter %s"
-                                                                        .formatted(adapterBuilderFactory, configuredAdapterType));
-                                } else if (adapterBuilderFactory.supports(configuredAdapterType)) {
-                                        throw new IllegalArgumentException(
-                                                        "Cannot add %s, because it provides already configured adapter %s"
-                                                                        .formatted(adapterBuilderFactory, configuredAdapterType));
-                                } else {
-                                        throw new IllegalArgumentException(
-                                                        "Cannot add %s, because configured adapter %s already provides %s"
-                                                                        .formatted(adapterBuilderFactory, configuredAdapterType, intersection));
-                                }
+        public <T extends ModelAdapterBuilder> ModelStoreBuilder with(T adapterBuilder) {
+                for (var existingAdapter : adapters) {
+                        if (existingAdapter.getClass().equals(adapterBuilder.getClass())) {
+                                throw new IllegalArgumentException("%s adapter was already configured for store builder"
+                                                .formatted(adapterBuilder.getClass().getName()));
                         }
                 }
-                var newAdapter = adapterBuilderFactory.createBuilder(this);
-                adapters.add(adapterBuilderFactory, newAdapter);
-                return newAdapter;
+                adapters.add(adapterBuilder);
+                return this;
         }
 
         @Override
-        public <T extends ModelAdapterBuilder> Optional<T> tryGetAdapter(ModelAdapterType<?, ?, ? extends T> adapterType) {
-                return adapters.tryGet(adapterType, adapterType.getModelAdapterBuilderClass());
+        public <T extends ModelAdapterBuilder> Optional<T> tryGetAdapter(Class<? extends T> adapterType) {
+                return AdapterUtils.tryGetAdapter(adapters, adapterType);
         }
 
         @Override
-        public <T extends ModelAdapterBuilder> T getAdapter(ModelAdapterType<?, ?, T> adapterType) {
-                return adapters.get(adapterType, adapterType.getModelAdapterBuilderClass());
+        public <T extends ModelAdapterBuilder> T getAdapter(Class<T> adapterType) {
+                return AdapterUtils.getAdapter(adapters, adapterType);
         }
 
         @Override
@@ -81,13 +63,13 @@ public class ModelStoreBuilderImpl implements ModelStoreBuilder {
                 for (var entry : equivalenceClasses.entrySet()) {
                         createStores(stores, entry.getKey(), entry.getValue());
                 }
-                var modelStore = new ModelStoreImpl(stores, adapters.size());
                 for (int i = adapters.size() - 1; i >= 0; i--) {
-                        adapters.get(i).configure();
+                        adapters.get(i).configure(this);
                 }
-                for (var entry : adapters.withAdapterTypes()) {
-                        var adapter = entry.adapter().createStoreAdapter(modelStore);
-                        modelStore.addAdapter(entry.adapterType(), adapter);
+                var modelStore = new ModelStoreImpl(stores, adapters.size());
+                for (var adapterBuilder : adapters) {
+                        var storeAdapter = adapterBuilder.build(modelStore);
+                        modelStore.addAdapter(storeAdapter);
                 }
                 return modelStore;
         }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelStoreImpl.java b/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelStoreImpl.java
index e8c205e4..60b735e6 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelStoreImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelStoreImpl.java
@@ -1,8 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model.internal;
 
-import tools.refinery.store.adapter.AdapterList;
-import tools.refinery.store.adapter.AnyModelAdapterType;
-import tools.refinery.store.adapter.ModelAdapterType;
+import tools.refinery.store.adapter.AdapterUtils;
 import tools.refinery.store.adapter.ModelStoreAdapter;
 import tools.refinery.store.map.DiffCursor;
 import tools.refinery.store.map.VersionedMapStore;
@@ -16,11 +19,11 @@ import java.util.*;
 
 public class ModelStoreImpl implements ModelStore {
         private final Map<? extends AnySymbol, ? extends VersionedMapStore<Tuple, ?>> stores;
-        private final AdapterList<ModelStoreAdapter> adapters;
+        private final List<ModelStoreAdapter> adapters;
 
         ModelStoreImpl(Map<? extends AnySymbol, ? extends VersionedMapStore<Tuple, ?>> stores, int adapterCount) {
                 this.stores = stores;
-                adapters = new AdapterList<>(adapterCount);
+                adapters = new ArrayList<>(adapterCount);
         }
 
         @Override
@@ -59,9 +62,9 @@ public class ModelStoreImpl implements ModelStore {
         }
 
         private void adaptModel(ModelImpl model) {
-                for (var entry : adapters.withAdapterTypes()) {
-                        var adapter = entry.adapter().createModelAdapter(model);
-                        model.addAdapter(entry.adapterType(), adapter);
+                for (var storeAdapter : adapters) {
+                        var adapter = storeAdapter.createModelAdapter(model);
+                        model.addAdapter(adapter);
                 }
         }
 
@@ -86,16 +89,16 @@ public class ModelStoreImpl implements ModelStore {
         }
 
         @Override
-        public <T extends ModelStoreAdapter> Optional<T> tryGetAdapter(ModelAdapterType<?, ? extends T, ?> adapterType) {
-                return adapters.tryGet(adapterType, adapterType.getModelStoreAdapterClass());
+        public <T extends ModelStoreAdapter> Optional<T> tryGetAdapter(Class<? extends T> adapterType) {
+                return AdapterUtils.tryGetAdapter(adapters, adapterType);
         }
 
         @Override
-        public <T extends ModelStoreAdapter> T getAdapter(ModelAdapterType<?, T, ?> adapterType) {
-                return adapters.get(adapterType, adapterType.getModelStoreAdapterClass());
+        public <T extends ModelStoreAdapter> T getAdapter(Class<T> adapterType) {
+                return AdapterUtils.getAdapter(adapters, adapterType);
         }
 
-        void addAdapter(AnyModelAdapterType adapterType, ModelStoreAdapter adapter) {
-                adapters.add(adapterType, adapter);
+        void addAdapter(ModelStoreAdapter adapter) {
+                adapters.add(adapter);
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/internal/SymbolEquivalenceClass.java b/subprojects/store/src/main/java/tools/refinery/store/model/internal/SymbolEquivalenceClass.java
index 5bf1b90d..136f2976 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/internal/SymbolEquivalenceClass.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/internal/SymbolEquivalenceClass.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model.internal;
 
 import tools.refinery.store.representation.Symbol;
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 c850d334..404be65f 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
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-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;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretation.java b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretation.java
deleted file mode 100644
index 331fa294..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretation.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package tools.refinery.store.partial;
-
-import tools.refinery.store.adapter.ModelAdapterBuilderFactory;
-import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.partial.internal.PartialInterpretationBuilderImpl;
-
-public final class PartialInterpretation extends ModelAdapterBuilderFactory<PartialInterpretationAdapter,
-                PartialInterpretationStoreAdapter, PartialInterpretationBuilder> {
-        public static final PartialInterpretation ADAPTER = new PartialInterpretation();
-
-        private PartialInterpretation() {
-                super(PartialInterpretationAdapter.class, PartialInterpretationStoreAdapter.class, PartialInterpretationBuilder.class);
-        }
-
-        @Override
-        public PartialInterpretationBuilder createBuilder(ModelStoreBuilder storeBuilder) {
-                return new PartialInterpretationBuilderImpl(storeBuilder);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationAdapter.java b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationAdapter.java
deleted file mode 100644
index 2c83a200..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationAdapter.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package tools.refinery.store.partial;
-
-import tools.refinery.store.adapter.ModelAdapter;
-
-public interface PartialInterpretationAdapter extends ModelAdapter {
-        @Override
-        PartialInterpretationStoreAdapter getStoreAdapter();
-}
-
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationBuilder.java b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationBuilder.java
deleted file mode 100644
index 0ec13836..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationBuilder.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package tools.refinery.store.partial;
-
-import tools.refinery.store.adapter.ModelAdapterBuilder;
-import tools.refinery.store.model.ModelStore;
-
-public interface PartialInterpretationBuilder extends ModelAdapterBuilder {
-        @Override
-        PartialInterpretationStoreAdapter createStoreAdapter(ModelStore store);
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationStoreAdapter.java b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationStoreAdapter.java
deleted file mode 100644
index d4eb770d..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationStoreAdapter.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package tools.refinery.store.partial;
-
-import tools.refinery.store.adapter.ModelStoreAdapter;
-import tools.refinery.store.model.Model;
-
-public interface PartialInterpretationStoreAdapter extends ModelStoreAdapter {
-        @Override
-        PartialInterpretationAdapter createModelAdapter(Model model);
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationAdapterImpl.java b/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationAdapterImpl.java
deleted file mode 100644
index 4b3977c0..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationAdapterImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package tools.refinery.store.partial.internal;
-
-import tools.refinery.store.model.Model;
-import tools.refinery.store.partial.PartialInterpretationAdapter;
-
-public class PartialInterpretationAdapterImpl implements PartialInterpretationAdapter {
-        private final Model model;
-        private final PartialInterpretationStoreAdapterImpl storeAdapter;
-
-        PartialInterpretationAdapterImpl(Model model, PartialInterpretationStoreAdapterImpl storeAdapter) {
-                this.model = model;
-                this.storeAdapter = storeAdapter;
-        }
-
-        @Override
-        public Model getModel() {
-                return model;
-        }
-
-        @Override
-        public PartialInterpretationStoreAdapterImpl getStoreAdapter() {
-                return storeAdapter;
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationBuilderImpl.java b/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationBuilderImpl.java
deleted file mode 100644
index 4609dc32..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationBuilderImpl.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package tools.refinery.store.partial.internal;
-
-import tools.refinery.store.adapter.AbstractModelAdapterBuilder;
-import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.partial.PartialInterpretationBuilder;
-
-public class PartialInterpretationBuilderImpl extends AbstractModelAdapterBuilder implements PartialInterpretationBuilder {
-        public PartialInterpretationBuilderImpl(ModelStoreBuilder storeBuilder) {
-                super(storeBuilder);
-        }
-
-        @Override
-        public PartialInterpretationStoreAdapterImpl createStoreAdapter(ModelStore store) {
-                return null;
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationStoreAdapterImpl.java b/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationStoreAdapterImpl.java
deleted file mode 100644
index 970b802b..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationStoreAdapterImpl.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package tools.refinery.store.partial.internal;
-
-import tools.refinery.store.model.Model;
-import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.partial.PartialInterpretationStoreAdapter;
-
-public class PartialInterpretationStoreAdapterImpl implements PartialInterpretationStoreAdapter {
-        private final ModelStore store;
-
-        PartialInterpretationStoreAdapterImpl(ModelStore store) {
-                this.store = store;
-        }
-
-        @Override
-        public ModelStore getStore() {
-                return store;
-        }
-
-        @Override
-        public PartialInterpretationAdapterImpl createModelAdapter(Model model) {
-                return new PartialInterpretationAdapterImpl(model, this);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/DNF.java b/subprojects/store/src/main/java/tools/refinery/store/query/DNF.java
deleted file mode 100644
index 95c5d787..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/DNF.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package tools.refinery.store.query;
-
-import tools.refinery.store.query.atom.DNFAtom;
-
-import java.util.*;
-
-public final class DNF implements RelationLike {
-        private final String name;
-
-        private final String uniqueName;
-
-        private final List<Variable> parameters;
-
-        private final List<FunctionalDependency<Variable>> functionalDependencies;
-
-        private final List<DNFAnd> clauses;
-
-        private DNF(String name, List<Variable> parameters, List<FunctionalDependency<Variable>> functionalDependencies,
-                                List<DNFAnd> clauses) {
-                validateFunctionalDependencies(parameters, functionalDependencies);
-                this.name = name;
-                this.uniqueName = DNFUtils.generateUniqueName(name);
-                this.parameters = parameters;
-                this.functionalDependencies = functionalDependencies;
-                this.clauses = clauses;
-        }
-
-        private static void validateFunctionalDependencies(
-                        Collection<Variable> parameters, Collection<FunctionalDependency<Variable>> functionalDependencies) {
-                var parameterSet = new HashSet<>(parameters);
-                for (var functionalDependency : functionalDependencies) {
-                        validateParameters(parameters, parameterSet, functionalDependency.forEach(), functionalDependency);
-                        validateParameters(parameters, parameterSet, functionalDependency.unique(), functionalDependency);
-                }
-        }
-
-        private static void validateParameters(Collection<Variable> parameters, Set<Variable> parameterSet,
-                                                                                   Collection<Variable> toValidate,
-                                                                                   FunctionalDependency<Variable> functionalDependency) {
-                for (var variable : toValidate) {
-                        if (!parameterSet.contains(variable)) {
-                                throw new IllegalArgumentException(
-                                                "Variable %s of functional dependency %s does not appear in the parameter list %s"
-                                                                .formatted(variable, functionalDependency, parameters));
-                        }
-                }
-        }
-
-        @Override
-        public String name() {
-                return name;
-        }
-
-        public String getUniqueName() {
-                return uniqueName;
-        }
-
-        public List<Variable> getParameters() {
-                return parameters;
-        }
-
-        public List<FunctionalDependency<Variable>> getFunctionalDependencies() {
-                return functionalDependencies;
-        }
-
-        @Override
-        public int arity() {
-                return parameters.size();
-        }
-
-        public List<DNFAnd> getClauses() {
-                return clauses;
-        }
-
-        public static Builder builder() {
-                return builder(null);
-        }
-
-        public static Builder builder(String name) {
-                return new Builder(name);
-        }
-
-        @SuppressWarnings("UnusedReturnValue")
-        public static class Builder {
-                private final String name;
-
-                private final List<Variable> parameters = new ArrayList<>();
-
-                private final List<FunctionalDependency<Variable>> functionalDependencies = new ArrayList<>();
-
-                private final List<List<DNFAtom>> clauses = new ArrayList<>();
-
-                private Builder(String name) {
-                        this.name = name;
-                }
-
-                public Builder parameter(Variable variable) {
-                        parameters.add(variable);
-                        return this;
-                }
-
-                public Builder parameters(Variable... variables) {
-                        return parameters(List.of(variables));
-                }
-
-                public Builder parameters(Collection<Variable> variables) {
-                        parameters.addAll(variables);
-                        return this;
-                }
-
-                public Builder functionalDependencies(Collection<FunctionalDependency<Variable>> functionalDependencies) {
-                        this.functionalDependencies.addAll(functionalDependencies);
-                        return this;
-                }
-
-                public Builder functionalDependency(FunctionalDependency<Variable> functionalDependency) {
-                        functionalDependencies.add(functionalDependency);
-                        return this;
-                }
-
-                public Builder functionalDependency(Set<Variable> forEach, Set<Variable> unique) {
-                        return functionalDependency(new FunctionalDependency<>(forEach, unique));
-                }
-
-                public Builder clause(DNFAtom... atoms) {
-                        clauses.add(List.of(atoms));
-                        return this;
-                }
-
-                public Builder clause(Collection<DNFAtom> atoms) {
-                        clauses.add(List.copyOf(atoms));
-                        return this;
-                }
-
-                public Builder clause(DNFAnd clause) {
-                        return clause(clause.constraints());
-                }
-
-                public Builder clauses(DNFAnd... clauses) {
-                        for (var clause : clauses) {
-                                this.clause(clause);
-                        }
-                        return this;
-                }
-
-                public Builder clauses(Collection<DNFAnd> clauses) {
-                        for (var clause : clauses) {
-                                this.clause(clause);
-                        }
-                        return this;
-                }
-
-                public DNF build() {
-                        var postProcessedClauses = new ArrayList<DNFAnd>();
-                        for (var constraints : clauses) {
-                                var variables = new HashSet<Variable>();
-                                for (var constraint : constraints) {
-                                        constraint.collectAllVariables(variables);
-                                }
-                                parameters.forEach(variables::remove);
-                                postProcessedClauses.add(new DNFAnd(Collections.unmodifiableSet(variables),
-                                                Collections.unmodifiableList(constraints)));
-                        }
-                        return new DNF(name, Collections.unmodifiableList(parameters),
-                                        Collections.unmodifiableList(functionalDependencies),
-                                        Collections.unmodifiableList(postProcessedClauses));
-                }
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/DNFAnd.java b/subprojects/store/src/main/java/tools/refinery/store/query/DNFAnd.java
deleted file mode 100644
index 8c3bf05d..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/DNFAnd.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package tools.refinery.store.query;
-
-import tools.refinery.store.query.atom.DNFAtom;
-
-import java.util.List;
-import java.util.Set;
-
-public record DNFAnd(Set<Variable> quantifiedVariables, List<DNFAtom> constraints) {
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/DNFUtils.java b/subprojects/store/src/main/java/tools/refinery/store/query/DNFUtils.java
deleted file mode 100644
index 0ef77d49..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/DNFUtils.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package tools.refinery.store.query;
-
-import java.util.UUID;
-
-public final class DNFUtils {
-        private DNFUtils() {
-                throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
-        }
-
-        public static String generateUniqueName(String originalName) {
-                UUID uuid = UUID.randomUUID();
-                String uniqueString = "_" + uuid.toString().replace('-', '_');
-                if (originalName == null) {
-                        return uniqueString;
-                } else {
-                        return originalName + uniqueString;
-                }
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/FunctionalDependency.java b/subprojects/store/src/main/java/tools/refinery/store/query/FunctionalDependency.java
deleted file mode 100644
index 63a81713..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/FunctionalDependency.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package tools.refinery.store.query;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public record FunctionalDependency<T>(Set<T> forEach, Set<T> unique) {
-        public FunctionalDependency {
-                var uniqueForEach = new HashSet<>(unique);
-                uniqueForEach.retainAll(forEach);
-                if (!uniqueForEach.isEmpty()) {
-                        throw new IllegalArgumentException("Variables %s appear on both sides of the functional dependency"
-                                        .formatted(uniqueForEach));
-                }
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/ModelQuery.java b/subprojects/store/src/main/java/tools/refinery/store/query/ModelQuery.java
deleted file mode 100644
index 6a1aeabb..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/ModelQuery.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package tools.refinery.store.query;
-
-import tools.refinery.store.adapter.ModelAdapterType;
-
-public final class ModelQuery extends ModelAdapterType<ModelQueryAdapter, ModelQueryStoreAdapter, ModelQueryBuilder> {
-        public static final ModelQuery ADAPTER = new ModelQuery();
-
-        private ModelQuery() {
-                super(ModelQueryAdapter.class, ModelQueryStoreAdapter.class, ModelQueryBuilder.class);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/ModelQueryAdapter.java b/subprojects/store/src/main/java/tools/refinery/store/query/ModelQueryAdapter.java
deleted file mode 100644
index 7449e39b..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/ModelQueryAdapter.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package tools.refinery.store.query;
-
-import tools.refinery.store.adapter.ModelAdapter;
-
-public interface ModelQueryAdapter extends ModelAdapter {
-        ModelQueryStoreAdapter getStoreAdapter();
-
-        ResultSet getResultSet(DNF query);
-
-        boolean hasPendingChanges();
-
-        void flushChanges();
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java b/subprojects/store/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java
deleted file mode 100644
index 4364d844..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package tools.refinery.store.query;
-
-import tools.refinery.store.adapter.ModelAdapterBuilder;
-import tools.refinery.store.model.ModelStore;
-
-import java.util.Collection;
-import java.util.List;
-
-public interface ModelQueryBuilder extends ModelAdapterBuilder {
-        default ModelQueryBuilder queries(DNF... queries) {
-                return queries(List.of(queries));
-        }
-
-        default ModelQueryBuilder queries(Collection<DNF> queries) {
-                queries.forEach(this::query);
-                return this;
-        }
-
-        ModelQueryBuilder query(DNF query);
-
-        @Override
-        ModelQueryStoreAdapter createStoreAdapter(ModelStore store);
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java b/subprojects/store/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java
deleted file mode 100644
index ef5a4587..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package tools.refinery.store.query;
-
-import tools.refinery.store.adapter.ModelStoreAdapter;
-import tools.refinery.store.model.Model;
-import tools.refinery.store.query.view.AnyRelationView;
-
-import java.util.Collection;
-
-public interface ModelQueryStoreAdapter extends ModelStoreAdapter {
-        Collection<AnyRelationView> getRelationViews();
-
-        Collection<DNF> getQueries();
-
-        @Override
-        ModelQueryAdapter createModelAdapter(Model model);
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/RelationLike.java b/subprojects/store/src/main/java/tools/refinery/store/query/RelationLike.java
deleted file mode 100644
index 8c784d8b..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/RelationLike.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package tools.refinery.store.query;
-
-public interface RelationLike {
-        String name();
-
-        int arity();
-
-        default boolean invalidIndex(int i) {
-                return i < 0 || i >= arity();
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/ResultSet.java b/subprojects/store/src/main/java/tools/refinery/store/query/ResultSet.java
deleted file mode 100644
index 3542e252..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/ResultSet.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package tools.refinery.store.query;
-
-import tools.refinery.store.tuple.Tuple;
-import tools.refinery.store.tuple.TupleLike;
-
-import java.util.Optional;
-import java.util.stream.Stream;
-
-public interface ResultSet {
-        boolean hasResult();
-
-        boolean hasResult(Tuple parameters);
-
-        Optional<TupleLike> oneResult();
-
-        Optional<TupleLike> oneResult(Tuple parameters);
-
-        Stream<TupleLike> allResults();
-
-        Stream<TupleLike> allResults(Tuple parameters);
-
-        int countResults();
-
-        int countResults(Tuple parameters);
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/Variable.java b/subprojects/store/src/main/java/tools/refinery/store/query/Variable.java
deleted file mode 100644
index 3632f3c5..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/Variable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package tools.refinery.store.query;
-
-import java.util.Objects;
-
-public class Variable {
-        private final String name;
-        private final String uniqueName;
-
-        public Variable() {
-                this(null);
-        }
-
-        public Variable(String name) {
-                super();
-                this.name = name;
-                this.uniqueName = DNFUtils.generateUniqueName(name);
-
-        }
-        public String getName() {
-                return name;
-        }
-
-        public String getUniqueName() {
-                return uniqueName;
-        }
-
-        public boolean isNamed() {
-                return name != null;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                Variable variable = (Variable) o;
-                return Objects.equals(uniqueName, variable.uniqueName);
-        }
-
-        @Override
-        public int hashCode() {
-                return Objects.hash(uniqueName);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/atom/CallAtom.java b/subprojects/store/src/main/java/tools/refinery/store/query/atom/CallAtom.java
deleted file mode 100644
index 47121870..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/atom/CallAtom.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package tools.refinery.store.query.atom;
-
-import tools.refinery.store.query.Variable;
-import tools.refinery.store.query.RelationLike;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-public abstract class CallAtom<T extends RelationLike> implements DNFAtom {
-        private final CallPolarity polarity;
-        private final T target;
-        private final List<Variable> substitution;
-
-        protected CallAtom(CallPolarity polarity, T target, List<Variable> substitution) {
-                if (substitution.size() != target.arity()) {
-                        throw new IllegalArgumentException("%s needs %d arguments, but got %s".formatted(target.name(),
-                                        target.arity(), substitution.size()));
-                }
-                if (polarity.isTransitive() && target.arity() != 2) {
-                        throw new IllegalArgumentException("Transitive closures can only take binary relations");
-                }
-                this.polarity = polarity;
-                this.target = target;
-                this.substitution = substitution;
-        }
-
-        protected CallAtom(CallPolarity polarity, T target, Variable... substitution) {
-                this(polarity, target, List.of(substitution));
-        }
-
-        protected CallAtom(boolean positive, T target, List<Variable> substitution) {
-                this(CallPolarity.fromBoolean(positive), target, substitution);
-        }
-
-        protected CallAtom(boolean positive, T target, Variable... substitution) {
-                this(positive, target, List.of(substitution));
-        }
-
-        protected CallAtom(T target, List<Variable> substitution) {
-                this(true, target, substitution);
-        }
-
-        protected CallAtom(T target, Variable... substitution) {
-                this(target, List.of(substitution));
-        }
-
-        public CallPolarity getPolarity() {
-                return polarity;
-        }
-
-        public T getTarget() {
-                return target;
-        }
-
-        public List<Variable> getSubstitution() {
-                return substitution;
-        }
-
-        @Override
-        public void collectAllVariables(Set<Variable> variables) {
-                if (polarity.isPositive()) {
-                        variables.addAll(substitution);
-                }
-        }
-
-        @Override
-        public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                CallAtom<?> callAtom = (CallAtom<?>) o;
-                return polarity == callAtom.polarity && Objects.equals(target, callAtom.target) && Objects.equals(substitution
-                                , callAtom.substitution);
-        }
-
-        @Override
-        public int hashCode() {
-                return Objects.hash(polarity, target, substitution);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/atom/CallPolarity.java b/subprojects/store/src/main/java/tools/refinery/store/query/atom/CallPolarity.java
deleted file mode 100644
index 957e9b7b..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/atom/CallPolarity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package tools.refinery.store.query.atom;
-
-public enum CallPolarity {
-        POSITIVE(true, false),
-        NEGATIVE(false, false),
-        TRANSITIVE(true, true);
-
-        private final boolean positive;
-
-        private final boolean transitive;
-
-        CallPolarity(boolean positive, boolean transitive) {
-                this.positive = positive;
-                this.transitive = transitive;
-        }
-
-        public boolean isPositive() {
-                return positive;
-        }
-
-        public boolean isTransitive() {
-                return transitive;
-        }
-
-        public static CallPolarity fromBoolean(boolean positive) {
-                return positive ? POSITIVE : NEGATIVE;
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/atom/ConstantAtom.java b/subprojects/store/src/main/java/tools/refinery/store/query/atom/ConstantAtom.java
deleted file mode 100644
index 13dae7d0..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/atom/ConstantAtom.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package tools.refinery.store.query.atom;
-
-import tools.refinery.store.query.Variable;
-
-import java.util.Set;
-
-public record ConstantAtom(Variable variable, int nodeId) implements DNFAtom {
-        @Override
-        public void collectAllVariables(Set<Variable> variables) {
-                variables.add(variable);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/atom/DNFAtom.java b/subprojects/store/src/main/java/tools/refinery/store/query/atom/DNFAtom.java
deleted file mode 100644
index ebf71236..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/atom/DNFAtom.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package tools.refinery.store.query.atom;
-
-import tools.refinery.store.query.Variable;
-
-import java.util.Set;
-
-public interface DNFAtom {
-        void collectAllVariables(Set<Variable> variables);
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/atom/DNFCallAtom.java b/subprojects/store/src/main/java/tools/refinery/store/query/atom/DNFCallAtom.java
deleted file mode 100644
index 3b4f5cd1..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/atom/DNFCallAtom.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package tools.refinery.store.query.atom;
-
-import tools.refinery.store.query.DNF;
-import tools.refinery.store.query.Variable;
-
-import java.util.List;
-
-public class DNFCallAtom extends CallAtom<DNF> {
-        public DNFCallAtom(CallPolarity polarity, DNF target, List<Variable> substitution) {
-                super(polarity, target, substitution);
-        }
-
-        public DNFCallAtom(CallPolarity polarity, DNF target, Variable... substitution) {
-                super(polarity, target, substitution);
-        }
-
-        public DNFCallAtom(boolean positive, DNF target, List<Variable> substitution) {
-                super(positive, target, substitution);
-        }
-
-        public DNFCallAtom(boolean positive, DNF target, Variable... substitution) {
-                super(positive, target, substitution);
-        }
-
-        public DNFCallAtom(DNF target, List<Variable> substitution) {
-                super(target, substitution);
-        }
-
-        public DNFCallAtom(DNF target, Variable... substitution) {
-                super(target, substitution);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/atom/EquivalenceAtom.java b/subprojects/store/src/main/java/tools/refinery/store/query/atom/EquivalenceAtom.java
deleted file mode 100644
index b1b3a6f7..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/atom/EquivalenceAtom.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package tools.refinery.store.query.atom;
-
-import tools.refinery.store.query.Variable;
-
-import java.util.Set;
-
-public record EquivalenceAtom(boolean positive, Variable left, Variable right) implements DNFAtom {
-        public EquivalenceAtom(Variable left, Variable right) {
-                this(true, left, right);
-        }
-
-        @Override
-        public void collectAllVariables(Set<Variable> variables) {
-                variables.add(left);
-                variables.add(right);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/atom/Modality.java b/subprojects/store/src/main/java/tools/refinery/store/query/atom/Modality.java
deleted file mode 100644
index e389f563..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/atom/Modality.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package tools.refinery.store.query.atom;
-
-import java.util.Locale;
-
-public enum Modality {
-        MUST,
-        MAY,
-        CURRENT;
-
-        public Modality negate() {
-                return switch(this) {
-                        case MUST -> MAY;
-                        case MAY -> MUST;
-                        case CURRENT -> CURRENT;
-                };
-        }
-
-        @Override
-        public String toString() {
-                return name().toLowerCase(Locale.ROOT);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/atom/RelationViewAtom.java b/subprojects/store/src/main/java/tools/refinery/store/query/atom/RelationViewAtom.java
deleted file mode 100644
index a2b176c4..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/atom/RelationViewAtom.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package tools.refinery.store.query.atom;
-
-import tools.refinery.store.query.Variable;
-import tools.refinery.store.query.view.AnyRelationView;
-
-import java.util.List;
-
-public final class RelationViewAtom extends CallAtom<AnyRelationView> {
-        public RelationViewAtom(CallPolarity polarity, AnyRelationView target, List<Variable> substitution) {
-                super(polarity, target, substitution);
-        }
-
-        public RelationViewAtom(CallPolarity polarity, AnyRelationView target, Variable... substitution) {
-                super(polarity, target, substitution);
-        }
-
-        public RelationViewAtom(boolean positive, AnyRelationView target, List<Variable> substitution) {
-                super(positive, target, substitution);
-        }
-
-        public RelationViewAtom(boolean positive, AnyRelationView target, Variable... substitution) {
-                super(positive, target, substitution);
-        }
-
-        public RelationViewAtom(AnyRelationView target, List<Variable> substitution) {
-                super(target, substitution);
-        }
-
-        public RelationViewAtom(AnyRelationView target, Variable... substitution) {
-                super(target, substitution);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/AnyRelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/AnyRelationView.java
deleted file mode 100644
index 328cde3a..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/view/AnyRelationView.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package tools.refinery.store.query.view;
-
-import tools.refinery.store.model.Model;
-import tools.refinery.store.query.FunctionalDependency;
-import tools.refinery.store.representation.AnySymbol;
-import tools.refinery.store.query.RelationLike;
-
-import java.util.Set;
-
-public sealed interface AnyRelationView extends RelationLike permits RelationView {
-        AnySymbol getSymbol();
-
-        default Set<FunctionalDependency<Integer>> getFunctionalDependencies() {
-                return Set.of();
-        }
-
-        default Set<RelationViewImplication> getImpliedRelationViews() {
-                return Set.of();
-        }
-
-        boolean get(Model model, Object[] tuple);
-
-        Iterable<Object[]> getAll(Model model);
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java
deleted file mode 100644
index 64c601bb..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package tools.refinery.store.query.view;
-
-import tools.refinery.store.tuple.Tuple;
-import tools.refinery.store.representation.Symbol;
-
-import java.util.Objects;
-import java.util.function.BiPredicate;
-import java.util.function.Predicate;
-
-public class FilteredRelationView<T> extends TuplePreservingRelationView<T> {
-        private final BiPredicate<Tuple, T> predicate;
-
-        public FilteredRelationView(Symbol<T> symbol, String name, BiPredicate<Tuple, T> predicate) {
-                super(symbol, name);
-                this.predicate = predicate;
-        }
-
-        public FilteredRelationView(Symbol<T> symbol, BiPredicate<Tuple, T> predicate) {
-                super(symbol);
-                this.predicate = predicate;
-        }
-
-        public FilteredRelationView(Symbol<T> symbol, String name, Predicate<T> predicate) {
-                this(symbol, name, (k, v) -> predicate.test(v));
-        }
-
-        public FilteredRelationView(Symbol<T> symbol, Predicate<T> predicate) {
-                this(symbol, (k, v) -> predicate.test(v));
-        }
-
-        @Override
-        public boolean filter(Tuple key, T value) {
-                return this.predicate.test(key, value);
-        }
-
-        @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;
-                FilteredRelationView<?> that = (FilteredRelationView<?>) o;
-                return Objects.equals(predicate, that.predicate);
-        }
-
-        @Override
-        public int hashCode() {
-                return Objects.hash(super.hashCode(), predicate);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java
deleted file mode 100644
index 3d278a8b..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package tools.refinery.store.query.view;
-
-import tools.refinery.store.model.Model;
-import tools.refinery.store.query.FunctionalDependency;
-import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.tuple.Tuple;
-import tools.refinery.store.tuple.Tuple1;
-
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-public final class FunctionalRelationView<T> extends RelationView<T> {
-        public FunctionalRelationView(Symbol<T> symbol, String name) {
-                super(symbol, name);
-        }
-
-        public FunctionalRelationView(Symbol<T> symbol) {
-                super(symbol);
-        }
-
-        @Override
-        public Set<FunctionalDependency<Integer>> getFunctionalDependencies() {
-                var arity = getSymbol().arity();
-                var forEach = IntStream.range(0, arity).boxed().collect(Collectors.toUnmodifiableSet());
-                var unique = Set.of(arity);
-                return Set.of(new FunctionalDependency<>(forEach, unique));
-        }
-
-        @Override
-        public Set<RelationViewImplication> getImpliedRelationViews() {
-                var symbol = getSymbol();
-                var impliedIndices = IntStream.range(0, symbol.arity()).boxed().toList();
-                var keyOnlyRelationView = new KeyOnlyRelationView<>(symbol);
-                return Set.of(new RelationViewImplication(this, keyOnlyRelationView, impliedIndices));
-        }
-
-        @Override
-        public boolean filter(Tuple key, T value) {
-                return true;
-        }
-
-        @Override
-        public Object[] forwardMap(Tuple key, T value) {
-                int size = key.getSize();
-                Object[] result = new Object[size + 1];
-                for (int i = 0; i < size; i++) {
-                        result[i] = Tuple.of(key.get(i));
-                }
-                result[key.getSize()] = value;
-                return result;
-        }
-
-        @Override
-        public boolean get(Model model, Object[] tuple) {
-                int[] content = new int[tuple.length - 1];
-                for (int i = 0; i < tuple.length - 1; i++) {
-                        content[i] = ((Tuple1) tuple[i]).value0();
-                }
-                Tuple key = Tuple.of(content);
-                @SuppressWarnings("unchecked")
-                T valueInTuple = (T) tuple[tuple.length - 1];
-                T valueInMap = model.getInterpretation(getSymbol()).get(key);
-                return valueInTuple.equals(valueInMap);
-        }
-
-        @Override
-        public int arity() {
-                return getSymbol().arity() + 1;
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java
deleted file mode 100644
index e1b2e45b..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package tools.refinery.store.query.view;
-
-import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.tuple.Tuple;
-
-import java.util.Objects;
-
-public final class KeyOnlyRelationView<T> extends TuplePreservingRelationView<T> {
-        public static final String VIEW_NAME = "key";
-
-        private final T defaultValue;
-
-        public KeyOnlyRelationView(Symbol<T> symbol) {
-                super(symbol, VIEW_NAME);
-                defaultValue = symbol.defaultValue();
-        }
-
-        @Override
-        public boolean filter(Tuple key, T value) {
-                return !Objects.equals(value, defaultValue);
-        }
-
-        @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;
-                KeyOnlyRelationView<?> that = (KeyOnlyRelationView<?>) o;
-                return Objects.equals(defaultValue, that.defaultValue);
-        }
-
-        @Override
-        public int hashCode() {
-                return Objects.hash(super.hashCode(), defaultValue);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationView.java
deleted file mode 100644
index bbec1e73..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationView.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package tools.refinery.store.query.view;
-
-import tools.refinery.store.map.CursorAsIterator;
-import tools.refinery.store.model.Model;
-import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.tuple.Tuple;
-
-import java.util.Objects;
-import java.util.UUID;
-
-/**
- * Represents a view of a {@link Symbol} that can be queried.
- *
- * @param <T>
- * @author Oszkar Semerath
- */
-public abstract non-sealed class RelationView<T> implements AnyRelationView {
-        private final Symbol<T> symbol;
-
-        private final String name;
-
-        protected RelationView(Symbol<T> symbol, String name) {
-                this.symbol = symbol;
-                this.name = name;
-        }
-
-        protected RelationView(Symbol<T> representation) {
-                this(representation, UUID.randomUUID().toString());
-        }
-
-        @Override
-        public Symbol<T> getSymbol() {
-                return symbol;
-        }
-
-        @Override
-        public String name() {
-                return symbol.name() + "#" + name;
-        }
-
-        public abstract boolean filter(Tuple key, T value);
-
-        public abstract Object[] forwardMap(Tuple key, T value);
-
-        @Override
-        public Iterable<Object[]> getAll(Model model) {
-                return (() -> new CursorAsIterator<>(model.getInterpretation(symbol).getAll(), this::forwardMap, this::filter));
-        }
-
-        @Override
-        public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                RelationView<?> that = (RelationView<?>) o;
-                return Objects.equals(symbol, that.symbol) && Objects.equals(name, that.name);
-        }
-
-        @Override
-        public int hashCode() {
-                return Objects.hash(symbol, name);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationViewImplication.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationViewImplication.java
deleted file mode 100644
index 2ba1fcc4..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/view/RelationViewImplication.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package tools.refinery.store.query.view;
-
-import java.util.List;
-
-public record RelationViewImplication(AnyRelationView implyingRelationView, AnyRelationView impliedRelationView,
-                                                                          List<Integer> impliedIndices) {
-        public RelationViewImplication {
-                if (impliedIndices.size() != impliedRelationView.arity()) {
-                        throw new IllegalArgumentException("Expected %d implied indices for %s, but %d are provided"
-                                        .formatted(impliedRelationView.arity(), impliedRelationView, impliedIndices.size()));
-                }
-                for (var index : impliedIndices) {
-                        if (impliedRelationView.invalidIndex(index)) {
-                                throw new IllegalArgumentException("%d is not a valid index for %s".formatted(index,
-                                                implyingRelationView));
-                        }
-                }
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/query/view/TuplePreservingRelationView.java b/subprojects/store/src/main/java/tools/refinery/store/query/view/TuplePreservingRelationView.java
deleted file mode 100644
index 8cc4986e..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/query/view/TuplePreservingRelationView.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package tools.refinery.store.query.view;
-
-import tools.refinery.store.model.Model;
-import tools.refinery.store.tuple.Tuple;
-import tools.refinery.store.tuple.Tuple1;
-import tools.refinery.store.representation.Symbol;
-
-public abstract class TuplePreservingRelationView<T> extends RelationView<T> {
-        protected TuplePreservingRelationView(Symbol<T> symbol, String name) {
-                super(symbol, name);
-        }
-
-        protected TuplePreservingRelationView(Symbol<T> symbol) {
-                super(symbol);
-        }
-
-        public Object[] forwardMap(Tuple key) {
-                Object[] result = new Object[key.getSize()];
-                for (int i = 0; i < key.getSize(); i++) {
-                        result[i] = Tuple.of(key.get(i));
-                }
-                return result;
-        }
-
-        @Override
-        public Object[] forwardMap(Tuple key, T value) {
-                return forwardMap(key);
-        }
-
-        @Override
-        public boolean get(Model model, Object[] tuple) {
-                int[] content = new int[tuple.length];
-                for (int i = 0; i < tuple.length; i++) {
-                        content[i] = ((Tuple1) tuple[i]).value0();
-                }
-                Tuple key = Tuple.of(content);
-                T value = model.getInterpretation(getSymbol()).get(key);
-                return filter(key, value);
-        }
-
-        public int arity() {
-                return this.getSymbol().arity();
-        }
-}
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
new file mode 100644
index 00000000..52c740e8
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/AbstractDomain.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.representation;
+
+import java.util.Optional;
+
+public non-sealed interface AbstractDomain<A, C> extends AnyAbstractDomain {
+        @Override
+        Class<A> abstractType();
+
+        @Override
+        Class<C> concreteType();
+
+        A toAbstract(C concreteValue);
+
+        Optional<C> toConcrete(A abstractValue);
+
+        default boolean isConcrete(A abstractValue) {
+                return toConcrete(abstractValue).isPresent();
+        }
+
+        boolean isRefinement(A originalValue, A refinedValue);
+
+        A commonRefinement(A leftValue, A rightValue);
+
+        A commonAncestor(A leftValue, A rightValue);
+
+        A unknown();
+
+        boolean isError(A abstractValue);
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/AnyAbstractDomain.java b/subprojects/store/src/main/java/tools/refinery/store/representation/AnyAbstractDomain.java
new file mode 100644
index 00000000..c354fab7
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/AnyAbstractDomain.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.representation;
+
+public sealed interface AnyAbstractDomain permits AbstractDomain {
+        Class<?> abstractType();
+
+        Class<?> concreteType();
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/AnySymbol.java b/subprojects/store/src/main/java/tools/refinery/store/representation/AnySymbol.java
index 20b9eead..b2377905 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/AnySymbol.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/AnySymbol.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation;
 
 public sealed interface AnySymbol permits Symbol {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/Symbol.java b/subprojects/store/src/main/java/tools/refinery/store/representation/Symbol.java
index 85ea15f4..cc748180 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/Symbol.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/Symbol.java
@@ -1,25 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation;
 
-import java.util.Objects;
-
 public record Symbol<T>(String name, int arity, Class<T> valueType, T defaultValue) implements AnySymbol {
-        public boolean isDefaultValue(T value) {
-                return Objects.equals(defaultValue, value);
+        @Override
+        public String toString() {
+                return "%s/%d".formatted(name, arity);
         }
 
-        @Override
-        public boolean equals(Object o) {
-                return this == o;
+        public static Symbol<Boolean> of(String name, int arity) {
+                return of(name, arity, Boolean.class, false);
         }
 
-        @Override
-        public int hashCode() {
-                // Compare by identity to make hash table lookups more efficient.
-                return System.identityHashCode(this);
+        public static <T> Symbol<T> of(String name, int arity, Class<T> valueType) {
+                return of(name, arity, valueType, null);
         }
 
-        @Override
-        public String toString() {
-                return "%s/%d".formatted(name, arity);
+        public static <T> Symbol<T> of(String name, int arity, Class<T> valueType, T defaultValue) {
+                return new Symbol<>(name, arity, valueType, defaultValue);
         }
 }
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 b7893fd3..40baf9a5 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
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation;
 
 public enum TruthValue {
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
new file mode 100644
index 00000000..89f8dd19
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/representation/TruthValueDomain.java
@@ -0,0 +1,65 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.representation;
+
+import java.util.Optional;
+
+public final class TruthValueDomain implements AbstractDomain<TruthValue, Boolean> {
+        public static final TruthValueDomain INSTANCE = new TruthValueDomain();
+
+        private TruthValueDomain() {
+        }
+
+        @Override
+        public Class<TruthValue> abstractType() {
+                return null;
+        }
+
+        @Override
+        public Class<Boolean> concreteType() {
+                return null;
+        }
+
+        @Override
+        public TruthValue toAbstract(Boolean concreteValue) {
+                return null;
+        }
+
+        @Override
+        public Optional<Boolean> toConcrete(TruthValue abstractValue) {
+                return Optional.empty();
+        }
+
+        @Override
+        public boolean isConcrete(TruthValue abstractValue) {
+                return AbstractDomain.super.isConcrete(abstractValue);
+        }
+
+        @Override
+        public boolean isRefinement(TruthValue originalValue, TruthValue refinedValue) {
+                return false;
+        }
+
+        @Override
+        public TruthValue commonRefinement(TruthValue leftValue, TruthValue rightValue) {
+                return null;
+        }
+
+        @Override
+        public TruthValue commonAncestor(TruthValue leftValue, TruthValue rightValue) {
+                return null;
+        }
+
+        @Override
+        public TruthValue unknown() {
+                return null;
+        }
+
+        @Override
+        public boolean isError(TruthValue abstractValue) {
+                return false;
+        }
+}
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 273d0de7..704ca2fc 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
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 public sealed interface CardinalityInterval permits NonEmptyCardinalityInterval, EmptyCardinalityInterval {
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 e1a08bf9..ad16a3e8 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
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 public final class CardinalityIntervals {
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 ab3ad9d1..49911c29 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
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 public final class EmptyCardinalityInterval implements CardinalityInterval {
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 381c8a57..82afdbbc 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
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 import org.jetbrains.annotations.NotNull;
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 32b3786f..38bd53bf 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
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 import java.util.function.BinaryOperator;
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 593bc322..a5634020 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
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 import org.jetbrains.annotations.NotNull;
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 d850fdc9..1e18dde0 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
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 public final class UpperCardinalities {
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 c6e31cb7..5dbaa922 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
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 public sealed interface UpperCardinality extends Comparable<UpperCardinality> permits FiniteUpperCardinality,
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 bf844c6d..aae7b344 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
@@ -1,28 +1,60 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.tuple;
 
-public sealed interface Tuple extends TupleLike permits Tuple0, Tuple1, Tuple2, TupleN {
+import org.jetbrains.annotations.NotNull;
+
+public sealed interface Tuple extends Comparable<Tuple> permits Tuple0, Tuple1, Tuple2, Tuple3, Tuple4, TupleN {
+        int getSize();
+
+        int get(int element);
+
         @Override
-        default Tuple toTuple() {
-                return this;
+        default int compareTo(@NotNull Tuple other) {
+                int size = getSize();
+                int compareSize = Integer.compare(size, other.getSize());
+                if (compareSize != 0) {
+                        return compareSize;
+                }
+                for (int i = 0; i < size; i++) {
+                        int compareElement = Integer.compare(get(i), other.get(i));
+                        if (compareElement != 0) {
+                                return compareElement;
+                        }
+                }
+                return 0;
         }
 
-        static Tuple of() {
+        static Tuple0 of() {
                 return Tuple0.INSTANCE;
         }
 
-        static Tuple of(int value) {
+        static Tuple1 of(int value) {
                 return Tuple1.Cache.INSTANCE.getOrCreate(value);
         }
 
-        static Tuple of(int value1, int value2) {
+        static Tuple2 of(int value1, int value2) {
                 return new Tuple2(value1, value2);
         }
 
+        static Tuple3 of(int value1, int value2, int value3) {
+                return new Tuple3(value1, value2, value3);
+        }
+
+        static Tuple4 of(int value1, int value2, int value3, int value4) {
+                return new Tuple4(value1, value2, value3, value4);
+        }
+
         static Tuple of(int... values) {
                 return switch (values.length) {
                         case 0 -> of();
                         case 1 -> of(values[0]);
                         case 2 -> of(values[0], values[1]);
+                        case 3 -> of(values[0], values[1], values[2]);
+                        case 4 -> of(values[0], values[1], values[2], values[3]);
                         default -> new TupleN(values);
                 };
         }
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 8eea5c3a..a9aa9bf2 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
@@ -1,7 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.tuple;
 
-public record Tuple0() implements Tuple {
-        public static Tuple0 INSTANCE = new Tuple0();
+import static tools.refinery.store.tuple.TupleConstants.TUPLE_BEGIN;
+import static tools.refinery.store.tuple.TupleConstants.TUPLE_END;
+
+/**
+ * Singleton implementation to ensure only a single empty tuple exists.
+ */
+@SuppressWarnings("squid:S6548")
+public final class Tuple0 implements Tuple {
+        public static final Tuple0 INSTANCE = new Tuple0();
+
+        private Tuple0() {
+        }
 
         @Override
         public int getSize() {
@@ -14,12 +29,7 @@ public record Tuple0() implements Tuple {
         }
 
         @Override
-        public int[] toArray() {
-                return new int[]{};
-        }
-
-        @Override
         public String toString() {
-                return "[]";
+                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 07380966..388ee3a9 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
@@ -1,10 +1,29 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.tuple;
 
+import org.jetbrains.annotations.NotNull;
 import tools.refinery.store.model.TupleHashProvider;
 
 import java.util.Arrays;
 
-public record Tuple1(int value0) implements Tuple {
+import static tools.refinery.store.tuple.TupleConstants.TUPLE_BEGIN;
+import static tools.refinery.store.tuple.TupleConstants.TUPLE_END;
+
+public final class Tuple1 implements Tuple {
+        private final int value0;
+
+        private Tuple1(int value0) {
+                this.value0 = value0;
+        }
+
+        public int value0() {
+                return value0;
+        }
+
         @Override
         public int getSize() {
                 return 1;
@@ -19,20 +38,40 @@ public record Tuple1(int value0) implements Tuple {
         }
 
         @Override
-        public int[] toArray() {
-                return new int[]{value0};
+        public String toString() {
+                return TUPLE_BEGIN + value0 + TUPLE_END;
         }
 
         @Override
-        public String toString() {
-                return "[" + value0 + "]";
+        public boolean equals(Object o) {
+                if (this == o) return true;
+                if (o == null || getClass() != o.getClass()) return false;
+                Tuple1 tuple1 = (Tuple1) o;
+                return value0 == tuple1.value0;
+        }
+
+        @Override
+        public int hashCode() {
+                return 31 + value0;
+        }
+
+        @Override
+        public int compareTo(@NotNull Tuple other) {
+                if (other instanceof Tuple1 other1) {
+                        return Integer.compare(value0, other1.value0);
+                }
+                return Tuple.super.compareTo(other);
         }
 
         /**
          * This class uses safe double-checked locking, see
          * <a href="https://shipilev.net/blog/2014/safe-public-construction/">Safe Publication and Safe Initialization in
          * Java</a> for details.
+         * <p>
+         * This class implements the singleton pattern to ensure only a single cache exists. This is thread-safe because
+         * of the locking of the cache.
          */
+        @SuppressWarnings("squid:S6548")
         public static class Cache {
                 private static final int MIN_CACHE_SIZE = 256;
 
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 0836a32d..6d886fd3 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
@@ -1,5 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.tuple;
 
+import org.jetbrains.annotations.NotNull;
+
+import static tools.refinery.store.tuple.TupleConstants.*;
+
 public record Tuple2(int value0, int value1) implements Tuple {
         @Override
         public int getSize() {
@@ -16,12 +25,34 @@ public record Tuple2(int value0, int value1) implements Tuple {
         }
 
         @Override
-        public int[] toArray() {
-                return new int[]{value0, value1};
+        public String toString() {
+                return TUPLE_BEGIN + value0 + TUPLE_SEPARATOR + value1 + TUPLE_END;
         }
 
         @Override
-        public String toString() {
-                return "[" + value0 + ", " + value1 + "]";
+        public boolean equals(Object o) {
+                if (this == o) return true;
+                if (o == null || getClass() != o.getClass()) return false;
+                Tuple2 tuple2 = (Tuple2) o;
+                return value0 == tuple2.value0 && value1 == tuple2.value1;
+        }
+
+        @Override
+        public int hashCode() {
+                int hash = 31 + value0;
+                hash = 31 * hash + value1;
+                return hash;
+        }
+
+        @Override
+        public int compareTo(@NotNull Tuple other) {
+                if (other instanceof Tuple2 other2) {
+                        int compare0 = Integer.compare(value0, other2.value0);
+                        if (compare0 != 0) {
+                                return compare0;
+                        }
+                        return Integer.compare(value1, other2.value1);
+                }
+                return Tuple.super.compareTo(other);
         }
 }
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
new file mode 100644
index 00000000..734e45c2
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple3.java
@@ -0,0 +1,64 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.tuple;
+
+import org.jetbrains.annotations.NotNull;
+
+import static tools.refinery.store.tuple.TupleConstants.*;
+
+public record Tuple3(int value0, int value1, int value2) implements Tuple {
+        @Override
+        public int getSize() {
+                return 3;
+        }
+
+        @Override
+        public int get(int element) {
+                return switch (element) {
+                        case 0 -> value0;
+                        case 1 -> value1;
+                        case 2 -> value2;
+                        default -> throw new ArrayIndexOutOfBoundsException(element);
+                };
+        }
+
+        @Override
+        public String toString() {
+                return TUPLE_BEGIN + value0 + TUPLE_SEPARATOR + value1 + TUPLE_SEPARATOR + value2 + TUPLE_END;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+                if (this == o) return true;
+                if (o == null || getClass() != o.getClass()) return false;
+                Tuple3 tuple3 = (Tuple3) o;
+                return value0 == tuple3.value0 && value1 == tuple3.value1 && value2 == tuple3.value2;
+        }
+
+        @Override
+        public int hashCode() {
+                int hash = 31 + value0;
+                hash = 31 * hash + value1;
+                hash = 31 * hash + value2;
+                return hash;
+        }
+
+        @Override
+        public int compareTo(@NotNull Tuple other) {
+                if (other instanceof Tuple3 other3) {
+                        int compare0 = Integer.compare(value0, other3.value0);
+                        if (compare0 != 0) {
+                                return compare0;
+                        }
+                        int compare1 = Integer.compare(value1, other3.value1);
+                        if (compare1 != 0) {
+                                return compare1;
+                        }
+                        return Integer.compare(value2, other3.value2);
+                }
+                return Tuple.super.compareTo(other);
+        }
+}
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
new file mode 100644
index 00000000..e1b93e7b
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/tuple/Tuple4.java
@@ -0,0 +1,71 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.tuple;
+
+import org.jetbrains.annotations.NotNull;
+
+import static tools.refinery.store.tuple.TupleConstants.*;
+
+public record Tuple4(int value0, int value1, int value2, int value3) implements Tuple {
+        @Override
+        public int getSize() {
+                return 4;
+        }
+
+        @Override
+        public int get(int element) {
+                return switch (element) {
+                        case 0 -> value0;
+                        case 1 -> value1;
+                        case 2 -> value2;
+                        case 3 -> value3;
+                        default -> throw new ArrayIndexOutOfBoundsException(element);
+                };
+        }
+
+        @Override
+        public String toString() {
+                return TUPLE_BEGIN + value0 + TUPLE_SEPARATOR + value1 + TUPLE_SEPARATOR + value2 + TUPLE_SEPARATOR + value3 +
+                                TUPLE_END;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+                if (this == o) return true;
+                if (o == null || getClass() != o.getClass()) return false;
+                Tuple4 tuple4 = (Tuple4) o;
+                return value0 == tuple4.value0 && value1 == tuple4.value1 && value2 == tuple4.value2 && value3 == tuple4.value3;
+        }
+
+        @Override
+        public int hashCode() {
+                int hash = 31 + value0;
+                hash = 31 * hash + value1;
+                hash = 31 * hash + value2;
+                hash = 31 * hash + value3;
+                return hash;
+        }
+
+        @Override
+        public int compareTo(@NotNull Tuple other) {
+                if (other instanceof Tuple4 other4) {
+                        int compare0 = Integer.compare(value0, other4.value0);
+                        if (compare0 != 0) {
+                                return compare0;
+                        }
+                        int compare1 = Integer.compare(value1, other4.value1);
+                        if (compare1 != 0) {
+                                return compare1;
+                        }
+                        int compare2 = Integer.compare(value2, other4.value2);
+                        if (compare2 != 0) {
+                                return compare2;
+                        }
+                        return Integer.compare(value3, other4.value3);
+                }
+                return Tuple.super.compareTo(other);
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/tuple/TupleConstants.java b/subprojects/store/src/main/java/tools/refinery/store/tuple/TupleConstants.java
new file mode 100644
index 00000000..f7d27848
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/tuple/TupleConstants.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.tuple;
+
+final class TupleConstants {
+        public static final int MAX_STATIC_ARITY_TUPLE_SIZE = 4;
+        public static final String TUPLE_BEGIN = "[";
+        public static final String TUPLE_SEPARATOR = ", ";
+        public static final String TUPLE_END = "]";
+
+        private TupleConstants() {
+                throw new IllegalArgumentException("This is a static utility class an should not instantiated directly");
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/tuple/TupleLike.java b/subprojects/store/src/main/java/tools/refinery/store/tuple/TupleLike.java
deleted file mode 100644
index 470ca298..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/tuple/TupleLike.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package tools.refinery.store.tuple;
-
-public interface TupleLike {
-        int getSize();
-
-        int get(int element);
-
-        default int[] toArray() {
-                int size = getSize();
-                var array = new int[size];
-                for (int i = 0; i < size; i++) {
-                        array[i] = get(i);
-                }
-                return array;
-        }
-
-        default Tuple toTuple() {
-                return switch (getSize()) {
-                        case 0 -> Tuple.of();
-                        case 1 -> Tuple.of(get(0));
-                        case 2 -> Tuple.of(get(0), get(1));
-                        default -> Tuple.of(toArray());
-                };
-        }
-}
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 15fd063b..b66af491 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
@@ -1,14 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.tuple;
 
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
-public record TupleN(int[] values) implements Tuple {
-        static final int CUSTOM_TUPLE_SIZE = 2;
+import static tools.refinery.store.tuple.TupleConstants.*;
 
-        public TupleN(int[] values) {
-                if (values.length < CUSTOM_TUPLE_SIZE)
-                        throw new IllegalArgumentException();
+public final class TupleN implements Tuple {
+        private final int[] values;
+
+        TupleN(int[] values) {
+                if (values.length < MAX_STATIC_ARITY_TUPLE_SIZE) {
+                        throw new IllegalArgumentException("Tuples of size at most %d must use static arity Tuple classes"
+                                        .formatted(MAX_STATIC_ARITY_TUPLE_SIZE));
+                }
                 this.values = Arrays.copyOf(values, values.length);
         }
 
@@ -23,19 +32,11 @@ public record TupleN(int[] values) implements Tuple {
         }
 
         @Override
-        public int[] toArray() {
-                return values;
-        }
-
-        @Override
         public String toString() {
-                var valuesString = Arrays.stream(values).mapToObj(Integer::toString).collect(Collectors.joining(", "));
-                return "[" + valuesString + "]";
-        }
-
-        @Override
-        public int hashCode() {
-                return Arrays.hashCode(values);
+                var valuesString = Arrays.stream(values)
+                                .mapToObj(Integer::toString)
+                                .collect(Collectors.joining(TUPLE_SEPARATOR));
+                return TUPLE_BEGIN + valuesString + TUPLE_END;
         }
 
         @Override
@@ -49,4 +50,9 @@ public record TupleN(int[] values) implements Tuple {
                 TupleN other = (TupleN) obj;
                 return Arrays.equals(values, other.values);
         }
+
+        @Override
+        public int hashCode() {
+                return Arrays.hashCode(values);
+        }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/util/CollectionsUtil.java b/subprojects/store/src/main/java/tools/refinery/store/util/CollectionsUtil.java
index 841d0dfa..adecd79b 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/util/CollectionsUtil.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/util/CollectionsUtil.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.util;
 
 import java.util.Iterator;
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
new file mode 100644
index 00000000..78ad2ad7
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/util/CycleDetectingMapper.java
@@ -0,0 +1,57 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.util;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class CycleDetectingMapper<T, R> {
+        private static final String SEPARATOR = " -> ";
+
+        private final Function<T, String> getName;
+
+        private final Function<T, R> doMap;
+
+        private final Set<T> inProgress = new LinkedHashSet<>();
+
+        private final Map<T, R> results = new HashMap<>();
+
+        public CycleDetectingMapper(Function<T, String> getName, Function<T, R> doMap) {
+                this.getName = getName;
+                this.doMap = doMap;
+        }
+
+        public R map(T input) {
+                if (inProgress.contains(input)) {
+                        var path = inProgress.stream().map(getName).collect(Collectors.joining(SEPARATOR));
+                        throw new IllegalArgumentException("Circular reference %s%s%s detected".formatted(path, SEPARATOR,
+                                        getName.apply(input)));
+                }
+                // We can't use computeIfAbsent here, because translating referenced queries calls this method in a reentrant
+                // way, which would cause a ConcurrentModificationException with computeIfAbsent.
+                @SuppressWarnings("squid:S3824")
+                var result = results.get(input);
+                if (result == null) {
+                        inProgress.add(input);
+                        try {
+                                result = doMap.apply(input);
+                                results.put(input, result);
+                        } finally {
+                                inProgress.remove(input);
+                        }
+                }
+                return result;
+        }
+
+        public List<T> getInProgress() {
+                return List.copyOf(inProgress);
+        }
+
+        public R getAlreadyMapped(T input) {
+                return results.get(input);
+        }
+}
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java
index 6889fd07..2be49bd9 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.tests;
 
 import org.junit.jupiter.api.Test;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/CommitFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/CommitFuzzTest.java
index 7977f772..58206eda 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/CommitFuzzTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/CommitFuzzTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.tests.fuzz;
 
 import org.junit.jupiter.api.Tag;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/ContentEqualsFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/ContentEqualsFuzzTest.java
index 99e76649..c49911b8 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/ContentEqualsFuzzTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/ContentEqualsFuzzTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.tests.fuzz;
 
 import org.junit.jupiter.api.Tag;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/DiffCursorFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/DiffCursorFuzzTest.java
index e02448cf..5a4f8038 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/DiffCursorFuzzTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/DiffCursorFuzzTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.tests.fuzz;
 
 import org.junit.jupiter.api.Tag;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadFuzzTest.java
index ea58e1b7..3b55434c 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadFuzzTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadFuzzTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.tests.fuzz;
 
 import org.junit.jupiter.api.Tag;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadTestRunnable.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadTestRunnable.java
index f449ca97..9b2e591a 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadTestRunnable.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadTestRunnable.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.tests.fuzz;
 
 import java.util.ArrayList;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableFuzzTest.java
index 61b17362..fdcd7f9f 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableFuzzTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableFuzzTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.tests.fuzz;
 
 import static org.junit.jupiter.api.Assertions.fail;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java
index cee15fe1..420dade6 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.tests.fuzz;
 
 import static org.junit.jupiter.api.Assertions.fail;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/RestoreFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/RestoreFuzzTest.java
index 1661cccb..0b399c3a 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/RestoreFuzzTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/RestoreFuzzTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.tests.fuzz;
 
 import org.junit.jupiter.api.Tag;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java
index 0544687a..680d962d 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.tests.fuzz;
 
 import java.util.HashMap;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtils.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtils.java
index 89c01690..32675635 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtils.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtils.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.tests.fuzz.utils;
 
 import java.util.Arrays;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtilsTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtilsTest.java
index 8c641205..951d6336 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtilsTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestUtilsTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.tests.fuzz.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java
index 0e695aaa..e7348370 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.map.tests.utils;
 
 import tools.refinery.store.map.*;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/hashtests/HashEfficiencyTest.java b/subprojects/store/src/test/java/tools/refinery/store/model/hashtests/HashEfficiencyTest.java
index bb083805..4d4f5e26 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/model/hashtests/HashEfficiencyTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/model/hashtests/HashEfficiencyTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model.hashtests;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java b/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java
index 371b5e47..56b75804 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.model.tests;
 
 import org.junit.jupiter.api.Test;
@@ -9,27 +14,24 @@ import tools.refinery.store.tuple.Tuple;
 import static org.junit.jupiter.api.Assertions.*;
 
 class ModelTest {
+        private static final Symbol<Boolean> person = Symbol.of("Person", 1);
+        private static final Symbol<Integer> age = Symbol.of("age", 1, Integer.class);
+        private static final Symbol<Boolean> friend = Symbol.of("friend", 2);
+
         @Test
         void modelConstructionTest() {
-                var person = new Symbol<>("Person", 1, Boolean.class, false);
-                var friend = new Symbol<>("friend", 2, Boolean.class, false);
-
                 var store = ModelStore.builder().symbols(person, friend).build();
                 var symbols = store.getSymbols();
 
                 assertTrue(symbols.contains(person));
                 assertTrue(symbols.contains(friend));
 
-                var other = new Symbol<>("other", 2, Integer.class, null);
+                var other = Symbol.of("other", 2, Integer.class);
                 assertFalse(symbols.contains(other));
         }
 
         @Test
         void modelBuildingTest() {
-                var person = new Symbol<>("Person", 1, Boolean.class, false);
-                var age = new Symbol<>("age", 1, Integer.class, null);
-                var friend = new Symbol<>("friend", 2, Boolean.class, false);
-
                 var store = ModelStore.builder().symbols(person, age, friend).build();
                 var model = store.createEmptyModel();
                 var personInterpretation = model.getInterpretation(person);
@@ -49,7 +51,7 @@ class ModelTest {
 
                 assertEquals(3, ageInterpretation.get(Tuple.of(0)));
                 assertEquals(1, ageInterpretation.get(Tuple.of(1)));
-                assertNull(ageInterpretation.get( Tuple.of(2)));
+                assertNull(ageInterpretation.get(Tuple.of(2)));
 
                 assertTrue(friendInterpretation.get(Tuple.of(0, 1)));
                 assertFalse(friendInterpretation.get(Tuple.of(0, 5)));
@@ -57,8 +59,6 @@ class ModelTest {
 
         @Test
         void modelBuildingArityFailTest() {
-                var person = new Symbol<>("Person", 1, Boolean.class, false);
-
                 var store = ModelStore.builder().symbols(person).build();
                 var model = store.createEmptyModel();
                 var personInterpretation = model.getInterpretation(person);
@@ -70,8 +70,6 @@ class ModelTest {
 
         @Test
         void modelBuildingNullFailTest() {
-                var age = new Symbol<>("age", 1, Integer.class, null);
-
                 var store = ModelStore.builder().symbols(age).build();
                 var model = store.createEmptyModel();
                 var ageInterpretation = model.getInterpretation(age);
@@ -84,10 +82,6 @@ class ModelTest {
 
         @Test
         void modelUpdateTest() {
-                var person = new Symbol<>("Person", 1, Boolean.class, false);
-                var age = new Symbol<>("age", 1, Integer.class, null);
-                var friend = new Symbol<>("friend", 2, Boolean.class, false);
-
                 var store = ModelStore.builder().symbols(person, age, friend).build();
                 var model = store.createEmptyModel();
                 var personInterpretation = model.getInterpretation(person);
@@ -113,9 +107,6 @@ class ModelTest {
 
         @Test
         void restoreTest() {
-                var person = new Symbol<>("Person", 1, Boolean.class, false);
-                var friend = new Symbol<>("friend", 2, Boolean.class, false);
-
                 var store = ModelStore.builder().symbols(person, friend).build();
                 var model = store.createEmptyModel();
                 var personInterpretation = model.getInterpretation(person);
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalTest.java
index 96fdc49e..6a66fa84 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalsTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalsTest.java
index 4a9ef8da..9fe76159 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalsTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalsTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 import org.junit.jupiter.api.Test;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/EmptyCardinalityIntervalTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/EmptyCardinalityIntervalTest.java
index e8b77b9f..24a788a8 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/EmptyCardinalityIntervalTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/EmptyCardinalityIntervalTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 import org.junit.jupiter.api.Test;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteCardinalityIntervalTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteCardinalityIntervalTest.java
index 9a190818..6cf56fae 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteCardinalityIntervalTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteCardinalityIntervalTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 import org.junit.jupiter.api.Test;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinalityTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinalityTest.java
index 90c21759..7c641c47 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinalityTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinalityTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 import org.junit.jupiter.api.Test;
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 3c7c0320..e61f7b36 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
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 import org.junit.jupiter.api.Test;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalityTest.java b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalityTest.java
index e87ce29b..10b4dd20 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalityTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalityTest.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.representation.cardinality;
 
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/util/CollectionsUtilTests.java b/subprojects/store/src/test/java/tools/refinery/store/util/CollectionsUtilTests.java
index 171be0e5..8d50fa8a 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/util/CollectionsUtilTests.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/util/CollectionsUtilTests.java
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 package tools.refinery.store.util;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;