refactor: lambda-based Dnf and Query factory

* Helps keeping variable scoping clear by limiting variable scopes to the body
  of the corresponding lambda.
* Overloads for convenience where variables are automatically created for lambda
  parameters.

35 files changed, 1062 insertions, 602 deletions

diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/DiagonalQueryTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/DiagonalQueryTest.java
index 5cffef71..3ff01064 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/DiagonalQueryTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/DiagonalQueryTest.java
@@ -10,13 +10,13 @@ import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQuery;
 import tools.refinery.store.query.dnf.Dnf;
 import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.viatra.tests.QueryEngineTest;
 import tools.refinery.store.query.view.FunctionView;
 import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -33,15 +33,10 @@ class DiagonalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var symbolView = new KeyOnlyView<>(symbol);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var query = Query.builder("Diagonal")
-                                .parameter(p1)
-                                .clause(
-                                                personView.call(p1),
-                                                not(symbolView.call(p1, p1, p2, p2))
-                                )
-                                .build();
+                var query = Query.of("Diagonal", (builder, p1) -> builder.clause(p2 -> List.of(
+                                personView.call(p1),
+                                not(symbolView.call(p1, p1, p2, p2))
+                )));
 
                 var store = ModelStore.builder()
                                 .symbols(person, symbol)
@@ -81,28 +76,24 @@ class DiagonalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var symbolView = new KeyOnlyView<>(symbol);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var p3 = Variable.of("p3");
-                var p4 = Variable.of("p4");
-                var subQuery = Dnf.builder("SubQuery")
-                                .parameters(p1, p2, p3, p4)
-                                .clause(
-                                                personView.call(p1),
-                                                symbolView.call(p1, p2, p3, p4)
-                                )
-                                .clause(
-                                                personView.call(p2),
-                                                symbolView.call(p1, p2, p3, p4)
-                                )
-                                .build();
-                var query = Query.builder("Diagonal")
-                                .parameter(p1)
-                                .clause(
-                                                personView.call(p1),
-                                                not(subQuery.call(p1, p1, p2, p2))
-                                )
-                                .build();
+                var subQuery = Dnf.of("SubQuery", builder -> {
+                        var p1 = builder.parameter("p1");
+                        var p2 = builder.parameter("p2");
+                        var p3 = builder.parameter("p3");
+                        var p4 = builder.parameter("p4");
+                        builder.clause(
+                                        personView.call(p1),
+                                        symbolView.call(p1, p2, p3, p4)
+                        );
+                        builder.clause(
+                                        personView.call(p2),
+                                        symbolView.call(p1, p2, p3, p4)
+                        );
+                });
+                var query = Query.of("Diagonal", (builder, p1) -> builder.clause(p2 -> List.of(
+                                personView.call(p1),
+                                not(subQuery.call(p1, p1, p2, p2))
+                )));
 
                 var store = ModelStore.builder()
                                 .symbols(person, symbol)
@@ -142,17 +133,10 @@ class DiagonalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var symbolView = new KeyOnlyView<>(symbol);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var x = Variable.of("x", Integer.class);
-                var query = Query.builder("Diagonal")
-                                .parameter(p1)
-                                .output(x)
-                                .clause(
-                                                personView.call(p1),
-                                                x.assign(symbolView.count(p1, p1, p2, p2))
-                                )
-                                .build();
+                var query = Query.of("Diagonal", Integer.class, (builder, p1, output) -> builder.clause(p2 -> List.of(
+                                personView.call(p1),
+                                output.assign(symbolView.count(p1, p1, p2, p2))
+                )));
 
                 var store = ModelStore.builder()
                                 .symbols(person, symbol)
@@ -193,30 +177,24 @@ class DiagonalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var symbolView = new KeyOnlyView<>(symbol);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var p3 = Variable.of("p3");
-                var p4 = Variable.of("p4");
-                var x = Variable.of("x", Integer.class);
-                var subQuery = Dnf.builder("SubQuery")
-                                .parameters(p1, p2, p3, p4)
-                                .clause(
-                                                personView.call(p1),
-                                                symbolView.call(p1, p2, p3, p4)
-                                )
-                                .clause(
-                                                personView.call(p2),
-                                                symbolView.call(p1, p2, p3, p4)
-                                )
-                                .build();
-                var query = Query.builder("Diagonal")
-                                .parameter(p1)
-                                .output(x)
-                                .clause(
-                                                personView.call(p1),
-                                                x.assign(subQuery.count(p1, p1, p2, p2))
-                                )
-                                .build();
+                var subQuery = Dnf.of("SubQuery", builder -> {
+                        var p1 = builder.parameter("p1");
+                        var p2 = builder.parameter("p2");
+                        var p3 = builder.parameter("p3");
+                        var p4 = builder.parameter("p4");
+                        builder.clause(
+                                        personView.call(p1),
+                                        symbolView.call(p1, p2, p3, p4)
+                        );
+                        builder.clause(
+                                        personView.call(p2),
+                                        symbolView.call(p1, p2, p3, p4)
+                        );
+                });
+                var query = Query.of("Diagonal", Integer.class, (builder, p1, output) -> builder.clause(p2 -> List.of(
+                                personView.call(p1),
+                                output.assign(subQuery.count(p1, p1, p2, p2))
+                )));
 
                 var store = ModelStore.builder()
                                 .symbols(person, symbol)
@@ -257,18 +235,11 @@ class DiagonalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var symbolView = new FunctionView<>(symbol);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var x = Variable.of("x", Integer.class);
-                var y = Variable.of("y", Integer.class);
-                var query = Query.builder("Diagonal")
-                                .parameter(p1)
-                                .output(x)
-                                .clause(
+                var query = Query.of("Diagonal", Integer.class, (builder, p1, output) -> builder.clause(Integer.class,
+                                (p2, y) -> List.of(
                                                 personView.call(p1),
-                                                x.assign(symbolView.aggregate(y, INT_SUM, p1, p1, p2, p2, y))
-                                )
-                                .build();
+                                                output.assign(symbolView.aggregate(y, INT_SUM, p1, p1, p2, p2, y))
+                                )));
 
                 var store = ModelStore.builder()
                                 .symbols(person, symbol)
@@ -309,34 +280,29 @@ class DiagonalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var symbolView = new FunctionView<>(symbol);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var p3 = Variable.of("p3");
-                var p4 = Variable.of("p4");
-                var x = Variable.of("x", Integer.class);
-                var y = Variable.of("y", Integer.class);
-                var z = Variable.of("z", Integer.class);
-                var subQuery = Dnf.builder("SubQuery")
-                                .parameters(p1, p2, p3, p4, x, y)
-                                .clause(
-                                                personView.call(p1),
-                                                symbolView.call(p1, p2, p3, p4, x),
-                                                y.assign(x)
-                                )
-                                .clause(
-                                                personView.call(p2),
-                                                symbolView.call(p1, p2, p3, p4, x),
-                                                y.assign(x)
-                                )
-                                .build();
-                var query = Query.builder("Diagonal")
-                                .parameter(p1)
-                                .output(x)
-                                .clause(
+                var subQuery = Dnf.of("SubQuery", builder -> {
+                        var p1 = builder.parameter("p1");
+                        var p2 = builder.parameter("p2");
+                        var p3 = builder.parameter("p3");
+                        var p4 = builder.parameter("p4");
+                        var x = builder.parameter("x", Integer.class);
+                        var y = builder.parameter("y", Integer.class);
+                        builder.clause(
+                                        personView.call(p1),
+                                        symbolView.call(p1, p2, p3, p4, x),
+                                        y.assign(x)
+                        );
+                        builder.clause(
+                                        personView.call(p2),
+                                        symbolView.call(p1, p2, p3, p4, x),
+                                        y.assign(x)
+                        );
+                });
+                var query = Query.of("Diagonal", Integer.class, (builder, p1, output) -> builder.clause(Integer.class,
+                                (p2, y) -> List.of(
                                                 personView.call(p1),
-                                                x.assign(subQuery.aggregate(z, INT_SUM, p1, p1, p2, p2, z, z))
-                                )
-                                .build();
+                                                output.assign(subQuery.aggregate(y, INT_SUM, p1, p1, p2, p2, y, y))
+                                )));
 
                 var store = ModelStore.builder()
                                 .symbols(person, symbol)
