diff --git a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/MatchSetRecordDiff.xtend b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/MatchSetRecordDiff.xtend
index 951a334cca..59456c03df 100644
--- a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/MatchSetRecordDiff.xtend
+++ b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/MatchSetRecordDiff.xtend
@@ -11,7 +11,8 @@ package org.eclipse.viatra.query.testing.core
 
 import com.google.common.collect.Sets
 import java.util.Set
-import org.eclipse.viatra.query.testing.core.internal.MatchRecordEquvalence
+import org.eclipse.viatra.query.testing.core.api.MatchRecordEquivalence
+import org.eclipse.viatra.query.testing.core.internal.DefaultMatchRecordEquivalence
 import org.eclipse.viatra.query.testing.snapshot.MatchRecord
 import org.eclipse.viatra.query.testing.snapshot.MatchSetRecord
 
@@ -39,17 +40,21 @@ class MatchSetRecordDiff {
 	def boolean isEmpty(){
 		additions.empty && removals.empty
 	}
-
+	
 	def static compute(MatchSetRecord expected, MatchSetRecord actual) {
-		val expectedSet = MatchRecordEquvalence::INSTANCE.wrap(expected.matches)
-		val actualSet = MatchRecordEquvalence::INSTANCE.wrap(actual.matches)
+        compute(expected, actual, new DefaultMatchRecordEquivalence())
+    }
+
+	def static compute(MatchSetRecord expected, MatchSetRecord actual, MatchRecordEquivalence equivalence) {
+		val expectedSet = equivalence.wrap(expected.matches)
+		val actualSet = equivalence.wrap(actual.matches)
 		
 		val unexpected = Sets::difference(actualSet, expectedSet)
 		val missing = Sets::difference(expectedSet, actualSet)
 		
 		new MatchSetRecordDiff(
-			MatchRecordEquvalence::INSTANCE.unwrap(unexpected),
-			MatchRecordEquvalence::INSTANCE.unwrap(missing)
+			equivalence.unwrap(unexpected),
+			equivalence.unwrap(missing)
 		)
 	}
 }
diff --git a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/PatternBasedMatchSetModelProvider.java b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/PatternBasedMatchSetModelProvider.java
index e2d94fcf36..e7cc619859 100644
--- a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/PatternBasedMatchSetModelProvider.java
+++ b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/PatternBasedMatchSetModelProvider.java
@@ -10,6 +10,9 @@
  */
 package org.eclipse.viatra.query.testing.core;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine;
 import org.eclipse.viatra.query.runtime.api.IPatternMatch;
