3 files changed, 21 insertions, 6 deletions

diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/representation/AuxiliaryData.java b/subprojects/store/src/main/java/tools/refinery/store/model/representation/AuxiliaryData.java
index 1a968f50..18c38151 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/representation/AuxiliaryData.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/representation/AuxiliaryData.java
@@ -5,8 +5,9 @@ import tools.refinery.store.map.ContinousHashProvider;
 public final class AuxiliaryData<K, V> extends DataRepresentation<K, V> {
         private final ContinousHashProvider<K> hashProvider;
 
-        public AuxiliaryData(String name, ContinousHashProvider<K> hashProvider, V defaultValue) {
-                super(name, defaultValue);
+        public AuxiliaryData(String name, Class<K> keyType, ContinousHashProvider<K> hashProvider, Class<V> valueType,
+                                                 V defaultValue) {
+                super(name, keyType, valueType, defaultValue);
                 this.hashProvider = hashProvider;
         }
 
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/representation/DataRepresentation.java b/subprojects/store/src/main/java/tools/refinery/store/model/representation/DataRepresentation.java
index 49f74717..61c6291b 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/representation/DataRepresentation.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/representation/DataRepresentation.java
@@ -7,9 +7,15 @@ public abstract sealed class DataRepresentation<K, V> permits Relation, Auxiliar
 
         private final V defaultValue;
 
-        protected DataRepresentation(String name, V defaultValue) {
+        private final Class<K> keyType;
+
+        private final Class<V> valueType;
+
+        protected DataRepresentation(String name, Class<K> keyType, Class<V> valueType, V defaultValue) {
                 this.name = name;
                 this.defaultValue = defaultValue;
+                this.keyType = keyType;
+                this.valueType = valueType;
         }
 
         public String getName() {
@@ -23,4 +29,12 @@ public abstract sealed class DataRepresentation<K, V> permits Relation, Auxiliar
         public V getDefaultValue() {
                 return defaultValue;
         }
+
+        public Class<K> getKeyType() {
+                return keyType;
+        }
+
+        public Class<V> getValueType() {
+                return valueType;
+        }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/representation/Relation.java b/subprojects/store/src/main/java/tools/refinery/store/model/representation/Relation.java
index 2e21ea37..cc32257c 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/representation/Relation.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/representation/Relation.java
@@ -2,14 +2,14 @@ package tools.refinery.store.model.representation;
 
 import tools.refinery.store.map.ContinousHashProvider;
 import tools.refinery.store.model.RelationLike;
-import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.model.TupleHashProvider;
+import tools.refinery.store.tuple.Tuple;
 
 public final class Relation<D> extends DataRepresentation<Tuple, D> implements RelationLike {
         private final int arity;
 
-        public Relation(String name, int arity, D defaultValue) {
-                super(name, defaultValue);
+        public Relation(String name, int arity, Class<D> valueType, D defaultValue) {
+                super(name, Tuple.class, valueType, defaultValue);
                 this.arity = arity;
         }