diff --git a/src/models/meta/MetaRDLTerm.java b/src/models/meta/MetaRDLTerm.java
index dedfb77..87327f4 100644
--- a/src/models/meta/MetaRDLTerm.java
+++ b/src/models/meta/MetaRDLTerm.java
@@ -26,14 +26,11 @@
 		META_EVALUATABLE_TERM_VARIABLE(EvaluatableTerm.class),
 		META_RESOURCE_VARIABLE(ResourceVariable.class);
 		
-		private Class<?> clazz;
+		@Getter
+		private Class<?> baseTermClass;
 		
-		TermType(Class<?> clazz) {
-			this.clazz = clazz;
-		}
-		
-		public Class<?> getClazz() {
-			return this.clazz;
+		private TermType(Class<?> clazz) {
+			this.baseTermClass = clazz;
 		}
 		
 	}
@@ -150,7 +147,7 @@
 	}
 	
 	public boolean isMatchedBy(RDLTerm another, Map<Variable, RDLTerm> binding, Map<Variable, OrderVariableConstraint> orderConstraint) {
-		if (! another.getClass().isAssignableFrom(this.termType.getClazz())) {
+		if (! another.getClass().isAssignableFrom(this.termType.getBaseTermClass())) {
 			return false;
 		}
 		if (this.getChildren().size() != another.getChildren().size()) {
diff --git a/src/models/meta/MetaVariable.java b/src/models/meta/MetaVariable.java
index 9e97762..52461f2 100644
--- a/src/models/meta/MetaVariable.java
+++ b/src/models/meta/MetaVariable.java
@@ -54,7 +54,7 @@
 	@Override
 	public boolean isMatchedBy(RDLTerm another, Map<Variable, RDLTerm> binding,
 			Map<Variable, OrderVariableConstraint> orderConstraint) {
-		if (! this.termType.getClazz().isAssignableFrom(another.getClass())) {
+		if (! this.termType.getBaseTermClass().isAssignableFrom(another.getClass())) {
 			return false;
 		}
 		
diff --git a/target/classes/META-INF/MANIFEST.MF b/target/classes/META-INF/MANIFEST.MF
index 6ea90ca..b55046a 100644
--- a/target/classes/META-INF/MANIFEST.MF
+++ b/target/classes/META-INF/MANIFEST.MF
@@ -1,5 +1,4 @@
 Manifest-Version: 1.0
-Built-By: takot
-Build-Jdk: 17.0.10
+Build-Jdk-Spec: 17
 Created-By: Maven Integration for Eclipse