@@ -18,14 +21,21 @@
 import org.eclipse.viatra.query.runtime.emf.EMFScope;
 import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
 import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.testing.core.api.JavaObjectAccess;
 import org.eclipse.viatra.query.testing.snapshot.MatchSetRecord;
 
 public class PatternBasedMatchSetModelProvider implements IMatchSetModelProvider {
 
     private QueryEvaluationHint hint;
+    private SnapshotHelper helper;
 
     public PatternBasedMatchSetModelProvider(QueryEvaluationHint hint) {
+        this(hint,new HashMap<String, JavaObjectAccess>());
+    }
+    
+    public PatternBasedMatchSetModelProvider(QueryEvaluationHint hint, Map<String, JavaObjectAccess> accessmap) {
         this.hint = hint;
+        this.helper = new SnapshotHelper(accessmap);
     }
 
     private AdvancedViatraQueryEngine engine;
@@ -40,7 +50,7 @@ public <Match extends IPatternMatch> MatchSetRecord getMatchSetRecord(EMFScope s
         }
         ViatraQueryMatcher<Match> matcher = (ViatraQueryMatcher<Match>) ((AdvancedViatraQueryEngine) engine)
                 .getMatcher(querySpecification, hint);
-        return new SnapshotHelper().createMatchSetRecordForMatcher(matcher,
+        return helper.createMatchSetRecordForMatcher(matcher,
                 filter == null ? matcher.newEmptyMatch() : filter);
 
     }
diff --git a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/QueryGroupPerformanceTest.xtend b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/QueryGroupPerformanceTest.xtend
index acd15b1323..62c32b5734 100644
--- a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/QueryGroupPerformanceTest.xtend
+++ b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/QueryGroupPerformanceTest.xtend
@@ -1,9 +1,21 @@
+/**
+ * Copyright (c) 2010-2016, Gabor Bergmann, IncQuery Labs Ltd.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Gabor Bergmann - initial API and implementation
+ */
 package org.eclipse.viatra.query.testing.core
 
 import org.eclipse.viatra.query.testing.core.QueryPerformanceTest
 
 /**
  * A variant of {@link QueryPerformanceTest}, where an ensemble of queries is measured together, instead of as individual queries.
+ * 
+ * @author Gabor Bergmann
  */
 abstract class QueryGroupPerformanceTest extends QueryPerformanceTest {
     override measureEntireGroup() {
diff --git a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/SnapshotHelper.xtend b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/SnapshotHelper.xtend
index 3aab3a4ed5..ac44c5c9bf 100644
--- a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/SnapshotHelper.xtend
+++ b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/SnapshotHelper.xtend
@@ -11,9 +11,11 @@
 
 package org.eclipse.viatra.query.testing.core
 
+import com.google.common.collect.Maps
 import java.util.ArrayList
 import java.util.Date
-import org.eclipse.emf.ecore.EEnumLiteral
+import java.util.Map
+import org.eclipse.emf.common.util.Enumerator
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.resource.ResourceSet
@@ -22,6 +24,7 @@ import org.eclipse.viatra.query.runtime.api.IQuerySpecification
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine
 import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
 import org.eclipse.viatra.query.runtime.emf.EMFScope
+import org.eclipse.viatra.query.testing.core.api.JavaObjectAccess
 import org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution
 import org.eclipse.viatra.query.testing.snapshot.DateSubstitution
 import org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution
@@ -36,6 +39,7 @@ import org.eclipse.viatra.query.testing.snapshot.MatchSetRecord
 import org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord
 import org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution
 import org.eclipse.viatra.query.testing.snapshot.QuerySnapshot
+import org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution
 import org.eclipse.viatra.query.testing.snapshot.SnapshotFactory
 import org.eclipse.viatra.query.testing.snapshot.StringSubstitution
 
@@ -43,6 +47,22 @@ import org.eclipse.viatra.query.testing.snapshot.StringSubstitution
  * Helper methods for dealing with snapshots and match set records.
  */
 class SnapshotHelper {
+    
+    private final Map<String, JavaObjectAccess> accessMap;
+    
+    new(){
+        this(Maps.newHashMap)
+    }
+    
+    /**
+     * Initializes a {@link SnapshotHelper} with a map containing {@link JavaObjectAccess} objects for 
+     * serialization and deserialization of plain Java types.
+     * 
+     * @since 1.6
+     */
+    new(Map<String, JavaObjectAccess> accessMap){
+        this.accessMap = accessMap
+    }
 	
 	/**
 	 * Returns the actual value of the substitution based on its type
@@ -59,6 +79,7 @@ class SnapshotHelper {
 			LongSubstitution: substitution.value
 			MiscellaneousSubstitution: substitution.value
 			StringSubstitution: substitution.value
+			SerializedJavaObjectSubstitution: substitution
 		}
 	}
 	
@@ -113,31 +134,31 @@ class SnapshotHelper {
 		    default: InputSpecification::UNSET
 		}
 	}
-
+	
 	/**
-	 * Saves the matches of the given matcher (using the partial match) into the given snapshot.
-	 * If the input specification is not yet filled, it is now filled based on the engine of the matcher.
-	 */
-	def saveMatchesToSnapshot(ViatraQueryMatcher matcher, IPatternMatch partialMatch, QuerySnapshot snapshot){
-		val patternFQN = matcher.patternName
-		val actualRecord = SnapshotFactory::eINSTANCE.createMatchSetRecord
-		actualRecord.patternQualifiedName = patternFQN
-		// 1. put actual match set record in the same model with the expected
-		snapshot.matchSetRecords.add(actualRecord)
-		// 2. store model roots
-		if(snapshot.inputSpecification == InputSpecification::UNSET){
-			snapshot.modelRoots.addAll(matcher.engine.modelRootsForEngine)
-			snapshot.modelRoots.remove(snapshot)
-			snapshot.inputSpecification = matcher.inputSpecificationForMatcher
-		}
-		actualRecord.filter = partialMatch.createMatchRecordForMatch
+     * Saves the matches of the given matcher (using the partial match) into the given snapshot.
+     * If the input specification is not yet filled, it is now filled based on the engine of the matcher.
+     */
+    def saveMatchesToSnapshot(ViatraQueryMatcher matcher, IPatternMatch partialMatch, QuerySnapshot snapshot){
+        val patternFQN = matcher.patternName
+        val actualRecord = SnapshotFactory::eINSTANCE.createMatchSetRecord
+        actualRecord.patternQualifiedName = patternFQN
+        // 1. put actual match set record in the same model with the expected
+        snapshot.matchSetRecords.add(actualRecord)
+        // 2. store model roots
+        if(snapshot.inputSpecification == InputSpecification::UNSET){
+            snapshot.modelRoots.addAll(matcher.engine.modelRootsForEngine)
+            snapshot.modelRoots.remove(snapshot)
+            snapshot.inputSpecification = matcher.inputSpecificationForMatcher
+        }
+        actualRecord.filter = partialMatch.createMatchRecordForMatch
 
-		// 3. create match set records
-		matcher.forEachMatch(partialMatch)[match |
-			actualRecord.matches.add(match.createMatchRecordForMatch)
-		]
-		return actualRecord
-	}
+        // 3. create match set records
+        matcher.forEachMatch(partialMatch)[match |
+            actualRecord.matches.add(match.createMatchRecordForMatch)
+        ]
+        return actualRecord
+    }
 
 	/**
 	 * Creates a match record that corresponds to the given match.
@@ -168,6 +189,7 @@ class SnapshotHelper {
 	/**
 	 * Creates a partial match that corresponds to the given match record.
 	 *  Each substitution is used as a value for the parameter with the same name.
+	 * 
 	 * @deprecated use createMatchForMatchRecord(IQuerySpecification, MatchRecord) instead
 	 */
 	@Deprecated
@@ -199,13 +221,14 @@ class SnapshotHelper {
 		return match
 	}
 
+	
 	/**
-	 * Saves all matches of the given matcher into the given snapshot.
-	 * If the input specification is not yet filled, it is now filled based on the engine of the matcher.
-	 */
-	def saveMatchesToSnapshot(ViatraQueryMatcher matcher, QuerySnapshot snapshot){
-		matcher.saveMatchesToSnapshot(matcher.newEmptyMatch, snapshot)
-	}
+     * Saves all matches of the given matcher into the given snapshot.
+     * If the input specification is not yet filled, it is now filled based on the engine of the matcher.
+     */
+    def saveMatchesToSnapshot(ViatraQueryMatcher matcher, QuerySnapshot snapshot){
+        matcher.saveMatchesToSnapshot(matcher.newEmptyMatch, snapshot)
+    }
 
 	/**
 	 * Returns the match set record for the given pattern FQN from the snapshot,
@@ -233,13 +256,12 @@ class SnapshotHelper {
 	 */
 	def createSubstitution(String parameterName, Object value){
 		return switch(value) {
-			EEnumLiteral: {
-				val sub = SnapshotFactory::eINSTANCE.createEnumSubstitution
-				sub.setValueLiteral((value as EEnumLiteral).literal)
-				sub.setEnumType((value as EEnumLiteral).EEnum)
-				sub.setParameterName(parameterName)
-				sub
-			}
+			Enumerator: {
+                val sub = SnapshotFactory::eINSTANCE.createEnumSubstitution
+                sub.setValueLiteral((value as Enumerator).literal)
+                sub.setParameterName(parameterName)
+                sub
+            }
 			EObject : {
 				val sub = SnapshotFactory::eINSTANCE.createEMFSubstitution
 				sub.setValue(value as EObject)
@@ -289,10 +311,17 @@ class SnapshotHelper {
 				sub				
 			}
 			default : {
-				val sub = SnapshotFactory::eINSTANCE.createMiscellaneousSubstitution
-				sub.setValue(value)
-				sub.setParameterName(parameterName)
-				sub	
+			    val access = accessMap.get(value.class.name)
+			    if(access!=null){
+			       val sub = access.toSubstitution(value)
+			       sub.parameterName = parameterName
+			       sub
+			    }else{
+			       val sub = SnapshotFactory::eINSTANCE.createMiscellaneousSubstitution
+                   sub.setValue(value)
+                   sub.setParameterName(parameterName)
+                   sub  
+			    }
 			}
 		}
 	}
diff --git a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/TestExecutor.xtend b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/TestExecutor.xtend
index 841be80642..9b2308346f 100644
--- a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/TestExecutor.xtend
+++ b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/TestExecutor.xtend
@@ -19,6 +19,8 @@ import org.eclipse.viatra.query.patternlanguage.emf.eMFPatternLanguage.PatternMo
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine
 import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
 import org.eclipse.viatra.query.runtime.emf.EMFScope
+import org.eclipse.viatra.query.testing.core.api.MatchRecordEquivalence
+import org.eclipse.viatra.query.testing.core.internal.DefaultMatchRecordEquivalence
 import org.eclipse.viatra.query.testing.snapshot.MatchRecord
 import org.eclipse.viatra.query.testing.snapshot.MatchSetRecord
 import org.eclipse.viatra.query.testing.snapshot.QuerySnapshot
@@ -73,14 +75,26 @@ class TestExecutor {
 		return true
 
 	}
+	
+	/**
+     * Compares the match set of a given matcher with the given match record
+     *  using VIATRA Query as a compare tool.
+     * Therefore the comparison depends on correct VIATRA Query query evaluation
+     *  (for a given limited pattern language feature set).
+     */
+    def compareResultSetsAsRecords(ViatraQueryMatcher matcher, MatchSetRecord expected){
+        compareResultSetsAsRecords(matcher, expected, new DefaultMatchRecordEquivalence())
+    }
 
 	/**
 	 * Compares the match set of a given matcher with the given match record
-	 *  using VIATRA Query as a compare tool.
-	 * Therefore the comparison depends on correct VIATRA Query query evaluation
-	 *  (for a given limited pattern language feature set).
+     * using VIATRA Query as a compare tool.
+     * 
+     * The comparison logic can be specified via the equivalence parameter.
+	 * 
+	 * @since 1.6
 	 */
-	def compareResultSetsAsRecords(ViatraQueryMatcher matcher, MatchSetRecord expected){
+	def compareResultSetsAsRecords(ViatraQueryMatcher matcher, MatchSetRecord expected, MatchRecordEquivalence equivalence){
 		val diff = newHashSet
 
 		// 1. Validate match set record against matcher
@@ -100,7 +114,7 @@ class TestExecutor {
 		val actual = matcher.saveMatchesToSnapshot(partialMatch,snapshot)
 
 		// 3. Compute diff
-		val matchdiff = MatchSetRecordDiff::compute(expected, actual)
+		val matchdiff = MatchSetRecordDiff::compute(expected, actual, equivalence)
 
 		// 4. Print results
 		diff.addAll(matchdiff.additions.map[UNEXPECTED_MATCH + " (" + it.prettyPrint + ")"])
diff --git a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/ViatraQueryTestCase.xtend b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/ViatraQueryTestCase.xtend
index 7b8fa26588..222b6f6867 100644
--- a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/ViatraQueryTestCase.xtend
+++ b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/ViatraQueryTestCase.xtend
@@ -13,6 +13,7 @@ import com.google.common.base.Joiner
 import java.util.Iterator
 import java.util.LinkedList
 import java.util.List
+import java.util.Map
 import org.apache.log4j.Level
 import org.eclipse.emf.common.notify.Notifier
 import org.eclipse.emf.common.util.URI
@@ -27,9 +28,13 @@ import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine
 import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
 import org.eclipse.viatra.query.runtime.emf.EMFScope
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil
+import org.eclipse.viatra.query.testing.core.api.JavaObjectAccess
+import org.eclipse.viatra.query.testing.core.api.MatchRecordEquivalence
+import org.eclipse.viatra.query.testing.core.internal.DefaultMatchRecordEquivalence
 import org.junit.Assert
 import org.junit.Assume
 import org.junit.ComparisonFailure
+import com.google.common.collect.Maps
 
 /** 
  * @author Grill Balazs
@@ -45,13 +50,19 @@ class ViatraQueryTestCase {
     private EMFScope scope = new EMFScope(new ResourceSetImpl)
 
     final List<IMatchSetModelProvider> modelProviders
-    extension SnapshotHelper = new SnapshotHelper
-
+    extension SnapshotHelper snapshotHelper
+    private Map<String, JavaObjectAccess> accessMap;
+    
     val TestingSeverityAggregatorLogAppender appender
 
     new() {
+        this(Maps.newHashMap)
+    }
+    
+    new(Map<String, JavaObjectAccess> accessMap) {
         this.modelProviders = new LinkedList
-
+        this.accessMap = accessMap
+        this.snapshotHelper = new SnapshotHelper(accessMap)
         val a = ViatraQueryLoggingUtil.getLogger(ViatraQueryEngine).getAppender(
             SEVERITY_AGGREGATOR_LOGAPPENDER_NAME)
         this.appender = if (a instanceof TestingSeverityAggregatorLogAppender) {
@@ -126,7 +137,7 @@ class ViatraQueryTestCase {
                 }
             }
         }
-
+        
         for (element : elementsToModify) {
             operation.apply(element)
         }
@@ -149,9 +160,20 @@ class ViatraQueryTestCase {
         ]
 
     }
-
+    
     def <Match extends IPatternMatch> assertMatchSetsEqual(
         IQuerySpecification<? extends ViatraQueryMatcher<Match>> querySpecification) {
+        assertMatchSetsEqual(querySpecification, new DefaultMatchRecordEquivalence(accessMap))
+    }
+
+
+     /**
+     * Checks if the match sets of the given query specification are equivalent, based on a user specified equivalence logic.
+     * 
+     * @since 1.6
+     */
+    def <Match extends IPatternMatch> assertMatchSetsEqual(
+        IQuerySpecification<? extends ViatraQueryMatcher<Match>> querySpecification, MatchRecordEquivalence equivalence) {
         if (modelProviders.size < 2) {
             throw new IllegalArgumentException("At least two model providers shall be set")
         }
@@ -159,7 +181,7 @@ class ViatraQueryTestCase {
         val reference = modelProviders.head
 
         modelProviders.tail.forEach [
-            val matchDiff = getMatchSetDiff(querySpecification, reference, it)
+            val matchDiff = getMatchSetDiff(querySpecification, reference, it, equivalence)
 
             if (!matchDiff.empty) {
                 val joiner = Joiner.on("\n")
@@ -172,16 +194,31 @@ class ViatraQueryTestCase {
             }
         ]
     }
-
+    
     def assertMatchSetsEqual(IQueryGroup queryGroup) {
+        assertMatchSetsEqual(queryGroup, new DefaultMatchRecordEquivalence(accessMap))
+    }
+
+     /**
+     * Checks if the match sets of the queries contained in the provided query group are equivalent in the scope of added {@link IMatchSetModelProvider} instances.
+     * 
+     * @since 1.6
+     */
+    def assertMatchSetsEqual(IQueryGroup queryGroup, MatchRecordEquivalence equivalence) {
         queryGroup.specifications.forEach [
-            assertMatchSetsEqual(it as IQuerySpecification<? extends ViatraQueryMatcher<IPatternMatch>>)
+            assertMatchSetsEqual(it as IQuerySpecification<? extends ViatraQueryMatcher<IPatternMatch>>, equivalence)
         ]
     }
 
+    
+     /**
+     * Calculates the differences between the match sets of a given {@link IQuerySpecification} based on the specified {@link IMatchSetModelProvider} instances.
+     * 
+     * @since 1.6
+     */
     def <Match extends IPatternMatch> getMatchSetDiff(
         IQuerySpecification<? extends ViatraQueryMatcher<Match>> querySpecification,
-        IMatchSetModelProvider expectedProvider, IMatchSetModelProvider actualProvider) {
+        IMatchSetModelProvider expectedProvider, IMatchSetModelProvider actualProvider, MatchRecordEquivalence equivalence) {
 
         var Match filter = null;
 
@@ -202,7 +239,13 @@ class ViatraQueryTestCase {
             }
         }
 
-        MatchSetRecordDiff::compute(expected, actual)
+        MatchSetRecordDiff::compute(expected, actual, equivalence)
+    }
+    
+    def <Match extends IPatternMatch> getMatchSetDiff(
+        IQuerySpecification<? extends ViatraQueryMatcher<Match>> querySpecification,
+        IMatchSetModelProvider expectedProvider, IMatchSetModelProvider actualProvider) {
+        getMatchSetDiff(querySpecification, expectedProvider, actualProvider, new DefaultMatchRecordEquivalence(accessMap))
     }
 
 }
diff --git a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/api/JavaObjectAccess.xtend b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/api/JavaObjectAccess.xtend
new file mode 100644
index 0000000000..7dcf6f5494
--- /dev/null
+++ b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/api/JavaObjectAccess.xtend
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2010-2016, Peter Lunk, IncQuery Labs Ltd.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Peter Lunk - initial API and implementation
+ */
+package org.eclipse.viatra.query.testing.core.api
+
+import org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution
+import org.eclipse.xtend.lib.annotations.Data
+
+/** 
+ * Inheriting classes should implement the abstract methods of this class, allowing the VIATRA 
+ * Query Testing Framework to access and compare plain java typed objects as well. 
+ * 
+ * @author Peter Lunk
+ */
+@Data
+abstract class JavaObjectAccess {
+    final val Class<?> type
+    
+    /**
+     * Constructs a {@link SerializedJavaObjectSubstitution} element based on the provided 
+     * object. Implementation should provide a serialized representation of the given object.
+     * This is called when a match set is converted to a snapshot.
+     * 
+     * @since 1.6
+     */
+    def SerializedJavaObjectSubstitution toSubstitution(Object value)
+    
+    /**
+     * Calculates the hash code for a given {@link SerializedJavaObjectSubstitution}. Note, that if 
+     * two {@link SerializedJavaObjectSubstitution} elements are equal, their hash code should be the same as well.
+     * 
+     * @since 1.6
+     */
+    def int calculateHash(SerializedJavaObjectSubstitution substitution)
+    
+    /**
+     * Returns if two {@link SerializedJavaObjectSubstitution} elements are equal or not. 
+     * Implementations should cover the deserialization of {@link SerializedJavaObjectSubstitution} contents. 
+     * 
+     * @since 1.6
+     */
+    def boolean equals(SerializedJavaObjectSubstitution a, SerializedJavaObjectSubstitution b)
+    
+}
diff --git a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/internal/MatchRecordEquvalence.xtend b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/api/MatchRecordEquivalence.xtend
similarity index 60%
rename from query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/internal/MatchRecordEquvalence.xtend
rename to query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/api/MatchRecordEquivalence.xtend
index ec4c846869..acfc07f295 100644
--- a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/internal/MatchRecordEquvalence.xtend
+++ b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/api/MatchRecordEquivalence.xtend
@@ -7,22 +7,27 @@
  * Contributors:
  * Grill Balázs - initial API and implementation
  */
-package org.eclipse.viatra.query.testing.core.internal
+package org.eclipse.viatra.query.testing.core.api
 
 import com.google.common.base.Equivalence
-import com.google.common.collect.Maps
 import com.google.common.collect.Sets
+import java.util.Map
 import org.eclipse.viatra.query.testing.core.SnapshotHelper
 import org.eclipse.viatra.query.testing.snapshot.MatchRecord
 
 /** 
  * @author Grill Balázs
  */
-class MatchRecordEquvalence extends Equivalence<MatchRecord> {
+abstract class MatchRecordEquivalence extends Equivalence<MatchRecord> {
 	
-	extension SnapshotHelper = new SnapshotHelper
+	protected extension SnapshotHelper helper
+	protected Map<String, JavaObjectAccess> accessMap
+	
+	new(Map<String, JavaObjectAccess> accessMap){
+	    this.accessMap = accessMap;
+	    helper = new SnapshotHelper(accessMap);
+	}
 	
-	public static val INSTANCE = new MatchRecordEquvalence
 	
 	def wrap(Iterable<MatchRecord> matches){
 		Sets.newHashSet(matches.map[it.wrap])
@@ -40,17 +45,5 @@ class MatchRecordEquvalence extends Equivalence<MatchRecord> {
 		return result
 	}
 	
-	/* (non-Javadoc)
-	 * @see Equivalence#doEquivalent(java.lang.Object, java.lang.Object)
-	 */
-	override protected boolean doEquivalent(MatchRecord a, MatchRecord b) {
-		Maps.difference(a.toMap, b.toMap).areEqual
-	}
-
-	/* (non-Javadoc)
-	 * @see Equivalence#doHash(java.lang.Object)
-	 */
-	override protected int doHash(MatchRecord t) {
-		t.substitutions.map[it.derivedValue?.hashCode].fold(0, [r, e | r+e])
-	}
+	
 }
diff --git a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/api/ViatraQueryTest.xtend b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/api/ViatraQueryTest.xtend
index 7e84075d8d..275357539f 100644
--- a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/api/ViatraQueryTest.xtend
+++ b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/api/ViatraQueryTest.xtend
@@ -11,9 +11,11 @@
 package org.eclipse.viatra.query.testing.core.api
 
 import com.google.common.base.Preconditions
+import com.google.common.collect.Maps
 import com.google.inject.Injector
 import java.util.LinkedList
 import java.util.List
+import java.util.Map
 import org.apache.log4j.Level
 import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.EObject
@@ -27,12 +29,14 @@ import org.eclipse.viatra.query.runtime.emf.EMFScope
 import org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackendFactory
 import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint
 import org.eclipse.viatra.query.runtime.registry.QuerySpecificationRegistry
+import org.eclipse.viatra.query.testing.core.IMatchSetModelProvider
 import org.eclipse.viatra.query.testing.core.InitializedSnapshotMatchSetModelProvider
 import org.eclipse.viatra.query.testing.core.PatternBasedMatchSetModelProvider
 import org.eclipse.viatra.query.testing.core.SnapshotMatchSetModelProvider
 import org.eclipse.viatra.query.testing.core.ViatraQueryTestCase
 import org.eclipse.viatra.query.testing.core.XmiModelUtil
 import org.eclipse.viatra.query.testing.core.XmiModelUtil.XmiModelUtilRunningOptionEnum
+import org.eclipse.viatra.query.testing.core.internal.DefaultMatchRecordEquivalence
 import org.eclipse.viatra.query.testing.snapshot.QuerySnapshot
 
 /**
@@ -44,10 +48,23 @@ class ViatraQueryTest {
 
     val ViatraQueryTestCase testCase;
     private val List<IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> patterns = new LinkedList;
+    private Map<String, JavaObjectAccess> accessMap;
 
     private new() {
-        testCase = new ViatraQueryTestCase
+        this(Maps.newHashMap)
     }
+    
+    /**
+     * Initializes a {@link ViatraQueryTest} with a map containing {@link JavaObjectAccess} objects for 
+     * serialization and deserialization of plain Java types.
+     * 
+     * @since 1.6
+     */
+    private new(Map<String, JavaObjectAccess> accessMap) {
+        this.accessMap = accessMap
+        testCase = new ViatraQueryTestCase(accessMap)
+    }
+    
 
     /**
      * Test the specified query
@@ -59,6 +76,14 @@ class ViatraQueryTest {
     static def test(IQueryGroup patterns) {
         new ViatraQueryTest().and(patterns)
     }
+    
+    static def <Match extends IPatternMatch> test(IQuerySpecification<? extends ViatraQueryMatcher<Match>> pattern, Map<String, JavaObjectAccess> accessMap) {
+        new ViatraQueryTest(accessMap).and(pattern)
+    }
+
+    static def test(IQueryGroup patterns, Map<String, JavaObjectAccess> accessMap) {
+        new ViatraQueryTest(accessMap).and(patterns)
+    }
 
     static def test() {
         new ViatraQueryTest
@@ -108,12 +133,22 @@ class ViatraQueryTest {
         this()
         this.patterns.add(pattern);
     }
+    
+    /**
+     * Add Java Object Access elements
+     * 
+     * @since 1.6
+     */
+    def withClasses(Map<String, JavaObjectAccess> accessmap) {
+        this.accessMap = accessmap;
+        this
+    }
 
     /**
      * Add match result set with a query initialized using the given hints
      */
     def with(QueryEvaluationHint hint) {
-        val modelProvider = new PatternBasedMatchSetModelProvider(hint);
+        val modelProvider = new PatternBasedMatchSetModelProvider(hint, accessMap);
         testCase.addMatchSetModelProvider(modelProvider)
         this
     }
@@ -222,19 +257,41 @@ class ViatraQueryTest {
         this
     }
 
+    /**
+     * Assert that the specified {@link IMatchSetModelProvider} instances produce the same match set snapshots, using a user defined equivalence algorithm.  
+     * 
+     * @since 1.6
+     */
+    def assertEquals(MatchRecordEquivalence equivalence) {
+        this.assertEquals(Level::INFO, equivalence)
+    }
+    
     /**
      * Execute all queries and check that the result sets are equal and no error log message was thrown
+     * 
      */
     def assertEquals() {
         this.assertEquals(Level::INFO)
     }
 
     /**
-     * Execute all queries and check that the result sets are equal with a selected log level treshold
+     * Execute all queries and check that the result sets are equal with a selected log level threshold, using a user specified equivalence algorithm.
+     * 
+     * @since 1.6
+     */
+    def assertEquals(Level treshold, MatchRecordEquivalence equivalence) {
+        patterns.forEach [
+            testCase.assertMatchSetsEqual(it as IQuerySpecification<ViatraQueryMatcher<IPatternMatch>>, equivalence)
+        ]
+        testCase.assertLogSeverityThreshold(treshold)
+    }
+    
+    /**
+     * Execute all queries and check that the result sets are equal with a selected log level threshold
      */
     def assertEquals(Level treshold) {
         patterns.forEach [
-            testCase.assertMatchSetsEqual(it as IQuerySpecification<ViatraQueryMatcher<IPatternMatch>>)
+            testCase.assertMatchSetsEqual(it as IQuerySpecification<ViatraQueryMatcher<IPatternMatch>>, new DefaultMatchRecordEquivalence(accessMap))
         ]
         testCase.assertLogSeverityThreshold(treshold)
     }
diff --git a/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/internal/DefaultMatchRecordEquivalence.xtend b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/internal/DefaultMatchRecordEquivalence.xtend
new file mode 100644
index 0000000000..dbba002e73
--- /dev/null
+++ b/query/tests/org.eclipse.viatra.query.testing.core/src/org/eclipse/viatra/query/testing/core/internal/DefaultMatchRecordEquivalence.xtend
@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) 2010-2016, Peter Lunk, IncQuery Labs Ltd.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Peter Lunk - initial API and implementation
+ */
+package org.eclipse.viatra.query.testing.core.internal
+
+import com.google.common.base.Equivalence
+import com.google.common.collect.Maps
+import java.util.Map
+import java.util.Objects
+import org.eclipse.emf.ecore.InternalEObject
+import org.eclipse.viatra.query.testing.core.api.JavaObjectAccess
+import org.eclipse.viatra.query.testing.core.api.MatchRecordEquivalence
+import org.eclipse.viatra.query.testing.snapshot.MatchRecord
+import org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution
+
+/** 
+ * @author Peter Lunk
+ */
+class DefaultMatchRecordEquivalence extends MatchRecordEquivalence {
+	
+	
+    new(Map<String, JavaObjectAccess> accessMap) {
+        super(accessMap)
+    }
+    
+    new() {
+        super(Maps.newHashMap)
+    }
+		
+	/* (non-Javadoc)
+	 * @see Equivalence#doEquivalent(java.lang.Object, java.lang.Object)
+	 */
+	override protected boolean doEquivalent(MatchRecord a, MatchRecord b) {
+        Maps.difference(a.toMap, b.toMap, new Equivalence<Object> {
+
+            override protected doEquivalent(Object a, Object b) {
+                if(a instanceof SerializedJavaObjectSubstitution && b instanceof SerializedJavaObjectSubstitution){
+                    val aSub = a as SerializedJavaObjectSubstitution
+                    val bSub = b as SerializedJavaObjectSubstitution
+                    if (aSub.type.equals(bSub.type)) {
+                        val access = accessMap.get(aSub.type)
+                        return access.equals(aSub, bSub)
+                    }
+                } else if(a instanceof InternalEObject && b instanceof InternalEObject){
+                    if((a as InternalEObject).eIsProxy && (b as InternalEObject).eIsProxy ){
+                        return (a as InternalEObject).eProxyURI == (b as InternalEObject).eProxyURI 
+                    }
+                }
+                return Objects.equals(a,b)
+            }
+
+            override protected doHash(Object t) {
+                if(t instanceof SerializedJavaObjectSubstitution && !(t as InternalEObject).eIsProxy){
+                    val access = accessMap.get((t as SerializedJavaObjectSubstitution).type)
+                    return access.calculateHash((t as SerializedJavaObjectSubstitution))
+                } else if(t instanceof InternalEObject && (t as InternalEObject).eIsProxy){
+                        return (t as InternalEObject).eProxyURI.hashCode
+                }
+                t.hashCode
+            }
+
+        }).areEqual
+    }
+
+	/* (non-Javadoc)
+	 * @see Equivalence#doHash(java.lang.Object)
+	 */
+	override protected int doHash(MatchRecord t) {
+		t.substitutions.map[
+            val value = it.derivedValue
+            
+            if (value instanceof InternalEObject && (value as InternalEObject).eIsProxy) {
+                (value as InternalEObject).eProxyURI.hashCode
+            } else if (it.derivedValue instanceof SerializedJavaObjectSubstitution) {
+                val access = accessMap.get((it.derivedValue as SerializedJavaObjectSubstitution).type)
+                return access.calculateHash((it.derivedValue as SerializedJavaObjectSubstitution))
+            } else {
+                it.derivedValue?.hashCode
+            }
+                
+        ].fold(0, [r, e | r+e])
+	}
+}
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/BooleanSubstitution.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/BooleanSubstitution.java
index d14be240f5..72eb66f0d1 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/BooleanSubstitution.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/BooleanSubstitution.java
@@ -20,30 +20,30 @@
  * @generated
  */
 public interface BooleanSubstitution extends MatchSubstitutionRecord {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(boolean)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getBooleanSubstitution_Value()
-	 * @model
-	 * @generated
-	 */
-	boolean isValue();
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' attribute.
+     * @see #setValue(boolean)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getBooleanSubstitution_Value()
+     * @model
+     * @generated
+     */
+    boolean isValue();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution#isValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #isValue()
-	 * @generated
-	 */
-	void setValue(boolean value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution#isValue <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value</em>' attribute.
+     * @see #isValue()
+     * @generated
+     */
+    void setValue(boolean value);
 
 } // BooleanSubstitution
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/DateSubstitution.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/DateSubstitution.java
index 0aefe1b4ea..00f06e2c5f 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/DateSubstitution.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/DateSubstitution.java
@@ -21,30 +21,30 @@
  * @generated
  */
 public interface DateSubstitution extends MatchSubstitutionRecord {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(Date)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getDateSubstitution_Value()
-	 * @model
-	 * @generated
-	 */
-	Date getValue();
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' attribute.
+     * @see #setValue(Date)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getDateSubstitution_Value()
+     * @model
+     * @generated
+     */
+    Date getValue();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.DateSubstitution#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(Date value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.DateSubstitution#getValue <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value</em>' attribute.
+     * @see #getValue()
+     * @generated
+     */
+    void setValue(Date value);
 
 } // DateSubstitution
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/DoubleSubstitution.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/DoubleSubstitution.java
index 92c8452377..532a8a5908 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/DoubleSubstitution.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/DoubleSubstitution.java
@@ -20,30 +20,30 @@
  * @generated
  */
 public interface DoubleSubstitution extends MatchSubstitutionRecord {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(double)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getDoubleSubstitution_Value()
-	 * @model
-	 * @generated
-	 */
-	double getValue();
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' attribute.
+     * @see #setValue(double)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getDoubleSubstitution_Value()
+     * @model
+     * @generated
+     */
+    double getValue();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(double value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution#getValue <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value</em>' attribute.
+     * @see #getValue()
+     * @generated
+     */
+    void setValue(double value);
 
 } // DoubleSubstitution
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/EMFSubstitution.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/EMFSubstitution.java
index dc33979561..47634b7333 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/EMFSubstitution.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/EMFSubstitution.java
@@ -21,30 +21,30 @@
  * @generated
  */
 public interface EMFSubstitution extends MatchSubstitutionRecord {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' reference.
-	 * @see #setValue(EObject)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getEMFSubstitution_Value()
-	 * @model
-	 * @generated
-	 */
-	EObject getValue();
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' reference.
+     * @see #setValue(EObject)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getEMFSubstitution_Value()
+     * @model
+     * @generated
+     */
+    EObject getValue();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.EMFSubstitution#getValue <em>Value</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' reference.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(EObject value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.EMFSubstitution#getValue <em>Value</em>}' reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value</em>' reference.
+     * @see #getValue()
+     * @generated
+     */
+    void setValue(EObject value);
 
 } // EMFSubstitution
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/EnumSubstitution.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/EnumSubstitution.java
index 89a29736c5..70414fb3ee 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/EnumSubstitution.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/EnumSubstitution.java
@@ -22,56 +22,56 @@
  * @generated
  */
 public interface EnumSubstitution extends MatchSubstitutionRecord {
-	/**
-	 * Returns the value of the '<em><b>Value Literal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Literal</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value Literal</em>' attribute.
-	 * @see #setValueLiteral(String)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getEnumSubstitution_ValueLiteral()
-	 * @model
-	 * @generated
-	 */
-	String getValueLiteral();
+    /**
+     * Returns the value of the '<em><b>Value Literal</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value Literal</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value Literal</em>' attribute.
+     * @see #setValueLiteral(String)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getEnumSubstitution_ValueLiteral()
+     * @model
+     * @generated
+     */
+    String getValueLiteral();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.EnumSubstitution#getValueLiteral <em>Value Literal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value Literal</em>' attribute.
-	 * @see #getValueLiteral()
-	 * @generated
-	 */
-	void setValueLiteral(String value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.EnumSubstitution#getValueLiteral <em>Value Literal</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value Literal</em>' attribute.
+     * @see #getValueLiteral()
+     * @generated
+     */
+    void setValueLiteral(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Enum Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Enum Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Enum Type</em>' reference.
-	 * @see #setEnumType(EEnum)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getEnumSubstitution_EnumType()
-	 * @model
-	 * @generated
-	 */
-	EEnum getEnumType();
+    /**
+     * Returns the value of the '<em><b>Enum Type</b></em>' reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Enum Type</em>' reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Enum Type</em>' reference.
+     * @see #setEnumType(EEnum)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getEnumSubstitution_EnumType()
+     * @model
+     * @generated
+     */
+    EEnum getEnumType();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.EnumSubstitution#getEnumType <em>Enum Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Enum Type</em>' reference.
-	 * @see #getEnumType()
-	 * @generated
-	 */
-	void setEnumType(EEnum value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.EnumSubstitution#getEnumType <em>Enum Type</em>}' reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Enum Type</em>' reference.
+     * @see #getEnumType()
+     * @generated
+     */
+    void setEnumType(EEnum value);
 
 } // EnumSubstitution
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/FloatSubstitution.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/FloatSubstitution.java
index c55f691256..ba72f182c8 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/FloatSubstitution.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/FloatSubstitution.java
@@ -20,30 +20,30 @@
  * @generated
  */
 public interface FloatSubstitution extends MatchSubstitutionRecord {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(float)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getFloatSubstitution_Value()
-	 * @model
-	 * @generated
-	 */
-	float getValue();
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' attribute.
+     * @see #setValue(float)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getFloatSubstitution_Value()
+     * @model
+     * @generated
+     */
+    float getValue();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.FloatSubstitution#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(float value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.FloatSubstitution#getValue <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value</em>' attribute.
+     * @see #getValue()
+     * @generated
+     */
+    void setValue(float value);
 
 } // FloatSubstitution
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/InputSpecification.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/InputSpecification.java
index a2acccc02e..6359fe7cd3 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/InputSpecification.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/InputSpecification.java
@@ -18,251 +18,251 @@
  * @generated
  */
 public enum InputSpecification implements Enumerator {
-	/**
-	 * The '<em><b>Unset</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #UNSET_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	UNSET(-1, "Unset", "Unset"),
+    /**
+     * The '<em><b>Unset</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #UNSET_VALUE
+     * @generated
+     * @ordered
+     */
+    UNSET(-1, "Unset", "Unset"),
 
-	/**
-	 * The '<em><b>Resource Set</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #RESOURCE_SET_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	RESOURCE_SET(0, "ResourceSet", "ResourceSet"),
+    /**
+     * The '<em><b>Resource Set</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #RESOURCE_SET_VALUE
+     * @generated
+     * @ordered
+     */
+    RESOURCE_SET(0, "ResourceSet", "ResourceSet"),
 
-	/**
-	 * The '<em><b>Resource</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #RESOURCE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	RESOURCE(1, "Resource", "Resource"),
+    /**
+     * The '<em><b>Resource</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #RESOURCE_VALUE
+     * @generated
+     * @ordered
+     */
+    RESOURCE(1, "Resource", "Resource"),
 
-	/**
-	 * The '<em><b>EObject</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EOBJECT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	EOBJECT(2, "EObject", "EObject");
+    /**
+     * The '<em><b>EObject</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #EOBJECT_VALUE
+     * @generated
+     * @ordered
+     */
+    EOBJECT(2, "EObject", "EObject");
 
-	/**
-	 * The '<em><b>Unset</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Unset</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #UNSET
-	 * @model name="Unset"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int UNSET_VALUE = -1;
+    /**
+     * The '<em><b>Unset</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Unset</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #UNSET
+     * @model name="Unset"
+     * @generated
+     * @ordered
+     */
+    public static final int UNSET_VALUE = -1;
 
-	/**
-	 * The '<em><b>Resource Set</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Resource Set</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #RESOURCE_SET
-	 * @model name="ResourceSet"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int RESOURCE_SET_VALUE = 0;
+    /**
+     * The '<em><b>Resource Set</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Resource Set</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #RESOURCE_SET
+     * @model name="ResourceSet"
+     * @generated
+     * @ordered
+     */
+    public static final int RESOURCE_SET_VALUE = 0;
 
-	/**
-	 * The '<em><b>Resource</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Resource</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #RESOURCE
-	 * @model name="Resource"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int RESOURCE_VALUE = 1;
+    /**
+     * The '<em><b>Resource</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Resource</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #RESOURCE
+     * @model name="Resource"
+     * @generated
+     * @ordered
+     */
+    public static final int RESOURCE_VALUE = 1;
 
-	/**
-	 * The '<em><b>EObject</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>EObject</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EOBJECT
-	 * @model name="EObject"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EOBJECT_VALUE = 2;
+    /**
+     * The '<em><b>EObject</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>EObject</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #EOBJECT
+     * @model name="EObject"
+     * @generated
+     * @ordered
+     */
+    public static final int EOBJECT_VALUE = 2;
 
-	/**
-	 * An array of all the '<em><b>Input Specification</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final InputSpecification[] VALUES_ARRAY =
-		new InputSpecification[] {
-			UNSET,
-			RESOURCE_SET,
-			RESOURCE,
-			EOBJECT,
-		};
+    /**
+     * An array of all the '<em><b>Input Specification</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private static final InputSpecification[] VALUES_ARRAY =
+        new InputSpecification[] {
+            UNSET,
+            RESOURCE_SET,
+            RESOURCE,
+            EOBJECT,
+        };
 
-	/**
-	 * A public read-only list of all the '<em><b>Input Specification</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<InputSpecification> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+    /**
+     * A public read-only list of all the '<em><b>Input Specification</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final List<InputSpecification> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
-	/**
-	 * Returns the '<em><b>Input Specification</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static InputSpecification get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			InputSpecification result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Input Specification</b></em>' literal with the specified literal value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param literal the literal.
+     * @return the matching enumerator or <code>null</code>.
+     * @generated
+     */
+    public static InputSpecification get(String literal) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            InputSpecification result = VALUES_ARRAY[i];
+            if (result.toString().equals(literal)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Input Specification</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static InputSpecification getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			InputSpecification result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Input Specification</b></em>' literal with the specified name.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param name the name.
+     * @return the matching enumerator or <code>null</code>.
+     * @generated
+     */
+    public static InputSpecification getByName(String name) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            InputSpecification result = VALUES_ARRAY[i];
+            if (result.getName().equals(name)) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Returns the '<em><b>Input Specification</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static InputSpecification get(int value) {
-		switch (value) {
-			case UNSET_VALUE: return UNSET;
-			case RESOURCE_SET_VALUE: return RESOURCE_SET;
-			case RESOURCE_VALUE: return RESOURCE;
-			case EOBJECT_VALUE: return EOBJECT;
-		}
-		return null;
-	}
+    /**
+     * Returns the '<em><b>Input Specification</b></em>' literal with the specified integer value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the integer value.
+     * @return the matching enumerator or <code>null</code>.
+     * @generated
+     */
+    public static InputSpecification get(int value) {
+        switch (value) {
+            case UNSET_VALUE: return UNSET;
+            case RESOURCE_SET_VALUE: return RESOURCE_SET;
+            case RESOURCE_VALUE: return RESOURCE;
+            case EOBJECT_VALUE: return EOBJECT;
+        }
+        return null;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final int value;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String name;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String literal;
 
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private InputSpecification(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    /**
+     * Only this class can construct instances.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private InputSpecification(int value, String name, String literal) {
+        this.value = value;
+        this.name = name;
+        this.literal = literal;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public int getValue() {
+      return value;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+      return name;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getLiteral() {
+      return literal;
+    }
 
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
+    /**
+     * Returns the literal value of the enumerator, which is its string representation.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        return literal;
+    }
+    
 } //InputSpecification
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/IntSubstitution.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/IntSubstitution.java
index 307cda873d..e03a364c5a 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/IntSubstitution.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/IntSubstitution.java
@@ -20,30 +20,30 @@
  * @generated
  */
 public interface IntSubstitution extends MatchSubstitutionRecord {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(int)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getIntSubstitution_Value()
-	 * @model
-	 * @generated
-	 */
-	int getValue();
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' attribute.
+     * @see #setValue(int)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getIntSubstitution_Value()
+     * @model
+     * @generated
+     */
+    int getValue();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.IntSubstitution#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(int value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.IntSubstitution#getValue <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value</em>' attribute.
+     * @see #getValue()
+     * @generated
+     */
+    void setValue(int value);
 
 } // IntSubstitution
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/LongSubstitution.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/LongSubstitution.java
index 8cf3ea9a56..5e1db96ea7 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/LongSubstitution.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/LongSubstitution.java
@@ -20,30 +20,30 @@
  * @generated
  */
 public interface LongSubstitution extends MatchSubstitutionRecord {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(long)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getLongSubstitution_Value()
-	 * @model
-	 * @generated
-	 */
-	long getValue();
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' attribute.
+     * @see #setValue(long)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getLongSubstitution_Value()
+     * @model
+     * @generated
+     */
+    long getValue();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.LongSubstitution#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(long value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.LongSubstitution#getValue <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value</em>' attribute.
+     * @see #getValue()
+     * @generated
+     */
+    void setValue(long value);
 
 } // LongSubstitution
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MatchRecord.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MatchRecord.java
index 1aac339ec1..0eb344857f 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MatchRecord.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MatchRecord.java
@@ -23,20 +23,20 @@
  * @generated
  */
 public interface MatchRecord extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Substitutions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Substitutions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Substitutions</em>' containment reference list.
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getMatchRecord_Substitutions()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<MatchSubstitutionRecord> getSubstitutions();
+    /**
+     * Returns the value of the '<em><b>Substitutions</b></em>' containment reference list.
+     * The list contents are of type {@link org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Substitutions</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Substitutions</em>' containment reference list.
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getMatchRecord_Substitutions()
+     * @model containment="true"
+     * @generated
+     */
+    EList<MatchSubstitutionRecord> getSubstitutions();
 
 } // MatchRecord
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MatchSetRecord.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MatchSetRecord.java
index 636b465bec..1ec7ad3dd1 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MatchSetRecord.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MatchSetRecord.java
@@ -25,72 +25,72 @@
  * @generated
  */
 public interface MatchSetRecord extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Pattern Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pattern Qualified Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pattern Qualified Name</em>' attribute.
-	 * @see #setPatternQualifiedName(String)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getMatchSetRecord_PatternQualifiedName()
-	 * @model
-	 * @generated
-	 */
-	String getPatternQualifiedName();
+    /**
+     * Returns the value of the '<em><b>Pattern Qualified Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Pattern Qualified Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Pattern Qualified Name</em>' attribute.
+     * @see #setPatternQualifiedName(String)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getMatchSetRecord_PatternQualifiedName()
+     * @model
+     * @generated
+     */
+    String getPatternQualifiedName();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getPatternQualifiedName <em>Pattern Qualified Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pattern Qualified Name</em>' attribute.
-	 * @see #getPatternQualifiedName()
-	 * @generated
-	 */
-	void setPatternQualifiedName(String value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getPatternQualifiedName <em>Pattern Qualified Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Pattern Qualified Name</em>' attribute.
+     * @see #getPatternQualifiedName()
+     * @generated
+     */
+    void setPatternQualifiedName(String value);
 
-	/**
-	 * Returns the value of the '<em><b>Matches</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.viatra.query.testing.snapshot.MatchRecord}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Matches</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Matches</em>' containment reference list.
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getMatchSetRecord_Matches()
-	 * @model containment="true" ordered="false"
-	 * @generated
-	 */
-	EList<MatchRecord> getMatches();
+    /**
+     * Returns the value of the '<em><b>Matches</b></em>' containment reference list.
+     * The list contents are of type {@link org.eclipse.viatra.query.testing.snapshot.MatchRecord}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Matches</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Matches</em>' containment reference list.
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getMatchSetRecord_Matches()
+     * @model containment="true" ordered="false"
+     * @generated
+     */
+    EList<MatchRecord> getMatches();
 
-	/**
-	 * Returns the value of the '<em><b>Filter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Filter</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Filter</em>' containment reference.
-	 * @see #setFilter(MatchRecord)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getMatchSetRecord_Filter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MatchRecord getFilter();
+    /**
+     * Returns the value of the '<em><b>Filter</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Filter</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Filter</em>' containment reference.
+     * @see #setFilter(MatchRecord)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getMatchSetRecord_Filter()
+     * @model containment="true"
+     * @generated
+     */
+    MatchRecord getFilter();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getFilter <em>Filter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Filter</em>' containment reference.
-	 * @see #getFilter()
-	 * @generated
-	 */
-	void setFilter(MatchRecord value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getFilter <em>Filter</em>}' containment reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Filter</em>' containment reference.
+     * @see #getFilter()
+     * @generated
+     */
+    void setFilter(MatchRecord value);
 
 } // MatchSetRecord
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MatchSubstitutionRecord.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MatchSubstitutionRecord.java
index 7e851fa9ed..5cead7a697 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MatchSubstitutionRecord.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MatchSubstitutionRecord.java
@@ -21,30 +21,30 @@
  * @generated
  */
 public interface MatchSubstitutionRecord extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Parameter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parameter Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parameter Name</em>' attribute.
-	 * @see #setParameterName(String)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getMatchSubstitutionRecord_ParameterName()
-	 * @model
-	 * @generated
-	 */
-	String getParameterName();
+    /**
+     * Returns the value of the '<em><b>Parameter Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Parameter Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Parameter Name</em>' attribute.
+     * @see #setParameterName(String)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getMatchSubstitutionRecord_ParameterName()
+     * @model
+     * @generated
+     */
+    String getParameterName();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord#getParameterName <em>Parameter Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parameter Name</em>' attribute.
-	 * @see #getParameterName()
-	 * @generated
-	 */
-	void setParameterName(String value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord#getParameterName <em>Parameter Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Parameter Name</em>' attribute.
+     * @see #getParameterName()
+     * @generated
+     */
+    void setParameterName(String value);
 
 } // MatchSubstitutionRecord
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MiscellaneousSubstitution.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MiscellaneousSubstitution.java
index bb0e6d9ad1..384cde1f77 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MiscellaneousSubstitution.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/MiscellaneousSubstitution.java
@@ -20,30 +20,30 @@
  * @generated
  */
 public interface MiscellaneousSubstitution extends MatchSubstitutionRecord {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(Object)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getMiscellaneousSubstitution_Value()
-	 * @model
-	 * @generated
-	 */
-	Object getValue();
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' attribute.
+     * @see #setValue(Object)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getMiscellaneousSubstitution_Value()
+     * @model
+     * @generated
+     */
+    Object getValue();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(Object value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution#getValue <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value</em>' attribute.
+     * @see #getValue()
+     * @generated
+     */
+    void setValue(Object value);
 
 } // MiscellaneousSubstitution
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/QuerySnapshot.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/QuerySnapshot.java
index 30ec894b86..4d7d3bbef8 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/QuerySnapshot.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/QuerySnapshot.java
@@ -25,65 +25,65 @@
  * @generated
  */
 public interface QuerySnapshot extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Match Set Records</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Match Set Records</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Match Set Records</em>' containment reference list.
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getQuerySnapshot_MatchSetRecords()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<MatchSetRecord> getMatchSetRecords();
+    /**
+     * Returns the value of the '<em><b>Match Set Records</b></em>' containment reference list.
+     * The list contents are of type {@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Match Set Records</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Match Set Records</em>' containment reference list.
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getQuerySnapshot_MatchSetRecords()
+     * @model containment="true"
+     * @generated
+     */
+    EList<MatchSetRecord> getMatchSetRecords();
 
-	/**
-	 * Returns the value of the '<em><b>Model Roots</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Model Roots</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Model Roots</em>' reference list.
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getQuerySnapshot_ModelRoots()
-	 * @model
-	 * @generated
-	 */
-	EList<EObject> getModelRoots();
+    /**
+     * Returns the value of the '<em><b>Model Roots</b></em>' reference list.
+     * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Model Roots</em>' reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Model Roots</em>' reference list.
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getQuerySnapshot_ModelRoots()
+     * @model
+     * @generated
+     */
+    EList<EObject> getModelRoots();
 
-	/**
-	 * Returns the value of the '<em><b>Input Specification</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.viatra.query.testing.snapshot.InputSpecification}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Input Specification</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Input Specification</em>' attribute.
-	 * @see org.eclipse.viatra.query.testing.snapshot.InputSpecification
-	 * @see #setInputSpecification(InputSpecification)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getQuerySnapshot_InputSpecification()
-	 * @model
-	 * @generated
-	 */
-	InputSpecification getInputSpecification();
+    /**
+     * Returns the value of the '<em><b>Input Specification</b></em>' attribute.
+     * The literals are from the enumeration {@link org.eclipse.viatra.query.testing.snapshot.InputSpecification}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Input Specification</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Input Specification</em>' attribute.
+     * @see org.eclipse.viatra.query.testing.snapshot.InputSpecification
+     * @see #setInputSpecification(InputSpecification)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getQuerySnapshot_InputSpecification()
+     * @model
+     * @generated
+     */
+    InputSpecification getInputSpecification();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.QuerySnapshot#getInputSpecification <em>Input Specification</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Input Specification</em>' attribute.
-	 * @see org.eclipse.viatra.query.testing.snapshot.InputSpecification
-	 * @see #getInputSpecification()
-	 * @generated
-	 */
-	void setInputSpecification(InputSpecification value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.QuerySnapshot#getInputSpecification <em>Input Specification</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Input Specification</em>' attribute.
+     * @see org.eclipse.viatra.query.testing.snapshot.InputSpecification
+     * @see #getInputSpecification()
+     * @generated
+     */
+    void setInputSpecification(InputSpecification value);
 
 } // QuerySnapshot
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/RecordRole.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/RecordRole.java
index 81a1c815e4..723a1cc1dc 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/RecordRole.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/RecordRole.java
@@ -18,197 +18,197 @@
  * @generated
  */
 public enum RecordRole implements Enumerator {
-	/**
-	 * The '<em><b>Match</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MATCH_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	MATCH(0, "Match", "Match"),
-
-	/**
-	 * The '<em><b>Filter</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FILTER_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	FILTER(1, "Filter", "Filter");
-
-	/**
-	 * The '<em><b>Match</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Match</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MATCH
-	 * @model name="Match"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MATCH_VALUE = 0;
-
-	/**
-	 * The '<em><b>Filter</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Filter</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FILTER
-	 * @model name="Filter"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FILTER_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Record Role</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final RecordRole[] VALUES_ARRAY =
-		new RecordRole[] {
-			MATCH,
-			FILTER,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Record Role</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<RecordRole> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Record Role</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static RecordRole get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			RecordRole result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Record Role</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static RecordRole getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			RecordRole result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Record Role</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static RecordRole get(int value) {
-		switch (value) {
-			case MATCH_VALUE: return MATCH;
-			case FILTER_VALUE: return FILTER;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private RecordRole(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
+    /**
+     * The '<em><b>Match</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #MATCH_VALUE
+     * @generated
+     * @ordered
+     */
+    MATCH(0, "Match", "Match"),
+
+    /**
+     * The '<em><b>Filter</b></em>' literal object.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #FILTER_VALUE
+     * @generated
+     * @ordered
+     */
+    FILTER(1, "Filter", "Filter");
+
+    /**
+     * The '<em><b>Match</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Match</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #MATCH
+     * @model name="Match"
+     * @generated
+     * @ordered
+     */
+    public static final int MATCH_VALUE = 0;
+
+    /**
+     * The '<em><b>Filter</b></em>' literal value.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of '<em><b>Filter</b></em>' literal object isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @see #FILTER
+     * @model name="Filter"
+     * @generated
+     * @ordered
+     */
+    public static final int FILTER_VALUE = 1;
+
+    /**
+     * An array of all the '<em><b>Record Role</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private static final RecordRole[] VALUES_ARRAY =
+        new RecordRole[] {
+            MATCH,
+            FILTER,
+        };
+
+    /**
+     * A public read-only list of all the '<em><b>Record Role</b></em>' enumerators.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final List<RecordRole> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+    /**
+     * Returns the '<em><b>Record Role</b></em>' literal with the specified literal value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param literal the literal.
+     * @return the matching enumerator or <code>null</code>.
+     * @generated
+     */
+    public static RecordRole get(String literal) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            RecordRole result = VALUES_ARRAY[i];
+            if (result.toString().equals(literal)) {
+                return result;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns the '<em><b>Record Role</b></em>' literal with the specified name.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param name the name.
+     * @return the matching enumerator or <code>null</code>.
+     * @generated
+     */
+    public static RecordRole getByName(String name) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            RecordRole result = VALUES_ARRAY[i];
+            if (result.getName().equals(name)) {
+                return result;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns the '<em><b>Record Role</b></em>' literal with the specified integer value.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the integer value.
+     * @return the matching enumerator or <code>null</code>.
+     * @generated
+     */
+    public static RecordRole get(int value) {
+        switch (value) {
+            case MATCH_VALUE: return MATCH;
+            case FILTER_VALUE: return FILTER;
+        }
+        return null;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final int value;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String name;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private final String literal;
+
+    /**
+     * Only this class can construct instances.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private RecordRole(int value, String name, String literal) {
+        this.value = value;
+        this.name = name;
+        this.literal = literal;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public int getValue() {
+      return value;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+      return name;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getLiteral() {
+      return literal;
+    }
+
+    /**
+     * Returns the literal value of the enumerator, which is its string representation.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        return literal;
+    }
+    
 } //RecordRole
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/SerializedJavaObjectSubstitution.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/SerializedJavaObjectSubstitution.java
new file mode 100644
index 0000000000..0d7f11b83f
--- /dev/null
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/SerializedJavaObjectSubstitution.java
@@ -0,0 +1,76 @@
+/**
+ */
+package org.eclipse.viatra.query.testing.snapshot;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Serialized Java Object Substitution</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution#getType <em>Type</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getSerializedJavaObjectSubstitution()
+ * @model
+ * @generated
+ */
+public interface SerializedJavaObjectSubstitution extends MatchSubstitutionRecord {
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' attribute.
+     * @see #setValue(String)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getSerializedJavaObjectSubstitution_Value()
+     * @model
+     * @generated
+     */
+    String getValue();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution#getValue <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value</em>' attribute.
+     * @see #getValue()
+     * @generated
+     */
+    void setValue(String value);
+
+    /**
+     * Returns the value of the '<em><b>Type</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Type</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Type</em>' attribute.
+     * @see #setType(String)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getSerializedJavaObjectSubstitution_Type()
+     * @model
+     * @generated
+     */
+    String getType();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution#getType <em>Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Type</em>' attribute.
+     * @see #getType()
+     * @generated
+     */
+    void setType(String value);
+
+} // SerializedJavaObjectSubstitution
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/SnapshotFactory.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/SnapshotFactory.java
index 76e297a166..f73a6e9991 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/SnapshotFactory.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/SnapshotFactory.java
@@ -13,138 +13,147 @@
  * @generated
  */
 public interface SnapshotFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	SnapshotFactory eINSTANCE = org.eclipse.viatra.query.testing.snapshot.impl.SnapshotFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Match Set Record</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Match Set Record</em>'.
-	 * @generated
-	 */
-	MatchSetRecord createMatchSetRecord();
-
-	/**
-	 * Returns a new object of class '<em>Match Record</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Match Record</em>'.
-	 * @generated
-	 */
-	MatchRecord createMatchRecord();
-
-	/**
-	 * Returns a new object of class '<em>EMF Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>EMF Substitution</em>'.
-	 * @generated
-	 */
-	EMFSubstitution createEMFSubstitution();
-
-	/**
-	 * Returns a new object of class '<em>Int Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Int Substitution</em>'.
-	 * @generated
-	 */
-	IntSubstitution createIntSubstitution();
-
-	/**
-	 * Returns a new object of class '<em>Long Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Long Substitution</em>'.
-	 * @generated
-	 */
-	LongSubstitution createLongSubstitution();
-
-	/**
-	 * Returns a new object of class '<em>Double Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Double Substitution</em>'.
-	 * @generated
-	 */
-	DoubleSubstitution createDoubleSubstitution();
-
-	/**
-	 * Returns a new object of class '<em>Float Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Float Substitution</em>'.
-	 * @generated
-	 */
-	FloatSubstitution createFloatSubstitution();
-
-	/**
-	 * Returns a new object of class '<em>Boolean Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Boolean Substitution</em>'.
-	 * @generated
-	 */
-	BooleanSubstitution createBooleanSubstitution();
-
-	/**
-	 * Returns a new object of class '<em>String Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>String Substitution</em>'.
-	 * @generated
-	 */
-	StringSubstitution createStringSubstitution();
-
-	/**
-	 * Returns a new object of class '<em>Date Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Date Substitution</em>'.
-	 * @generated
-	 */
-	DateSubstitution createDateSubstitution();
-
-	/**
-	 * Returns a new object of class '<em>Enum Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Enum Substitution</em>'.
-	 * @generated
-	 */
-	EnumSubstitution createEnumSubstitution();
-
-	/**
-	 * Returns a new object of class '<em>Miscellaneous Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Miscellaneous Substitution</em>'.
-	 * @generated
-	 */
-	MiscellaneousSubstitution createMiscellaneousSubstitution();
-
-	/**
-	 * Returns a new object of class '<em>Query Snapshot</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Query Snapshot</em>'.
-	 * @generated
-	 */
-	QuerySnapshot createQuerySnapshot();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	SnapshotPackage getSnapshotPackage();
+    /**
+     * The singleton instance of the factory.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    SnapshotFactory eINSTANCE = org.eclipse.viatra.query.testing.snapshot.impl.SnapshotFactoryImpl.init();
+
+    /**
+     * Returns a new object of class '<em>Match Set Record</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Match Set Record</em>'.
+     * @generated
+     */
+    MatchSetRecord createMatchSetRecord();
+
+    /**
+     * Returns a new object of class '<em>Match Record</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Match Record</em>'.
+     * @generated
+     */
+    MatchRecord createMatchRecord();
+
+    /**
+     * Returns a new object of class '<em>EMF Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>EMF Substitution</em>'.
+     * @generated
+     */
+    EMFSubstitution createEMFSubstitution();
+
+    /**
+     * Returns a new object of class '<em>Int Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Int Substitution</em>'.
+     * @generated
+     */
+    IntSubstitution createIntSubstitution();
+
+    /**
+     * Returns a new object of class '<em>Long Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Long Substitution</em>'.
+     * @generated
+     */
+    LongSubstitution createLongSubstitution();
+
+    /**
+     * Returns a new object of class '<em>Double Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Double Substitution</em>'.
+     * @generated
+     */
+    DoubleSubstitution createDoubleSubstitution();
+
+    /**
+     * Returns a new object of class '<em>Float Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Float Substitution</em>'.
+     * @generated
+     */
+    FloatSubstitution createFloatSubstitution();
+
+    /**
+     * Returns a new object of class '<em>Boolean Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Boolean Substitution</em>'.
+     * @generated
+     */
+    BooleanSubstitution createBooleanSubstitution();
+
+    /**
+     * Returns a new object of class '<em>String Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>String Substitution</em>'.
+     * @generated
+     */
+    StringSubstitution createStringSubstitution();
+
+    /**
+     * Returns a new object of class '<em>Date Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Date Substitution</em>'.
+     * @generated
+     */
+    DateSubstitution createDateSubstitution();
+
+    /**
+     * Returns a new object of class '<em>Enum Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Enum Substitution</em>'.
+     * @generated
+     */
+    EnumSubstitution createEnumSubstitution();
+
+    /**
+     * Returns a new object of class '<em>Miscellaneous Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Miscellaneous Substitution</em>'.
+     * @generated
+     */
+    MiscellaneousSubstitution createMiscellaneousSubstitution();
+
+    /**
+     * Returns a new object of class '<em>Query Snapshot</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Query Snapshot</em>'.
+     * @generated
+     */
+    QuerySnapshot createQuerySnapshot();
+
+    /**
+     * Returns a new object of class '<em>Serialized Java Object Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Serialized Java Object Substitution</em>'.
+     * @generated
+     */
+    SerializedJavaObjectSubstitution createSerializedJavaObjectSubstitution();
+
+    /**
+     * Returns the package supported by this factory.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the package supported by this factory.
+     * @generated
+     */
+    SnapshotPackage getSnapshotPackage();
 
 } //SnapshotFactory
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/SnapshotPackage.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/SnapshotPackage.java
index 8bfc9b966f..745abae741 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/SnapshotPackage.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/SnapshotPackage.java
@@ -25,1416 +25,1529 @@
  * @generated
  */
 public interface SnapshotPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "snapshot";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/viatra/query/snapshot";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "vqSnapshot";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	SnapshotPackage eINSTANCE = org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MatchSetRecordImpl <em>Match Set Record</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.MatchSetRecordImpl
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMatchSetRecord()
-	 * @generated
-	 */
-	int MATCH_SET_RECORD = 0;
-
-	/**
-	 * The feature id for the '<em><b>Pattern Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Matches</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCH_SET_RECORD__MATCHES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Filter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCH_SET_RECORD__FILTER = 2;
-
-	/**
-	 * The number of structural features of the '<em>Match Set Record</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCH_SET_RECORD_FEATURE_COUNT = 3;
-
-	/**
-	 * The number of operations of the '<em>Match Set Record</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCH_SET_RECORD_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MatchRecordImpl <em>Match Record</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.MatchRecordImpl
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMatchRecord()
-	 * @generated
-	 */
-	int MATCH_RECORD = 1;
-
-	/**
-	 * The feature id for the '<em><b>Substitutions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCH_RECORD__SUBSTITUTIONS = 0;
-
-	/**
-	 * The number of structural features of the '<em>Match Record</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCH_RECORD_FEATURE_COUNT = 1;
-
-	/**
-	 * The number of operations of the '<em>Match Record</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCH_RECORD_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MatchSubstitutionRecordImpl <em>Match Substitution Record</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.MatchSubstitutionRecordImpl
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMatchSubstitutionRecord()
-	 * @generated
-	 */
-	int MATCH_SUBSTITUTION_RECORD = 2;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Match Substitution Record</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT = 1;
-
-	/**
-	 * The number of operations of the '<em>Match Substitution Record</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.EMFSubstitutionImpl <em>EMF Substitution</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.EMFSubstitutionImpl
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getEMFSubstitution()
-	 * @generated
-	 */
-	int EMF_SUBSTITUTION = 3;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>EMF Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>EMF Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.IntSubstitutionImpl <em>Int Substitution</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.IntSubstitutionImpl
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getIntSubstitution()
-	 * @generated
-	 */
-	int INT_SUBSTITUTION = 4;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INT_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INT_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Int Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INT_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Int Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INT_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.LongSubstitutionImpl <em>Long Substitution</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.LongSubstitutionImpl
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getLongSubstitution()
-	 * @generated
-	 */
-	int LONG_SUBSTITUTION = 5;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LONG_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LONG_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Long Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LONG_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Long Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LONG_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.DoubleSubstitutionImpl <em>Double Substitution</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.DoubleSubstitutionImpl
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getDoubleSubstitution()
-	 * @generated
-	 */
-	int DOUBLE_SUBSTITUTION = 6;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOUBLE_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOUBLE_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Double Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOUBLE_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Double Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOUBLE_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.FloatSubstitutionImpl <em>Float Substitution</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.FloatSubstitutionImpl
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getFloatSubstitution()
-	 * @generated
-	 */
-	int FLOAT_SUBSTITUTION = 7;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOAT_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOAT_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Float Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOAT_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Float Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOAT_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.BooleanSubstitutionImpl <em>Boolean Substitution</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.BooleanSubstitutionImpl
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getBooleanSubstitution()
-	 * @generated
-	 */
-	int BOOLEAN_SUBSTITUTION = 8;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BOOLEAN_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BOOLEAN_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Boolean Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BOOLEAN_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Boolean Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BOOLEAN_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.StringSubstitutionImpl <em>String Substitution</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.StringSubstitutionImpl
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getStringSubstitution()
-	 * @generated
-	 */
-	int STRING_SUBSTITUTION = 9;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRING_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRING_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>String Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRING_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>String Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRING_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.DateSubstitutionImpl <em>Date Substitution</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.DateSubstitutionImpl
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getDateSubstitution()
-	 * @generated
-	 */
-	int DATE_SUBSTITUTION = 10;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATE_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATE_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Date Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATE_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Date Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATE_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.EnumSubstitutionImpl <em>Enum Substitution</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.EnumSubstitutionImpl
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getEnumSubstitution()
-	 * @generated
-	 */
-	int ENUM_SUBSTITUTION = 11;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENUM_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Value Literal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENUM_SUBSTITUTION__VALUE_LITERAL = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Enum Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENUM_SUBSTITUTION__ENUM_TYPE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Enum Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENUM_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of operations of the '<em>Enum Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENUM_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MiscellaneousSubstitutionImpl <em>Miscellaneous Substitution</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.MiscellaneousSubstitutionImpl
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMiscellaneousSubstitution()
-	 * @generated
-	 */
-	int MISCELLANEOUS_SUBSTITUTION = 12;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MISCELLANEOUS_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MISCELLANEOUS_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Miscellaneous Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MISCELLANEOUS_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Miscellaneous Substitution</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MISCELLANEOUS_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.QuerySnapshotImpl <em>Query Snapshot</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.QuerySnapshotImpl
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getQuerySnapshot()
-	 * @generated
-	 */
-	int QUERY_SNAPSHOT = 13;
-
-	/**
-	 * The feature id for the '<em><b>Match Set Records</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_SNAPSHOT__MATCH_SET_RECORDS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Model Roots</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_SNAPSHOT__MODEL_ROOTS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Input Specification</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_SNAPSHOT__INPUT_SPECIFICATION = 2;
-
-	/**
-	 * The number of structural features of the '<em>Query Snapshot</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_SNAPSHOT_FEATURE_COUNT = 3;
-
-	/**
-	 * The number of operations of the '<em>Query Snapshot</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_SNAPSHOT_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.InputSpecification <em>Input Specification</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.InputSpecification
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getInputSpecification()
-	 * @generated
-	 */
-	int INPUT_SPECIFICATION = 14;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.RecordRole <em>Record Role</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.viatra.query.testing.snapshot.RecordRole
-	 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getRecordRole()
-	 * @generated
-	 */
-	int RECORD_ROLE = 15;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord <em>Match Set Record</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Match Set Record</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.MatchSetRecord
-	 * @generated
-	 */
-	EClass getMatchSetRecord();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getPatternQualifiedName <em>Pattern Qualified Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Pattern Qualified Name</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getPatternQualifiedName()
-	 * @see #getMatchSetRecord()
-	 * @generated
-	 */
-	EAttribute getMatchSetRecord_PatternQualifiedName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getMatches <em>Matches</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Matches</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getMatches()
-	 * @see #getMatchSetRecord()
-	 * @generated
-	 */
-	EReference getMatchSetRecord_Matches();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getFilter <em>Filter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Filter</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getFilter()
-	 * @see #getMatchSetRecord()
-	 * @generated
-	 */
-	EReference getMatchSetRecord_Filter();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.MatchRecord <em>Match Record</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Match Record</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.MatchRecord
-	 * @generated
-	 */
-	EClass getMatchRecord();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.query.testing.snapshot.MatchRecord#getSubstitutions <em>Substitutions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Substitutions</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.MatchRecord#getSubstitutions()
-	 * @see #getMatchRecord()
-	 * @generated
-	 */
-	EReference getMatchRecord_Substitutions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord <em>Match Substitution Record</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Match Substitution Record</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord
-	 * @generated
-	 */
-	EClass getMatchSubstitutionRecord();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord#getParameterName <em>Parameter Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Parameter Name</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord#getParameterName()
-	 * @see #getMatchSubstitutionRecord()
-	 * @generated
-	 */
-	EAttribute getMatchSubstitutionRecord_ParameterName();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.EMFSubstitution <em>EMF Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>EMF Substitution</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.EMFSubstitution
-	 * @generated
-	 */
-	EClass getEMFSubstitution();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.viatra.query.testing.snapshot.EMFSubstitution#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Value</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.EMFSubstitution#getValue()
-	 * @see #getEMFSubstitution()
-	 * @generated
-	 */
-	EReference getEMFSubstitution_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.IntSubstitution <em>Int Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Int Substitution</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.IntSubstitution
-	 * @generated
-	 */
-	EClass getIntSubstitution();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.IntSubstitution#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.IntSubstitution#getValue()
-	 * @see #getIntSubstitution()
-	 * @generated
-	 */
-	EAttribute getIntSubstitution_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.LongSubstitution <em>Long Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Long Substitution</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.LongSubstitution
-	 * @generated
-	 */
-	EClass getLongSubstitution();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.LongSubstitution#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.LongSubstitution#getValue()
-	 * @see #getLongSubstitution()
-	 * @generated
-	 */
-	EAttribute getLongSubstitution_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution <em>Double Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Double Substitution</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution
-	 * @generated
-	 */
-	EClass getDoubleSubstitution();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution#getValue()
-	 * @see #getDoubleSubstitution()
-	 * @generated
-	 */
-	EAttribute getDoubleSubstitution_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.FloatSubstitution <em>Float Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Float Substitution</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.FloatSubstitution
-	 * @generated
-	 */
-	EClass getFloatSubstitution();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.FloatSubstitution#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.FloatSubstitution#getValue()
-	 * @see #getFloatSubstitution()
-	 * @generated
-	 */
-	EAttribute getFloatSubstitution_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution <em>Boolean Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Boolean Substitution</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution
-	 * @generated
-	 */
-	EClass getBooleanSubstitution();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution#isValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution#isValue()
-	 * @see #getBooleanSubstitution()
-	 * @generated
-	 */
-	EAttribute getBooleanSubstitution_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.StringSubstitution <em>String Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>String Substitution</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.StringSubstitution
-	 * @generated
-	 */
-	EClass getStringSubstitution();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.StringSubstitution#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.StringSubstitution#getValue()
-	 * @see #getStringSubstitution()
-	 * @generated
-	 */
-	EAttribute getStringSubstitution_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.DateSubstitution <em>Date Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Date Substitution</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.DateSubstitution
-	 * @generated
-	 */
-	EClass getDateSubstitution();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.DateSubstitution#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.DateSubstitution#getValue()
-	 * @see #getDateSubstitution()
-	 * @generated
-	 */
-	EAttribute getDateSubstitution_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.EnumSubstitution <em>Enum Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Enum Substitution</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.EnumSubstitution
-	 * @generated
-	 */
-	EClass getEnumSubstitution();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.EnumSubstitution#getValueLiteral <em>Value Literal</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value Literal</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.EnumSubstitution#getValueLiteral()
-	 * @see #getEnumSubstitution()
-	 * @generated
-	 */
-	EAttribute getEnumSubstitution_ValueLiteral();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.viatra.query.testing.snapshot.EnumSubstitution#getEnumType <em>Enum Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Enum Type</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.EnumSubstitution#getEnumType()
-	 * @see #getEnumSubstitution()
-	 * @generated
-	 */
-	EReference getEnumSubstitution_EnumType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution <em>Miscellaneous Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Miscellaneous Substitution</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution
-	 * @generated
-	 */
-	EClass getMiscellaneousSubstitution();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution#getValue()
-	 * @see #getMiscellaneousSubstitution()
-	 * @generated
-	 */
-	EAttribute getMiscellaneousSubstitution_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.QuerySnapshot <em>Query Snapshot</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Query Snapshot</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.QuerySnapshot
-	 * @generated
-	 */
-	EClass getQuerySnapshot();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.query.testing.snapshot.QuerySnapshot#getMatchSetRecords <em>Match Set Records</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Match Set Records</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.QuerySnapshot#getMatchSetRecords()
-	 * @see #getQuerySnapshot()
-	 * @generated
-	 */
-	EReference getQuerySnapshot_MatchSetRecords();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.viatra.query.testing.snapshot.QuerySnapshot#getModelRoots <em>Model Roots</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Model Roots</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.QuerySnapshot#getModelRoots()
-	 * @see #getQuerySnapshot()
-	 * @generated
-	 */
-	EReference getQuerySnapshot_ModelRoots();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.QuerySnapshot#getInputSpecification <em>Input Specification</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Input Specification</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.QuerySnapshot#getInputSpecification()
-	 * @see #getQuerySnapshot()
-	 * @generated
-	 */
-	EAttribute getQuerySnapshot_InputSpecification();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.viatra.query.testing.snapshot.InputSpecification <em>Input Specification</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Input Specification</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.InputSpecification
-	 * @generated
-	 */
-	EEnum getInputSpecification();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.viatra.query.testing.snapshot.RecordRole <em>Record Role</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Record Role</em>'.
-	 * @see org.eclipse.viatra.query.testing.snapshot.RecordRole
-	 * @generated
-	 */
-	EEnum getRecordRole();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	SnapshotFactory getSnapshotFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MatchSetRecordImpl <em>Match Set Record</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.MatchSetRecordImpl
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMatchSetRecord()
-		 * @generated
-		 */
-		EClass MATCH_SET_RECORD = eINSTANCE.getMatchSetRecord();
-
-		/**
-		 * The meta object literal for the '<em><b>Pattern Qualified Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME = eINSTANCE.getMatchSetRecord_PatternQualifiedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Matches</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MATCH_SET_RECORD__MATCHES = eINSTANCE.getMatchSetRecord_Matches();
-
-		/**
-		 * The meta object literal for the '<em><b>Filter</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MATCH_SET_RECORD__FILTER = eINSTANCE.getMatchSetRecord_Filter();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MatchRecordImpl <em>Match Record</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.MatchRecordImpl
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMatchRecord()
-		 * @generated
-		 */
-		EClass MATCH_RECORD = eINSTANCE.getMatchRecord();
-
-		/**
-		 * The meta object literal for the '<em><b>Substitutions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MATCH_RECORD__SUBSTITUTIONS = eINSTANCE.getMatchRecord_Substitutions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MatchSubstitutionRecordImpl <em>Match Substitution Record</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.MatchSubstitutionRecordImpl
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMatchSubstitutionRecord()
-		 * @generated
-		 */
-		EClass MATCH_SUBSTITUTION_RECORD = eINSTANCE.getMatchSubstitutionRecord();
-
-		/**
-		 * The meta object literal for the '<em><b>Parameter Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME = eINSTANCE.getMatchSubstitutionRecord_ParameterName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.EMFSubstitutionImpl <em>EMF Substitution</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.EMFSubstitutionImpl
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getEMFSubstitution()
-		 * @generated
-		 */
-		EClass EMF_SUBSTITUTION = eINSTANCE.getEMFSubstitution();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EMF_SUBSTITUTION__VALUE = eINSTANCE.getEMFSubstitution_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.IntSubstitutionImpl <em>Int Substitution</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.IntSubstitutionImpl
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getIntSubstitution()
-		 * @generated
-		 */
-		EClass INT_SUBSTITUTION = eINSTANCE.getIntSubstitution();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INT_SUBSTITUTION__VALUE = eINSTANCE.getIntSubstitution_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.LongSubstitutionImpl <em>Long Substitution</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.LongSubstitutionImpl
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getLongSubstitution()
-		 * @generated
-		 */
-		EClass LONG_SUBSTITUTION = eINSTANCE.getLongSubstitution();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LONG_SUBSTITUTION__VALUE = eINSTANCE.getLongSubstitution_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.DoubleSubstitutionImpl <em>Double Substitution</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.DoubleSubstitutionImpl
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getDoubleSubstitution()
-		 * @generated
-		 */
-		EClass DOUBLE_SUBSTITUTION = eINSTANCE.getDoubleSubstitution();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DOUBLE_SUBSTITUTION__VALUE = eINSTANCE.getDoubleSubstitution_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.FloatSubstitutionImpl <em>Float Substitution</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.FloatSubstitutionImpl
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getFloatSubstitution()
-		 * @generated
-		 */
-		EClass FLOAT_SUBSTITUTION = eINSTANCE.getFloatSubstitution();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FLOAT_SUBSTITUTION__VALUE = eINSTANCE.getFloatSubstitution_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.BooleanSubstitutionImpl <em>Boolean Substitution</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.BooleanSubstitutionImpl
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getBooleanSubstitution()
-		 * @generated
-		 */
-		EClass BOOLEAN_SUBSTITUTION = eINSTANCE.getBooleanSubstitution();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute BOOLEAN_SUBSTITUTION__VALUE = eINSTANCE.getBooleanSubstitution_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.StringSubstitutionImpl <em>String Substitution</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.StringSubstitutionImpl
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getStringSubstitution()
-		 * @generated
-		 */
-		EClass STRING_SUBSTITUTION = eINSTANCE.getStringSubstitution();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute STRING_SUBSTITUTION__VALUE = eINSTANCE.getStringSubstitution_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.DateSubstitutionImpl <em>Date Substitution</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.DateSubstitutionImpl
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getDateSubstitution()
-		 * @generated
-		 */
-		EClass DATE_SUBSTITUTION = eINSTANCE.getDateSubstitution();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DATE_SUBSTITUTION__VALUE = eINSTANCE.getDateSubstitution_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.EnumSubstitutionImpl <em>Enum Substitution</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.EnumSubstitutionImpl
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getEnumSubstitution()
-		 * @generated
-		 */
-		EClass ENUM_SUBSTITUTION = eINSTANCE.getEnumSubstitution();
-
-		/**
-		 * The meta object literal for the '<em><b>Value Literal</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENUM_SUBSTITUTION__VALUE_LITERAL = eINSTANCE.getEnumSubstitution_ValueLiteral();
-
-		/**
-		 * The meta object literal for the '<em><b>Enum Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ENUM_SUBSTITUTION__ENUM_TYPE = eINSTANCE.getEnumSubstitution_EnumType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MiscellaneousSubstitutionImpl <em>Miscellaneous Substitution</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.MiscellaneousSubstitutionImpl
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMiscellaneousSubstitution()
-		 * @generated
-		 */
-		EClass MISCELLANEOUS_SUBSTITUTION = eINSTANCE.getMiscellaneousSubstitution();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MISCELLANEOUS_SUBSTITUTION__VALUE = eINSTANCE.getMiscellaneousSubstitution_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.QuerySnapshotImpl <em>Query Snapshot</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.QuerySnapshotImpl
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getQuerySnapshot()
-		 * @generated
-		 */
-		EClass QUERY_SNAPSHOT = eINSTANCE.getQuerySnapshot();
-
-		/**
-		 * The meta object literal for the '<em><b>Match Set Records</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference QUERY_SNAPSHOT__MATCH_SET_RECORDS = eINSTANCE.getQuerySnapshot_MatchSetRecords();
-
-		/**
-		 * The meta object literal for the '<em><b>Model Roots</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference QUERY_SNAPSHOT__MODEL_ROOTS = eINSTANCE.getQuerySnapshot_ModelRoots();
-
-		/**
-		 * The meta object literal for the '<em><b>Input Specification</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute QUERY_SNAPSHOT__INPUT_SPECIFICATION = eINSTANCE.getQuerySnapshot_InputSpecification();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.InputSpecification <em>Input Specification</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.InputSpecification
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getInputSpecification()
-		 * @generated
-		 */
-		EEnum INPUT_SPECIFICATION = eINSTANCE.getInputSpecification();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.RecordRole <em>Record Role</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.viatra.query.testing.snapshot.RecordRole
-		 * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getRecordRole()
-		 * @generated
-		 */
-		EEnum RECORD_ROLE = eINSTANCE.getRecordRole();
-
-	}
+    /**
+     * The package name.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    String eNAME = "snapshot";
+
+    /**
+     * The package namespace URI.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    String eNS_URI = "http://www.eclipse.org/viatra/query/snapshot";
+
+    /**
+     * The package namespace name.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    String eNS_PREFIX = "vqSnapshot";
+
+    /**
+     * The singleton instance of the package.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    SnapshotPackage eINSTANCE = org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl.init();
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MatchSetRecordImpl <em>Match Set Record</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.MatchSetRecordImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMatchSetRecord()
+     * @generated
+     */
+    int MATCH_SET_RECORD = 0;
+
+    /**
+     * The feature id for the '<em><b>Pattern Qualified Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME = 0;
+
+    /**
+     * The feature id for the '<em><b>Matches</b></em>' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MATCH_SET_RECORD__MATCHES = 1;
+
+    /**
+     * The feature id for the '<em><b>Filter</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MATCH_SET_RECORD__FILTER = 2;
+
+    /**
+     * The number of structural features of the '<em>Match Set Record</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MATCH_SET_RECORD_FEATURE_COUNT = 3;
+
+    /**
+     * The number of operations of the '<em>Match Set Record</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MATCH_SET_RECORD_OPERATION_COUNT = 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MatchRecordImpl <em>Match Record</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.MatchRecordImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMatchRecord()
+     * @generated
+     */
+    int MATCH_RECORD = 1;
+
+    /**
+     * The feature id for the '<em><b>Substitutions</b></em>' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MATCH_RECORD__SUBSTITUTIONS = 0;
+
+    /**
+     * The number of structural features of the '<em>Match Record</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MATCH_RECORD_FEATURE_COUNT = 1;
+
+    /**
+     * The number of operations of the '<em>Match Record</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MATCH_RECORD_OPERATION_COUNT = 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MatchSubstitutionRecordImpl <em>Match Substitution Record</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.MatchSubstitutionRecordImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMatchSubstitutionRecord()
+     * @generated
+     */
+    int MATCH_SUBSTITUTION_RECORD = 2;
+
+    /**
+     * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME = 0;
+
+    /**
+     * The number of structural features of the '<em>Match Substitution Record</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT = 1;
+
+    /**
+     * The number of operations of the '<em>Match Substitution Record</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT = 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.EMFSubstitutionImpl <em>EMF Substitution</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.EMFSubstitutionImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getEMFSubstitution()
+     * @generated
+     */
+    int EMF_SUBSTITUTION = 3;
+
+    /**
+     * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int EMF_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
+
+    /**
+     * The feature id for the '<em><b>Value</b></em>' reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int EMF_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '<em>EMF Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int EMF_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
+
+    /**
+     * The number of operations of the '<em>EMF Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int EMF_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.IntSubstitutionImpl <em>Int Substitution</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.IntSubstitutionImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getIntSubstitution()
+     * @generated
+     */
+    int INT_SUBSTITUTION = 4;
+
+    /**
+     * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int INT_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
+
+    /**
+     * The feature id for the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int INT_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '<em>Int Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int INT_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
+
+    /**
+     * The number of operations of the '<em>Int Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int INT_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.LongSubstitutionImpl <em>Long Substitution</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.LongSubstitutionImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getLongSubstitution()
+     * @generated
+     */
+    int LONG_SUBSTITUTION = 5;
+
+    /**
+     * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int LONG_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
+
+    /**
+     * The feature id for the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int LONG_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '<em>Long Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int LONG_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
+
+    /**
+     * The number of operations of the '<em>Long Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int LONG_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.DoubleSubstitutionImpl <em>Double Substitution</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.DoubleSubstitutionImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getDoubleSubstitution()
+     * @generated
+     */
+    int DOUBLE_SUBSTITUTION = 6;
+
+    /**
+     * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int DOUBLE_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
+
+    /**
+     * The feature id for the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int DOUBLE_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '<em>Double Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int DOUBLE_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
+
+    /**
+     * The number of operations of the '<em>Double Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int DOUBLE_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.FloatSubstitutionImpl <em>Float Substitution</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.FloatSubstitutionImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getFloatSubstitution()
+     * @generated
+     */
+    int FLOAT_SUBSTITUTION = 7;
+
+    /**
+     * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int FLOAT_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
+
+    /**
+     * The feature id for the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int FLOAT_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '<em>Float Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int FLOAT_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
+
+    /**
+     * The number of operations of the '<em>Float Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int FLOAT_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.BooleanSubstitutionImpl <em>Boolean Substitution</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.BooleanSubstitutionImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getBooleanSubstitution()
+     * @generated
+     */
+    int BOOLEAN_SUBSTITUTION = 8;
+
+    /**
+     * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int BOOLEAN_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
+
+    /**
+     * The feature id for the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int BOOLEAN_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '<em>Boolean Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int BOOLEAN_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
+
+    /**
+     * The number of operations of the '<em>Boolean Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int BOOLEAN_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.StringSubstitutionImpl <em>String Substitution</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.StringSubstitutionImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getStringSubstitution()
+     * @generated
+     */
+    int STRING_SUBSTITUTION = 9;
+
+    /**
+     * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int STRING_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
+
+    /**
+     * The feature id for the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int STRING_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '<em>String Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int STRING_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
+
+    /**
+     * The number of operations of the '<em>String Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int STRING_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.DateSubstitutionImpl <em>Date Substitution</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.DateSubstitutionImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getDateSubstitution()
+     * @generated
+     */
+    int DATE_SUBSTITUTION = 10;
+
+    /**
+     * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int DATE_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
+
+    /**
+     * The feature id for the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int DATE_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '<em>Date Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int DATE_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
+
+    /**
+     * The number of operations of the '<em>Date Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int DATE_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.EnumSubstitutionImpl <em>Enum Substitution</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.EnumSubstitutionImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getEnumSubstitution()
+     * @generated
+     */
+    int ENUM_SUBSTITUTION = 11;
+
+    /**
+     * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int ENUM_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
+
+    /**
+     * The feature id for the '<em><b>Value Literal</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int ENUM_SUBSTITUTION__VALUE_LITERAL = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
+
+    /**
+     * The feature id for the '<em><b>Enum Type</b></em>' reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int ENUM_SUBSTITUTION__ENUM_TYPE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
+
+    /**
+     * The number of structural features of the '<em>Enum Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int ENUM_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 2;
+
+    /**
+     * The number of operations of the '<em>Enum Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int ENUM_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MiscellaneousSubstitutionImpl <em>Miscellaneous Substitution</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.MiscellaneousSubstitutionImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMiscellaneousSubstitution()
+     * @generated
+     */
+    int MISCELLANEOUS_SUBSTITUTION = 12;
+
+    /**
+     * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MISCELLANEOUS_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
+
+    /**
+     * The feature id for the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MISCELLANEOUS_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '<em>Miscellaneous Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MISCELLANEOUS_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
+
+    /**
+     * The number of operations of the '<em>Miscellaneous Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int MISCELLANEOUS_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.QuerySnapshotImpl <em>Query Snapshot</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.QuerySnapshotImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getQuerySnapshot()
+     * @generated
+     */
+    int QUERY_SNAPSHOT = 13;
+
+    /**
+     * The feature id for the '<em><b>Match Set Records</b></em>' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int QUERY_SNAPSHOT__MATCH_SET_RECORDS = 0;
+
+    /**
+     * The feature id for the '<em><b>Model Roots</b></em>' reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int QUERY_SNAPSHOT__MODEL_ROOTS = 1;
+
+    /**
+     * The feature id for the '<em><b>Input Specification</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int QUERY_SNAPSHOT__INPUT_SPECIFICATION = 2;
+
+    /**
+     * The number of structural features of the '<em>Query Snapshot</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int QUERY_SNAPSHOT_FEATURE_COUNT = 3;
+
+    /**
+     * The number of operations of the '<em>Query Snapshot</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int QUERY_SNAPSHOT_OPERATION_COUNT = 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.SerializedJavaObjectSubstitutionImpl <em>Serialized Java Object Substitution</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SerializedJavaObjectSubstitutionImpl
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getSerializedJavaObjectSubstitution()
+     * @generated
+     */
+    int SERIALIZED_JAVA_OBJECT_SUBSTITUTION = 14;
+
+    /**
+     * The feature id for the '<em><b>Parameter Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int SERIALIZED_JAVA_OBJECT_SUBSTITUTION__PARAMETER_NAME = MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME;
+
+    /**
+     * The feature id for the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int SERIALIZED_JAVA_OBJECT_SUBSTITUTION__VALUE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 0;
+
+    /**
+     * The feature id for the '<em><b>Type</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int SERIALIZED_JAVA_OBJECT_SUBSTITUTION__TYPE = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 1;
+
+    /**
+     * The number of structural features of the '<em>Serialized Java Object Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int SERIALIZED_JAVA_OBJECT_SUBSTITUTION_FEATURE_COUNT = MATCH_SUBSTITUTION_RECORD_FEATURE_COUNT + 2;
+
+    /**
+     * The number of operations of the '<em>Serialized Java Object Substitution</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int SERIALIZED_JAVA_OBJECT_SUBSTITUTION_OPERATION_COUNT = MATCH_SUBSTITUTION_RECORD_OPERATION_COUNT + 0;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.InputSpecification <em>Input Specification</em>}' enum.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.InputSpecification
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getInputSpecification()
+     * @generated
+     */
+    int INPUT_SPECIFICATION = 15;
+
+    /**
+     * The meta object id for the '{@link org.eclipse.viatra.query.testing.snapshot.RecordRole <em>Record Role</em>}' enum.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.query.testing.snapshot.RecordRole
+     * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getRecordRole()
+     * @generated
+     */
+    int RECORD_ROLE = 16;
+
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord <em>Match Set Record</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Match Set Record</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.MatchSetRecord
+     * @generated
+     */
+    EClass getMatchSetRecord();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getPatternQualifiedName <em>Pattern Qualified Name</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Pattern Qualified Name</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getPatternQualifiedName()
+     * @see #getMatchSetRecord()
+     * @generated
+     */
+    EAttribute getMatchSetRecord_PatternQualifiedName();
+
+    /**
+     * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getMatches <em>Matches</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the containment reference list '<em>Matches</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getMatches()
+     * @see #getMatchSetRecord()
+     * @generated
+     */
+    EReference getMatchSetRecord_Matches();
+
+    /**
+     * Returns the meta object for the containment reference '{@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getFilter <em>Filter</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the containment reference '<em>Filter</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.MatchSetRecord#getFilter()
+     * @see #getMatchSetRecord()
+     * @generated
+     */
+    EReference getMatchSetRecord_Filter();
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.MatchRecord <em>Match Record</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Match Record</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.MatchRecord
+     * @generated
+     */
+    EClass getMatchRecord();
+
+    /**
+     * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.query.testing.snapshot.MatchRecord#getSubstitutions <em>Substitutions</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the containment reference list '<em>Substitutions</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.MatchRecord#getSubstitutions()
+     * @see #getMatchRecord()
+     * @generated
+     */
+    EReference getMatchRecord_Substitutions();
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord <em>Match Substitution Record</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Match Substitution Record</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord
+     * @generated
+     */
+    EClass getMatchSubstitutionRecord();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord#getParameterName <em>Parameter Name</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Parameter Name</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord#getParameterName()
+     * @see #getMatchSubstitutionRecord()
+     * @generated
+     */
+    EAttribute getMatchSubstitutionRecord_ParameterName();
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.EMFSubstitution <em>EMF Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>EMF Substitution</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.EMFSubstitution
+     * @generated
+     */
+    EClass getEMFSubstitution();
+
+    /**
+     * Returns the meta object for the reference '{@link org.eclipse.viatra.query.testing.snapshot.EMFSubstitution#getValue <em>Value</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the reference '<em>Value</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.EMFSubstitution#getValue()
+     * @see #getEMFSubstitution()
+     * @generated
+     */
+    EReference getEMFSubstitution_Value();
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.IntSubstitution <em>Int Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Int Substitution</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.IntSubstitution
+     * @generated
+     */
+    EClass getIntSubstitution();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.IntSubstitution#getValue <em>Value</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Value</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.IntSubstitution#getValue()
+     * @see #getIntSubstitution()
+     * @generated
+     */
+    EAttribute getIntSubstitution_Value();
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.LongSubstitution <em>Long Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Long Substitution</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.LongSubstitution
+     * @generated
+     */
+    EClass getLongSubstitution();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.LongSubstitution#getValue <em>Value</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Value</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.LongSubstitution#getValue()
+     * @see #getLongSubstitution()
+     * @generated
+     */
+    EAttribute getLongSubstitution_Value();
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution <em>Double Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Double Substitution</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution
+     * @generated
+     */
+    EClass getDoubleSubstitution();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution#getValue <em>Value</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Value</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution#getValue()
+     * @see #getDoubleSubstitution()
+     * @generated
+     */
+    EAttribute getDoubleSubstitution_Value();
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.FloatSubstitution <em>Float Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Float Substitution</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.FloatSubstitution
+     * @generated
+     */
+    EClass getFloatSubstitution();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.FloatSubstitution#getValue <em>Value</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Value</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.FloatSubstitution#getValue()
+     * @see #getFloatSubstitution()
+     * @generated
+     */
+    EAttribute getFloatSubstitution_Value();
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution <em>Boolean Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Boolean Substitution</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution
+     * @generated
+     */
+    EClass getBooleanSubstitution();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution#isValue <em>Value</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Value</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution#isValue()
+     * @see #getBooleanSubstitution()
+     * @generated
+     */
+    EAttribute getBooleanSubstitution_Value();
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.StringSubstitution <em>String Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>String Substitution</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.StringSubstitution
+     * @generated
+     */
+    EClass getStringSubstitution();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.StringSubstitution#getValue <em>Value</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Value</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.StringSubstitution#getValue()
+     * @see #getStringSubstitution()
+     * @generated
+     */
+    EAttribute getStringSubstitution_Value();
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.DateSubstitution <em>Date Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Date Substitution</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.DateSubstitution
+     * @generated
+     */
+    EClass getDateSubstitution();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.DateSubstitution#getValue <em>Value</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Value</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.DateSubstitution#getValue()
+     * @see #getDateSubstitution()
+     * @generated
+     */
+    EAttribute getDateSubstitution_Value();
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.EnumSubstitution <em>Enum Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Enum Substitution</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.EnumSubstitution
+     * @generated
+     */
+    EClass getEnumSubstitution();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.EnumSubstitution#getValueLiteral <em>Value Literal</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Value Literal</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.EnumSubstitution#getValueLiteral()
+     * @see #getEnumSubstitution()
+     * @generated
+     */
+    EAttribute getEnumSubstitution_ValueLiteral();
+
+    /**
+     * Returns the meta object for the reference '{@link org.eclipse.viatra.query.testing.snapshot.EnumSubstitution#getEnumType <em>Enum Type</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the reference '<em>Enum Type</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.EnumSubstitution#getEnumType()
+     * @see #getEnumSubstitution()
+     * @generated
+     */
+    EReference getEnumSubstitution_EnumType();
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution <em>Miscellaneous Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Miscellaneous Substitution</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution
+     * @generated
+     */
+    EClass getMiscellaneousSubstitution();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution#getValue <em>Value</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Value</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution#getValue()
+     * @see #getMiscellaneousSubstitution()
+     * @generated
+     */
+    EAttribute getMiscellaneousSubstitution_Value();
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.QuerySnapshot <em>Query Snapshot</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Query Snapshot</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.QuerySnapshot
+     * @generated
+     */
+    EClass getQuerySnapshot();
+
+    /**
+     * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.query.testing.snapshot.QuerySnapshot#getMatchSetRecords <em>Match Set Records</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the containment reference list '<em>Match Set Records</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.QuerySnapshot#getMatchSetRecords()
+     * @see #getQuerySnapshot()
+     * @generated
+     */
+    EReference getQuerySnapshot_MatchSetRecords();
+
+    /**
+     * Returns the meta object for the reference list '{@link org.eclipse.viatra.query.testing.snapshot.QuerySnapshot#getModelRoots <em>Model Roots</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the reference list '<em>Model Roots</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.QuerySnapshot#getModelRoots()
+     * @see #getQuerySnapshot()
+     * @generated
+     */
+    EReference getQuerySnapshot_ModelRoots();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.QuerySnapshot#getInputSpecification <em>Input Specification</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Input Specification</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.QuerySnapshot#getInputSpecification()
+     * @see #getQuerySnapshot()
+     * @generated
+     */
+    EAttribute getQuerySnapshot_InputSpecification();
+
+    /**
+     * Returns the meta object for class '{@link org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution <em>Serialized Java Object Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Serialized Java Object Substitution</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution
+     * @generated
+     */
+    EClass getSerializedJavaObjectSubstitution();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution#getValue <em>Value</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Value</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution#getValue()
+     * @see #getSerializedJavaObjectSubstitution()
+     * @generated
+     */
+    EAttribute getSerializedJavaObjectSubstitution_Value();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution#getType <em>Type</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Type</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution#getType()
+     * @see #getSerializedJavaObjectSubstitution()
+     * @generated
+     */
+    EAttribute getSerializedJavaObjectSubstitution_Type();
+
+    /**
+     * Returns the meta object for enum '{@link org.eclipse.viatra.query.testing.snapshot.InputSpecification <em>Input Specification</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for enum '<em>Input Specification</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.InputSpecification
+     * @generated
+     */
+    EEnum getInputSpecification();
+
+    /**
+     * Returns the meta object for enum '{@link org.eclipse.viatra.query.testing.snapshot.RecordRole <em>Record Role</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for enum '<em>Record Role</em>'.
+     * @see org.eclipse.viatra.query.testing.snapshot.RecordRole
+     * @generated
+     */
+    EEnum getRecordRole();
+
+    /**
+     * Returns the factory that creates the instances of the model.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the factory that creates the instances of the model.
+     * @generated
+     */
+    SnapshotFactory getSnapshotFactory();
+
+    /**
+     * <!-- begin-user-doc -->
+     * Defines literals for the meta objects that represent
+     * <ul>
+     *   <li>each class,</li>
+     *   <li>each feature of each class,</li>
+     *   <li>each operation of each class,</li>
+     *   <li>each enum,</li>
+     *   <li>and each data type</li>
+     * </ul>
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    interface Literals {
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MatchSetRecordImpl <em>Match Set Record</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.MatchSetRecordImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMatchSetRecord()
+         * @generated
+         */
+        EClass MATCH_SET_RECORD = eINSTANCE.getMatchSetRecord();
+
+        /**
+         * The meta object literal for the '<em><b>Pattern Qualified Name</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME = eINSTANCE.getMatchSetRecord_PatternQualifiedName();
+
+        /**
+         * The meta object literal for the '<em><b>Matches</b></em>' containment reference list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EReference MATCH_SET_RECORD__MATCHES = eINSTANCE.getMatchSetRecord_Matches();
+
+        /**
+         * The meta object literal for the '<em><b>Filter</b></em>' containment reference feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EReference MATCH_SET_RECORD__FILTER = eINSTANCE.getMatchSetRecord_Filter();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MatchRecordImpl <em>Match Record</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.MatchRecordImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMatchRecord()
+         * @generated
+         */
+        EClass MATCH_RECORD = eINSTANCE.getMatchRecord();
+
+        /**
+         * The meta object literal for the '<em><b>Substitutions</b></em>' containment reference list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EReference MATCH_RECORD__SUBSTITUTIONS = eINSTANCE.getMatchRecord_Substitutions();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MatchSubstitutionRecordImpl <em>Match Substitution Record</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.MatchSubstitutionRecordImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMatchSubstitutionRecord()
+         * @generated
+         */
+        EClass MATCH_SUBSTITUTION_RECORD = eINSTANCE.getMatchSubstitutionRecord();
+
+        /**
+         * The meta object literal for the '<em><b>Parameter Name</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME = eINSTANCE.getMatchSubstitutionRecord_ParameterName();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.EMFSubstitutionImpl <em>EMF Substitution</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.EMFSubstitutionImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getEMFSubstitution()
+         * @generated
+         */
+        EClass EMF_SUBSTITUTION = eINSTANCE.getEMFSubstitution();
+
+        /**
+         * The meta object literal for the '<em><b>Value</b></em>' reference feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EReference EMF_SUBSTITUTION__VALUE = eINSTANCE.getEMFSubstitution_Value();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.IntSubstitutionImpl <em>Int Substitution</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.IntSubstitutionImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getIntSubstitution()
+         * @generated
+         */
+        EClass INT_SUBSTITUTION = eINSTANCE.getIntSubstitution();
+
+        /**
+         * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute INT_SUBSTITUTION__VALUE = eINSTANCE.getIntSubstitution_Value();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.LongSubstitutionImpl <em>Long Substitution</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.LongSubstitutionImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getLongSubstitution()
+         * @generated
+         */
+        EClass LONG_SUBSTITUTION = eINSTANCE.getLongSubstitution();
+
+        /**
+         * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute LONG_SUBSTITUTION__VALUE = eINSTANCE.getLongSubstitution_Value();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.DoubleSubstitutionImpl <em>Double Substitution</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.DoubleSubstitutionImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getDoubleSubstitution()
+         * @generated
+         */
+        EClass DOUBLE_SUBSTITUTION = eINSTANCE.getDoubleSubstitution();
+
+        /**
+         * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute DOUBLE_SUBSTITUTION__VALUE = eINSTANCE.getDoubleSubstitution_Value();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.FloatSubstitutionImpl <em>Float Substitution</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.FloatSubstitutionImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getFloatSubstitution()
+         * @generated
+         */
+        EClass FLOAT_SUBSTITUTION = eINSTANCE.getFloatSubstitution();
+
+        /**
+         * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute FLOAT_SUBSTITUTION__VALUE = eINSTANCE.getFloatSubstitution_Value();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.BooleanSubstitutionImpl <em>Boolean Substitution</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.BooleanSubstitutionImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getBooleanSubstitution()
+         * @generated
+         */
+        EClass BOOLEAN_SUBSTITUTION = eINSTANCE.getBooleanSubstitution();
+
+        /**
+         * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute BOOLEAN_SUBSTITUTION__VALUE = eINSTANCE.getBooleanSubstitution_Value();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.StringSubstitutionImpl <em>String Substitution</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.StringSubstitutionImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getStringSubstitution()
+         * @generated
+         */
+        EClass STRING_SUBSTITUTION = eINSTANCE.getStringSubstitution();
+
+        /**
+         * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute STRING_SUBSTITUTION__VALUE = eINSTANCE.getStringSubstitution_Value();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.DateSubstitutionImpl <em>Date Substitution</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.DateSubstitutionImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getDateSubstitution()
+         * @generated
+         */
+        EClass DATE_SUBSTITUTION = eINSTANCE.getDateSubstitution();
+
+        /**
+         * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute DATE_SUBSTITUTION__VALUE = eINSTANCE.getDateSubstitution_Value();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.EnumSubstitutionImpl <em>Enum Substitution</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.EnumSubstitutionImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getEnumSubstitution()
+         * @generated
+         */
+        EClass ENUM_SUBSTITUTION = eINSTANCE.getEnumSubstitution();
+
+        /**
+         * The meta object literal for the '<em><b>Value Literal</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute ENUM_SUBSTITUTION__VALUE_LITERAL = eINSTANCE.getEnumSubstitution_ValueLiteral();
+
+        /**
+         * The meta object literal for the '<em><b>Enum Type</b></em>' reference feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EReference ENUM_SUBSTITUTION__ENUM_TYPE = eINSTANCE.getEnumSubstitution_EnumType();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.MiscellaneousSubstitutionImpl <em>Miscellaneous Substitution</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.MiscellaneousSubstitutionImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getMiscellaneousSubstitution()
+         * @generated
+         */
+        EClass MISCELLANEOUS_SUBSTITUTION = eINSTANCE.getMiscellaneousSubstitution();
+
+        /**
+         * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute MISCELLANEOUS_SUBSTITUTION__VALUE = eINSTANCE.getMiscellaneousSubstitution_Value();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.QuerySnapshotImpl <em>Query Snapshot</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.QuerySnapshotImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getQuerySnapshot()
+         * @generated
+         */
+        EClass QUERY_SNAPSHOT = eINSTANCE.getQuerySnapshot();
+
+        /**
+         * The meta object literal for the '<em><b>Match Set Records</b></em>' containment reference list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EReference QUERY_SNAPSHOT__MATCH_SET_RECORDS = eINSTANCE.getQuerySnapshot_MatchSetRecords();
+
+        /**
+         * The meta object literal for the '<em><b>Model Roots</b></em>' reference list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EReference QUERY_SNAPSHOT__MODEL_ROOTS = eINSTANCE.getQuerySnapshot_ModelRoots();
+
+        /**
+         * The meta object literal for the '<em><b>Input Specification</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute QUERY_SNAPSHOT__INPUT_SPECIFICATION = eINSTANCE.getQuerySnapshot_InputSpecification();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.impl.SerializedJavaObjectSubstitutionImpl <em>Serialized Java Object Substitution</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SerializedJavaObjectSubstitutionImpl
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getSerializedJavaObjectSubstitution()
+         * @generated
+         */
+        EClass SERIALIZED_JAVA_OBJECT_SUBSTITUTION = eINSTANCE.getSerializedJavaObjectSubstitution();
+
+        /**
+         * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute SERIALIZED_JAVA_OBJECT_SUBSTITUTION__VALUE = eINSTANCE.getSerializedJavaObjectSubstitution_Value();
+
+        /**
+         * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute SERIALIZED_JAVA_OBJECT_SUBSTITUTION__TYPE = eINSTANCE.getSerializedJavaObjectSubstitution_Type();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.InputSpecification <em>Input Specification</em>}' enum.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.InputSpecification
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getInputSpecification()
+         * @generated
+         */
+        EEnum INPUT_SPECIFICATION = eINSTANCE.getInputSpecification();
+
+        /**
+         * The meta object literal for the '{@link org.eclipse.viatra.query.testing.snapshot.RecordRole <em>Record Role</em>}' enum.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.query.testing.snapshot.RecordRole
+         * @see org.eclipse.viatra.query.testing.snapshot.impl.SnapshotPackageImpl#getRecordRole()
+         * @generated
+         */
+        EEnum RECORD_ROLE = eINSTANCE.getRecordRole();
+
+    }
 
 } //SnapshotPackage
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/StringSubstitution.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/StringSubstitution.java
index d219db3dc1..d6e3a0bb34 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/StringSubstitution.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/StringSubstitution.java
@@ -20,30 +20,30 @@
  * @generated
  */
 public interface StringSubstitution extends MatchSubstitutionRecord {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getStringSubstitution_Value()
-	 * @model
-	 * @generated
-	 */
-	String getValue();
+    /**
+     * Returns the value of the '<em><b>Value</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Value</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Value</em>' attribute.
+     * @see #setValue(String)
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#getStringSubstitution_Value()
+     * @model
+     * @generated
+     */
+    String getValue();
 
-	/**
-	 * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.StringSubstitution#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
+    /**
+     * Sets the value of the '{@link org.eclipse.viatra.query.testing.snapshot.StringSubstitution#getValue <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Value</em>' attribute.
+     * @see #getValue()
+     * @generated
+     */
+    void setValue(String value);
 
 } // StringSubstitution
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/BooleanSubstitutionImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/BooleanSubstitutionImpl.java
index 07259e4203..815705c9ac 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/BooleanSubstitutionImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/BooleanSubstitutionImpl.java
@@ -25,138 +25,138 @@
  * @generated
  */
 public class BooleanSubstitutionImpl extends MatchSubstitutionRecordImpl implements BooleanSubstitution {
-	/**
-	 * The default value of the '{@link #isValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean VALUE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BooleanSubstitutionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SnapshotPackage.Literals.BOOLEAN_SUBSTITUTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(boolean newValue) {
-		boolean oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.BOOLEAN_SUBSTITUTION__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SnapshotPackage.BOOLEAN_SUBSTITUTION__VALUE:
-				return isValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SnapshotPackage.BOOLEAN_SUBSTITUTION__VALUE:
-				setValue((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.BOOLEAN_SUBSTITUTION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.BOOLEAN_SUBSTITUTION__VALUE:
-				return value != VALUE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
+    /**
+     * The default value of the '{@link #isValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #isValue()
+     * @generated
+     * @ordered
+     */
+    protected static final boolean VALUE_EDEFAULT = false;
+
+    /**
+     * The cached value of the '{@link #isValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #isValue()
+     * @generated
+     * @ordered
+     */
+    protected boolean value = VALUE_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected BooleanSubstitutionImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.BOOLEAN_SUBSTITUTION;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public boolean isValue() {
+        return value;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setValue(boolean newValue) {
+        boolean oldValue = value;
+        value = newValue;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.BOOLEAN_SUBSTITUTION__VALUE, oldValue, value));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.BOOLEAN_SUBSTITUTION__VALUE:
+                return isValue();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.BOOLEAN_SUBSTITUTION__VALUE:
+                setValue((Boolean)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.BOOLEAN_SUBSTITUTION__VALUE:
+                setValue(VALUE_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.BOOLEAN_SUBSTITUTION__VALUE:
+                return value != VALUE_EDEFAULT;
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (value: ");
+        result.append(value);
+        result.append(')');
+        return result.toString();
+    }
 
 } //BooleanSubstitutionImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/DateSubstitutionImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/DateSubstitutionImpl.java
index 265b4ea2dd..56ca92dde3 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/DateSubstitutionImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/DateSubstitutionImpl.java
@@ -27,138 +27,138 @@
  * @generated
  */
 public class DateSubstitutionImpl extends MatchSubstitutionRecordImpl implements DateSubstitution {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Date VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected Date value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DateSubstitutionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SnapshotPackage.Literals.DATE_SUBSTITUTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Date getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(Date newValue) {
-		Date oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.DATE_SUBSTITUTION__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SnapshotPackage.DATE_SUBSTITUTION__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SnapshotPackage.DATE_SUBSTITUTION__VALUE:
-				setValue((Date)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.DATE_SUBSTITUTION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.DATE_SUBSTITUTION__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
+    /**
+     * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected static final Date VALUE_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected Date value = VALUE_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected DateSubstitutionImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.DATE_SUBSTITUTION;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Date getValue() {
+        return value;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setValue(Date newValue) {
+        Date oldValue = value;
+        value = newValue;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.DATE_SUBSTITUTION__VALUE, oldValue, value));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.DATE_SUBSTITUTION__VALUE:
+                return getValue();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.DATE_SUBSTITUTION__VALUE:
+                setValue((Date)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.DATE_SUBSTITUTION__VALUE:
+                setValue(VALUE_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.DATE_SUBSTITUTION__VALUE:
+                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (value: ");
+        result.append(value);
+        result.append(')');
+        return result.toString();
+    }
 
 } //DateSubstitutionImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/DoubleSubstitutionImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/DoubleSubstitutionImpl.java
index 517ca73650..9b86620e99 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/DoubleSubstitutionImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/DoubleSubstitutionImpl.java
@@ -25,138 +25,138 @@
  * @generated
  */
 public class DoubleSubstitutionImpl extends MatchSubstitutionRecordImpl implements DoubleSubstitution {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final double VALUE_EDEFAULT = 0.0;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected double value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DoubleSubstitutionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SnapshotPackage.Literals.DOUBLE_SUBSTITUTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public double getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(double newValue) {
-		double oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.DOUBLE_SUBSTITUTION__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SnapshotPackage.DOUBLE_SUBSTITUTION__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SnapshotPackage.DOUBLE_SUBSTITUTION__VALUE:
-				setValue((Double)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.DOUBLE_SUBSTITUTION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.DOUBLE_SUBSTITUTION__VALUE:
-				return value != VALUE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
+    /**
+     * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected static final double VALUE_EDEFAULT = 0.0;
+
+    /**
+     * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected double value = VALUE_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected DoubleSubstitutionImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.DOUBLE_SUBSTITUTION;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public double getValue() {
+        return value;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setValue(double newValue) {
+        double oldValue = value;
+        value = newValue;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.DOUBLE_SUBSTITUTION__VALUE, oldValue, value));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.DOUBLE_SUBSTITUTION__VALUE:
+                return getValue();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.DOUBLE_SUBSTITUTION__VALUE:
+                setValue((Double)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.DOUBLE_SUBSTITUTION__VALUE:
+                setValue(VALUE_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.DOUBLE_SUBSTITUTION__VALUE:
+                return value != VALUE_EDEFAULT;
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (value: ");
+        result.append(value);
+        result.append(')');
+        return result.toString();
+    }
 
 } //DoubleSubstitutionImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/EMFSubstitutionImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/EMFSubstitutionImpl.java
index 612adedff5..261cc697a1 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/EMFSubstitutionImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/EMFSubstitutionImpl.java
@@ -27,130 +27,130 @@
  * @generated
  */
 public class EMFSubstitutionImpl extends MatchSubstitutionRecordImpl implements EMFSubstitution {
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected EObject value;
+    /**
+     * The cached value of the '{@link #getValue() <em>Value</em>}' reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected EObject value;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EMFSubstitutionImpl() {
-		super();
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected EMFSubstitutionImpl() {
+        super();
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SnapshotPackage.Literals.EMF_SUBSTITUTION;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.EMF_SUBSTITUTION;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject getValue() {
-		if (value != null && value.eIsProxy()) {
-			InternalEObject oldValue = (InternalEObject)value;
-			value = eResolveProxy(oldValue);
-			if (value != oldValue) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SnapshotPackage.EMF_SUBSTITUTION__VALUE, oldValue, value));
-			}
-		}
-		return value;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EObject getValue() {
+        if (value != null && value.eIsProxy()) {
+            InternalEObject oldValue = (InternalEObject)value;
+            value = eResolveProxy(oldValue);
+            if (value != oldValue) {
+                if (eNotificationRequired())
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, SnapshotPackage.EMF_SUBSTITUTION__VALUE, oldValue, value));
+            }
+        }
+        return value;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject basicGetValue() {
-		return value;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EObject basicGetValue() {
+        return value;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(EObject newValue) {
-		EObject oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.EMF_SUBSTITUTION__VALUE, oldValue, value));
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setValue(EObject newValue) {
+        EObject oldValue = value;
+        value = newValue;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.EMF_SUBSTITUTION__VALUE, oldValue, value));
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SnapshotPackage.EMF_SUBSTITUTION__VALUE:
-				if (resolve) return getValue();
-				return basicGetValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.EMF_SUBSTITUTION__VALUE:
+                if (resolve) return getValue();
+                return basicGetValue();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SnapshotPackage.EMF_SUBSTITUTION__VALUE:
-				setValue((EObject)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.EMF_SUBSTITUTION__VALUE:
+                setValue((EObject)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.EMF_SUBSTITUTION__VALUE:
-				setValue((EObject)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.EMF_SUBSTITUTION__VALUE:
+                setValue((EObject)null);
+                return;
+        }
+        super.eUnset(featureID);
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.EMF_SUBSTITUTION__VALUE:
-				return value != null;
-		}
-		return super.eIsSet(featureID);
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.EMF_SUBSTITUTION__VALUE:
+                return value != null;
+        }
+        return super.eIsSet(featureID);
+    }
 
 } //EMFSubstitutionImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/EnumSubstitutionImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/EnumSubstitutionImpl.java
index 6f9ffebb69..1917b4a664 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/EnumSubstitutionImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/EnumSubstitutionImpl.java
@@ -28,197 +28,197 @@
  * @generated
  */
 public class EnumSubstitutionImpl extends MatchSubstitutionRecordImpl implements EnumSubstitution {
-	/**
-	 * The default value of the '{@link #getValueLiteral() <em>Value Literal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueLiteral()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_LITERAL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValueLiteral() <em>Value Literal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValueLiteral()
-	 * @generated
-	 * @ordered
-	 */
-	protected String valueLiteral = VALUE_LITERAL_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getEnumType() <em>Enum Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnumType()
-	 * @generated
-	 * @ordered
-	 */
-	protected EEnum enumType;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EnumSubstitutionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SnapshotPackage.Literals.ENUM_SUBSTITUTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValueLiteral() {
-		return valueLiteral;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValueLiteral(String newValueLiteral) {
-		String oldValueLiteral = valueLiteral;
-		valueLiteral = newValueLiteral;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.ENUM_SUBSTITUTION__VALUE_LITERAL, oldValueLiteral, valueLiteral));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getEnumType() {
-		if (enumType != null && enumType.eIsProxy()) {
-			InternalEObject oldEnumType = (InternalEObject)enumType;
-			enumType = (EEnum)eResolveProxy(oldEnumType);
-			if (enumType != oldEnumType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, SnapshotPackage.ENUM_SUBSTITUTION__ENUM_TYPE, oldEnumType, enumType));
-			}
-		}
-		return enumType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum basicGetEnumType() {
-		return enumType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEnumType(EEnum newEnumType) {
-		EEnum oldEnumType = enumType;
-		enumType = newEnumType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.ENUM_SUBSTITUTION__ENUM_TYPE, oldEnumType, enumType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SnapshotPackage.ENUM_SUBSTITUTION__VALUE_LITERAL:
-				return getValueLiteral();
-			case SnapshotPackage.ENUM_SUBSTITUTION__ENUM_TYPE:
-				if (resolve) return getEnumType();
-				return basicGetEnumType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SnapshotPackage.ENUM_SUBSTITUTION__VALUE_LITERAL:
-				setValueLiteral((String)newValue);
-				return;
-			case SnapshotPackage.ENUM_SUBSTITUTION__ENUM_TYPE:
-				setEnumType((EEnum)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.ENUM_SUBSTITUTION__VALUE_LITERAL:
-				setValueLiteral(VALUE_LITERAL_EDEFAULT);
-				return;
-			case SnapshotPackage.ENUM_SUBSTITUTION__ENUM_TYPE:
-				setEnumType((EEnum)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.ENUM_SUBSTITUTION__VALUE_LITERAL:
-				return VALUE_LITERAL_EDEFAULT == null ? valueLiteral != null : !VALUE_LITERAL_EDEFAULT.equals(valueLiteral);
-			case SnapshotPackage.ENUM_SUBSTITUTION__ENUM_TYPE:
-				return enumType != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (valueLiteral: ");
-		result.append(valueLiteral);
-		result.append(')');
-		return result.toString();
-	}
+    /**
+     * The default value of the '{@link #getValueLiteral() <em>Value Literal</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValueLiteral()
+     * @generated
+     * @ordered
+     */
+    protected static final String VALUE_LITERAL_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getValueLiteral() <em>Value Literal</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValueLiteral()
+     * @generated
+     * @ordered
+     */
+    protected String valueLiteral = VALUE_LITERAL_EDEFAULT;
+
+    /**
+     * The cached value of the '{@link #getEnumType() <em>Enum Type</em>}' reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getEnumType()
+     * @generated
+     * @ordered
+     */
+    protected EEnum enumType;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected EnumSubstitutionImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.ENUM_SUBSTITUTION;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getValueLiteral() {
+        return valueLiteral;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setValueLiteral(String newValueLiteral) {
+        String oldValueLiteral = valueLiteral;
+        valueLiteral = newValueLiteral;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.ENUM_SUBSTITUTION__VALUE_LITERAL, oldValueLiteral, valueLiteral));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EEnum getEnumType() {
+        if (enumType != null && enumType.eIsProxy()) {
+            InternalEObject oldEnumType = (InternalEObject)enumType;
+            enumType = (EEnum)eResolveProxy(oldEnumType);
+            if (enumType != oldEnumType) {
+                if (eNotificationRequired())
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, SnapshotPackage.ENUM_SUBSTITUTION__ENUM_TYPE, oldEnumType, enumType));
+            }
+        }
+        return enumType;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EEnum basicGetEnumType() {
+        return enumType;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setEnumType(EEnum newEnumType) {
+        EEnum oldEnumType = enumType;
+        enumType = newEnumType;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.ENUM_SUBSTITUTION__ENUM_TYPE, oldEnumType, enumType));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.ENUM_SUBSTITUTION__VALUE_LITERAL:
+                return getValueLiteral();
+            case SnapshotPackage.ENUM_SUBSTITUTION__ENUM_TYPE:
+                if (resolve) return getEnumType();
+                return basicGetEnumType();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.ENUM_SUBSTITUTION__VALUE_LITERAL:
+                setValueLiteral((String)newValue);
+                return;
+            case SnapshotPackage.ENUM_SUBSTITUTION__ENUM_TYPE:
+                setEnumType((EEnum)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.ENUM_SUBSTITUTION__VALUE_LITERAL:
+                setValueLiteral(VALUE_LITERAL_EDEFAULT);
+                return;
+            case SnapshotPackage.ENUM_SUBSTITUTION__ENUM_TYPE:
+                setEnumType((EEnum)null);
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.ENUM_SUBSTITUTION__VALUE_LITERAL:
+                return VALUE_LITERAL_EDEFAULT == null ? valueLiteral != null : !VALUE_LITERAL_EDEFAULT.equals(valueLiteral);
+            case SnapshotPackage.ENUM_SUBSTITUTION__ENUM_TYPE:
+                return enumType != null;
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (valueLiteral: ");
+        result.append(valueLiteral);
+        result.append(')');
+        return result.toString();
+    }
 
 } //EnumSubstitutionImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/FloatSubstitutionImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/FloatSubstitutionImpl.java
index a07c8b315a..b1d09944a3 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/FloatSubstitutionImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/FloatSubstitutionImpl.java
@@ -25,138 +25,138 @@
  * @generated
  */
 public class FloatSubstitutionImpl extends MatchSubstitutionRecordImpl implements FloatSubstitution {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float VALUE_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected float value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FloatSubstitutionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SnapshotPackage.Literals.FLOAT_SUBSTITUTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(float newValue) {
-		float oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.FLOAT_SUBSTITUTION__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SnapshotPackage.FLOAT_SUBSTITUTION__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SnapshotPackage.FLOAT_SUBSTITUTION__VALUE:
-				setValue((Float)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.FLOAT_SUBSTITUTION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.FLOAT_SUBSTITUTION__VALUE:
-				return value != VALUE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
+    /**
+     * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected static final float VALUE_EDEFAULT = 0.0F;
+
+    /**
+     * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected float value = VALUE_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected FloatSubstitutionImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.FLOAT_SUBSTITUTION;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public float getValue() {
+        return value;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setValue(float newValue) {
+        float oldValue = value;
+        value = newValue;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.FLOAT_SUBSTITUTION__VALUE, oldValue, value));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.FLOAT_SUBSTITUTION__VALUE:
+                return getValue();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.FLOAT_SUBSTITUTION__VALUE:
+                setValue((Float)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.FLOAT_SUBSTITUTION__VALUE:
+                setValue(VALUE_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.FLOAT_SUBSTITUTION__VALUE:
+                return value != VALUE_EDEFAULT;
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (value: ");
+        result.append(value);
+        result.append(')');
+        return result.toString();
+    }
 
 } //FloatSubstitutionImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/IntSubstitutionImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/IntSubstitutionImpl.java
index fa8b23c434..a166d04f45 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/IntSubstitutionImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/IntSubstitutionImpl.java
@@ -25,138 +25,138 @@
  * @generated
  */
 public class IntSubstitutionImpl extends MatchSubstitutionRecordImpl implements IntSubstitution {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int VALUE_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected int value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IntSubstitutionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SnapshotPackage.Literals.INT_SUBSTITUTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(int newValue) {
-		int oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.INT_SUBSTITUTION__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SnapshotPackage.INT_SUBSTITUTION__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SnapshotPackage.INT_SUBSTITUTION__VALUE:
-				setValue((Integer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.INT_SUBSTITUTION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.INT_SUBSTITUTION__VALUE:
-				return value != VALUE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
+    /**
+     * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected static final int VALUE_EDEFAULT = 0;
+
+    /**
+     * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected int value = VALUE_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected IntSubstitutionImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.INT_SUBSTITUTION;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public int getValue() {
+        return value;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setValue(int newValue) {
+        int oldValue = value;
+        value = newValue;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.INT_SUBSTITUTION__VALUE, oldValue, value));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.INT_SUBSTITUTION__VALUE:
+                return getValue();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.INT_SUBSTITUTION__VALUE:
+                setValue((Integer)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.INT_SUBSTITUTION__VALUE:
+                setValue(VALUE_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.INT_SUBSTITUTION__VALUE:
+                return value != VALUE_EDEFAULT;
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (value: ");
+        result.append(value);
+        result.append(')');
+        return result.toString();
+    }
 
 } //IntSubstitutionImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/LongSubstitutionImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/LongSubstitutionImpl.java
index fbd4ca226d..dcaa5af200 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/LongSubstitutionImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/LongSubstitutionImpl.java
@@ -25,138 +25,138 @@
  * @generated
  */
 public class LongSubstitutionImpl extends MatchSubstitutionRecordImpl implements LongSubstitution {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final long VALUE_EDEFAULT = 0L;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected long value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LongSubstitutionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SnapshotPackage.Literals.LONG_SUBSTITUTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public long getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(long newValue) {
-		long oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.LONG_SUBSTITUTION__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SnapshotPackage.LONG_SUBSTITUTION__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SnapshotPackage.LONG_SUBSTITUTION__VALUE:
-				setValue((Long)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.LONG_SUBSTITUTION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.LONG_SUBSTITUTION__VALUE:
-				return value != VALUE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
+    /**
+     * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected static final long VALUE_EDEFAULT = 0L;
+
+    /**
+     * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected long value = VALUE_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected LongSubstitutionImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.LONG_SUBSTITUTION;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public long getValue() {
+        return value;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setValue(long newValue) {
+        long oldValue = value;
+        value = newValue;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.LONG_SUBSTITUTION__VALUE, oldValue, value));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.LONG_SUBSTITUTION__VALUE:
+                return getValue();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.LONG_SUBSTITUTION__VALUE:
+                setValue((Long)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.LONG_SUBSTITUTION__VALUE:
+                setValue(VALUE_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.LONG_SUBSTITUTION__VALUE:
+                return value != VALUE_EDEFAULT;
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (value: ");
+        result.append(value);
+        result.append(')');
+        return result.toString();
+    }
 
 } //LongSubstitutionImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MatchRecordImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MatchRecordImpl.java
index a61fb6858b..83366f34a8 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MatchRecordImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MatchRecordImpl.java
@@ -34,119 +34,119 @@
  * @generated
  */
 public class MatchRecordImpl extends MinimalEObjectImpl.Container implements MatchRecord {
-	/**
-	 * The cached value of the '{@link #getSubstitutions() <em>Substitutions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubstitutions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<MatchSubstitutionRecord> substitutions;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MatchRecordImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SnapshotPackage.Literals.MATCH_RECORD;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<MatchSubstitutionRecord> getSubstitutions() {
-		if (substitutions == null) {
-			substitutions = new EObjectContainmentEList<MatchSubstitutionRecord>(MatchSubstitutionRecord.class, this, SnapshotPackage.MATCH_RECORD__SUBSTITUTIONS);
-		}
-		return substitutions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case SnapshotPackage.MATCH_RECORD__SUBSTITUTIONS:
-				return ((InternalEList<?>)getSubstitutions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SnapshotPackage.MATCH_RECORD__SUBSTITUTIONS:
-				return getSubstitutions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SnapshotPackage.MATCH_RECORD__SUBSTITUTIONS:
-				getSubstitutions().clear();
-				getSubstitutions().addAll((Collection<? extends MatchSubstitutionRecord>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.MATCH_RECORD__SUBSTITUTIONS:
-				getSubstitutions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.MATCH_RECORD__SUBSTITUTIONS:
-				return substitutions != null && !substitutions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
+    /**
+     * The cached value of the '{@link #getSubstitutions() <em>Substitutions</em>}' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getSubstitutions()
+     * @generated
+     * @ordered
+     */
+    protected EList<MatchSubstitutionRecord> substitutions;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected MatchRecordImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.MATCH_RECORD;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EList<MatchSubstitutionRecord> getSubstitutions() {
+        if (substitutions == null) {
+            substitutions = new EObjectContainmentEList<MatchSubstitutionRecord>(MatchSubstitutionRecord.class, this, SnapshotPackage.MATCH_RECORD__SUBSTITUTIONS);
+        }
+        return substitutions;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+            case SnapshotPackage.MATCH_RECORD__SUBSTITUTIONS:
+                return ((InternalEList<?>)getSubstitutions()).basicRemove(otherEnd, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.MATCH_RECORD__SUBSTITUTIONS:
+                return getSubstitutions();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.MATCH_RECORD__SUBSTITUTIONS:
+                getSubstitutions().clear();
+                getSubstitutions().addAll((Collection<? extends MatchSubstitutionRecord>)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.MATCH_RECORD__SUBSTITUTIONS:
+                getSubstitutions().clear();
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.MATCH_RECORD__SUBSTITUTIONS:
+                return substitutions != null && !substitutions.isEmpty();
+        }
+        return super.eIsSet(featureID);
+    }
 
 } //MatchRecordImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MatchSetRecordImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MatchSetRecordImpl.java
index 7bb9a2d3bd..16b91c24ee 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MatchSetRecordImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MatchSetRecordImpl.java
@@ -38,251 +38,251 @@
  * @generated
  */
 public class MatchSetRecordImpl extends MinimalEObjectImpl.Container implements MatchSetRecord {
-	/**
-	 * The default value of the '{@link #getPatternQualifiedName() <em>Pattern Qualified Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPatternQualifiedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PATTERN_QUALIFIED_NAME_EDEFAULT = null;
+    /**
+     * The default value of the '{@link #getPatternQualifiedName() <em>Pattern Qualified Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getPatternQualifiedName()
+     * @generated
+     * @ordered
+     */
+    protected static final String PATTERN_QUALIFIED_NAME_EDEFAULT = null;
 
-	/**
-	 * The cached value of the '{@link #getPatternQualifiedName() <em>Pattern Qualified Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPatternQualifiedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String patternQualifiedName = PATTERN_QUALIFIED_NAME_EDEFAULT;
+    /**
+     * The cached value of the '{@link #getPatternQualifiedName() <em>Pattern Qualified Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getPatternQualifiedName()
+     * @generated
+     * @ordered
+     */
+    protected String patternQualifiedName = PATTERN_QUALIFIED_NAME_EDEFAULT;
 
-	/**
-	 * The cached value of the '{@link #getMatches() <em>Matches</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMatches()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<MatchRecord> matches;
+    /**
+     * The cached value of the '{@link #getMatches() <em>Matches</em>}' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getMatches()
+     * @generated
+     * @ordered
+     */
+    protected EList<MatchRecord> matches;
 
-	/**
-	 * The cached value of the '{@link #getFilter() <em>Filter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFilter()
-	 * @generated
-	 * @ordered
-	 */
-	protected MatchRecord filter;
+    /**
+     * The cached value of the '{@link #getFilter() <em>Filter</em>}' containment reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getFilter()
+     * @generated
+     * @ordered
+     */
+    protected MatchRecord filter;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MatchSetRecordImpl() {
-		super();
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected MatchSetRecordImpl() {
+        super();
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SnapshotPackage.Literals.MATCH_SET_RECORD;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.MATCH_SET_RECORD;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPatternQualifiedName() {
-		return patternQualifiedName;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getPatternQualifiedName() {
+        return patternQualifiedName;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPatternQualifiedName(String newPatternQualifiedName) {
-		String oldPatternQualifiedName = patternQualifiedName;
-		patternQualifiedName = newPatternQualifiedName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME, oldPatternQualifiedName, patternQualifiedName));
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setPatternQualifiedName(String newPatternQualifiedName) {
+        String oldPatternQualifiedName = patternQualifiedName;
+        patternQualifiedName = newPatternQualifiedName;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME, oldPatternQualifiedName, patternQualifiedName));
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<MatchRecord> getMatches() {
-		if (matches == null) {
-			matches = new EObjectContainmentEList<MatchRecord>(MatchRecord.class, this, SnapshotPackage.MATCH_SET_RECORD__MATCHES);
-		}
-		return matches;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EList<MatchRecord> getMatches() {
+        if (matches == null) {
+            matches = new EObjectContainmentEList<MatchRecord>(MatchRecord.class, this, SnapshotPackage.MATCH_SET_RECORD__MATCHES);
+        }
+        return matches;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MatchRecord getFilter() {
-		return filter;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public MatchRecord getFilter() {
+        return filter;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetFilter(MatchRecord newFilter, NotificationChain msgs) {
-		MatchRecord oldFilter = filter;
-		filter = newFilter;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SnapshotPackage.MATCH_SET_RECORD__FILTER, oldFilter, newFilter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public NotificationChain basicSetFilter(MatchRecord newFilter, NotificationChain msgs) {
+        MatchRecord oldFilter = filter;
+        filter = newFilter;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SnapshotPackage.MATCH_SET_RECORD__FILTER, oldFilter, newFilter);
+            if (msgs == null) msgs = notification; else msgs.add(notification);
+        }
+        return msgs;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFilter(MatchRecord newFilter) {
-		if (newFilter != filter) {
-			NotificationChain msgs = null;
-			if (filter != null)
-				msgs = ((InternalEObject)filter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SnapshotPackage.MATCH_SET_RECORD__FILTER, null, msgs);
-			if (newFilter != null)
-				msgs = ((InternalEObject)newFilter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SnapshotPackage.MATCH_SET_RECORD__FILTER, null, msgs);
-			msgs = basicSetFilter(newFilter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.MATCH_SET_RECORD__FILTER, newFilter, newFilter));
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setFilter(MatchRecord newFilter) {
+        if (newFilter != filter) {
+            NotificationChain msgs = null;
+            if (filter != null)
+                msgs = ((InternalEObject)filter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SnapshotPackage.MATCH_SET_RECORD__FILTER, null, msgs);
+            if (newFilter != null)
+                msgs = ((InternalEObject)newFilter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SnapshotPackage.MATCH_SET_RECORD__FILTER, null, msgs);
+            msgs = basicSetFilter(newFilter, msgs);
+            if (msgs != null) msgs.dispatch();
+        }
+        else if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.MATCH_SET_RECORD__FILTER, newFilter, newFilter));
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case SnapshotPackage.MATCH_SET_RECORD__MATCHES:
-				return ((InternalEList<?>)getMatches()).basicRemove(otherEnd, msgs);
-			case SnapshotPackage.MATCH_SET_RECORD__FILTER:
-				return basicSetFilter(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+            case SnapshotPackage.MATCH_SET_RECORD__MATCHES:
+                return ((InternalEList<?>)getMatches()).basicRemove(otherEnd, msgs);
+            case SnapshotPackage.MATCH_SET_RECORD__FILTER:
+                return basicSetFilter(null, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SnapshotPackage.MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME:
-				return getPatternQualifiedName();
-			case SnapshotPackage.MATCH_SET_RECORD__MATCHES:
-				return getMatches();
-			case SnapshotPackage.MATCH_SET_RECORD__FILTER:
-				return getFilter();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME:
+                return getPatternQualifiedName();
+            case SnapshotPackage.MATCH_SET_RECORD__MATCHES:
+                return getMatches();
+            case SnapshotPackage.MATCH_SET_RECORD__FILTER:
+                return getFilter();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SnapshotPackage.MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME:
-				setPatternQualifiedName((String)newValue);
-				return;
-			case SnapshotPackage.MATCH_SET_RECORD__MATCHES:
-				getMatches().clear();
-				getMatches().addAll((Collection<? extends MatchRecord>)newValue);
-				return;
-			case SnapshotPackage.MATCH_SET_RECORD__FILTER:
-				setFilter((MatchRecord)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME:
+                setPatternQualifiedName((String)newValue);
+                return;
+            case SnapshotPackage.MATCH_SET_RECORD__MATCHES:
+                getMatches().clear();
+                getMatches().addAll((Collection<? extends MatchRecord>)newValue);
+                return;
+            case SnapshotPackage.MATCH_SET_RECORD__FILTER:
+                setFilter((MatchRecord)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME:
-				setPatternQualifiedName(PATTERN_QUALIFIED_NAME_EDEFAULT);
-				return;
-			case SnapshotPackage.MATCH_SET_RECORD__MATCHES:
-				getMatches().clear();
-				return;
-			case SnapshotPackage.MATCH_SET_RECORD__FILTER:
-				setFilter((MatchRecord)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME:
+                setPatternQualifiedName(PATTERN_QUALIFIED_NAME_EDEFAULT);
+                return;
+            case SnapshotPackage.MATCH_SET_RECORD__MATCHES:
+                getMatches().clear();
+                return;
+            case SnapshotPackage.MATCH_SET_RECORD__FILTER:
+                setFilter((MatchRecord)null);
+                return;
+        }
+        super.eUnset(featureID);
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME:
-				return PATTERN_QUALIFIED_NAME_EDEFAULT == null ? patternQualifiedName != null : !PATTERN_QUALIFIED_NAME_EDEFAULT.equals(patternQualifiedName);
-			case SnapshotPackage.MATCH_SET_RECORD__MATCHES:
-				return matches != null && !matches.isEmpty();
-			case SnapshotPackage.MATCH_SET_RECORD__FILTER:
-				return filter != null;
-		}
-		return super.eIsSet(featureID);
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME:
+                return PATTERN_QUALIFIED_NAME_EDEFAULT == null ? patternQualifiedName != null : !PATTERN_QUALIFIED_NAME_EDEFAULT.equals(patternQualifiedName);
+            case SnapshotPackage.MATCH_SET_RECORD__MATCHES:
+                return matches != null && !matches.isEmpty();
+            case SnapshotPackage.MATCH_SET_RECORD__FILTER:
+                return filter != null;
+        }
+        return super.eIsSet(featureID);
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (patternQualifiedName: ");
-		result.append(patternQualifiedName);
-		result.append(')');
-		return result.toString();
-	}
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (patternQualifiedName: ");
+        result.append(patternQualifiedName);
+        result.append(')');
+        return result.toString();
+    }
 
 } //MatchSetRecordImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MatchSubstitutionRecordImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MatchSubstitutionRecordImpl.java
index b01dc40d21..456a101155 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MatchSubstitutionRecordImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MatchSubstitutionRecordImpl.java
@@ -5,6 +5,7 @@
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
@@ -25,138 +26,138 @@
  * @generated
  */
 public abstract class MatchSubstitutionRecordImpl extends MinimalEObjectImpl.Container implements MatchSubstitutionRecord {
-	/**
-	 * The default value of the '{@link #getParameterName() <em>Parameter Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParameterName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARAMETER_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getParameterName() <em>Parameter Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParameterName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String parameterName = PARAMETER_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MatchSubstitutionRecordImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SnapshotPackage.Literals.MATCH_SUBSTITUTION_RECORD;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getParameterName() {
-		return parameterName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParameterName(String newParameterName) {
-		String oldParameterName = parameterName;
-		parameterName = newParameterName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME, oldParameterName, parameterName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SnapshotPackage.MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME:
-				return getParameterName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SnapshotPackage.MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME:
-				setParameterName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME:
-				setParameterName(PARAMETER_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME:
-				return PARAMETER_NAME_EDEFAULT == null ? parameterName != null : !PARAMETER_NAME_EDEFAULT.equals(parameterName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (parameterName: ");
-		result.append(parameterName);
-		result.append(')');
-		return result.toString();
-	}
+    /**
+     * The default value of the '{@link #getParameterName() <em>Parameter Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getParameterName()
+     * @generated
+     * @ordered
+     */
+    protected static final String PARAMETER_NAME_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getParameterName() <em>Parameter Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getParameterName()
+     * @generated
+     * @ordered
+     */
+    protected String parameterName = PARAMETER_NAME_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected MatchSubstitutionRecordImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.MATCH_SUBSTITUTION_RECORD;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getParameterName() {
+        return parameterName;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setParameterName(String newParameterName) {
+        String oldParameterName = parameterName;
+        parameterName = newParameterName;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME, oldParameterName, parameterName));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME:
+                return getParameterName();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME:
+                setParameterName((String)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME:
+                setParameterName(PARAMETER_NAME_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME:
+                return PARAMETER_NAME_EDEFAULT == null ? parameterName != null : !PARAMETER_NAME_EDEFAULT.equals(parameterName);
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (parameterName: ");
+        result.append(parameterName);
+        result.append(')');
+        return result.toString();
+    }
 
 } //MatchSubstitutionRecordImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MiscellaneousSubstitutionImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MiscellaneousSubstitutionImpl.java
index d5e8a4ed87..29b6e23e3c 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MiscellaneousSubstitutionImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/MiscellaneousSubstitutionImpl.java
@@ -25,138 +25,138 @@
  * @generated
  */
 public class MiscellaneousSubstitutionImpl extends MatchSubstitutionRecordImpl implements MiscellaneousSubstitution {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MiscellaneousSubstitutionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SnapshotPackage.Literals.MISCELLANEOUS_SUBSTITUTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(Object newValue) {
-		Object oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.MISCELLANEOUS_SUBSTITUTION__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SnapshotPackage.MISCELLANEOUS_SUBSTITUTION__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SnapshotPackage.MISCELLANEOUS_SUBSTITUTION__VALUE:
-				setValue(newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.MISCELLANEOUS_SUBSTITUTION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.MISCELLANEOUS_SUBSTITUTION__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
+    /**
+     * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected static final Object VALUE_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected Object value = VALUE_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected MiscellaneousSubstitutionImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.MISCELLANEOUS_SUBSTITUTION;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Object getValue() {
+        return value;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setValue(Object newValue) {
+        Object oldValue = value;
+        value = newValue;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.MISCELLANEOUS_SUBSTITUTION__VALUE, oldValue, value));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.MISCELLANEOUS_SUBSTITUTION__VALUE:
+                return getValue();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.MISCELLANEOUS_SUBSTITUTION__VALUE:
+                setValue(newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.MISCELLANEOUS_SUBSTITUTION__VALUE:
+                setValue(VALUE_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.MISCELLANEOUS_SUBSTITUTION__VALUE:
+                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (value: ");
+        result.append(value);
+        result.append(')');
+        return result.toString();
+    }
 
 } //MiscellaneousSubstitutionImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/QuerySnapshotImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/QuerySnapshotImpl.java
index 0f04903cda..283cf52b06 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/QuerySnapshotImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/QuerySnapshotImpl.java
@@ -41,219 +41,219 @@
  * @generated
  */
 public class QuerySnapshotImpl extends MinimalEObjectImpl.Container implements QuerySnapshot {
-	/**
-	 * The cached value of the '{@link #getMatchSetRecords() <em>Match Set Records</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMatchSetRecords()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<MatchSetRecord> matchSetRecords;
+    /**
+     * The cached value of the '{@link #getMatchSetRecords() <em>Match Set Records</em>}' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getMatchSetRecords()
+     * @generated
+     * @ordered
+     */
+    protected EList<MatchSetRecord> matchSetRecords;
 
-	/**
-	 * The cached value of the '{@link #getModelRoots() <em>Model Roots</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getModelRoots()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<EObject> modelRoots;
+    /**
+     * The cached value of the '{@link #getModelRoots() <em>Model Roots</em>}' reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getModelRoots()
+     * @generated
+     * @ordered
+     */
+    protected EList<EObject> modelRoots;
 
-	/**
-	 * The default value of the '{@link #getInputSpecification() <em>Input Specification</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInputSpecification()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final InputSpecification INPUT_SPECIFICATION_EDEFAULT = InputSpecification.UNSET;
+    /**
+     * The default value of the '{@link #getInputSpecification() <em>Input Specification</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getInputSpecification()
+     * @generated
+     * @ordered
+     */
+    protected static final InputSpecification INPUT_SPECIFICATION_EDEFAULT = InputSpecification.UNSET;
 
-	/**
-	 * The cached value of the '{@link #getInputSpecification() <em>Input Specification</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInputSpecification()
-	 * @generated
-	 * @ordered
-	 */
-	protected InputSpecification inputSpecification = INPUT_SPECIFICATION_EDEFAULT;
+    /**
+     * The cached value of the '{@link #getInputSpecification() <em>Input Specification</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getInputSpecification()
+     * @generated
+     * @ordered
+     */
+    protected InputSpecification inputSpecification = INPUT_SPECIFICATION_EDEFAULT;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected QuerySnapshotImpl() {
-		super();
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected QuerySnapshotImpl() {
+        super();
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SnapshotPackage.Literals.QUERY_SNAPSHOT;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.QUERY_SNAPSHOT;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<MatchSetRecord> getMatchSetRecords() {
-		if (matchSetRecords == null) {
-			matchSetRecords = new EObjectContainmentEList<MatchSetRecord>(MatchSetRecord.class, this, SnapshotPackage.QUERY_SNAPSHOT__MATCH_SET_RECORDS);
-		}
-		return matchSetRecords;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EList<MatchSetRecord> getMatchSetRecords() {
+        if (matchSetRecords == null) {
+            matchSetRecords = new EObjectContainmentEList<MatchSetRecord>(MatchSetRecord.class, this, SnapshotPackage.QUERY_SNAPSHOT__MATCH_SET_RECORDS);
+        }
+        return matchSetRecords;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<EObject> getModelRoots() {
-		if (modelRoots == null) {
-			modelRoots = new EObjectResolvingEList<EObject>(EObject.class, this, SnapshotPackage.QUERY_SNAPSHOT__MODEL_ROOTS);
-		}
-		return modelRoots;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EList<EObject> getModelRoots() {
+        if (modelRoots == null) {
+            modelRoots = new EObjectResolvingEList<EObject>(EObject.class, this, SnapshotPackage.QUERY_SNAPSHOT__MODEL_ROOTS);
+        }
+        return modelRoots;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InputSpecification getInputSpecification() {
-		return inputSpecification;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public InputSpecification getInputSpecification() {
+        return inputSpecification;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInputSpecification(InputSpecification newInputSpecification) {
-		InputSpecification oldInputSpecification = inputSpecification;
-		inputSpecification = newInputSpecification == null ? INPUT_SPECIFICATION_EDEFAULT : newInputSpecification;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.QUERY_SNAPSHOT__INPUT_SPECIFICATION, oldInputSpecification, inputSpecification));
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setInputSpecification(InputSpecification newInputSpecification) {
+        InputSpecification oldInputSpecification = inputSpecification;
+        inputSpecification = newInputSpecification == null ? INPUT_SPECIFICATION_EDEFAULT : newInputSpecification;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.QUERY_SNAPSHOT__INPUT_SPECIFICATION, oldInputSpecification, inputSpecification));
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case SnapshotPackage.QUERY_SNAPSHOT__MATCH_SET_RECORDS:
-				return ((InternalEList<?>)getMatchSetRecords()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+            case SnapshotPackage.QUERY_SNAPSHOT__MATCH_SET_RECORDS:
+                return ((InternalEList<?>)getMatchSetRecords()).basicRemove(otherEnd, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SnapshotPackage.QUERY_SNAPSHOT__MATCH_SET_RECORDS:
-				return getMatchSetRecords();
-			case SnapshotPackage.QUERY_SNAPSHOT__MODEL_ROOTS:
-				return getModelRoots();
-			case SnapshotPackage.QUERY_SNAPSHOT__INPUT_SPECIFICATION:
-				return getInputSpecification();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.QUERY_SNAPSHOT__MATCH_SET_RECORDS:
+                return getMatchSetRecords();
+            case SnapshotPackage.QUERY_SNAPSHOT__MODEL_ROOTS:
+                return getModelRoots();
+            case SnapshotPackage.QUERY_SNAPSHOT__INPUT_SPECIFICATION:
+                return getInputSpecification();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SnapshotPackage.QUERY_SNAPSHOT__MATCH_SET_RECORDS:
-				getMatchSetRecords().clear();
-				getMatchSetRecords().addAll((Collection<? extends MatchSetRecord>)newValue);
-				return;
-			case SnapshotPackage.QUERY_SNAPSHOT__MODEL_ROOTS:
-				getModelRoots().clear();
-				getModelRoots().addAll((Collection<? extends EObject>)newValue);
-				return;
-			case SnapshotPackage.QUERY_SNAPSHOT__INPUT_SPECIFICATION:
-				setInputSpecification((InputSpecification)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.QUERY_SNAPSHOT__MATCH_SET_RECORDS:
+                getMatchSetRecords().clear();
+                getMatchSetRecords().addAll((Collection<? extends MatchSetRecord>)newValue);
+                return;
+            case SnapshotPackage.QUERY_SNAPSHOT__MODEL_ROOTS:
+                getModelRoots().clear();
+                getModelRoots().addAll((Collection<? extends EObject>)newValue);
+                return;
+            case SnapshotPackage.QUERY_SNAPSHOT__INPUT_SPECIFICATION:
+                setInputSpecification((InputSpecification)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.QUERY_SNAPSHOT__MATCH_SET_RECORDS:
-				getMatchSetRecords().clear();
-				return;
-			case SnapshotPackage.QUERY_SNAPSHOT__MODEL_ROOTS:
-				getModelRoots().clear();
-				return;
-			case SnapshotPackage.QUERY_SNAPSHOT__INPUT_SPECIFICATION:
-				setInputSpecification(INPUT_SPECIFICATION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.QUERY_SNAPSHOT__MATCH_SET_RECORDS:
+                getMatchSetRecords().clear();
+                return;
+            case SnapshotPackage.QUERY_SNAPSHOT__MODEL_ROOTS:
+                getModelRoots().clear();
+                return;
+            case SnapshotPackage.QUERY_SNAPSHOT__INPUT_SPECIFICATION:
+                setInputSpecification(INPUT_SPECIFICATION_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.QUERY_SNAPSHOT__MATCH_SET_RECORDS:
-				return matchSetRecords != null && !matchSetRecords.isEmpty();
-			case SnapshotPackage.QUERY_SNAPSHOT__MODEL_ROOTS:
-				return modelRoots != null && !modelRoots.isEmpty();
-			case SnapshotPackage.QUERY_SNAPSHOT__INPUT_SPECIFICATION:
-				return inputSpecification != INPUT_SPECIFICATION_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.QUERY_SNAPSHOT__MATCH_SET_RECORDS:
+                return matchSetRecords != null && !matchSetRecords.isEmpty();
+            case SnapshotPackage.QUERY_SNAPSHOT__MODEL_ROOTS:
+                return modelRoots != null && !modelRoots.isEmpty();
+            case SnapshotPackage.QUERY_SNAPSHOT__INPUT_SPECIFICATION:
+                return inputSpecification != INPUT_SPECIFICATION_EDEFAULT;
+        }
+        return super.eIsSet(featureID);
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (inputSpecification: ");
-		result.append(inputSpecification);
-		result.append(')');
-		return result.toString();
-	}
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (inputSpecification: ");
+        result.append(inputSpecification);
+        result.append(')');
+        return result.toString();
+    }
 
 } //QuerySnapshotImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/SerializedJavaObjectSubstitutionImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/SerializedJavaObjectSubstitutionImpl.java
new file mode 100644
index 0000000000..05e0db80a9
--- /dev/null
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/SerializedJavaObjectSubstitutionImpl.java
@@ -0,0 +1,216 @@
+/**
+ */
+package org.eclipse.viatra.query.testing.snapshot.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution;
+import org.eclipse.viatra.query.testing.snapshot.SnapshotPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Serialized Java Object Substitution</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.query.testing.snapshot.impl.SerializedJavaObjectSubstitutionImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.viatra.query.testing.snapshot.impl.SerializedJavaObjectSubstitutionImpl#getType <em>Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class SerializedJavaObjectSubstitutionImpl extends MatchSubstitutionRecordImpl implements SerializedJavaObjectSubstitution {
+    /**
+     * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected static final String VALUE_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected String value = VALUE_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getType()
+     * @generated
+     * @ordered
+     */
+    protected static final String TYPE_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getType()
+     * @generated
+     * @ordered
+     */
+    protected String type = TYPE_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected SerializedJavaObjectSubstitutionImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.SERIALIZED_JAVA_OBJECT_SUBSTITUTION;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setValue(String newValue) {
+        String oldValue = value;
+        value = newValue;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.SERIALIZED_JAVA_OBJECT_SUBSTITUTION__VALUE, oldValue, value));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setType(String newType) {
+        String oldType = type;
+        type = newType;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.SERIALIZED_JAVA_OBJECT_SUBSTITUTION__TYPE, oldType, type));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.SERIALIZED_JAVA_OBJECT_SUBSTITUTION__VALUE:
+                return getValue();
+            case SnapshotPackage.SERIALIZED_JAVA_OBJECT_SUBSTITUTION__TYPE:
+                return getType();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.SERIALIZED_JAVA_OBJECT_SUBSTITUTION__VALUE:
+                setValue((String)newValue);
+                return;
+            case SnapshotPackage.SERIALIZED_JAVA_OBJECT_SUBSTITUTION__TYPE:
+                setType((String)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.SERIALIZED_JAVA_OBJECT_SUBSTITUTION__VALUE:
+                setValue(VALUE_EDEFAULT);
+                return;
+            case SnapshotPackage.SERIALIZED_JAVA_OBJECT_SUBSTITUTION__TYPE:
+                setType(TYPE_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.SERIALIZED_JAVA_OBJECT_SUBSTITUTION__VALUE:
+                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+            case SnapshotPackage.SERIALIZED_JAVA_OBJECT_SUBSTITUTION__TYPE:
+                return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (value: ");
+        result.append(value);
+        result.append(", type: ");
+        result.append(type);
+        result.append(')');
+        return result.toString();
+    }
+
+} //SerializedJavaObjectSubstitutionImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/SnapshotFactoryImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/SnapshotFactoryImpl.java
index d3a0183d65..43057add99 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/SnapshotFactoryImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/SnapshotFactoryImpl.java
@@ -20,283 +20,294 @@
  * @generated
  */
 public class SnapshotFactoryImpl extends EFactoryImpl implements SnapshotFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SnapshotFactory init() {
-		try {
-			SnapshotFactory theSnapshotFactory = (SnapshotFactory)EPackage.Registry.INSTANCE.getEFactory(SnapshotPackage.eNS_URI);
-			if (theSnapshotFactory != null) {
-				return theSnapshotFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new SnapshotFactoryImpl();
-	}
+    /**
+     * Creates the default factory implementation.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static SnapshotFactory init() {
+        try {
+            SnapshotFactory theSnapshotFactory = (SnapshotFactory)EPackage.Registry.INSTANCE.getEFactory(SnapshotPackage.eNS_URI);
+            if (theSnapshotFactory != null) {
+                return theSnapshotFactory;
+            }
+        }
+        catch (Exception exception) {
+            EcorePlugin.INSTANCE.log(exception);
+        }
+        return new SnapshotFactoryImpl();
+    }
 
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SnapshotFactoryImpl() {
-		super();
-	}
+    /**
+     * Creates an instance of the factory.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public SnapshotFactoryImpl() {
+        super();
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case SnapshotPackage.MATCH_SET_RECORD: return createMatchSetRecord();
-			case SnapshotPackage.MATCH_RECORD: return createMatchRecord();
-			case SnapshotPackage.EMF_SUBSTITUTION: return createEMFSubstitution();
-			case SnapshotPackage.INT_SUBSTITUTION: return createIntSubstitution();
-			case SnapshotPackage.LONG_SUBSTITUTION: return createLongSubstitution();
-			case SnapshotPackage.DOUBLE_SUBSTITUTION: return createDoubleSubstitution();
-			case SnapshotPackage.FLOAT_SUBSTITUTION: return createFloatSubstitution();
-			case SnapshotPackage.BOOLEAN_SUBSTITUTION: return createBooleanSubstitution();
-			case SnapshotPackage.STRING_SUBSTITUTION: return createStringSubstitution();
-			case SnapshotPackage.DATE_SUBSTITUTION: return createDateSubstitution();
-			case SnapshotPackage.ENUM_SUBSTITUTION: return createEnumSubstitution();
-			case SnapshotPackage.MISCELLANEOUS_SUBSTITUTION: return createMiscellaneousSubstitution();
-			case SnapshotPackage.QUERY_SNAPSHOT: return createQuerySnapshot();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public EObject create(EClass eClass) {
+        switch (eClass.getClassifierID()) {
+            case SnapshotPackage.MATCH_SET_RECORD: return createMatchSetRecord();
+            case SnapshotPackage.MATCH_RECORD: return createMatchRecord();
+            case SnapshotPackage.EMF_SUBSTITUTION: return createEMFSubstitution();
+            case SnapshotPackage.INT_SUBSTITUTION: return createIntSubstitution();
+            case SnapshotPackage.LONG_SUBSTITUTION: return createLongSubstitution();
+            case SnapshotPackage.DOUBLE_SUBSTITUTION: return createDoubleSubstitution();
+            case SnapshotPackage.FLOAT_SUBSTITUTION: return createFloatSubstitution();
+            case SnapshotPackage.BOOLEAN_SUBSTITUTION: return createBooleanSubstitution();
+            case SnapshotPackage.STRING_SUBSTITUTION: return createStringSubstitution();
+            case SnapshotPackage.DATE_SUBSTITUTION: return createDateSubstitution();
+            case SnapshotPackage.ENUM_SUBSTITUTION: return createEnumSubstitution();
+            case SnapshotPackage.MISCELLANEOUS_SUBSTITUTION: return createMiscellaneousSubstitution();
+            case SnapshotPackage.QUERY_SNAPSHOT: return createQuerySnapshot();
+            case SnapshotPackage.SERIALIZED_JAVA_OBJECT_SUBSTITUTION: return createSerializedJavaObjectSubstitution();
+            default:
+                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+        }
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case SnapshotPackage.INPUT_SPECIFICATION:
-				return createInputSpecificationFromString(eDataType, initialValue);
-			case SnapshotPackage.RECORD_ROLE:
-				return createRecordRoleFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object createFromString(EDataType eDataType, String initialValue) {
+        switch (eDataType.getClassifierID()) {
+            case SnapshotPackage.INPUT_SPECIFICATION:
+                return createInputSpecificationFromString(eDataType, initialValue);
+            case SnapshotPackage.RECORD_ROLE:
+                return createRecordRoleFromString(eDataType, initialValue);
+            default:
+                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+        }
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case SnapshotPackage.INPUT_SPECIFICATION:
-				return convertInputSpecificationToString(eDataType, instanceValue);
-			case SnapshotPackage.RECORD_ROLE:
-				return convertRecordRoleToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String convertToString(EDataType eDataType, Object instanceValue) {
+        switch (eDataType.getClassifierID()) {
+            case SnapshotPackage.INPUT_SPECIFICATION:
+                return convertInputSpecificationToString(eDataType, instanceValue);
+            case SnapshotPackage.RECORD_ROLE:
+                return convertRecordRoleToString(eDataType, instanceValue);
+            default:
+                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+        }
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MatchSetRecord createMatchSetRecord() {
-		MatchSetRecordImpl matchSetRecord = new MatchSetRecordImpl();
-		return matchSetRecord;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public MatchSetRecord createMatchSetRecord() {
+        MatchSetRecordImpl matchSetRecord = new MatchSetRecordImpl();
+        return matchSetRecord;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MatchRecord createMatchRecord() {
-		MatchRecordImpl matchRecord = new MatchRecordImpl();
-		return matchRecord;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public MatchRecord createMatchRecord() {
+        MatchRecordImpl matchRecord = new MatchRecordImpl();
+        return matchRecord;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMFSubstitution createEMFSubstitution() {
-		EMFSubstitutionImpl emfSubstitution = new EMFSubstitutionImpl();
-		return emfSubstitution;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EMFSubstitution createEMFSubstitution() {
+        EMFSubstitutionImpl emfSubstitution = new EMFSubstitutionImpl();
+        return emfSubstitution;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IntSubstitution createIntSubstitution() {
-		IntSubstitutionImpl intSubstitution = new IntSubstitutionImpl();
-		return intSubstitution;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public IntSubstitution createIntSubstitution() {
+        IntSubstitutionImpl intSubstitution = new IntSubstitutionImpl();
+        return intSubstitution;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LongSubstitution createLongSubstitution() {
-		LongSubstitutionImpl longSubstitution = new LongSubstitutionImpl();
-		return longSubstitution;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public LongSubstitution createLongSubstitution() {
+        LongSubstitutionImpl longSubstitution = new LongSubstitutionImpl();
+        return longSubstitution;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DoubleSubstitution createDoubleSubstitution() {
-		DoubleSubstitutionImpl doubleSubstitution = new DoubleSubstitutionImpl();
-		return doubleSubstitution;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public DoubleSubstitution createDoubleSubstitution() {
+        DoubleSubstitutionImpl doubleSubstitution = new DoubleSubstitutionImpl();
+        return doubleSubstitution;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FloatSubstitution createFloatSubstitution() {
-		FloatSubstitutionImpl floatSubstitution = new FloatSubstitutionImpl();
-		return floatSubstitution;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public FloatSubstitution createFloatSubstitution() {
+        FloatSubstitutionImpl floatSubstitution = new FloatSubstitutionImpl();
+        return floatSubstitution;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BooleanSubstitution createBooleanSubstitution() {
-		BooleanSubstitutionImpl booleanSubstitution = new BooleanSubstitutionImpl();
-		return booleanSubstitution;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public BooleanSubstitution createBooleanSubstitution() {
+        BooleanSubstitutionImpl booleanSubstitution = new BooleanSubstitutionImpl();
+        return booleanSubstitution;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StringSubstitution createStringSubstitution() {
-		StringSubstitutionImpl stringSubstitution = new StringSubstitutionImpl();
-		return stringSubstitution;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public StringSubstitution createStringSubstitution() {
+        StringSubstitutionImpl stringSubstitution = new StringSubstitutionImpl();
+        return stringSubstitution;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DateSubstitution createDateSubstitution() {
-		DateSubstitutionImpl dateSubstitution = new DateSubstitutionImpl();
-		return dateSubstitution;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public DateSubstitution createDateSubstitution() {
+        DateSubstitutionImpl dateSubstitution = new DateSubstitutionImpl();
+        return dateSubstitution;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnumSubstitution createEnumSubstitution() {
-		EnumSubstitutionImpl enumSubstitution = new EnumSubstitutionImpl();
-		return enumSubstitution;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EnumSubstitution createEnumSubstitution() {
+        EnumSubstitutionImpl enumSubstitution = new EnumSubstitutionImpl();
+        return enumSubstitution;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MiscellaneousSubstitution createMiscellaneousSubstitution() {
-		MiscellaneousSubstitutionImpl miscellaneousSubstitution = new MiscellaneousSubstitutionImpl();
-		return miscellaneousSubstitution;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public MiscellaneousSubstitution createMiscellaneousSubstitution() {
+        MiscellaneousSubstitutionImpl miscellaneousSubstitution = new MiscellaneousSubstitutionImpl();
+        return miscellaneousSubstitution;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public QuerySnapshot createQuerySnapshot() {
-		QuerySnapshotImpl querySnapshot = new QuerySnapshotImpl();
-		return querySnapshot;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public QuerySnapshot createQuerySnapshot() {
+        QuerySnapshotImpl querySnapshot = new QuerySnapshotImpl();
+        return querySnapshot;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InputSpecification createInputSpecificationFromString(EDataType eDataType, String initialValue) {
-		InputSpecification result = InputSpecification.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public SerializedJavaObjectSubstitution createSerializedJavaObjectSubstitution() {
+        SerializedJavaObjectSubstitutionImpl serializedJavaObjectSubstitution = new SerializedJavaObjectSubstitutionImpl();
+        return serializedJavaObjectSubstitution;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertInputSpecificationToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public InputSpecification createInputSpecificationFromString(EDataType eDataType, String initialValue) {
+        InputSpecification result = InputSpecification.get(initialValue);
+        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+        return result;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RecordRole createRecordRoleFromString(EDataType eDataType, String initialValue) {
-		RecordRole result = RecordRole.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String convertInputSpecificationToString(EDataType eDataType, Object instanceValue) {
+        return instanceValue == null ? null : instanceValue.toString();
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertRecordRoleToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public RecordRole createRecordRoleFromString(EDataType eDataType, String initialValue) {
+        RecordRole result = RecordRole.get(initialValue);
+        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+        return result;
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SnapshotPackage getSnapshotPackage() {
-		return (SnapshotPackage)getEPackage();
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String convertRecordRoleToString(EDataType eDataType, Object instanceValue) {
+        return instanceValue == null ? null : instanceValue.toString();
+    }
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static SnapshotPackage getPackage() {
-		return SnapshotPackage.eINSTANCE;
-	}
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public SnapshotPackage getSnapshotPackage() {
+        return (SnapshotPackage)getEPackage();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @deprecated
+     * @generated
+     */
+    @Deprecated
+    public static SnapshotPackage getPackage() {
+        return SnapshotPackage.eINSTANCE;
+    }
 
 } //SnapshotFactoryImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/SnapshotPackageImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/SnapshotPackageImpl.java
index bb76ea8229..a30ad5c140 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/SnapshotPackageImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/SnapshotPackageImpl.java
@@ -26,6 +26,7 @@
 import org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution;
 import org.eclipse.viatra.query.testing.snapshot.QuerySnapshot;
 import org.eclipse.viatra.query.testing.snapshot.RecordRole;
+import org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution;
 import org.eclipse.viatra.query.testing.snapshot.SnapshotFactory;
 import org.eclipse.viatra.query.testing.snapshot.SnapshotPackage;
 import org.eclipse.viatra.query.testing.snapshot.StringSubstitution;
@@ -37,680 +38,723 @@
  * @generated
  */
 public class SnapshotPackageImpl extends EPackageImpl implements SnapshotPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass matchSetRecordEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass matchRecordEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass matchSubstitutionRecordEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass emfSubstitutionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass intSubstitutionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass longSubstitutionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass doubleSubstitutionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass floatSubstitutionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass booleanSubstitutionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass stringSubstitutionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass dateSubstitutionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass enumSubstitutionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass miscellaneousSubstitutionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass querySnapshotEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum inputSpecificationEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum recordRoleEEnum = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private SnapshotPackageImpl() {
-		super(eNS_URI, SnapshotFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link SnapshotPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static SnapshotPackage init() {
-		if (isInited) return (SnapshotPackage)EPackage.Registry.INSTANCE.getEPackage(SnapshotPackage.eNS_URI);
-
-		// Obtain or create and register package
-		SnapshotPackageImpl theSnapshotPackage = (SnapshotPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SnapshotPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SnapshotPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theSnapshotPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theSnapshotPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theSnapshotPackage.freeze();
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass matchSetRecordEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass matchRecordEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass matchSubstitutionRecordEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass emfSubstitutionEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass intSubstitutionEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass longSubstitutionEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass doubleSubstitutionEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass floatSubstitutionEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass booleanSubstitutionEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass stringSubstitutionEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass dateSubstitutionEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass enumSubstitutionEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass miscellaneousSubstitutionEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass querySnapshotEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass serializedJavaObjectSubstitutionEClass = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EEnum inputSpecificationEEnum = null;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EEnum recordRoleEEnum = null;
+
+    /**
+     * Creates an instance of the model <b>Package</b>, registered with
+     * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+     * package URI value.
+     * <p>Note: the correct way to create the package is via the static
+     * factory method {@link #init init()}, which also performs
+     * initialization of the package, or returns the registered package,
+     * if one already exists.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.emf.ecore.EPackage.Registry
+     * @see org.eclipse.viatra.query.testing.snapshot.SnapshotPackage#eNS_URI
+     * @see #init()
+     * @generated
+     */
+    private SnapshotPackageImpl() {
+        super(eNS_URI, SnapshotFactory.eINSTANCE);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private static boolean isInited = false;
+
+    /**
+     * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+     * 
+     * <p>This method is used to initialize {@link SnapshotPackage#eINSTANCE} when that field is accessed.
+     * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #eNS_URI
+     * @see #createPackageContents()
+     * @see #initializePackageContents()
+     * @generated
+     */
+    public static SnapshotPackage init() {
+        if (isInited) return (SnapshotPackage)EPackage.Registry.INSTANCE.getEPackage(SnapshotPackage.eNS_URI);
+
+        // Obtain or create and register package
+        SnapshotPackageImpl theSnapshotPackage = (SnapshotPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SnapshotPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SnapshotPackageImpl());
+
+        isInited = true;
+
+        // Initialize simple dependencies
+        EcorePackage.eINSTANCE.eClass();
+
+        // Create package meta-data objects
+        theSnapshotPackage.createPackageContents();
+
+        // Initialize created meta-data
+        theSnapshotPackage.initializePackageContents();
+
+        // Mark meta-data to indicate it can't be changed
+        theSnapshotPackage.freeze();
 
   
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(SnapshotPackage.eNS_URI, theSnapshotPackage);
-		return theSnapshotPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMatchSetRecord() {
-		return matchSetRecordEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMatchSetRecord_PatternQualifiedName() {
-		return (EAttribute)matchSetRecordEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMatchSetRecord_Matches() {
-		return (EReference)matchSetRecordEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMatchSetRecord_Filter() {
-		return (EReference)matchSetRecordEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMatchRecord() {
-		return matchRecordEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMatchRecord_Substitutions() {
-		return (EReference)matchRecordEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMatchSubstitutionRecord() {
-		return matchSubstitutionRecordEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMatchSubstitutionRecord_ParameterName() {
-		return (EAttribute)matchSubstitutionRecordEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEMFSubstitution() {
-		return emfSubstitutionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEMFSubstitution_Value() {
-		return (EReference)emfSubstitutionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIntSubstitution() {
-		return intSubstitutionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getIntSubstitution_Value() {
-		return (EAttribute)intSubstitutionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLongSubstitution() {
-		return longSubstitutionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLongSubstitution_Value() {
-		return (EAttribute)longSubstitutionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDoubleSubstitution() {
-		return doubleSubstitutionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDoubleSubstitution_Value() {
-		return (EAttribute)doubleSubstitutionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFloatSubstitution() {
-		return floatSubstitutionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFloatSubstitution_Value() {
-		return (EAttribute)floatSubstitutionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBooleanSubstitution() {
-		return booleanSubstitutionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBooleanSubstitution_Value() {
-		return (EAttribute)booleanSubstitutionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getStringSubstitution() {
-		return stringSubstitutionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getStringSubstitution_Value() {
-		return (EAttribute)stringSubstitutionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDateSubstitution() {
-		return dateSubstitutionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDateSubstitution_Value() {
-		return (EAttribute)dateSubstitutionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEnumSubstitution() {
-		return enumSubstitutionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEnumSubstitution_ValueLiteral() {
-		return (EAttribute)enumSubstitutionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEnumSubstitution_EnumType() {
-		return (EReference)enumSubstitutionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMiscellaneousSubstitution() {
-		return miscellaneousSubstitutionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMiscellaneousSubstitution_Value() {
-		return (EAttribute)miscellaneousSubstitutionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getQuerySnapshot() {
-		return querySnapshotEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getQuerySnapshot_MatchSetRecords() {
-		return (EReference)querySnapshotEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getQuerySnapshot_ModelRoots() {
-		return (EReference)querySnapshotEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getQuerySnapshot_InputSpecification() {
-		return (EAttribute)querySnapshotEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getInputSpecification() {
-		return inputSpecificationEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getRecordRole() {
-		return recordRoleEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SnapshotFactory getSnapshotFactory() {
-		return (SnapshotFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		matchSetRecordEClass = createEClass(MATCH_SET_RECORD);
-		createEAttribute(matchSetRecordEClass, MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME);
-		createEReference(matchSetRecordEClass, MATCH_SET_RECORD__MATCHES);
-		createEReference(matchSetRecordEClass, MATCH_SET_RECORD__FILTER);
-
-		matchRecordEClass = createEClass(MATCH_RECORD);
-		createEReference(matchRecordEClass, MATCH_RECORD__SUBSTITUTIONS);
-
-		matchSubstitutionRecordEClass = createEClass(MATCH_SUBSTITUTION_RECORD);
-		createEAttribute(matchSubstitutionRecordEClass, MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME);
-
-		emfSubstitutionEClass = createEClass(EMF_SUBSTITUTION);
-		createEReference(emfSubstitutionEClass, EMF_SUBSTITUTION__VALUE);
-
-		intSubstitutionEClass = createEClass(INT_SUBSTITUTION);
-		createEAttribute(intSubstitutionEClass, INT_SUBSTITUTION__VALUE);
-
-		longSubstitutionEClass = createEClass(LONG_SUBSTITUTION);
-		createEAttribute(longSubstitutionEClass, LONG_SUBSTITUTION__VALUE);
-
-		doubleSubstitutionEClass = createEClass(DOUBLE_SUBSTITUTION);
-		createEAttribute(doubleSubstitutionEClass, DOUBLE_SUBSTITUTION__VALUE);
-
-		floatSubstitutionEClass = createEClass(FLOAT_SUBSTITUTION);
-		createEAttribute(floatSubstitutionEClass, FLOAT_SUBSTITUTION__VALUE);
-
-		booleanSubstitutionEClass = createEClass(BOOLEAN_SUBSTITUTION);
-		createEAttribute(booleanSubstitutionEClass, BOOLEAN_SUBSTITUTION__VALUE);
-
-		stringSubstitutionEClass = createEClass(STRING_SUBSTITUTION);
-		createEAttribute(stringSubstitutionEClass, STRING_SUBSTITUTION__VALUE);
-
-		dateSubstitutionEClass = createEClass(DATE_SUBSTITUTION);
-		createEAttribute(dateSubstitutionEClass, DATE_SUBSTITUTION__VALUE);
-
-		enumSubstitutionEClass = createEClass(ENUM_SUBSTITUTION);
-		createEAttribute(enumSubstitutionEClass, ENUM_SUBSTITUTION__VALUE_LITERAL);
-		createEReference(enumSubstitutionEClass, ENUM_SUBSTITUTION__ENUM_TYPE);
-
-		miscellaneousSubstitutionEClass = createEClass(MISCELLANEOUS_SUBSTITUTION);
-		createEAttribute(miscellaneousSubstitutionEClass, MISCELLANEOUS_SUBSTITUTION__VALUE);
-
-		querySnapshotEClass = createEClass(QUERY_SNAPSHOT);
-		createEReference(querySnapshotEClass, QUERY_SNAPSHOT__MATCH_SET_RECORDS);
-		createEReference(querySnapshotEClass, QUERY_SNAPSHOT__MODEL_ROOTS);
-		createEAttribute(querySnapshotEClass, QUERY_SNAPSHOT__INPUT_SPECIFICATION);
-
-		// Create enums
-		inputSpecificationEEnum = createEEnum(INPUT_SPECIFICATION);
-		recordRoleEEnum = createEEnum(RECORD_ROLE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		emfSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
-		intSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
-		longSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
-		doubleSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
-		floatSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
-		booleanSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
-		stringSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
-		dateSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
-		enumSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
-		miscellaneousSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
-
-		// Initialize classes, features, and operations; add parameters
-		initEClass(matchSetRecordEClass, MatchSetRecord.class, "MatchSetRecord", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMatchSetRecord_PatternQualifiedName(), ecorePackage.getEString(), "patternQualifiedName", null, 0, 1, MatchSetRecord.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMatchSetRecord_Matches(), this.getMatchRecord(), null, "matches", null, 0, -1, MatchSetRecord.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getMatchSetRecord_Filter(), this.getMatchRecord(), null, "filter", null, 0, 1, MatchSetRecord.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(matchRecordEClass, MatchRecord.class, "MatchRecord", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMatchRecord_Substitutions(), this.getMatchSubstitutionRecord(), null, "substitutions", null, 0, -1, MatchRecord.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        // Update the registry and return the package
+        EPackage.Registry.INSTANCE.put(SnapshotPackage.eNS_URI, theSnapshotPackage);
+        return theSnapshotPackage;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getMatchSetRecord() {
+        return matchSetRecordEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getMatchSetRecord_PatternQualifiedName() {
+        return (EAttribute)matchSetRecordEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EReference getMatchSetRecord_Matches() {
+        return (EReference)matchSetRecordEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EReference getMatchSetRecord_Filter() {
+        return (EReference)matchSetRecordEClass.getEStructuralFeatures().get(2);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getMatchRecord() {
+        return matchRecordEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EReference getMatchRecord_Substitutions() {
+        return (EReference)matchRecordEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getMatchSubstitutionRecord() {
+        return matchSubstitutionRecordEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getMatchSubstitutionRecord_ParameterName() {
+        return (EAttribute)matchSubstitutionRecordEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getEMFSubstitution() {
+        return emfSubstitutionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EReference getEMFSubstitution_Value() {
+        return (EReference)emfSubstitutionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getIntSubstitution() {
+        return intSubstitutionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getIntSubstitution_Value() {
+        return (EAttribute)intSubstitutionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getLongSubstitution() {
+        return longSubstitutionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getLongSubstitution_Value() {
+        return (EAttribute)longSubstitutionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getDoubleSubstitution() {
+        return doubleSubstitutionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getDoubleSubstitution_Value() {
+        return (EAttribute)doubleSubstitutionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getFloatSubstitution() {
+        return floatSubstitutionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getFloatSubstitution_Value() {
+        return (EAttribute)floatSubstitutionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getBooleanSubstitution() {
+        return booleanSubstitutionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getBooleanSubstitution_Value() {
+        return (EAttribute)booleanSubstitutionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getStringSubstitution() {
+        return stringSubstitutionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getStringSubstitution_Value() {
+        return (EAttribute)stringSubstitutionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getDateSubstitution() {
+        return dateSubstitutionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getDateSubstitution_Value() {
+        return (EAttribute)dateSubstitutionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getEnumSubstitution() {
+        return enumSubstitutionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getEnumSubstitution_ValueLiteral() {
+        return (EAttribute)enumSubstitutionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EReference getEnumSubstitution_EnumType() {
+        return (EReference)enumSubstitutionEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getMiscellaneousSubstitution() {
+        return miscellaneousSubstitutionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getMiscellaneousSubstitution_Value() {
+        return (EAttribute)miscellaneousSubstitutionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getQuerySnapshot() {
+        return querySnapshotEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EReference getQuerySnapshot_MatchSetRecords() {
+        return (EReference)querySnapshotEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EReference getQuerySnapshot_ModelRoots() {
+        return (EReference)querySnapshotEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getQuerySnapshot_InputSpecification() {
+        return (EAttribute)querySnapshotEClass.getEStructuralFeatures().get(2);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EClass getSerializedJavaObjectSubstitution() {
+        return serializedJavaObjectSubstitutionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getSerializedJavaObjectSubstitution_Value() {
+        return (EAttribute)serializedJavaObjectSubstitutionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getSerializedJavaObjectSubstitution_Type() {
+        return (EAttribute)serializedJavaObjectSubstitutionEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EEnum getInputSpecification() {
+        return inputSpecificationEEnum;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EEnum getRecordRole() {
+        return recordRoleEEnum;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public SnapshotFactory getSnapshotFactory() {
+        return (SnapshotFactory)getEFactoryInstance();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private boolean isCreated = false;
+
+    /**
+     * Creates the meta-model objects for the package.  This method is
+     * guarded to have no affect on any invocation but its first.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void createPackageContents() {
+        if (isCreated) return;
+        isCreated = true;
+
+        // Create classes and their features
+        matchSetRecordEClass = createEClass(MATCH_SET_RECORD);
+        createEAttribute(matchSetRecordEClass, MATCH_SET_RECORD__PATTERN_QUALIFIED_NAME);
+        createEReference(matchSetRecordEClass, MATCH_SET_RECORD__MATCHES);
+        createEReference(matchSetRecordEClass, MATCH_SET_RECORD__FILTER);
+
+        matchRecordEClass = createEClass(MATCH_RECORD);
+        createEReference(matchRecordEClass, MATCH_RECORD__SUBSTITUTIONS);
+
+        matchSubstitutionRecordEClass = createEClass(MATCH_SUBSTITUTION_RECORD);
+        createEAttribute(matchSubstitutionRecordEClass, MATCH_SUBSTITUTION_RECORD__PARAMETER_NAME);
+
+        emfSubstitutionEClass = createEClass(EMF_SUBSTITUTION);
+        createEReference(emfSubstitutionEClass, EMF_SUBSTITUTION__VALUE);
+
+        intSubstitutionEClass = createEClass(INT_SUBSTITUTION);
+        createEAttribute(intSubstitutionEClass, INT_SUBSTITUTION__VALUE);
+
+        longSubstitutionEClass = createEClass(LONG_SUBSTITUTION);
+        createEAttribute(longSubstitutionEClass, LONG_SUBSTITUTION__VALUE);
+
+        doubleSubstitutionEClass = createEClass(DOUBLE_SUBSTITUTION);
+        createEAttribute(doubleSubstitutionEClass, DOUBLE_SUBSTITUTION__VALUE);
+
+        floatSubstitutionEClass = createEClass(FLOAT_SUBSTITUTION);
+        createEAttribute(floatSubstitutionEClass, FLOAT_SUBSTITUTION__VALUE);
+
+        booleanSubstitutionEClass = createEClass(BOOLEAN_SUBSTITUTION);
+        createEAttribute(booleanSubstitutionEClass, BOOLEAN_SUBSTITUTION__VALUE);
+
+        stringSubstitutionEClass = createEClass(STRING_SUBSTITUTION);
+        createEAttribute(stringSubstitutionEClass, STRING_SUBSTITUTION__VALUE);
+
+        dateSubstitutionEClass = createEClass(DATE_SUBSTITUTION);
+        createEAttribute(dateSubstitutionEClass, DATE_SUBSTITUTION__VALUE);
+
+        enumSubstitutionEClass = createEClass(ENUM_SUBSTITUTION);
+        createEAttribute(enumSubstitutionEClass, ENUM_SUBSTITUTION__VALUE_LITERAL);
+        createEReference(enumSubstitutionEClass, ENUM_SUBSTITUTION__ENUM_TYPE);
+
+        miscellaneousSubstitutionEClass = createEClass(MISCELLANEOUS_SUBSTITUTION);
+        createEAttribute(miscellaneousSubstitutionEClass, MISCELLANEOUS_SUBSTITUTION__VALUE);
+
+        querySnapshotEClass = createEClass(QUERY_SNAPSHOT);
+        createEReference(querySnapshotEClass, QUERY_SNAPSHOT__MATCH_SET_RECORDS);
+        createEReference(querySnapshotEClass, QUERY_SNAPSHOT__MODEL_ROOTS);
+        createEAttribute(querySnapshotEClass, QUERY_SNAPSHOT__INPUT_SPECIFICATION);
+
+        serializedJavaObjectSubstitutionEClass = createEClass(SERIALIZED_JAVA_OBJECT_SUBSTITUTION);
+        createEAttribute(serializedJavaObjectSubstitutionEClass, SERIALIZED_JAVA_OBJECT_SUBSTITUTION__VALUE);
+        createEAttribute(serializedJavaObjectSubstitutionEClass, SERIALIZED_JAVA_OBJECT_SUBSTITUTION__TYPE);
+
+        // Create enums
+        inputSpecificationEEnum = createEEnum(INPUT_SPECIFICATION);
+        recordRoleEEnum = createEEnum(RECORD_ROLE);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private boolean isInitialized = false;
+
+    /**
+     * Complete the initialization of the package and its meta-model.  This
+     * method is guarded to have no affect on any invocation but its first.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void initializePackageContents() {
+        if (isInitialized) return;
+        isInitialized = true;
+
+        // Initialize package
+        setName(eNAME);
+        setNsPrefix(eNS_PREFIX);
+        setNsURI(eNS_URI);
+
+        // Obtain other dependent packages
+        EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+
+        // Create type parameters
+
+        // Set bounds for type parameters
+
+        // Add supertypes to classes
+        emfSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
+        intSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
+        longSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
+        doubleSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
+        floatSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
+        booleanSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
+        stringSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
+        dateSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
+        enumSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
+        miscellaneousSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
+        serializedJavaObjectSubstitutionEClass.getESuperTypes().add(this.getMatchSubstitutionRecord());
 
-		initEClass(matchSubstitutionRecordEClass, MatchSubstitutionRecord.class, "MatchSubstitutionRecord", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMatchSubstitutionRecord_ParameterName(), ecorePackage.getEString(), "parameterName", null, 0, 1, MatchSubstitutionRecord.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        // Initialize classes, features, and operations; add parameters
+        initEClass(matchSetRecordEClass, MatchSetRecord.class, "MatchSetRecord", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getMatchSetRecord_PatternQualifiedName(), ecorePackage.getEString(), "patternQualifiedName", null, 0, 1, MatchSetRecord.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getMatchSetRecord_Matches(), this.getMatchRecord(), null, "matches", null, 0, -1, MatchSetRecord.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+        initEReference(getMatchSetRecord_Filter(), this.getMatchRecord(), null, "filter", null, 0, 1, MatchSetRecord.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(emfSubstitutionEClass, EMFSubstitution.class, "EMFSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEMFSubstitution_Value(), ecorePackage.getEObject(), null, "value", null, 0, 1, EMFSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(intSubstitutionEClass, IntSubstitution.class, "IntSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getIntSubstitution_Value(), ecorePackage.getEInt(), "value", null, 0, 1, IntSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(longSubstitutionEClass, LongSubstitution.class, "LongSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getLongSubstitution_Value(), ecorePackage.getELong(), "value", null, 0, 1, LongSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(doubleSubstitutionEClass, DoubleSubstitution.class, "DoubleSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDoubleSubstitution_Value(), ecorePackage.getEDouble(), "value", null, 0, 1, DoubleSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(floatSubstitutionEClass, FloatSubstitution.class, "FloatSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFloatSubstitution_Value(), ecorePackage.getEFloat(), "value", null, 0, 1, FloatSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(booleanSubstitutionEClass, BooleanSubstitution.class, "BooleanSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBooleanSubstitution_Value(), ecorePackage.getEBoolean(), "value", null, 0, 1, BooleanSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(stringSubstitutionEClass, StringSubstitution.class, "StringSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getStringSubstitution_Value(), ecorePackage.getEString(), "value", null, 0, 1, StringSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(dateSubstitutionEClass, DateSubstitution.class, "DateSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDateSubstitution_Value(), ecorePackage.getEDate(), "value", null, 0, 1, DateSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(enumSubstitutionEClass, EnumSubstitution.class, "EnumSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEnumSubstitution_ValueLiteral(), theEcorePackage.getEString(), "valueLiteral", null, 0, 1, EnumSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEnumSubstitution_EnumType(), theEcorePackage.getEEnum(), null, "enumType", null, 0, 1, EnumSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(miscellaneousSubstitutionEClass, MiscellaneousSubstitution.class, "MiscellaneousSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMiscellaneousSubstitution_Value(), ecorePackage.getEJavaObject(), "value", null, 0, 1, MiscellaneousSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(querySnapshotEClass, QuerySnapshot.class, "QuerySnapshot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getQuerySnapshot_MatchSetRecords(), this.getMatchSetRecord(), null, "matchSetRecords", null, 0, -1, QuerySnapshot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getQuerySnapshot_ModelRoots(), theEcorePackage.getEObject(), null, "modelRoots", null, 0, -1, QuerySnapshot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getQuerySnapshot_InputSpecification(), this.getInputSpecification(), "inputSpecification", null, 0, 1, QuerySnapshot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(inputSpecificationEEnum, InputSpecification.class, "InputSpecification");
-		addEEnumLiteral(inputSpecificationEEnum, InputSpecification.UNSET);
-		addEEnumLiteral(inputSpecificationEEnum, InputSpecification.RESOURCE_SET);
-		addEEnumLiteral(inputSpecificationEEnum, InputSpecification.RESOURCE);
-		addEEnumLiteral(inputSpecificationEEnum, InputSpecification.EOBJECT);
-
-		initEEnum(recordRoleEEnum, RecordRole.class, "RecordRole");
-		addEEnumLiteral(recordRoleEEnum, RecordRole.MATCH);
-		addEEnumLiteral(recordRoleEEnum, RecordRole.FILTER);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
+        initEClass(matchRecordEClass, MatchRecord.class, "MatchRecord", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getMatchRecord_Substitutions(), this.getMatchSubstitutionRecord(), null, "substitutions", null, 0, -1, MatchRecord.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        initEClass(matchSubstitutionRecordEClass, MatchSubstitutionRecord.class, "MatchSubstitutionRecord", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getMatchSubstitutionRecord_ParameterName(), ecorePackage.getEString(), "parameterName", null, 0, 1, MatchSubstitutionRecord.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        initEClass(emfSubstitutionEClass, EMFSubstitution.class, "EMFSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getEMFSubstitution_Value(), ecorePackage.getEObject(), null, "value", null, 0, 1, EMFSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        initEClass(intSubstitutionEClass, IntSubstitution.class, "IntSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getIntSubstitution_Value(), ecorePackage.getEInt(), "value", null, 0, 1, IntSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        initEClass(longSubstitutionEClass, LongSubstitution.class, "LongSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getLongSubstitution_Value(), ecorePackage.getELong(), "value", null, 0, 1, LongSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        initEClass(doubleSubstitutionEClass, DoubleSubstitution.class, "DoubleSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getDoubleSubstitution_Value(), ecorePackage.getEDouble(), "value", null, 0, 1, DoubleSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        initEClass(floatSubstitutionEClass, FloatSubstitution.class, "FloatSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getFloatSubstitution_Value(), ecorePackage.getEFloat(), "value", null, 0, 1, FloatSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        initEClass(booleanSubstitutionEClass, BooleanSubstitution.class, "BooleanSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getBooleanSubstitution_Value(), ecorePackage.getEBoolean(), "value", null, 0, 1, BooleanSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        initEClass(stringSubstitutionEClass, StringSubstitution.class, "StringSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getStringSubstitution_Value(), ecorePackage.getEString(), "value", null, 0, 1, StringSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        initEClass(dateSubstitutionEClass, DateSubstitution.class, "DateSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getDateSubstitution_Value(), ecorePackage.getEDate(), "value", null, 0, 1, DateSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        initEClass(enumSubstitutionEClass, EnumSubstitution.class, "EnumSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getEnumSubstitution_ValueLiteral(), theEcorePackage.getEString(), "valueLiteral", null, 0, 1, EnumSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getEnumSubstitution_EnumType(), theEcorePackage.getEEnum(), null, "enumType", null, 0, 1, EnumSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        initEClass(miscellaneousSubstitutionEClass, MiscellaneousSubstitution.class, "MiscellaneousSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getMiscellaneousSubstitution_Value(), ecorePackage.getEJavaObject(), "value", null, 0, 1, MiscellaneousSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        initEClass(querySnapshotEClass, QuerySnapshot.class, "QuerySnapshot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getQuerySnapshot_MatchSetRecords(), this.getMatchSetRecord(), null, "matchSetRecords", null, 0, -1, QuerySnapshot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getQuerySnapshot_ModelRoots(), theEcorePackage.getEObject(), null, "modelRoots", null, 0, -1, QuerySnapshot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getQuerySnapshot_InputSpecification(), this.getInputSpecification(), "inputSpecification", null, 0, 1, QuerySnapshot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        initEClass(serializedJavaObjectSubstitutionEClass, SerializedJavaObjectSubstitution.class, "SerializedJavaObjectSubstitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getSerializedJavaObjectSubstitution_Value(), ecorePackage.getEString(), "value", null, 0, 1, SerializedJavaObjectSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getSerializedJavaObjectSubstitution_Type(), ecorePackage.getEString(), "type", null, 0, 1, SerializedJavaObjectSubstitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        // Initialize enums and add enum literals
+        initEEnum(inputSpecificationEEnum, InputSpecification.class, "InputSpecification");
+        addEEnumLiteral(inputSpecificationEEnum, InputSpecification.UNSET);
+        addEEnumLiteral(inputSpecificationEEnum, InputSpecification.RESOURCE_SET);
+        addEEnumLiteral(inputSpecificationEEnum, InputSpecification.RESOURCE);
+        addEEnumLiteral(inputSpecificationEEnum, InputSpecification.EOBJECT);
+
+        initEEnum(recordRoleEEnum, RecordRole.class, "RecordRole");
+        addEEnumLiteral(recordRoleEEnum, RecordRole.MATCH);
+        addEEnumLiteral(recordRoleEEnum, RecordRole.FILTER);
+
+        // Create resource
+        createResource(eNS_URI);
+    }
 
 } //SnapshotPackageImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/StringSubstitutionImpl.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/StringSubstitutionImpl.java
index d051b62544..62090e7559 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/StringSubstitutionImpl.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/impl/StringSubstitutionImpl.java
@@ -25,138 +25,138 @@
  * @generated
  */
 public class StringSubstitutionImpl extends MatchSubstitutionRecordImpl implements StringSubstitution {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StringSubstitutionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SnapshotPackage.Literals.STRING_SUBSTITUTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.STRING_SUBSTITUTION__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case SnapshotPackage.STRING_SUBSTITUTION__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case SnapshotPackage.STRING_SUBSTITUTION__VALUE:
-				setValue((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.STRING_SUBSTITUTION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case SnapshotPackage.STRING_SUBSTITUTION__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
+    /**
+     * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected static final String VALUE_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getValue()
+     * @generated
+     * @ordered
+     */
+    protected String value = VALUE_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected StringSubstitutionImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return SnapshotPackage.Literals.STRING_SUBSTITUTION;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setValue(String newValue) {
+        String oldValue = value;
+        value = newValue;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, SnapshotPackage.STRING_SUBSTITUTION__VALUE, oldValue, value));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case SnapshotPackage.STRING_SUBSTITUTION__VALUE:
+                return getValue();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case SnapshotPackage.STRING_SUBSTITUTION__VALUE:
+                setValue((String)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.STRING_SUBSTITUTION__VALUE:
+                setValue(VALUE_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case SnapshotPackage.STRING_SUBSTITUTION__VALUE:
+                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (value: ");
+        result.append(value);
+        result.append(')');
+        return result.toString();
+    }
 
 } //StringSubstitutionImpl
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/util/SnapshotAdapterFactory.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/util/SnapshotAdapterFactory.java
index a2b6143c2c..01902b9264 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/util/SnapshotAdapterFactory.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/util/SnapshotAdapterFactory.java
@@ -20,335 +20,353 @@
  * @generated
  */
 public class SnapshotAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static SnapshotPackage modelPackage;
+    /**
+     * The cached model package.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected static SnapshotPackage modelPackage;
 
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SnapshotAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = SnapshotPackage.eINSTANCE;
-		}
-	}
+    /**
+     * Creates an instance of the adapter factory.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public SnapshotAdapterFactory() {
+        if (modelPackage == null) {
+            modelPackage = SnapshotPackage.eINSTANCE;
+        }
+    }
 
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
+    /**
+     * Returns whether this factory is applicable for the type of the object.
+     * <!-- begin-user-doc -->
+     * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+     * <!-- end-user-doc -->
+     * @return whether this factory is applicable for the type of the object.
+     * @generated
+     */
+    @Override
+    public boolean isFactoryForType(Object object) {
+        if (object == modelPackage) {
+            return true;
+        }
+        if (object instanceof EObject) {
+            return ((EObject)object).eClass().getEPackage() == modelPackage;
+        }
+        return false;
+    }
 
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SnapshotSwitch<Adapter> modelSwitch =
-		new SnapshotSwitch<Adapter>() {
-			@Override
-			public Adapter caseMatchSetRecord(MatchSetRecord object) {
-				return createMatchSetRecordAdapter();
-			}
-			@Override
-			public Adapter caseMatchRecord(MatchRecord object) {
-				return createMatchRecordAdapter();
-			}
-			@Override
-			public Adapter caseMatchSubstitutionRecord(MatchSubstitutionRecord object) {
-				return createMatchSubstitutionRecordAdapter();
-			}
-			@Override
-			public Adapter caseEMFSubstitution(EMFSubstitution object) {
-				return createEMFSubstitutionAdapter();
-			}
-			@Override
-			public Adapter caseIntSubstitution(IntSubstitution object) {
-				return createIntSubstitutionAdapter();
-			}
-			@Override
-			public Adapter caseLongSubstitution(LongSubstitution object) {
-				return createLongSubstitutionAdapter();
-			}
-			@Override
-			public Adapter caseDoubleSubstitution(DoubleSubstitution object) {
-				return createDoubleSubstitutionAdapter();
-			}
-			@Override
-			public Adapter caseFloatSubstitution(FloatSubstitution object) {
-				return createFloatSubstitutionAdapter();
-			}
-			@Override
-			public Adapter caseBooleanSubstitution(BooleanSubstitution object) {
-				return createBooleanSubstitutionAdapter();
-			}
-			@Override
-			public Adapter caseStringSubstitution(StringSubstitution object) {
-				return createStringSubstitutionAdapter();
-			}
-			@Override
-			public Adapter caseDateSubstitution(DateSubstitution object) {
-				return createDateSubstitutionAdapter();
-			}
-			@Override
-			public Adapter caseEnumSubstitution(EnumSubstitution object) {
-				return createEnumSubstitutionAdapter();
-			}
-			@Override
-			public Adapter caseMiscellaneousSubstitution(MiscellaneousSubstitution object) {
-				return createMiscellaneousSubstitutionAdapter();
-			}
-			@Override
-			public Adapter caseQuerySnapshot(QuerySnapshot object) {
-				return createQuerySnapshotAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+    /**
+     * The switch that delegates to the <code>createXXX</code> methods.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected SnapshotSwitch<Adapter> modelSwitch =
+        new SnapshotSwitch<Adapter>() {
+            @Override
+            public Adapter caseMatchSetRecord(MatchSetRecord object) {
+                return createMatchSetRecordAdapter();
+            }
+            @Override
+            public Adapter caseMatchRecord(MatchRecord object) {
+                return createMatchRecordAdapter();
+            }
+            @Override
+            public Adapter caseMatchSubstitutionRecord(MatchSubstitutionRecord object) {
+                return createMatchSubstitutionRecordAdapter();
+            }
+            @Override
+            public Adapter caseEMFSubstitution(EMFSubstitution object) {
+                return createEMFSubstitutionAdapter();
+            }
+            @Override
+            public Adapter caseIntSubstitution(IntSubstitution object) {
+                return createIntSubstitutionAdapter();
+            }
+            @Override
+            public Adapter caseLongSubstitution(LongSubstitution object) {
+                return createLongSubstitutionAdapter();
+            }
+            @Override
+            public Adapter caseDoubleSubstitution(DoubleSubstitution object) {
+                return createDoubleSubstitutionAdapter();
+            }
+            @Override
+            public Adapter caseFloatSubstitution(FloatSubstitution object) {
+                return createFloatSubstitutionAdapter();
+            }
+            @Override
+            public Adapter caseBooleanSubstitution(BooleanSubstitution object) {
+                return createBooleanSubstitutionAdapter();
+            }
+            @Override
+            public Adapter caseStringSubstitution(StringSubstitution object) {
+                return createStringSubstitutionAdapter();
+            }
+            @Override
+            public Adapter caseDateSubstitution(DateSubstitution object) {
+                return createDateSubstitutionAdapter();
+            }
+            @Override
+            public Adapter caseEnumSubstitution(EnumSubstitution object) {
+                return createEnumSubstitutionAdapter();
+            }
+            @Override
+            public Adapter caseMiscellaneousSubstitution(MiscellaneousSubstitution object) {
+                return createMiscellaneousSubstitutionAdapter();
+            }
+            @Override
+            public Adapter caseQuerySnapshot(QuerySnapshot object) {
+                return createQuerySnapshotAdapter();
+            }
+            @Override
+            public Adapter caseSerializedJavaObjectSubstitution(SerializedJavaObjectSubstitution object) {
+                return createSerializedJavaObjectSubstitutionAdapter();
+            }
+            @Override
+            public Adapter defaultCase(EObject object) {
+                return createEObjectAdapter();
+            }
+        };
 
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
+    /**
+     * Creates an adapter for the <code>target</code>.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param target the object to adapt.
+     * @return the adapter for the <code>target</code>.
+     * @generated
+     */
+    @Override
+    public Adapter createAdapter(Notifier target) {
+        return modelSwitch.doSwitch((EObject)target);
+    }
 
 
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord <em>Match Set Record</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.viatra.query.testing.snapshot.MatchSetRecord
-	 * @generated
-	 */
-	public Adapter createMatchSetRecordAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.MatchSetRecord <em>Match Set Record</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.MatchSetRecord
+     * @generated
+     */
+    public Adapter createMatchSetRecordAdapter() {
+        return null;
+    }
 
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.MatchRecord <em>Match Record</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.viatra.query.testing.snapshot.MatchRecord
-	 * @generated
-	 */
-	public Adapter createMatchRecordAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.MatchRecord <em>Match Record</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.MatchRecord
+     * @generated
+     */
+    public Adapter createMatchRecordAdapter() {
+        return null;
+    }
 
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord <em>Match Substitution Record</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord
-	 * @generated
-	 */
-	public Adapter createMatchSubstitutionRecordAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord <em>Match Substitution Record</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.MatchSubstitutionRecord
+     * @generated
+     */
+    public Adapter createMatchSubstitutionRecordAdapter() {
+        return null;
+    }
 
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.EMFSubstitution <em>EMF Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.viatra.query.testing.snapshot.EMFSubstitution
-	 * @generated
-	 */
-	public Adapter createEMFSubstitutionAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.EMFSubstitution <em>EMF Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.EMFSubstitution
+     * @generated
+     */
+    public Adapter createEMFSubstitutionAdapter() {
+        return null;
+    }
 
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.IntSubstitution <em>Int Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.viatra.query.testing.snapshot.IntSubstitution
-	 * @generated
-	 */
-	public Adapter createIntSubstitutionAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.IntSubstitution <em>Int Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.IntSubstitution
+     * @generated
+     */
+    public Adapter createIntSubstitutionAdapter() {
+        return null;
+    }
 
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.LongSubstitution <em>Long Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.viatra.query.testing.snapshot.LongSubstitution
-	 * @generated
-	 */
-	public Adapter createLongSubstitutionAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.LongSubstitution <em>Long Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.LongSubstitution
+     * @generated
+     */
+    public Adapter createLongSubstitutionAdapter() {
+        return null;
+    }
 
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution <em>Double Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution
-	 * @generated
-	 */
-	public Adapter createDoubleSubstitutionAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution <em>Double Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.DoubleSubstitution
+     * @generated
+     */
+    public Adapter createDoubleSubstitutionAdapter() {
+        return null;
+    }
 
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.FloatSubstitution <em>Float Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.viatra.query.testing.snapshot.FloatSubstitution
-	 * @generated
-	 */
-	public Adapter createFloatSubstitutionAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.FloatSubstitution <em>Float Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.FloatSubstitution
+     * @generated
+     */
+    public Adapter createFloatSubstitutionAdapter() {
+        return null;
+    }
 
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution <em>Boolean Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution
-	 * @generated
-	 */
-	public Adapter createBooleanSubstitutionAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution <em>Boolean Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.BooleanSubstitution
+     * @generated
+     */
+    public Adapter createBooleanSubstitutionAdapter() {
+        return null;
+    }
 
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.StringSubstitution <em>String Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.viatra.query.testing.snapshot.StringSubstitution
-	 * @generated
-	 */
-	public Adapter createStringSubstitutionAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.StringSubstitution <em>String Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.StringSubstitution
+     * @generated
+     */
+    public Adapter createStringSubstitutionAdapter() {
+        return null;
+    }
 
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.DateSubstitution <em>Date Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.viatra.query.testing.snapshot.DateSubstitution
-	 * @generated
-	 */
-	public Adapter createDateSubstitutionAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.DateSubstitution <em>Date Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.DateSubstitution
+     * @generated
+     */
+    public Adapter createDateSubstitutionAdapter() {
+        return null;
+    }
 
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.EnumSubstitution <em>Enum Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.viatra.query.testing.snapshot.EnumSubstitution
-	 * @generated
-	 */
-	public Adapter createEnumSubstitutionAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.EnumSubstitution <em>Enum Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.EnumSubstitution
+     * @generated
+     */
+    public Adapter createEnumSubstitutionAdapter() {
+        return null;
+    }
 
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution <em>Miscellaneous Substitution</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution
-	 * @generated
-	 */
-	public Adapter createMiscellaneousSubstitutionAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution <em>Miscellaneous Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.MiscellaneousSubstitution
+     * @generated
+     */
+    public Adapter createMiscellaneousSubstitutionAdapter() {
+        return null;
+    }
 
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.QuerySnapshot <em>Query Snapshot</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.viatra.query.testing.snapshot.QuerySnapshot
-	 * @generated
-	 */
-	public Adapter createQuerySnapshotAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.QuerySnapshot <em>Query Snapshot</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.QuerySnapshot
+     * @generated
+     */
+    public Adapter createQuerySnapshotAdapter() {
+        return null;
+    }
 
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
+    /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution <em>Serialized Java Object Substitution</em>}'.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @see org.eclipse.viatra.query.testing.snapshot.SerializedJavaObjectSubstitution
+     * @generated
+     */
+    public Adapter createSerializedJavaObjectSubstitutionAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for the default case.
+     * <!-- begin-user-doc -->
+     * This default implementation returns null.
+     * <!-- end-user-doc -->
+     * @return the new adapter.
+     * @generated
+     */
+    public Adapter createEObjectAdapter() {
+        return null;
+    }
 
 } //SnapshotAdapterFactory
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/util/SnapshotSwitch.java b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/util/SnapshotSwitch.java
index 1681ccd61b..8abfaaea33 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/util/SnapshotSwitch.java
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/emf-gen/org/eclipse/viatra/query/testing/snapshot/util/SnapshotSwitch.java
@@ -23,371 +23,393 @@
  * @generated
  */
 public class SnapshotSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static SnapshotPackage modelPackage;
+    /**
+     * The cached model package
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected static SnapshotPackage modelPackage;
 
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SnapshotSwitch() {
-		if (modelPackage == null) {
-			modelPackage = SnapshotPackage.eINSTANCE;
-		}
-	}
+    /**
+     * Creates an instance of the switch.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public SnapshotSwitch() {
+        if (modelPackage == null) {
+            modelPackage = SnapshotPackage.eINSTANCE;
+        }
+    }
 
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
+    /**
+     * Checks whether this is a switch for the given package.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param ePackage the package in question.
+     * @return whether this is a switch for the given package.
+     * @generated
+     */
+    @Override
+    protected boolean isSwitchFor(EPackage ePackage) {
+        return ePackage == modelPackage;
+    }
 
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case SnapshotPackage.MATCH_SET_RECORD: {
-				MatchSetRecord matchSetRecord = (MatchSetRecord)theEObject;
-				T result = caseMatchSetRecord(matchSetRecord);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SnapshotPackage.MATCH_RECORD: {
-				MatchRecord matchRecord = (MatchRecord)theEObject;
-				T result = caseMatchRecord(matchRecord);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SnapshotPackage.MATCH_SUBSTITUTION_RECORD: {
-				MatchSubstitutionRecord matchSubstitutionRecord = (MatchSubstitutionRecord)theEObject;
-				T result = caseMatchSubstitutionRecord(matchSubstitutionRecord);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SnapshotPackage.EMF_SUBSTITUTION: {
-				EMFSubstitution emfSubstitution = (EMFSubstitution)theEObject;
-				T result = caseEMFSubstitution(emfSubstitution);
-				if (result == null) result = caseMatchSubstitutionRecord(emfSubstitution);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SnapshotPackage.INT_SUBSTITUTION: {
-				IntSubstitution intSubstitution = (IntSubstitution)theEObject;
-				T result = caseIntSubstitution(intSubstitution);
-				if (result == null) result = caseMatchSubstitutionRecord(intSubstitution);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SnapshotPackage.LONG_SUBSTITUTION: {
-				LongSubstitution longSubstitution = (LongSubstitution)theEObject;
-				T result = caseLongSubstitution(longSubstitution);
-				if (result == null) result = caseMatchSubstitutionRecord(longSubstitution);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SnapshotPackage.DOUBLE_SUBSTITUTION: {
-				DoubleSubstitution doubleSubstitution = (DoubleSubstitution)theEObject;
-				T result = caseDoubleSubstitution(doubleSubstitution);
-				if (result == null) result = caseMatchSubstitutionRecord(doubleSubstitution);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SnapshotPackage.FLOAT_SUBSTITUTION: {
-				FloatSubstitution floatSubstitution = (FloatSubstitution)theEObject;
-				T result = caseFloatSubstitution(floatSubstitution);
-				if (result == null) result = caseMatchSubstitutionRecord(floatSubstitution);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SnapshotPackage.BOOLEAN_SUBSTITUTION: {
-				BooleanSubstitution booleanSubstitution = (BooleanSubstitution)theEObject;
-				T result = caseBooleanSubstitution(booleanSubstitution);
-				if (result == null) result = caseMatchSubstitutionRecord(booleanSubstitution);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SnapshotPackage.STRING_SUBSTITUTION: {
-				StringSubstitution stringSubstitution = (StringSubstitution)theEObject;
-				T result = caseStringSubstitution(stringSubstitution);
-				if (result == null) result = caseMatchSubstitutionRecord(stringSubstitution);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SnapshotPackage.DATE_SUBSTITUTION: {
-				DateSubstitution dateSubstitution = (DateSubstitution)theEObject;
-				T result = caseDateSubstitution(dateSubstitution);
-				if (result == null) result = caseMatchSubstitutionRecord(dateSubstitution);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SnapshotPackage.ENUM_SUBSTITUTION: {
-				EnumSubstitution enumSubstitution = (EnumSubstitution)theEObject;
-				T result = caseEnumSubstitution(enumSubstitution);
-				if (result == null) result = caseMatchSubstitutionRecord(enumSubstitution);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SnapshotPackage.MISCELLANEOUS_SUBSTITUTION: {
-				MiscellaneousSubstitution miscellaneousSubstitution = (MiscellaneousSubstitution)theEObject;
-				T result = caseMiscellaneousSubstitution(miscellaneousSubstitution);
-				if (result == null) result = caseMatchSubstitutionRecord(miscellaneousSubstitution);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case SnapshotPackage.QUERY_SNAPSHOT: {
-				QuerySnapshot querySnapshot = (QuerySnapshot)theEObject;
-				T result = caseQuerySnapshot(querySnapshot);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
+    /**
+     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the first non-null result returned by a <code>caseXXX</code> call.
+     * @generated
+     */
+    @Override
+    protected T doSwitch(int classifierID, EObject theEObject) {
+        switch (classifierID) {
+            case SnapshotPackage.MATCH_SET_RECORD: {
+                MatchSetRecord matchSetRecord = (MatchSetRecord)theEObject;
+                T result = caseMatchSetRecord(matchSetRecord);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case SnapshotPackage.MATCH_RECORD: {
+                MatchRecord matchRecord = (MatchRecord)theEObject;
+                T result = caseMatchRecord(matchRecord);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case SnapshotPackage.MATCH_SUBSTITUTION_RECORD: {
+                MatchSubstitutionRecord matchSubstitutionRecord = (MatchSubstitutionRecord)theEObject;
+                T result = caseMatchSubstitutionRecord(matchSubstitutionRecord);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case SnapshotPackage.EMF_SUBSTITUTION: {
+                EMFSubstitution emfSubstitution = (EMFSubstitution)theEObject;
+                T result = caseEMFSubstitution(emfSubstitution);
+                if (result == null) result = caseMatchSubstitutionRecord(emfSubstitution);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case SnapshotPackage.INT_SUBSTITUTION: {
+                IntSubstitution intSubstitution = (IntSubstitution)theEObject;
+                T result = caseIntSubstitution(intSubstitution);
+                if (result == null) result = caseMatchSubstitutionRecord(intSubstitution);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case SnapshotPackage.LONG_SUBSTITUTION: {
+                LongSubstitution longSubstitution = (LongSubstitution)theEObject;
+                T result = caseLongSubstitution(longSubstitution);
+                if (result == null) result = caseMatchSubstitutionRecord(longSubstitution);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case SnapshotPackage.DOUBLE_SUBSTITUTION: {
+                DoubleSubstitution doubleSubstitution = (DoubleSubstitution)theEObject;
+                T result = caseDoubleSubstitution(doubleSubstitution);
+                if (result == null) result = caseMatchSubstitutionRecord(doubleSubstitution);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case SnapshotPackage.FLOAT_SUBSTITUTION: {
+                FloatSubstitution floatSubstitution = (FloatSubstitution)theEObject;
+                T result = caseFloatSubstitution(floatSubstitution);
+                if (result == null) result = caseMatchSubstitutionRecord(floatSubstitution);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case SnapshotPackage.BOOLEAN_SUBSTITUTION: {
+                BooleanSubstitution booleanSubstitution = (BooleanSubstitution)theEObject;
+                T result = caseBooleanSubstitution(booleanSubstitution);
+                if (result == null) result = caseMatchSubstitutionRecord(booleanSubstitution);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case SnapshotPackage.STRING_SUBSTITUTION: {
+                StringSubstitution stringSubstitution = (StringSubstitution)theEObject;
+                T result = caseStringSubstitution(stringSubstitution);
+                if (result == null) result = caseMatchSubstitutionRecord(stringSubstitution);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case SnapshotPackage.DATE_SUBSTITUTION: {
+                DateSubstitution dateSubstitution = (DateSubstitution)theEObject;
+                T result = caseDateSubstitution(dateSubstitution);
+                if (result == null) result = caseMatchSubstitutionRecord(dateSubstitution);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case SnapshotPackage.ENUM_SUBSTITUTION: {
+                EnumSubstitution enumSubstitution = (EnumSubstitution)theEObject;
+                T result = caseEnumSubstitution(enumSubstitution);
+                if (result == null) result = caseMatchSubstitutionRecord(enumSubstitution);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case SnapshotPackage.MISCELLANEOUS_SUBSTITUTION: {
+                MiscellaneousSubstitution miscellaneousSubstitution = (MiscellaneousSubstitution)theEObject;
+                T result = caseMiscellaneousSubstitution(miscellaneousSubstitution);
+                if (result == null) result = caseMatchSubstitutionRecord(miscellaneousSubstitution);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case SnapshotPackage.QUERY_SNAPSHOT: {
+                QuerySnapshot querySnapshot = (QuerySnapshot)theEObject;
+                T result = caseQuerySnapshot(querySnapshot);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            case SnapshotPackage.SERIALIZED_JAVA_OBJECT_SUBSTITUTION: {
+                SerializedJavaObjectSubstitution serializedJavaObjectSubstitution = (SerializedJavaObjectSubstitution)theEObject;
+                T result = caseSerializedJavaObjectSubstitution(serializedJavaObjectSubstitution);
+                if (result == null) result = caseMatchSubstitutionRecord(serializedJavaObjectSubstitution);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
+            }
+            default: return defaultCase(theEObject);
+        }
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Match Set Record</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Match Set Record</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMatchSetRecord(MatchSetRecord object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>Match Set Record</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Match Set Record</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseMatchSetRecord(MatchSetRecord object) {
+        return null;
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Match Record</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Match Record</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMatchRecord(MatchRecord object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>Match Record</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Match Record</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseMatchRecord(MatchRecord object) {
+        return null;
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Match Substitution Record</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Match Substitution Record</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMatchSubstitutionRecord(MatchSubstitutionRecord object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>Match Substitution Record</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Match Substitution Record</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseMatchSubstitutionRecord(MatchSubstitutionRecord object) {
+        return null;
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EMF Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EMF Substitution</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEMFSubstitution(EMFSubstitution object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>EMF Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>EMF Substitution</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseEMFSubstitution(EMFSubstitution object) {
+        return null;
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Int Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Int Substitution</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseIntSubstitution(IntSubstitution object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>Int Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Int Substitution</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseIntSubstitution(IntSubstitution object) {
+        return null;
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Long Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Long Substitution</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLongSubstitution(LongSubstitution object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>Long Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Long Substitution</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseLongSubstitution(LongSubstitution object) {
+        return null;
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Double Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Double Substitution</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDoubleSubstitution(DoubleSubstitution object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>Double Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Double Substitution</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseDoubleSubstitution(DoubleSubstitution object) {
+        return null;
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Float Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Float Substitution</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFloatSubstitution(FloatSubstitution object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>Float Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Float Substitution</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseFloatSubstitution(FloatSubstitution object) {
+        return null;
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Boolean Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Boolean Substitution</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBooleanSubstitution(BooleanSubstitution object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>Boolean Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Boolean Substitution</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseBooleanSubstitution(BooleanSubstitution object) {
+        return null;
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>String Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>String Substitution</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseStringSubstitution(StringSubstitution object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>String Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>String Substitution</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseStringSubstitution(StringSubstitution object) {
+        return null;
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Date Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Date Substitution</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDateSubstitution(DateSubstitution object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>Date Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Date Substitution</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseDateSubstitution(DateSubstitution object) {
+        return null;
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Enum Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Enum Substitution</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEnumSubstitution(EnumSubstitution object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>Enum Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Enum Substitution</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseEnumSubstitution(EnumSubstitution object) {
+        return null;
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Miscellaneous Substitution</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Miscellaneous Substitution</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMiscellaneousSubstitution(MiscellaneousSubstitution object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>Miscellaneous Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Miscellaneous Substitution</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseMiscellaneousSubstitution(MiscellaneousSubstitution object) {
+        return null;
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Query Snapshot</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Query Snapshot</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseQuerySnapshot(QuerySnapshot object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>Query Snapshot</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Query Snapshot</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseQuerySnapshot(QuerySnapshot object) {
+        return null;
+    }
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>Serialized Java Object Substitution</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Serialized Java Object Substitution</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseSerializedJavaObjectSubstitution(SerializedJavaObjectSubstitution object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+     * <!-- begin-user-doc -->
+     * This implementation returns null;
+     * returning a non-null result will terminate the switch, but this is the last case anyway.
+     * <!-- end-user-doc -->
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+     * @generated
+     */
+    @Override
+    public T defaultCase(EObject object) {
+        return null;
+    }
 
 } //SnapshotSwitch
diff --git a/query/tests/org.eclipse.viatra.query.testing.snapshot/model/snapshot.ecore b/query/tests/org.eclipse.viatra.query.testing.snapshot/model/snapshot.ecore
index 4ccabb96d5..1aad84c968 100644
--- a/query/tests/org.eclipse.viatra.query.testing.snapshot/model/snapshot.ecore
+++ b/query/tests/org.eclipse.viatra.query.testing.snapshot/model/snapshot.ecore
@@ -64,4 +64,8 @@
     <eLiterals name="Match"/>
     <eLiterals name="Filter" value="1" literal="Filter"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SerializedJavaObjectSubstitution" eSuperTypes="#//MatchSubstitutionRecord">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
 </ecore:EPackage>