@@ -377,14 +343,10 @@ class DiagonalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var symbolView = new KeyOnlyView<>(symbol);
 
-                var p1 = Variable.of("p1");
-                var query = Query.builder("Diagonal")
-                                .parameter(p1)
-                                .clause(
-                                                personView.call(p1),
-                                                symbolView.callTransitive(p1, p1)
-                                )
-                                .build();
+                var query = Query.of("Diagonal", (builder, p1) -> builder.clause(
+                                personView.call(p1),
+                                symbolView.callTransitive(p1, p1)
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, symbol)
@@ -423,26 +385,22 @@ class DiagonalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var symbolView = new KeyOnlyView<>(symbol);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var subQuery = Dnf.builder("SubQuery")
-                                .parameters(p1, p2)
-                                .clause(
-                                                personView.call(p1),
-                                                symbolView.call(p1, p2)
-                                )
-                                .clause(
-                                                personView.call(p2),
-                                                symbolView.call(p1, p2)
-                                )
-                                .build();
-                var query = Query.builder("Diagonal")
-                                .parameter(p1)
-                                .clause(
-                                                personView.call(p1),
-                                                subQuery.callTransitive(p1, p1)
-                                )
-                                .build();
+                var subQuery = Dnf.of("SubQuery", builder -> {
+                        var p1 = builder.parameter("p1");
+                        var p2 = builder.parameter("p2");
+                        builder.clause(
+                                        personView.call(p1),
+                                        symbolView.call(p1, p2)
+                        );
+                        builder.clause(
+                                        personView.call(p2),
+                                        symbolView.call(p1, p2)
+                        );
+                });
+                var query = Query.of("Diagonal", (builder, p1) -> builder.clause(
+                                personView.call(p1),
+                                subQuery.callTransitive(p1, p1)
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, symbol)
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/FunctionalQueryTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/FunctionalQueryTest.java
index 19584273..ffa5e60b 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/FunctionalQueryTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/FunctionalQueryTest.java
@@ -20,6 +20,7 @@ import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.representation.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -41,16 +42,10 @@ class FunctionalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var ageView = new FunctionView<>(age);
 
-                var p1 = Variable.of("p1");
-                var x = Variable.of("x", Integer.class);
-                var query = Query.builder("InputKey")
-                                .parameter(p1)
-                                .output(x)
-                                .clause(
-                                                personView.call(p1),
-                                                ageView.call(p1, x)
-                                )
-                                .build();
+                var query = Query.of("InputKey", Integer.class, (builder, p1, output) -> builder.clause(
+                                personView.call(p1),
+                                ageView.call(p1, output)
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
@@ -87,23 +82,18 @@ class FunctionalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var ageView = new FunctionView<>(age);
 
-                var p1 = Variable.of("p1");
-                var x = Variable.of("x", Integer.class);
-                var subQuery = Dnf.builder("SubQuery")
-                                .parameters(p1, x)
-                                .clause(
-                                                personView.call(p1),
-                                                ageView.call(p1, x)
-                                )
-                                .build();
-                var query = Query.builder("Predicate")
-                                .parameter(p1)
-                                .output(x)
-                                .clause(
-                                                personView.call(p1),
-                                                subQuery.call(p1, x)
-                                )
-                                .build();
+                var subQuery = Dnf.of("SubQuery", builder -> {
+                        var p1 = builder.parameter("p1");
+                        var x = builder.parameter("x", Integer.class);
+                        builder.clause(
+                                        personView.call(p1),
+                                        ageView.call(p1, x)
+                        );
+                });
+                var query = Query.of("Predicate", Integer.class, (builder, p1, output) -> builder.clause(
+                                personView.call(p1),
+                                subQuery.call(p1, output)
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
@@ -140,18 +130,14 @@ class FunctionalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var ageView = new FunctionView<>(age);
 
-                var p1 = Variable.of("p1");
-                var x = Variable.of("x", Integer.class);
-                var y = Variable.of("y", Integer.class);
-                var query = Query.builder("Computation")
-                                .parameter(p1)
-                                .output(y)
-                                .clause(
-                                                personView.call(p1),
-                                                ageView.call(p1, x),
-                                                y.assign(mul(x, constant(7)))
-                                )
-                                .build();
+                var query = Query.of("Computation", Integer.class, (builder, p1, output) -> builder.clause(() -> {
+                        var x = Variable.of("x", Integer.class);
+                        return List.of(
+                                        personView.call(p1),
+                                        ageView.call(p1, x),
+                                        output.assign(mul(x, constant(7)))
+                        );
+                }));
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
@@ -187,17 +173,10 @@ class FunctionalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var x = Variable.of("x", Integer.class);
-                var query = Query.builder("Count")
-                                .parameter(p1)
-                                .output(x)
-                                .clause(
-                                                personView.call(p1),
-                                                x.assign(friendMustView.count(p1, p2))
-                                )
-                                .build();
+                var query = Query.of("Count", Integer.class, (builder, p1, output) -> builder.clause(
+                                personView.call(p1),
+                                output.assign(friendMustView.count(p1, Variable.of()))
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
@@ -236,25 +215,19 @@ class FunctionalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var x = Variable.of("x", Integer.class);
-                var subQuery = Dnf.builder("SubQuery")
-                                .parameters(p1, p2)
-                                .clause(
-                                                personView.call(p1),
-                                                personView.call(p2),
-                                                friendMustView.call(p1, p2)
-                                )
-                                .build();
-                var query = Query.builder("Count")
-                                .parameter(p1)
-                                .output(x)
-                                .clause(
-                                                personView.call(p1),
-                                                x.assign(subQuery.count(p1, p2))
-                                )
-                                .build();
+                var subQuery = Dnf.of("SubQuery", builder -> {
+                        var p1 = builder.parameter("p1");
+                        var p2 = builder.parameter("p2");
+                        builder.clause(
+                                        personView.call(p1),
+                                        personView.call(p2),
+                                        friendMustView.call(p1, p2)
+                        );
+                });
+                var query = Query.of("Count", Integer.class, (builder, p1, output) -> builder.clause(
+                                personView.call(p1),
+                                output.assign(subQuery.count(p1, Variable.of()))
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
@@ -291,15 +264,8 @@ class FunctionalQueryTest {
                 var age = new Symbol<>("age", 1, Integer.class, null);
                 var ageView = new FunctionView<>(age);
 
-                var p1 = Variable.of("p1");
-                var x = Variable.of("x", Integer.class);
-                var y = Variable.of("y", Integer.class);
-                var query = Query.builder("Aggregate")
-                                .output(x)
-                                .clause(
-                                                x.assign(ageView.aggregate(y, INT_SUM, p1, y))
-                                )
-                                .build();
+                var query = Query.of("Aggregate", Integer.class, (builder, output) -> builder.clause(Integer.class,
+                                (y) -> List.of(output.assign(ageView.aggregate(y, INT_SUM, Variable.of(), y)))));
 
                 var store = ModelStore.builder()
                                 .symbols(age)
@@ -327,22 +293,16 @@ class FunctionalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var ageView = new FunctionView<>(age);
 
-                var p1 = Variable.of("p1");
-                var x = Variable.of("x", Integer.class);
-                var y = Variable.of("y", Integer.class);
-                var subQuery = Dnf.builder("SubQuery")
-                                .parameters(p1, x)
-                                .clause(
-                                                personView.call(p1),
-                                                ageView.call(p1, x)
-                                )
-                                .build();
-                var query = Query.builder("Aggregate")
-                                .output(x)
-                                .clause(
-                                                x.assign(subQuery.aggregate(y, INT_SUM, p1, y))
-                                )
-                                .build();
+                var subQuery = Dnf.of("SubQuery", builder -> {
+                        var p1 = builder.parameter("p1");
+                        var x = builder.parameter("x", Integer.class);
+                        builder.clause(
+                                        personView.call(p1),
+                                        ageView.call(p1, x)
+                        );
+                });
+                var query = Query.of("Aggregate", Integer.class, (builder, output) -> builder.clause(Integer.class,
+                                (y) -> List.of(output.assign(subQuery.aggregate(y, INT_SUM, Variable.of(), y)))));
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
@@ -374,29 +334,18 @@ class FunctionalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var x = Variable.of("x", Integer.class);
-                var y = Variable.of("y", Integer.class);
-                var subQuery = Dnf.builder("SubQuery")
-                                .parameters(p1, x)
-                                .clause(
-                                                personView.call(p1),
-                                                x.assign(friendMustView.count(p1, p2))
-                                )
-                                .build();
-                var minQuery = Query.builder("Min")
-                                .output(x)
-                                .clause(
-                                                x.assign(subQuery.aggregate(y, INT_MIN, p1, y))
-                                )
-                                .build();
-                var maxQuery = Query.builder("Max")
-                                .output(x)
-                                .clause(
-                                                x.assign(subQuery.aggregate(y, INT_MAX, p1, y))
-                                )
-                                .build();
+                var subQuery = Dnf.of("SubQuery", builder -> {
+                        var p1 = builder.parameter("p1");
+                        var x = builder.parameter("x", Integer.class);
+                        builder.clause(
+                                        personView.call(p1),
+                                        x.assign(friendMustView.count(p1, Variable.of()))
+                        );
+                });
+                var minQuery = Query.of("Min", Integer.class, (builder, output) -> builder.clause(Integer.class,
+                                (y) -> List.of(output.assign(subQuery.aggregate(y, INT_MIN, Variable.of(), y)))));
+                var maxQuery = Query.of("Max", Integer.class, (builder, output) -> builder.clause(Integer.class,
+                                (y) -> List.of(output.assign(subQuery.aggregate(y, INT_MAX, Variable.of(), y)))));
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
@@ -450,18 +399,12 @@ class FunctionalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var ageView = new FunctionView<>(age);
 
-                var p1 = Variable.of("p1");
-                var x = Variable.of("x", Integer.class);
-                var y = Variable.of("y", Integer.class);
-                var query = Query.builder("InvalidComputation")
-                                .parameter(p1)
-                                .output(y)
-                                .clause(
+                var query = Query.of("InvalidComputation", Integer.class,
+                                (builder, p1, output) -> builder.clause(Integer.class, (x) -> List.of(
                                                 personView.call(p1),
                                                 ageView.call(p1, x),
-                                                y.assign(div(constant(120), x))
-                                )
-                                .build();
+                                                output.assign(div(constant(120), x))
+                                )));
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
@@ -497,16 +440,11 @@ class FunctionalQueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var ageView = new FunctionView<>(age);
 
-                var p1 = Variable.of("p1");
-                var x = Variable.of("x", Integer.class);
-                var query = Query.builder("InvalidComputation")
-                                .parameter(p1)
-                                .clause(
-                                                personView.call(p1),
-                                                ageView.call(p1, x),
-                                                assume(lessEq(div(constant(120), x), constant(5)))
-                                )
-                                .build();
+                var query = Query.of("InvalidAssume", (builder, p1) -> builder.clause(Integer.class, (x) -> List.of(
+                                personView.call(p1),
+                                ageView.call(p1, x),
+                                assume(lessEq(div(constant(120), x), constant(5)))
+                )));
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
@@ -547,18 +485,11 @@ class FunctionalQueryTest {
                 var ageView = new FunctionView<>(age);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var x = Variable.of("x", Integer.class);
-                var query = Query.builder("NotFunctional")
-                                .parameter(p1)
-                                .output(x)
-                                .clause(
-                                                personView.call(p1),
-                                                friendMustView.call(p1, p2),
-                                                ageView.call(p2, x)
-                                )
-                                .build();
+                var query = Query.of("NotFunctional", Integer.class, (builder, p1, output) -> builder.clause((p2) -> List.of(
+                                personView.call(p1),
+                                friendMustView.call(p1, p2),
+                                ageView.call(p2, output)
+                )));
 
                 var store = ModelStore.builder()
                                 .symbols(person, age, friend)
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java
index 11ee98f5..a90889c6 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTest.java
@@ -20,6 +20,7 @@ import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.representation.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 
+import java.util.List;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -36,11 +37,7 @@ class QueryTest {
                 var asset = new Symbol<>("Asset", 1, Boolean.class, false);
                 var personView = new KeyOnlyView<>(person);
 
-                var p1 = Variable.of("p1");
-                var predicate = Query.builder("TypeConstraint")
-                                .parameters(p1)
-                                .clause(personView.call(p1))
-                                .build();
+                var predicate = Query.of("TypeConstraint", (builder, p1) -> builder.clause(personView.call(p1)));
 
                 var store = ModelStore.builder()
                                 .symbols(person, asset)
@@ -76,16 +73,11 @@ class QueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var predicate = Query.builder("RelationConstraint")
-                                .parameters(p1, p2)
-                                .clause(
-                                                personView.call(p1),
-                                                personView.call(p2),
-                                                friendMustView.call(p1, p2)
-                                )
-                                .build();
+                var predicate = Query.of("RelationConstraint", (builder, p1, p2) -> builder.clause(
+                                personView.call(p1),
+                                personView.call(p2),
+                                friendMustView.call(p1, p2)
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
@@ -125,16 +117,11 @@ class QueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var predicate = Query.builder("RelationConstraint")
-                                .parameters(p1)
-                                .clause(
-                                                personView.call(p1),
-                                                personView.call(p2),
-                                                friendMustView.call(p1, p2)
-                                )
-                                .build();
+                var predicate = Query.of("Exists", (builder, p1) -> builder.clause((p2) -> List.of(
+                                personView.call(p1),
+                                personView.call(p2),
+                                friendMustView.call(p1, p2)
+                )));
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
@@ -176,21 +163,15 @@ class QueryTest {
                 var animalView = new KeyOnlyView<>(animal);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var predicate = Query.builder("Or")
-                                .parameters(p1, p2)
-                                .clause(
-                                                personView.call(p1),
-                                                personView.call(p2),
-                                                friendMustView.call(p1, p2)
-                                )
-                                .clause(
-                                                animalView.call(p1),
-                                                animalView.call(p2),
-                                                friendMustView.call(p1, p2)
-                                )
-                                .build();
+                var predicate = Query.of("Or", (builder, p1, p2) -> builder.clause(
+                                personView.call(p1),
+                                personView.call(p2),
+                                friendMustView.call(p1, p2)
+                ).clause(
+                                animalView.call(p1),
+                                animalView.call(p2),
+                                friendMustView.call(p1, p2)
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, animal, friend)
@@ -232,16 +213,11 @@ class QueryTest {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var personView = new KeyOnlyView<>(person);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var predicate = Query.builder("Equality")
-                                .parameters(p1, p2)
-                                .clause(
-                                                personView.call(p1),
-                                                personView.call(p2),
-                                                p1.isEquivalent(p2)
-                                )
-                                .build();
+                var predicate = Query.of("Equality", (builder, p1, p2) -> builder.clause(
+                                personView.call(p1),
+                                personView.call(p2),
+                                p1.isEquivalent(p2)
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person)
@@ -276,19 +252,13 @@ class QueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var p3 = Variable.of("p3");
-                var predicate = Query.builder("Inequality")
-                                .parameters(p1, p2, p3)
-                                .clause(
-                                                personView.call(p1),
-                                                personView.call(p2),
-                                                friendMustView.call(p1, p3),
-                                                friendMustView.call(p2, p3),
-                                                p1.notEquivalent(p2)
-                                )
-                                .build();
+                var predicate = Query.of("Inequality", (builder, p1, p2, p3) -> builder.clause(
+                                personView.call(p1),
+                                personView.call(p2),
+                                friendMustView.call(p1, p3),
+                                friendMustView.call(p2, p3),
+                                p1.notEquivalent(p2)
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
@@ -325,27 +295,20 @@ class QueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var friendPredicate = Dnf.builder("RelationConstraint")
-                                .parameters(p1, p2)
-                                .clause(
-                                                personView.call(p1),
-                                                personView.call(p2),
-                                                friendMustView.call(p1, p2)
-                                )
-                                .build();
-
-                var p3 = Variable.of("p3");
-                var p4 = Variable.of("p4");
-                var predicate = Query.builder("PositivePatternCall")
-                                .parameters(p3, p4)
-                                .clause(
-                                                personView.call(p3),
-                                                personView.call(p4),
-                                                friendPredicate.call(p3, p4)
-                                )
-                                .build();
+                var friendPredicate = Dnf.of("Friend", builder -> {
+                        var p1 = builder.parameter("p1");
+                        var p2 = builder.parameter("p2");
+                        builder.clause(
+                                        personView.call(p1),
+                                        personView.call(p2),
+                                        friendMustView.call(p1, p2)
+                        );
+                });
+                var predicate = Query.of("PositivePatternCall", (builder, p3, p4) -> builder.clause(
+                                personView.call(p3),
+                                personView.call(p4),
+                                friendPredicate.call(p3, p4)
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
@@ -384,16 +347,11 @@ class QueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var predicate = Query.builder("NegativePatternCall")
-                                .parameters(p1, p2)
-                                .clause(
-                                                personView.call(p1),
-                                                personView.call(p2),
-                                                not(friendMustView.call(p1, p2))
-                                )
-                                .build();
+                var predicate = Query.of("NegativePatternCall", (builder, p1, p2) -> builder.clause(
+                                personView.call(p1),
+                                personView.call(p2),
+                                not(friendMustView.call(p1, p2))
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
@@ -438,27 +396,20 @@ class QueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var friendPredicate = Dnf.builder("RelationConstraint")
-                                .parameters(p1, p2)
-                                .clause(
-                                                personView.call(p1),
-                                                personView.call(p2),
-                                                friendMustView.call(p1, p2)
-                                )
-                                .build();
-
-                var p3 = Variable.of("p3");
-                var p4 = Variable.of("p4");
-                var predicate = Query.builder("NegativePatternCall")
-                                .parameters(p3, p4)
-                                .clause(
-                                                personView.call(p3),
-                                                personView.call(p4),
-                                                not(friendPredicate.call(p3, p4))
-                                )
-                                .build();
+                var friendPredicate = Dnf.of("Friend", builder -> {
+                        var p1 = builder.parameter("p1");
+                        var p2 = builder.parameter("p2");
+                        builder.clause(
+                                        personView.call(p1),
+                                        personView.call(p2),
+                                        friendMustView.call(p1, p2)
+                        );
+                });
+                var predicate = Query.of("NegativePatternCall", (builder, p3, p4) -> builder.clause(
+                                personView.call(p3),
+                                personView.call(p4),
+                                not(friendPredicate.call(p3, p4))
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
@@ -503,16 +454,10 @@ class QueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-
-                var predicate = Query.builder("Count")
-                                .parameters(p1)
-                                .clause(
-                                                personView.call(p1),
-                                                not(friendMustView.call(p1, p2))
-                                )
-                                .build();
+                var predicate = Query.of("Negative", (builder, p1) -> builder.clause(
+                                personView.call(p1),
+                                not(friendMustView.call(p1, Variable.of()))
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
@@ -550,25 +495,19 @@ class QueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-
-                var called = Dnf.builder("Called")
-                                .parameters(p1, p2)
-                                .clause(
-                                                personView.call(p1),
-                                                personView.call(p2),
-                                                friendMustView.call(p1, p2)
-                                )
-                                .build();
-
-                var predicate = Query.builder("Count")
-                                .parameters(p1)
-                                .clause(
-                                                personView.call(p1),
-                                                not(called.call(p1, p2))
-                                )
-                                .build();
+                var called = Dnf.of("Called", builder -> {
+                        var p1 = builder.parameter("p1");
+                        var p2 = builder.parameter("p2");
+                        builder.clause(
+                                        personView.call(p1),
+                                        personView.call(p2),
+                                        friendMustView.call(p1, p2)
+                        );
+                });
+                var predicate = Query.of("Negative", (builder, p1) -> builder.clause(
+                                personView.call(p1),
+                                not(called.call(p1, Variable.of()))
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
@@ -606,16 +545,11 @@ class QueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var predicate = Query.builder("TransitivePatternCall")
-                                .parameters(p1, p2)
-                                .clause(
-                                                personView.call(p1),
-                                                personView.call(p2),
-                                                friendMustView.callTransitive(p1, p2)
-                                )
-                                .build();
+                var predicate = Query.of("Transitive", (builder, p1, p2) -> builder.clause(
+                                personView.call(p1),
+                                personView.call(p2),
+                                friendMustView.callTransitive(p1, p2)
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
@@ -659,27 +593,20 @@ class QueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var friendMustView = new FilteredView<>(friend, "must", TruthValue::must);
 
-                var p1 = Variable.of("p1");
-                var p2 = Variable.of("p2");
-                var friendPredicate = Dnf.builder("RelationConstraint")
-                                .parameters(p1, p2)
-                                .clause(
-                                                personView.call(p1),
-                                                personView.call(p2),
-                                                friendMustView.call(p1, p2)
-                                )
-                                .build();
-
-                var p3 = Variable.of("p3");
-                var p4 = Variable.of("p4");
-                var predicate = Query.builder("TransitivePatternCall")
-                                .parameters(p3, p4)
-                                .clause(
-                                                personView.call(p3),
-                                                personView.call(p4),
-                                                friendPredicate.callTransitive(p3, p4)
-                                )
-                                .build();
+                var called = Dnf.of("Called", builder -> {
+                        var p1 = builder.parameter("p1");
+                        var p2 = builder.parameter("p2");
+                        builder.clause(
+                                        personView.call(p1),
+                                        personView.call(p2),
+                                        friendMustView.call(p1, p2)
+                        );
+                });
+                var predicate = Query.of("Transitive", (builder, p1, p2) -> builder.clause(
+                                personView.call(p1),
+                                personView.call(p2),
+                                called.callTransitive(p1, p2)
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, friend)
@@ -723,16 +650,11 @@ class QueryTest {
                 var personView = new KeyOnlyView<>(person);
                 var ageView = new FunctionView<>(age);
 
-                var p1 = Variable.of("p1");
-                var x = Variable.of("x", Integer.class);
-                var query = Query.builder("Constraint")
-                                .parameter(p1)
-                                .clause(
-                                                personView.call(p1),
-                                                ageView.call(p1, x),
-                                                assume(greaterEq(x, constant(18)))
-                                )
-                                .build();
+                var query = Query.of("Constraint", (builder, p1) -> builder.clause(Integer.class, (x) -> List.of(
+                                personView.call(p1),
+                                ageView.call(p1, x),
+                                assume(greaterEq(x, constant(18)))
+                )));
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
@@ -765,8 +687,7 @@ class QueryTest {
         void alwaysFalseTest() {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
 
-                var p1 = Variable.of("p1");
-                var predicate = Query.builder("AlwaysFalse").parameters(p1).build();
+                var predicate = Query.of("AlwaysFalse", builder -> builder.parameter("p1"));
 
                 var store = ModelStore.builder()
                                 .symbols(person)
@@ -789,8 +710,6 @@ class QueryTest {
 
         @Test
         void alwaysTrueTest() {
-                var person = new Symbol<>("Person", 1, Boolean.class, false);
-
                 var p1 = Variable.of("p1");
                 var predicate = Query.builder("AlwaysTrue").parameters(p1).clause().build();
 
diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTransactionTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTransactionTest.java
index bd6b6b81..9de2655f 100644
--- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTransactionTest.java
+++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/QueryTransactionTest.java
@@ -11,7 +11,6 @@ import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQuery;
 import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.view.FilteredView;
 import tools.refinery.store.query.view.FunctionView;
 import tools.refinery.store.query.view.KeyOnlyView;
@@ -32,11 +31,7 @@ class QueryTransactionTest {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var personView = new KeyOnlyView<>(person);
 
-                var p1 = Variable.of("p1");
-                var predicate = Query.builder("TypeConstraint")
-                                .parameters(p1)
-                                .clause(personView.call(p1))
-                                .build();
+                var predicate = Query.of("TypeConstraint", (builder, p1) -> builder.clause(personView.call(p1)));
 
                 var store = ModelStore.builder()
                                 .symbols(person)
@@ -103,11 +98,7 @@ class QueryTransactionTest {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var personView = new KeyOnlyView<>(person);
 
-                var p1 = Variable.of("p1");
-                var predicate = Query.builder("TypeConstraint")
-                                .parameters(p1)
-                                .clause(personView.call(p1))
-                                .build();
+                var predicate = Query.of("TypeConstraint", (builder, p1) -> builder.clause(personView.call(p1)));
 
                 var store = ModelStore.builder()
                                 .symbols(person)
@@ -158,11 +149,7 @@ class QueryTransactionTest {
                 var asset = new Symbol<>("Asset", 1, Boolean.class, false);
                 var personView = new KeyOnlyView<>(person);
 
-                var p1 = Variable.of("p1");
-                var predicate = Query.builder("TypeConstraint")
-                                .parameters(p1)
-                                .clause(personView.call(p1))
-                                .build();
+                var predicate = Query.of("TypeConstraint", (builder, p1) -> builder.clause(personView.call(p1)));
 
                 var store = ModelStore.builder()
                                 .symbols(person, asset)
@@ -232,16 +219,10 @@ class QueryTransactionTest {
                 var personView = new KeyOnlyView<>(person);
                 var ageView = new FunctionView<>(age);
 
-                var p1 = Variable.of("p1");
-                var x = Variable.of("x", Integer.class);
-                var query = Query.builder()
-                                .parameter(p1)
-                                .output(x)
-                                .clause(
-                                                personView.call(p1),
-                                                ageView.call(p1, x)
-                                )
-                                .build();
+                var query = Query.of("TypeConstraint", Integer.class, (builder, p1, output) -> builder.clause(
+                                personView.call(p1),
+                                ageView.call(p1, output)
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
@@ -280,15 +261,10 @@ class QueryTransactionTest {
                 var personView = new KeyOnlyView<>(person);
                 var adultView = new FilteredView<>(age, "adult", n -> n != null && n >= 18);
 
-                var p1 = Variable.of("p1");
-                var x = Variable.of("x", Integer.class);
-                var query = Query.builder()
-                                .parameter(p1)
-                                .clause(
-                                                personView.call(p1),
-                                                adultView.call(p1)
-                                )
-                                .build();
+                var query = Query.of("TypeConstraint", (builder, p1) -> builder.clause(
+                                personView.call(p1),
+                                adultView.call(p1)
+                ));
 
                 var store = ModelStore.builder()
                                 .symbols(person, age)
@@ -326,11 +302,7 @@ class QueryTransactionTest {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var personView = new KeyOnlyView<>(person);
 
-                var p1 = Variable.of("p1");
-                var predicate = Query.builder("TypeConstraint")
-                                .parameters(p1)
-                                .clause(personView.call(p1))
-                                .build();
+                var predicate = Query.of("TypeConstraint", (builder, p1) -> builder.clause(personView.call(p1)));
 
                 var store = ModelStore.builder()
                                 .symbols(person)
@@ -384,11 +356,7 @@ class QueryTransactionTest {
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var personView = new KeyOnlyView<>(person);
 
-                var p1 = Variable.of("p1");
-                var predicate = Query.builder("TypeConstraint")
-                                .parameters(p1)
-                                .clause(personView.call(p1))
-                                .build();
+                var predicate = Query.of("TypeConstraint", (builder, p1) -> builder.clause(personView.call(p1)));
 
                 var store = ModelStore.builder()
                                 .symbols(person)
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/AbstractQueryBuilder.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/AbstractQueryBuilder.java
new file mode 100644
index 00000000..ddd69b9f
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/AbstractQueryBuilder.java
@@ -0,0 +1,151 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf;
+
+import tools.refinery.store.query.dnf.callback.*;
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.query.term.Variable;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public abstract class AbstractQueryBuilder<T extends AbstractQueryBuilder<T>> {
+        protected final DnfBuilder dnfBuilder;
+
+        protected AbstractQueryBuilder(DnfBuilder dnfBuilder) {
+                this.dnfBuilder = dnfBuilder;
+        }
+
+        protected abstract T self();
+
+        public NodeVariable parameter() {
+                return dnfBuilder.parameter();
+        }
+
+        public NodeVariable parameter(String name) {
+                return dnfBuilder.parameter(name);
+        }
+
+        public T parameter(NodeVariable variable) {
+                dnfBuilder.parameter(variable);
+                return self();
+        }
+
+        public T parameters(NodeVariable... variables) {
+                dnfBuilder.parameters(variables);
+                return self();
+        }
+
+        public T parameters(List<NodeVariable> variables) {
+                dnfBuilder.parameters(variables);
+                return self();
+        }
+
+        public T functionalDependencies(Collection<FunctionalDependency<Variable>> functionalDependencies) {
+                dnfBuilder.functionalDependencies(functionalDependencies);
+                return self();
+        }
+
+        public T functionalDependency(FunctionalDependency<Variable> functionalDependency) {
+                dnfBuilder.functionalDependency(functionalDependency);
+                return self();
+        }
+
+        public T functionalDependency(Set<? extends Variable> forEach, Set<? extends Variable> unique) {
+                dnfBuilder.functionalDependency(forEach, unique);
+                return self();
+        }
+
+        public T clause(ClauseCallback0 callback) {
+                dnfBuilder.clause(callback);
+                return self();
+        }
+
+        public T clause(ClauseCallback1Data0 callback) {
+                dnfBuilder.clause(callback);
+                return self();
+        }
+
+        public <U1> T clause(Class<U1> type1, ClauseCallback1Data1<U1> callback) {
+                dnfBuilder.clause(type1, callback);
+                return self();
+        }
+
+        public T clause(ClauseCallback2Data0 callback) {
+                dnfBuilder.clause(callback);
+                return self();
+        }
+
+        public <U1> T clause(Class<U1> type1, ClauseCallback2Data1<U1> callback) {
+                dnfBuilder.clause(type1, callback);
+                return self();
+        }
+
+        public <U1, U2> T clause(Class<U1> type1, Class<U2> type2, ClauseCallback2Data2<U1, U2> callback) {
+                dnfBuilder.clause(type1, type2, callback);
+                return self();
+        }
+
+        public T clause(ClauseCallback3Data0 callback) {
+                dnfBuilder.clause(callback);
+                return self();
+        }
+
+        public <U1> T clause(Class<U1> type1, ClauseCallback3Data1<U1> callback) {
+                dnfBuilder.clause(type1, callback);
+                return self();
+        }
+
+        public <U1, U2> T clause(Class<U1> type1, Class<U2> type2, ClauseCallback3Data2<U1, U2> callback) {
+                dnfBuilder.clause(type1, type2, callback);
+                return self();
+        }
+
+        public <U1, U2, U3> T clause(Class<U1> type1, Class<U2> type2, Class<U3> type3,
+                                                                 ClauseCallback3Data3<U1, U2, U3> callback) {
+                dnfBuilder.clause(type1, type2, type3, callback);
+                return self();
+        }
+
+        public T clause(ClauseCallback4Data0 callback) {
+                dnfBuilder.clause(callback);
+                return self();
+        }
+
+        public <U1> T clause(Class<U1> type1, ClauseCallback4Data1<U1> callback) {
+                dnfBuilder.clause(type1, callback);
+                return self();
+        }
+
+        public <U1, U2> T clause(Class<U1> type1, Class<U2> type2, ClauseCallback4Data2<U1, U2> callback) {
+                dnfBuilder.clause(type1, type2, callback);
+                return self();
+        }
+
+        public <U1, U2, U3> T clause(Class<U1> type1, Class<U2> type2, Class<U3> type3,
+                                                                 ClauseCallback4Data3<U1, U2, U3> callback) {
+                dnfBuilder.clause(type1, type2, type3, callback);
+                return self();
+        }
+
+        public <U1, U2, U3, U4> T clause(Class<U1> type1, Class<U2> type2, Class<U3> type3, Class<U4> type4,
+                                                                         ClauseCallback4Data4<U1, U2, U3, U4> callback) {
+                dnfBuilder.clause(type1, type2, type3, type4, callback);
+                return self();
+        }
+
+        public T clause(Literal... literals) {
+                dnfBuilder.clause(literals);
+                return self();
+        }
+
+        public T clause(Collection<? extends Literal> literals) {
+                dnfBuilder.clause(literals);
+                return self();
+        }
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Dnf.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Dnf.java
index 3321a10f..8de5079d 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Dnf.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Dnf.java
@@ -16,6 +16,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Consumer;
 
 public final class Dnf implements Constraint {
         private static final String INDENTATION = "    ";
@@ -196,4 +197,14 @@ public final class Dnf implements Constraint {
         public static DnfBuilder builder(String name) {
                 return new DnfBuilder(name);
         }
+
+        public static Dnf of(Consumer<DnfBuilder> callback) {
+                return of(null, callback);
+        }
+
+        public static Dnf of(String name, Consumer<DnfBuilder> callback) {
+                var builder = builder(name);
+                callback.accept(builder);
+                return builder.build();
+        }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfBuilder.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfBuilder.java
index 4f920f8f..a42ae558 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfBuilder.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfBuilder.java
@@ -5,8 +5,10 @@
  */
 package tools.refinery.store.query.dnf;
 
+import tools.refinery.store.query.dnf.callback.*;
 import tools.refinery.store.query.literal.Literal;
 import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
 import tools.refinery.store.query.term.Variable;
 
 import java.util.*;
@@ -25,6 +27,26 @@ public final class DnfBuilder {
                 this.name = name;
         }
 
+        public NodeVariable parameter() {
+                return parameter((String) null);
+        }
+
+        public NodeVariable parameter(String name) {
+                var variable = Variable.of(name);
+                parameter(variable);
+                return variable;
+        }
+
+        public <T> DataVariable<T> parameter(Class<T> type) {
+                return parameter(null, type);
+        }
+
+        public <T> DataVariable<T> parameter(String name, Class<T> type) {
+                var variable = Variable.of(name, type);
+                parameter(variable);
+                return variable;
+        }
+
         public DnfBuilder parameter(Variable variable) {
                 if (parameters.contains(variable)) {
                         throw new IllegalArgumentException("Duplicate parameter: " + variable);
@@ -56,6 +78,74 @@ public final class DnfBuilder {
                 return functionalDependency(new FunctionalDependency<>(Set.copyOf(forEach), Set.copyOf(unique)));
         }
 
+        public DnfBuilder clause(ClauseCallback0 callback) {
+                return clause(callback.toLiterals());
+        }
+
+        public DnfBuilder clause(ClauseCallback1Data0 callback) {
+                return clause(callback.toLiterals(Variable.of("v1")));
+        }
+
+        public <T> DnfBuilder clause(Class<T> type1, ClauseCallback1Data1<T> callback) {
+                return clause(callback.toLiterals(Variable.of("v1", type1)));
+        }
+
+        public DnfBuilder clause(ClauseCallback2Data0 callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("v2")));
+        }
+
+        public <T> DnfBuilder clause(Class<T> type1, ClauseCallback2Data1<T> callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("d1", type1)));
+        }
+
+        public <T1, T2> DnfBuilder clause(Class<T1> type1, Class<T2> type2, ClauseCallback2Data2<T1, T2> callback) {
+                return clause(callback.toLiterals(Variable.of("d1", type1), Variable.of("d2", type2)));
+        }
+
+        public DnfBuilder clause(ClauseCallback3Data0 callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("v2"), Variable.of("v3")));
+        }
+
+        public <T> DnfBuilder clause(Class<T> type1, ClauseCallback3Data1<T> callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("v2"), Variable.of("d1", type1)));
+        }
+
+        public <T1, T2> DnfBuilder clause(Class<T1> type1, Class<T2> type2, ClauseCallback3Data2<T1, T2> callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("d1", type1), Variable.of("d2", type2)));
+        }
+
+        public <T1, T2, T3> DnfBuilder clause(Class<T1> type1, Class<T2> type2, Class<T3> type3,
+                                                                                  ClauseCallback3Data3<T1, T2, T3> callback) {
+                return clause(callback.toLiterals(Variable.of("d1", type1), Variable.of("d2", type2),
+                                Variable.of("d3", type3)));
+        }
+
+        public DnfBuilder clause(ClauseCallback4Data0 callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("v2"), Variable.of("v3"), Variable.of("v4")));
+        }
+
+        public <T> DnfBuilder clause(Class<T> type1, ClauseCallback4Data1<T> callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("v2"), Variable.of("v3"), Variable.of("d1",
+                                type1)));
+        }
+
+        public <T1, T2> DnfBuilder clause(Class<T1> type1, Class<T2> type2, ClauseCallback4Data2<T1, T2> callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("v2"), Variable.of("d1", type1),
+                                Variable.of("d2", type2)));
+        }
+
+        public <T1, T2, T3> DnfBuilder clause(Class<T1> type1, Class<T2> type2, Class<T3> type3,
+                                                                                  ClauseCallback4Data3<T1, T2, T3> callback) {
+                return clause(callback.toLiterals(Variable.of("v1"), Variable.of("d1", type1), Variable.of("d2", type2),
+                                Variable.of("d3", type3)));
+        }
+
+        public <T1, T2, T3, T4> DnfBuilder clause(Class<T1> type1, Class<T2> type2, Class<T3> type3, Class<T4> type4,
+                                                                                          ClauseCallback4Data4<T1, T2, T3, T4> callback) {
+                return clause(callback.toLiterals(Variable.of("d1", type1), Variable.of("d2", type2),
+                                Variable.of("d3", type3), Variable.of("d4", type4)));
+        }
+
         public DnfBuilder clause(Literal... literals) {
                 clause(List.of(literals));
                 return this;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQueryBuilder.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQueryBuilder.java
index 63580676..d1cd7ba8 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQueryBuilder.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQueryBuilder.java
@@ -5,47 +5,25 @@
  */
 package tools.refinery.store.query.dnf;
 
-import tools.refinery.store.query.literal.Literal;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.store.query.term.DataVariable;
 
-import java.util.Collection;
-import java.util.Set;
-
-public final class FunctionalQueryBuilder<T> {
-        private final DnfBuilder dnfBuilder;
+public final class FunctionalQueryBuilder<T> extends AbstractQueryBuilder<FunctionalQueryBuilder<T>> {
+        private final DataVariable<T> outputVariable;
         private final Class<T> type;
 
-        FunctionalQueryBuilder(DnfBuilder dnfBuilder, Class<T> type) {
-                this.dnfBuilder = dnfBuilder;
+        FunctionalQueryBuilder(DataVariable<T> outputVariable, DnfBuilder dnfBuilder, Class<T> type) {
+                super(dnfBuilder);
+                this.outputVariable = outputVariable;
                 this.type = type;
         }
 
-        public FunctionalQueryBuilder<T> functionalDependencies(Collection<FunctionalDependency<Variable>> functionalDependencies) {
-                dnfBuilder.functionalDependencies(functionalDependencies);
-                return this;
-        }
-
-        public FunctionalQueryBuilder<T> functionalDependency(FunctionalDependency<Variable> functionalDependency) {
-                dnfBuilder.functionalDependency(functionalDependency);
-                return this;
-        }
-
-        public FunctionalQueryBuilder<T> functionalDependency(Set<? extends Variable> forEach, Set<? extends Variable> unique) {
-                dnfBuilder.functionalDependency(forEach, unique);
-                return this;
-        }
-
-        public FunctionalQueryBuilder<T> clause(Literal... literals) {
-                dnfBuilder.clause(literals);
-                return this;
-        }
-
-        public FunctionalQueryBuilder<T> clause(Collection<? extends Literal> literals) {
-                dnfBuilder.clause(literals);
+        @Override
+        protected FunctionalQueryBuilder<T> self() {
                 return this;
         }
 
         public FunctionalQuery<T> build() {
+                dnfBuilder.output(outputVariable);
                 return dnfBuilder.build().asFunction(type);
         }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java
index d3de475f..e94c0c6b 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java
@@ -5,17 +5,130 @@
  */
 package tools.refinery.store.query.dnf;
 
+import tools.refinery.store.query.dnf.callback.*;
+import tools.refinery.store.query.term.Variable;
+
 public sealed interface Query<T> extends AnyQuery permits RelationalQuery, FunctionalQuery {
+        String OUTPUT_VARIABLE_NAME = "output";
+
         @Override
         Class<T> valueType();
 
         T defaultValue();
 
         static QueryBuilder builder() {
-                return new QueryBuilder();
+                return builder(null);
         }
 
         static QueryBuilder builder(String name) {
                 return new QueryBuilder(name);
         }
+
+        static RelationalQuery of(QueryCallback0 callback) {
+                return of(null, callback);
+        }
+
+        static RelationalQuery of(String name, QueryCallback0 callback) {
+                var builder = builder(name);
+                callback.accept(builder);
+                return builder.build();
+        }
+
+        static RelationalQuery of(QueryCallback1 callback) {
+                return of(null, callback);
+        }
+
+        static RelationalQuery of(String name, QueryCallback1 callback) {
+                var builder = builder(name);
+                callback.accept(builder, builder.parameter("p1"));
+                return builder.build();
+        }
+
+        static RelationalQuery of(QueryCallback2 callback) {
+                return of(null, callback);
+        }
+
+        static RelationalQuery of(String name, QueryCallback2 callback) {
+                var builder = builder(name);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"));
+                return builder.build();
+        }
+
+        static RelationalQuery of(QueryCallback3 callback) {
+                return of(null, callback);
+        }
+
+        static RelationalQuery of(String name, QueryCallback3 callback) {
+                var builder = builder(name);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"), builder.parameter("p3"));
+                return builder.build();
+        }
+
+        static RelationalQuery of(QueryCallback4 callback) {
+                return of(null, callback);
+        }
+
+        static RelationalQuery of(String name, QueryCallback4 callback) {
+                var builder = builder(name);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"), builder.parameter("p3"),
+                                builder.parameter("p4"));
+                return builder.build();
+        }
+
+        static <T> FunctionalQuery<T> of(Class<T> type, FunctionalQueryCallback0<T> callback) {
+                return of(null, type, callback);
+        }
+
+        static <T> FunctionalQuery<T> of(String name, Class<T> type, FunctionalQueryCallback0<T> callback) {
+                var outputVariable = Variable.of(OUTPUT_VARIABLE_NAME, type);
+                var builder = builder(name).output(outputVariable);
+                callback.accept(builder, outputVariable);
+                return builder.build();
+        }
+
+        static <T> FunctionalQuery<T> of(Class<T> type, FunctionalQueryCallback1<T> callback) {
+                return of(null, type, callback);
+        }
+
+        static <T> FunctionalQuery<T> of(String name, Class<T> type, FunctionalQueryCallback1<T> callback) {
+                var outputVariable = Variable.of(OUTPUT_VARIABLE_NAME, type);
+                var builder = builder(name).output(outputVariable);
+                callback.accept(builder, builder.parameter("p1"), outputVariable);
+                return builder.build();
+        }
+
+        static <T> FunctionalQuery<T> of(Class<T> type, FunctionalQueryCallback2<T> callback) {
+                return of(null, type, callback);
+        }
+
+        static <T> FunctionalQuery<T> of(String name, Class<T> type, FunctionalQueryCallback2<T> callback) {
+                var outputVariable = Variable.of(OUTPUT_VARIABLE_NAME, type);
+                var builder = builder(name).output(outputVariable);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"), outputVariable);
+                return builder.build();
+        }
+
+        static <T> FunctionalQuery<T> of(Class<T> type, FunctionalQueryCallback3<T> callback) {
+                return of(null, type, callback);
+        }
+
+        static <T> FunctionalQuery<T> of(String name, Class<T> type, FunctionalQueryCallback3<T> callback) {
+                var outputVariable = Variable.of(OUTPUT_VARIABLE_NAME, type);
+                var builder = builder(name).output(outputVariable);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"), builder.parameter("p3"),
+                                outputVariable);
+                return builder.build();
+        }
+
+        static <T> FunctionalQuery<T> of(Class<T> type, FunctionalQueryCallback4<T> callback) {
+                return of(null, type, callback);
+        }
+
+        static <T> FunctionalQuery<T> of(String name, Class<T> type, FunctionalQueryCallback4<T> callback) {
+                var outputVariable = Variable.of(OUTPUT_VARIABLE_NAME, type);
+                var builder = builder(name).output(outputVariable);
+                callback.accept(builder, builder.parameter("p1"), builder.parameter("p2"), builder.parameter("p3"),
+                                builder.parameter("p4"), outputVariable);
+                return builder.build();
+        }
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/QueryBuilder.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/QueryBuilder.java
index f925c9ac..138911bc 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/QueryBuilder.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/QueryBuilder.java
@@ -5,69 +5,20 @@
  */
 package tools.refinery.store.query.dnf;
 
-import tools.refinery.store.query.literal.Literal;
 import tools.refinery.store.query.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-public final class QueryBuilder {
-        private final DnfBuilder dnfBuilder;
 
+public final class QueryBuilder extends AbstractQueryBuilder<QueryBuilder> {
         QueryBuilder(String name) {
-                dnfBuilder = Dnf.builder(name);
-        }
-
-        QueryBuilder() {
-                dnfBuilder = Dnf.builder();
-        }
-
-        public QueryBuilder parameter(NodeVariable variable) {
-                dnfBuilder.parameter(variable);
-                return this;
+                super(Dnf.builder(name));
         }
 
-        public QueryBuilder parameters(NodeVariable... variables) {
-                dnfBuilder.parameters(variables);
-                return this;
-        }
-
-        public QueryBuilder parameters(List<NodeVariable> variables) {
-                dnfBuilder.parameters(variables);
+        @Override
+        protected QueryBuilder self() {
                 return this;
         }
 
         public <T> FunctionalQueryBuilder<T> output(DataVariable<T> outputVariable) {
-                dnfBuilder.output(outputVariable);
-                return new FunctionalQueryBuilder<>(dnfBuilder, outputVariable.getType());
-        }
-
-        public QueryBuilder functionalDependencies(Collection<FunctionalDependency<Variable>> functionalDependencies) {
-                dnfBuilder.functionalDependencies(functionalDependencies);
-                return this;
-        }
-
-        public QueryBuilder functionalDependency(FunctionalDependency<Variable> functionalDependency) {
-                dnfBuilder.functionalDependency(functionalDependency);
-                return this;
-        }
-
-        public QueryBuilder functionalDependency(Set<? extends Variable> forEach, Set<? extends Variable> unique) {
-                dnfBuilder.functionalDependency(forEach, unique);
-                return this;
-        }
-
-        public QueryBuilder clause(Literal... literals) {
-                dnfBuilder.clause(literals);
-                return this;
-        }
-
-        public QueryBuilder clause(Collection<? extends Literal> literals) {
-                dnfBuilder.clause(literals);
-                return this;
+                return new FunctionalQueryBuilder<>(outputVariable, dnfBuilder, outputVariable.getType());
         }
 
         public RelationalQuery build() {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback0.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback0.java
new file mode 100644
index 00000000..d98dda2e
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback0.java
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback0 {
+        Collection<Literal> toLiterals();
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data0.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data0.java
new file mode 100644
index 00000000..4c01a527
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data0.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback1Data0 {
+        Collection<Literal> toLiterals(NodeVariable v1);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data1.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data1.java
new file mode 100644
index 00000000..2c0cb6eb
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data1.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback1Data1<T> {
+        Collection<Literal> toLiterals(DataVariable<T> d1);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data0.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data0.java
new file mode 100644
index 00000000..d764bdba
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data0.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback2Data0 {
+        Collection<Literal> toLiterals(NodeVariable v1, NodeVariable v2);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data1.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data1.java
new file mode 100644
index 00000000..140af03a
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data1.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.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback2Data1<T> {
+        Collection<Literal> toLiterals(NodeVariable v1, DataVariable<T> x1);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data2.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data2.java
new file mode 100644
index 00000000..bfc8637c
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data2.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback2Data2<T1, T2> {
+        Collection<Literal> toLiterals(DataVariable<T1> x1, DataVariable<T2> x2);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data0.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data0.java
new file mode 100644
index 00000000..074df65b
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data0.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback3Data0 {
+        Collection<Literal> toLiterals(NodeVariable v1, NodeVariable v2, NodeVariable v3);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data1.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data1.java
new file mode 100644
index 00000000..24ba5187
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data1.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.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback3Data1<T> {
+        Collection<Literal> toLiterals(NodeVariable v1, NodeVariable v2, DataVariable<T> d1);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data2.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data2.java
new file mode 100644
index 00000000..2a2e837a
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data2.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.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback3Data2<T1, T2> {
+        Collection<Literal> toLiterals(NodeVariable v1, DataVariable<T1> d1, DataVariable<T2> d2);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data3.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data3.java
new file mode 100644
index 00000000..8f4bdd01
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data3.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback3Data3<T1, T2, T3> {
+        Collection<Literal> toLiterals(DataVariable<T1> d1, DataVariable<T2> d2, DataVariable<T3> d3);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data0.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data0.java
new file mode 100644
index 00000000..ed0f87b2
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data0.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback4Data0 {
+        Collection<Literal> toLiterals(NodeVariable v1, NodeVariable v2, NodeVariable v3, NodeVariable v4);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data1.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data1.java
new file mode 100644
index 00000000..9b27e2e1
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data1.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.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback4Data1<T> {
+        Collection<Literal> toLiterals(NodeVariable v1, NodeVariable v2, NodeVariable v3, DataVariable<T> d1);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data2.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data2.java
new file mode 100644
index 00000000..cbc4808e
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data2.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.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback4Data2<T1, T2> {
+        Collection<Literal> toLiterals(NodeVariable v1, NodeVariable v2, DataVariable<T1> d1, DataVariable<T2> d2);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data3.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data3.java
new file mode 100644
index 00000000..a6258f36
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data3.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.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback4Data3<T1, T2, T3> {
+        Collection<Literal> toLiterals(NodeVariable v1, DataVariable<T1> d1, DataVariable<T2> d2, DataVariable<T3> d3);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data4.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data4.java
new file mode 100644
index 00000000..b52a911a
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data4.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.term.DataVariable;
+
+import java.util.Collection;
+
+@FunctionalInterface
+public interface ClauseCallback4Data4<T1, T2, T3, T4> {
+        Collection<Literal> toLiterals(DataVariable<T1> d1, DataVariable<T2> d2, DataVariable<T3> d3, DataVariable<T4> d4);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback0.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback0.java
new file mode 100644
index 00000000..63b3eee6
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback0.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.store.query.term.DataVariable;
+
+@FunctionalInterface
+public interface FunctionalQueryCallback0<T> {
+        void accept(FunctionalQueryBuilder<T> builder, DataVariable<T> output);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback1.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback1.java
new file mode 100644
index 00000000..1295a118
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback1.java
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface FunctionalQueryCallback1<T> {
+        void accept(FunctionalQueryBuilder<T> builder, NodeVariable p1, DataVariable<T> output);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback2.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback2.java
new file mode 100644
index 00000000..d5b7f9ff
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback2.java
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface FunctionalQueryCallback2<T> {
+        void accept(FunctionalQueryBuilder<T> builder, NodeVariable p1, NodeVariable p2, DataVariable<T> output);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback3.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback3.java
new file mode 100644
index 00000000..dc8404a0
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback3.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface FunctionalQueryCallback3<T> {
+        void accept(FunctionalQueryBuilder<T> builder, NodeVariable p1, NodeVariable p2, NodeVariable p3,
+                                DataVariable<T> output);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback4.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback4.java
new file mode 100644
index 00000000..b6d3ddb0
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback4.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface FunctionalQueryCallback4<T> {
+        void accept(FunctionalQueryBuilder<T> builder, NodeVariable p1, NodeVariable p2, NodeVariable p3, NodeVariable p4,
+                                DataVariable<T> output);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback0.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback0.java
new file mode 100644
index 00000000..3cf1de48
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback0.java
@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.QueryBuilder;
+
+@FunctionalInterface
+public interface QueryCallback0 {
+        void accept(QueryBuilder builder);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback1.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback1.java
new file mode 100644
index 00000000..0a150955
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback1.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.QueryBuilder;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface QueryCallback1 {
+        void accept(QueryBuilder builder, NodeVariable p1);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback2.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback2.java
new file mode 100644
index 00000000..9493a7b4
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback2.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.QueryBuilder;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface QueryCallback2 {
+        void accept(QueryBuilder builder, NodeVariable p1, NodeVariable p2);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback3.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback3.java
new file mode 100644
index 00000000..358c7da7
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback3.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.QueryBuilder;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface QueryCallback3 {
+        void accept(QueryBuilder builder, NodeVariable p1, NodeVariable p2, NodeVariable p3);
+}
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback4.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback4.java
new file mode 100644
index 00000000..890dda16
--- /dev/null
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback4.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.store.query.dnf.callback;
+
+import tools.refinery.store.query.dnf.QueryBuilder;
+import tools.refinery.store.query.term.NodeVariable;
+
+@FunctionalInterface
+public interface QueryCallback4 {
+        void accept(QueryBuilder builder, NodeVariable p1, NodeVariable p2, NodeVariable p3, NodeVariable p4);
+}