diff --git a/AlgebraicDataflowArchitectureModel/src/algorithm/DerivingStorageResources.java b/AlgebraicDataflowArchitectureModel/src/algorithm/DerivingStorageResources.java
index c3de0e1..97f9365 100644
--- a/AlgebraicDataflowArchitectureModel/src/algorithm/DerivingStorageResources.java
+++ b/AlgebraicDataflowArchitectureModel/src/algorithm/DerivingStorageResources.java
@@ -10,10 +10,12 @@
 import models.dataFlowModel.DataFlowModel;
 
 public class DerivingStorageResources {
-	public void run(DataFlowModel model) {
+	static public final Type PULL = new Type("PULL","pull");
+	static public final Type PUSH = new Type("PUSH","push");
+	static public void run(DataFlowModel model) {
 		DataConstraintModel dcmodel = (DataConstraintModel) model;
 		for(IdentifierTemplate resource:dcmodel.getIdentifierTemplates()) {
-			resource.setResourceStateType(new Type("PULL","pull"));
+			resource.setResourceStateType(PULL);
 		}
 		for (ChannelGenerator generator : dcmodel.getChannelGenerators()) {
 			for (ChannelMember member : generator.getChannelMembers()) {
@@ -22,7 +24,7 @@
 				for (Position cuspos : curexp.getVariables().keySet()) {
 					for (Position nextpos : nextexp.getVariables().keySet()) {
 						if (curexp.getVariables().get(cuspos).getName().equals(nextexp.getVariables().get(nextpos).getName())) {
-							member.getIdentifierTemplate().setResourceStateType(new Type("PUSH", "push"));
+							member.getIdentifierTemplate().setResourceStateType(PUSH);
 						}
 					}
 				}
diff --git a/AlgebraicDataflowArchitectureModel/src/tests/DerivingStorageResourcesTest.java b/AlgebraicDataflowArchitectureModel/src/tests/DerivingStorageResourcesTest.java
index e149c02..8d0039e 100644
--- a/AlgebraicDataflowArchitectureModel/src/tests/DerivingStorageResourcesTest.java
+++ b/AlgebraicDataflowArchitectureModel/src/tests/DerivingStorageResourcesTest.java
@@ -39,14 +39,13 @@
 public class DerivingStorageResourcesTest {
 	public static void main(String[] args) {
 		File file = new File("models/POS2.model");
-		DerivingStorageResources deriving = new DerivingStorageResources();
 		try {
 			Parser parser = new Parser(new BufferedReader(new FileReader(file)));
 			DataFlowModel model;
 			try {
 				model = parser.doParse();
 				System.out.println(model);
-				deriving.run(model);
+				DerivingStorageResources.run(model);
 				for (ChannelGenerator c: model.getChannelGenerators()) {
 					for(IdentifierTemplate resource:c.getIdentifierTemplates()) {
 						System.out.println(resource.getResourceStateType().getTypeName());