2 files changed, 6 insertions, 7 deletions

diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/EmptyResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/EmptyResultSet.java
index 0c2e07d6..9ff6df26 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/EmptyResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/EmptyResultSet.java
@@ -1,9 +1,9 @@
 package tools.refinery.store.query;
 
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.Cursors;
 import tools.refinery.store.tuple.TupleLike;
 
-import java.util.stream.Stream;
-
 public class EmptyResultSet implements ResultSet {
         @Override
         public boolean hasResult(TupleLike parameters) {
@@ -11,8 +11,8 @@ public class EmptyResultSet implements ResultSet {
         }
 
         @Override
-        public Stream<TupleLike> allResults() {
-                return Stream.of();
+        public Cursor<TupleLike, Boolean> allResults() {
+                return Cursors.empty();
         }
 
         @Override
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/ResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/ResultSet.java
index 407cf075..d2b8c9dd 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/ResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/ResultSet.java
@@ -1,9 +1,8 @@
 package tools.refinery.store.query;
 
+import tools.refinery.store.map.Cursor;
 import tools.refinery.store.tuple.TupleLike;
 
-import java.util.stream.Stream;
-
 public interface ResultSet {
         default boolean hasResult() {
                 return countResults() > 0;
@@ -11,7 +10,7 @@ public interface ResultSet {
 
         boolean hasResult(TupleLike parameters);
 
-        Stream<TupleLike> allResults();
+        Cursor<TupleLike, Boolean> allResults();
 
         int countResults();
 }