diff --git a/src/main/java/models/formulas/DependencyFormula.java b/src/main/java/models/formulas/DependencyFormula.java
index cc70ee5..ce737d9 100644
--- a/src/main/java/models/formulas/DependencyFormula.java
+++ b/src/main/java/models/formulas/DependencyFormula.java
@@ -4,8 +4,8 @@
 
 import lombok.Getter;
 import models.terms.Dependency;
+import models.terms.EvaluatableTerm;
 import models.terms.RDLTerm;
-import models.terms.Resource;
 
 @Getter
 public class DependencyFormula extends Formula {
@@ -16,7 +16,7 @@
 		this.dependency = dependency;
 	}
 	
-	public DependencyFormula(RDLTerm dependingTerm, List<Resource> dependedResources) {
+	public DependencyFormula(RDLTerm dependingTerm, List<EvaluatableTerm> dependedResources) {
 		this.dependency = new Dependency(dependingTerm, dependedResources);
 	}
 
diff --git a/src/main/java/models/terms/Dependency.java b/src/main/java/models/terms/Dependency.java
index c0bcf00..8edefba 100644
--- a/src/main/java/models/terms/Dependency.java
+++ b/src/main/java/models/terms/Dependency.java
@@ -12,7 +12,7 @@
 public class Dependency extends RDLTerm{
 	
 	private RDLTerm dependingTerm;
-	private List<Resource> dependedResources;
+	private List<EvaluatableTerm> dependedTerms;
 	private Dependency dependency;
 	private boolean isListType;
 	
@@ -26,13 +26,13 @@
 //		this.isListType = false;
 //	}
 	
-	public Dependency(RDLTerm dependingTerm, List<Resource> dependedResources) {
-		super(new Symbol(":", dependedResources.size() + 1), dependedResources.get(0).getOrder(), dependingTerm.getSize() + dependedResources.stream().mapToInt(v -> v.size).sum());
+	public Dependency(RDLTerm dependingTerm, List<EvaluatableTerm> dependedTerms) {
+		super(new Symbol(":", dependedTerms.size() + 1), dependedTerms.get(0).getOrder(), dependingTerm.getSize() + dependedTerms.stream().mapToInt(v -> v.size).sum());
 		this.dependingTerm = dependingTerm;
-		this.dependedResources = dependedResources;
+		this.dependedTerms = dependedTerms;
 		this.dependency = null;
 		this.addChild(dependingTerm);
-		for (Resource dependedResource: dependedResources) {
+		for (EvaluatableTerm dependedResource: dependedTerms) {
 			this.addChild(dependedResource);
 		}
 		this.isListType = false;
@@ -46,7 +46,7 @@
 		super(new Symbol(":", 1), dependency.getOrder() - 1, dependency.getSize());
 		this.dependency = dependency;
 		this.dependingTerm = null;
-		this.dependedResources = null;
+		this.dependedTerms = null;
 		this.addChild(dependency);
 		this.isListType = true;
 	}
@@ -88,7 +88,7 @@
 		if(dependency == null) {
 			sb.append(dependingTerm.toTermString());
 			sb.append(" : ");
-			sb.append(dependedResources.toString());
+			sb.append(dependedTerms.toString());
 		} else {
 			sb.append('[');
 			sb.append(dependency.toString());
@@ -103,7 +103,7 @@
 		if(dependency == null) {
 			sb.append(dependingTerm.toStringWithOrder());
 			sb.append(" : ");
-			sb.append(dependedResources.stream().map(RDLTerm::toStringWithOrder).collect(Collectors.joining(", ")));
+			sb.append(dependedTerms.stream().map(RDLTerm::toStringWithOrder).collect(Collectors.joining(", ")));
 		} else {
 			sb.append('[');
 			sb.append(dependency.toStringWithOrder());
@@ -130,7 +130,7 @@
 			return anotherDep.getDependency().equals(dependency);
 		}
 		return anotherDep.getDependingTerm().equals(dependingTerm)
-				&& anotherDep.getDependedResources().equals(dependedResources);
+				&& anotherDep.getDependedTerms().equals(dependedTerms);
 	}
 
 	@Override
@@ -140,7 +140,7 @@
 	
 	@Override
 	public Object clone() {
-		return new Dependency((RDLTerm) dependingTerm.clone(), new ArrayList<>(dependedResources));
+		return new Dependency((RDLTerm) dependingTerm.clone(), new ArrayList<>(dependedTerms));
 	}
 
 }
diff --git a/src/main/java/models/terms/DependencyTerm.java b/src/main/java/models/terms/DependencyTerm.java
index 667fa68..46d871e 100644
--- a/src/main/java/models/terms/DependencyTerm.java
+++ b/src/main/java/models/terms/DependencyTerm.java
@@ -11,11 +11,11 @@
 public class DependencyTerm extends EvaluatableTerm{
 
 	private EvaluatableTerm dependingTerm;
-	private List<Resource> dependedResources = new ArrayList<>();
+	private List<EvaluatableTerm> dependedTerms = new ArrayList<>();
 	private List<EvaluatableTerm> argumentTerms = new ArrayList<>();
 	
 	
-	public DependencyTerm(EvaluatableTerm dependingTerm, List<Resource> dependedTerms, List<EvaluatableTerm> argumentTerms) {
+	public DependencyTerm(EvaluatableTerm dependingTerm, List<EvaluatableTerm> dependedTerms, List<EvaluatableTerm> argumentTerms) {
 		super(
 				new Symbol(":", 1 + dependedTerms.size() + argumentTerms.size()), 
 				-1, 
@@ -40,7 +40,7 @@
 			throw new RuntimeException("Size not equals");
 		}
 		this.dependingTerm = dependingTerm;
-		this.dependedResources = new ArrayList<>(dependedTerms);
+		this.dependedTerms = new ArrayList<>(dependedTerms);
 		this.argumentTerms = new ArrayList<>(argumentTerms);
 		addChild(dependingTerm);
 		for (int i = 0; i < dependedTerms.size(); i++) {
@@ -52,7 +52,7 @@
 	public DependencyTerm(EvaluatableTerm dependingTerm, EvaluatableTerm ...terms) {
 		this(
 				dependingTerm, 
-				IntStream.range(0, terms.length).filter(i -> i % 2 == 0).mapToObj(i -> (Resource) terms[i]).toList(), 
+				IntStream.range(0, terms.length).filter(i -> i % 2 == 0).mapToObj(i -> terms[i]).toList(), 
 				IntStream.range(0, terms.length).filter(i -> i % 2 == 1).mapToObj(i -> terms[i]).toList()
 			);
 	}
@@ -126,8 +126,8 @@
 		sb.append('[');
 		sb.append(getDependingTerm().toString());
 		sb.append(" : ");
-		for (int i = 0; i < dependedResources.size(); i++) {
-			sb.append(dependedResources.get(i).toString());
+		for (int i = 0; i < dependedTerms.size(); i++) {
+			sb.append(dependedTerms.get(i).toString());
 			sb.append(" -> ");
 			sb.append(argumentTerms.get(i).toString());
 			sb.append(", ");
@@ -144,8 +144,8 @@
 		sb.append('[');
 		sb.append(getDependingTerm().toStringWithOrder());
 		sb.append(" : ");
-		for (int i = 0; i < dependedResources.size(); i++) {
-			sb.append(dependedResources.get(i).toStringWithOrder());
+		for (int i = 0; i < dependedTerms.size(); i++) {
+			sb.append(dependedTerms.get(i).toStringWithOrder());
 			sb.append(" -> ");
 			sb.append(argumentTerms.get(i).toStringWithOrder());
 			sb.append(", ");
@@ -166,7 +166,7 @@
 		DependencyTerm term = (DependencyTerm) another;
 		
 		return dependingTerm.equals(term.getDependingTerm()) && 
-				dependedResources.stream().sorted().toList().equals(term.getDependedResources().stream().sorted().toList()) &&
+				dependedTerms.stream().sorted().toList().equals(term.getDependedTerms().stream().sorted().toList()) &&
 				argumentTerms.stream().sorted().toList().equals(term.getArgumentTerms().stream().sorted().toList());
 	}
 
@@ -179,7 +179,7 @@
 	public Object clone() {
 		return new DependencyTerm(
 				(EvaluatableTerm) dependingTerm.clone(),
-				new ArrayList<>(dependedResources),
+				new ArrayList<>(dependedTerms),
 				new ArrayList<>(argumentTerms)
 		);
 	}