Index: /DCWoRMS/branches/coolemall/src/example/energy/NodeEnergyEstimationPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/energy/NodeEnergyEstimationPlugin.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/energy/NodeEnergyEstimationPlugin.java	(revision 1247)
@@ -1,5 +1,5 @@
 package example.energy;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -13,5 +13,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		for(Processor cpu: node.getProcessors()){
 			try{
Index: /DCWoRMS/branches/coolemall/src/example/energy/DataCenterEnergyEstimationPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/energy/DataCenterEnergyEstimationPlugin.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/energy/DataCenterEnergyEstimationPlugin.java	(revision 1247)
@@ -1,5 +1,5 @@
 package example.energy;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.DataCenter;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15,5 +15,5 @@
 		double power = 0;
 		DataCenter dataCenter = (DataCenter)resource;
-		for(ComputingNode cn:dataCenter.getComputingNodes()){
+		for(Node cn:dataCenter.getNodes()){
 			PowerUsage powerUsage = cn.getPowerInterface().getRecentPowerUsage();
 			power += (powerUsage == null ? 0 : powerUsage.getValue());
Index: /DCWoRMS/branches/coolemall/src/example/energy/coolemall/NodeGroupEnergyEstimationPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/energy/coolemall/NodeGroupEnergyEstimationPlugin.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/energy/coolemall/NodeGroupEnergyEstimationPlugin.java	(revision 1247)
@@ -1,5 +1,5 @@
 package example.energy.coolemall;
 
-import schedframe.resources.computing.coolemall.Node;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.coolemall.NodeGroup;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
Index: /DCWoRMS/branches/coolemall/src/example/energy/coolemall/NodeEnergyEstimationPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/energy/coolemall/NodeEnergyEstimationPlugin.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/energy/coolemall/NodeEnergyEstimationPlugin.java	(revision 1247)
@@ -1,6 +1,6 @@
 package example.energy.coolemall;
 
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
-import schedframe.resources.computing.coolemall.Node;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
 import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
Index: /DCWoRMS/branches/coolemall/src/example/energy/coolemall/CB2EnergyEstimationPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/energy/coolemall/CB2EnergyEstimationPlugin.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/energy/coolemall/CB2EnergyEstimationPlugin.java	(revision 1247)
@@ -3,8 +3,8 @@
 
 import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.coolemall.ComputeBox1;
-import schedframe.resources.computing.coolemall.Node;
 import schedframe.resources.computing.coolemall.NodeGroup;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
Index: /DCWoRMS/branches/coolemall/src/example/energy/coolemall/HeatsinkEnergyEstimationPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/energy/coolemall/HeatsinkEnergyEstimationPlugin.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/energy/coolemall/HeatsinkEnergyEstimationPlugin.java	(revision 1247)
@@ -1,5 +1,5 @@
 package example.energy.coolemall;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -16,5 +16,5 @@
 		double powerConsumption = 0;
 		Device device = (Device) resource;
-		ComputingNode cn = (ComputingNode) device.getComputingResource();
+		Node cn = (Node) device.getComputingResource();
 		for(Processor proc : cn.getProcessors()){
 			powerConsumption = powerConsumption + proc.getPowerInterface().getRecentPowerUsage().getValue();
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_ConsolidationClusterPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_ConsolidationClusterPlugin.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_ConsolidationClusterPlugin.java	(revision 1247)
@@ -12,5 +12,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.units.Memory;
@@ -74,8 +74,8 @@
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(ClusterResourceManager resourceManager, TaskInterface<?> task) throws NoSuchFieldException {
 
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
+		List<Node> nodes = resourceManager.getNodes();
 		nodes = findSuitableNodes(task, nodes);
-		Collections.sort(nodes, new Comparator<ComputingNode>(){
-		    public int compare(ComputingNode node1, ComputingNode node2){   
+		Collections.sort(nodes, new Comparator<Node>(){
+		    public int compare(Node node1, Node node2){   
 		        return node1.getResourceCharacteristic().getParameters().get("category").get(0).getContent().compareTo(node2.getResourceCharacteristic().getParameters().get("category").get(0).getContent());
 		    }
@@ -83,5 +83,5 @@
 		if(nodes.size() > 0)
 		{
-			ComputingNode node = nodes.get(0);
+			Node node = nodes.get(0);
 			Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
 			List<ComputingResource> choosenResources =  new ArrayList<ComputingResource>();
@@ -117,5 +117,5 @@
 	}
 	
-	private List<ComputingNode> findSuitableNodes(TaskInterface<?> task, List<ComputingNode> nodes) throws NoSuchFieldException{
+	private List<Node> findSuitableNodes(TaskInterface<?> task, List<Node> nodes) throws NoSuchFieldException{
 		int cpuRequest;
 		try {
@@ -130,6 +130,6 @@
 			memoryRequest = 0;
 		}
-		List<ComputingNode> suitableNodes = new ArrayList<ComputingNode>();
-		for(ComputingNode node: nodes){
+		List<Node> suitableNodes = new ArrayList<Node>();
+		for(Node node: nodes){
 			if(node.getFreeProcessorsNumber() >= cpuRequest && node.getFreeMemory() >= memoryRequest){
 				suitableNodes.add(node);
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_Consolidation_NodePowMan_SP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_Consolidation_NodePowMan_SP.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_Consolidation_NodePowMan_SP.java	(revision 1247)
@@ -12,8 +12,8 @@
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
-import schedframe.resources.computing.coolemall.Node;
 import schedframe.resources.computing.profiles.energy.airthroughput.UserAirThroughputStateName;
 import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_ConsolidationAtom_NodePowMan_SP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_ConsolidationAtom_NodePowMan_SP.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_ConsolidationAtom_NodePowMan_SP.java	(revision 1247)
@@ -12,8 +12,8 @@
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
-import schedframe.resources.computing.coolemall.Node;
 import schedframe.resources.computing.profiles.energy.airthroughput.UserAirThroughputStateName;
 import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_LoadBalancing_SP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_LoadBalancing_SP.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_LoadBalancing_SP.java	(revision 1247)
@@ -6,6 +6,6 @@
 import schedframe.exceptions.ResourceException;
 import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
-import schedframe.resources.computing.coolemall.Node;
 import schedframe.scheduling.manager.resources.ClusterResourceManager;
 import schedframe.scheduling.manager.resources.ResourceManager;
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_Random_SP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_Random_SP.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_Random_SP.java	(revision 1247)
@@ -11,7 +11,7 @@
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
-import schedframe.resources.computing.coolemall.Node;
 import schedframe.resources.units.ProcessingElements;
 import schedframe.resources.units.ResourceUnit;
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_Consolidation_SP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_Consolidation_SP.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_Consolidation_SP.java	(revision 1247)
@@ -12,7 +12,7 @@
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
-import schedframe.resources.computing.coolemall.Node;
 import schedframe.resources.units.ProcessingElements;
 import schedframe.resources.units.ResourceUnit;
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_Random_SP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_Random_SP.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_Random_SP.java	(revision 1247)
@@ -10,7 +10,7 @@
 import schedframe.exceptions.ResourceException;
 import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Processor;
-import schedframe.resources.computing.coolemall.Node;
 import schedframe.resources.units.ProcessingElements;
 import schedframe.resources.units.ResourceUnit;
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_Consolidation_SP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_Consolidation_SP.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_Consolidation_SP.java	(revision 1247)
@@ -12,7 +12,7 @@
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
-import schedframe.resources.computing.coolemall.Node;
 import schedframe.resources.units.ProcessingElements;
 import schedframe.resources.units.ResourceUnit;
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_Consolidation_NodePowMan_SP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_Consolidation_NodePowMan_SP.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_Consolidation_NodePowMan_SP.java	(revision 1247)
@@ -12,8 +12,8 @@
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
-import schedframe.resources.computing.coolemall.Node;
 import schedframe.resources.computing.profiles.energy.airthroughput.UserAirThroughputStateName;
 import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_LoadBalancing_SP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_LoadBalancing_SP.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_LoadBalancing_SP.java	(revision 1247)
@@ -6,6 +6,6 @@
 import schedframe.exceptions.ResourceException;
 import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
-import schedframe.resources.computing.coolemall.Node;
 import schedframe.scheduling.manager.resources.ClusterResourceManager;
 import schedframe.scheduling.manager.resources.ResourceManager;
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/recs/RECS_FCFS_Consolidation_SP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/recs/RECS_FCFS_Consolidation_SP.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/recs/RECS_FCFS_Consolidation_SP.java	(revision 1247)
@@ -12,7 +12,7 @@
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Processor;
-import schedframe.resources.computing.coolemall.Node;
 import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
 import schedframe.resources.units.Memory;
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/recs/RECS_FCFS_LB_SP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/recs/RECS_FCFS_LB_SP.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/recs/RECS_FCFS_LB_SP.java	(revision 1247)
@@ -6,6 +6,6 @@
 import schedframe.exceptions.ResourceException;
 import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
-import schedframe.resources.computing.coolemall.Node;
 import schedframe.scheduling.manager.resources.ClusterResourceManager;
 import schedframe.scheduling.manager.resources.ResourceManager;
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/recs/RECS_FCFS_Random_SP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/recs/RECS_FCFS_Random_SP.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/recs/RECS_FCFS_Random_SP.java	(revision 1247)
@@ -11,5 +11,5 @@
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.StandardResourceType;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -57,7 +57,7 @@
 			TaskQueue q = queues.get(0);
 			
-			List<ComputingNode> notSelectedNodes = null;
+			List<Node> notSelectedNodes = null;
 			try {
-				notSelectedNodes = (List<ComputingNode>) resourceManager.getResourcesOfType(StandardResourceType.Node);
+				notSelectedNodes = (List<Node>) resourceManager.getResourcesOfType(StandardResourceType.Node);
 			} catch (ResourceException e) {
 				// TODO Auto-generated catch block
@@ -88,8 +88,8 @@
 
 	@SuppressWarnings("unchecked")
-	private ComputingNode chooseRandomProvider(ClusterResourceManager resourceManager) {
-		List<ComputingNode> nodes = null;
+	private Node chooseRandomProvider(ClusterResourceManager resourceManager) {
+		List<Node> nodes = null;
 		try {
-			nodes = (List<ComputingNode>) resourceManager.getResourcesOfType(StandardResourceType.Node);
+			nodes = (List<Node>) resourceManager.getResourcesOfType(StandardResourceType.Node);
 		} catch (ResourceException e) {
 			// TODO Auto-generated catch block
@@ -101,7 +101,7 @@
 	}
 
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			if(node.getFreeProcessors().size() > 0)
 				filteredNodes.add(node);
@@ -116,15 +116,15 @@
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
 		
-		List<ComputingNode> nodes = null;
+		List<Node> nodes = null;
 		try {
-			nodes = (List<ComputingNode>) resourceManager.getResourcesOfType(StandardResourceType.Node);
+			nodes = (List<Node>) resourceManager.getResourcesOfType(StandardResourceType.Node);
 		} catch (ResourceException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
-		List<ComputingNode> avNodes = filterNodes(nodes, task);
+		List<Node> avNodes = filterNodes(nodes, task);
 		if(avNodes.size() == 0)
 			return null;
-		ComputingNode node = randomNode(avNodes);
+		Node node = randomNode(avNodes);
 
 		int cpuRequest;
@@ -158,7 +158,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -194,10 +194,10 @@
 	}
 	
-	private ComputingNode randomNode(List<ComputingNode> nodes){
+	private Node randomNode(List<Node> nodes){
 		return nodes.get(rand.nextInt(nodes.size()));
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes) {
-		for (ComputingNode node : nodes) {
+	private void adjustOtherFans(List<Node> nodes) {
+		for (Node node : nodes) {
 			
 			if (node.getProcessors().size() == node.getFreeProcessorsNumber()) {
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_ClusterPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_ClusterPlugin.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_ClusterPlugin.java	(revision 1247)
@@ -12,5 +12,5 @@
 import schedframe.resources.ResourceStatus;
 import schedframe.resources.StandardResourceType;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Processor;
@@ -81,6 +81,6 @@
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
-		for (ComputingNode node : nodes) {
+		List<Node> nodes = resourceManager.getNodes();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_NodePowerManagementClusterPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_NodePowerManagementClusterPlugin.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_NodePowerManagementClusterPlugin.java	(revision 1247)
@@ -12,5 +12,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
@@ -54,10 +54,10 @@
 						addToSchedulingPlan(plan, task, choosenResources);
 					} else {
-						if(harnessIdleNodesToWork(task, resourceManager.getComputingNodes()))
+						if(harnessIdleNodesToWork(task, resourceManager.getNodes()))
 							i--;
 					}
 				}
 			}
-			turnOffIdleNodes(resourceManager.getComputingNodes());
+			turnOffIdleNodes(resourceManager.getNodes());
 			break;
 		}
@@ -67,8 +67,8 @@
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(ClusterResourceManager resourceManager, TaskInterface<?> task) {
 
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
+		List<Node> nodes = resourceManager.getNodes();
 		nodes = findSuitableNodes(task, nodes);
-		Collections.sort(nodes, new Comparator<ComputingNode>(){
-		    public int compare(ComputingNode node1, ComputingNode node2){    
+		Collections.sort(nodes, new Comparator<Node>(){
+		    public int compare(Node node1, Node node2){    
 		        return node1.getResourceCharacteristic().getParameters().get("category").get(0).getContent().compareTo(node2.getResourceCharacteristic().getParameters().get("category").get(0).getContent());
 		    }
@@ -98,5 +98,5 @@
 	}
 	
-	private List<ComputingNode> findSuitableNodes(TaskInterface<?> task, List<ComputingNode> nodes){
+	private List<Node> findSuitableNodes(TaskInterface<?> task, List<Node> nodes){
 		int cpuRequest;
 		try {
@@ -105,6 +105,6 @@
 			cpuRequest = 1;
 		}
-		List<ComputingNode> avNodes = new ArrayList<ComputingNode>();
-		for(ComputingNode node: nodes){
+		List<Node> avNodes = new ArrayList<Node>();
+		for(Node node: nodes){
 			if(node.getFreeProcessorsNumber() >= cpuRequest){
 				avNodes.add(node);
@@ -114,6 +114,6 @@
 	}
 
-	private void turnOffIdleNodes(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void turnOffIdleNodes(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				node.getPowerInterface().setPowerState(StandardPowerStateName.OFF);
@@ -122,5 +122,5 @@
 	}
 	
-	private boolean harnessIdleNodesToWork(TaskInterface<?> task, List<ComputingNode> nodes){
+	private boolean harnessIdleNodesToWork(TaskInterface<?> task, List<Node> nodes){
 		int cpuRequest;
 		try {
@@ -129,11 +129,11 @@
 			cpuRequest = 1;
 		}
-		Collections.sort(nodes, new Comparator<ComputingNode>(){
-		    public int compare(ComputingNode node1, ComputingNode node2){    
+		Collections.sort(nodes, new Comparator<Node>(){
+		    public int compare(Node node1, Node node2){    
 		        return node1.getResourceCharacteristic().getParameters().get("category").get(0).getContent().compareTo(node2.getResourceCharacteristic().getParameters().get("category").get(0).getContent());
 		    }
 		});
 		for (int i = 0; i < nodes.size() && cpuRequest > 0; i++) {
-			ComputingNode node = nodes.get(i);
+			Node node = nodes.get(i);
 			if(node.getPowerInterface().getPowerState() == StandardPowerStateName.OFF){
 				node.getPowerInterface().setPowerState(StandardPowerStateName.ON);
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_RandomClusterPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_RandomClusterPlugin.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_RandomClusterPlugin.java	(revision 1247)
@@ -7,5 +7,5 @@
 
 import schedframe.events.scheduling.SchedulingEvent;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.scheduling.manager.resources.ClusterResourceManager;
 import schedframe.scheduling.manager.resources.ResourceManager;
@@ -59,5 +59,5 @@
 
 	private String chooseRandomProvider(ClusterResourceManager resourceManager) {
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
+		List<Node> nodes = resourceManager.getNodes();
 		int nodeIdx = rand.nextInt(nodes.size());
 		return nodes.get(nodeIdx).getFullName();
Index: /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_FanManagementClusterPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_FanManagementClusterPlugin.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_FanManagementClusterPlugin.java	(revision 1247)
@@ -9,5 +9,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.StandardResourceType;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.profiles.energy.airthroughput.StandardAirThroughputStateName;
 import schedframe.resources.computing.profiles.energy.airthroughput.UserAirThroughputStateName;
@@ -46,5 +46,5 @@
 			// BaseLocalSchedulingPlugin.placeJobsInQueues() method)
 			TaskQueue q = queues.get(0);
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -53,5 +53,5 @@
 				if (task.getStatus() == DCWormsTags.READY) {
 
-					ComputingNode node = chooseRandomProvider(resourceManager, task);
+					Node node = chooseRandomProvider(resourceManager, task);
 					if (node != null) {
 						//if there are two or more tasks ( running on the given node then
@@ -83,12 +83,12 @@
 	}
 
-	private ComputingNode chooseRandomProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
+	private Node chooseRandomProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
 		return randomNode(nodes);
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -106,10 +106,10 @@
 	}
 	
-	private ComputingNode randomNode(List<ComputingNode> nodes){
+	private Node randomNode(List<Node> nodes){
 		return nodes.get(rand.nextInt(nodes.size()));
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			List<Device> devices = node.getResourceCharacteristic().getDevices();
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
Index: /DCWoRMS/branches/coolemall/src/simulator/stats/implementation/TaskStats.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/simulator/stats/implementation/TaskStats.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/simulator/stats/implementation/TaskStats.java	(revision 1247)
@@ -7,5 +7,5 @@
 
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -180,13 +180,13 @@
 		while(it.hasNext()) {
 			ComputingResource compRes = it.next();
-			ComputingNode node = null;
+			Node node = null;
 			if(compRes instanceof Core){
 				Core core =(Core) compRes;
-				node = (ComputingNode)core.getNode();
+				node = (Node)core.getNode();
 			} else if(compRes instanceof Processor){
 				Processor proc = (Processor) compRes;
-				node = (ComputingNode)proc.getNode();
-			} else if(compRes instanceof ComputingNode){
-				node = (ComputingNode)compRes;
+				node = (Node)proc.getNode();
+			} else if(compRes instanceof Node){
+				node = (Node)compRes;
 			}
 			if(node != null)
Index: /DCWoRMS/branches/coolemall/src/test/ariel/FCFSCPUFreqScalingPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/ariel/FCFSCPUFreqScalingPlugin.java	(revision 506)
+++ /DCWoRMS/branches/coolemall/src/test/ariel/FCFSCPUFreqScalingPlugin.java	(revision 1247)
@@ -12,5 +12,5 @@
 import schedframe.events.scheduling.TaskRequestedTimeExpiredEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Processor;
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/utils/DAO.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/utils/DAO.java	(revision 1120)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/utils/DAO.java	(revision 1247)
@@ -7,5 +7,5 @@
 import java.util.ResourceBundle;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.scheduling.tasks.TaskInterface;
@@ -20,5 +20,5 @@
 	private TaskToApp taskToApp = new TaskToApp();
 
-	protected String createQuery(TaskInterface<?> task, ComputingNode node) {
+	protected String createQuery(TaskInterface<?> task, Node node) {
 		String query;
 		query = getApplicationType(task) + "." + getNodeCategory(node) + "." + getFrequency(node) + "." + getCoreCnt(task);
@@ -31,10 +31,10 @@
 	}
 	
-	private String getNodeCategory(ComputingNode node){
+	private String getNodeCategory(Node node){
 
 		return node.getCategory();
 	}
 	
-	private int getFrequency(ComputingNode node){
+	private int getFrequency(Node node){
 		Processor proc = (Processor) node.getProcessors().get(0);
 		double freq = proc.getPowerInterface().getFrequency();
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/AtomD510NodeEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/AtomD510NodeEEP.java	(revision 1243)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/AtomD510NodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15,5 +15,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		try {
 			if(jobRegistry.getRunningTasks().size() > 0) {
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/IntelNodeEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/IntelNodeEEP.java	(revision 1243)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/IntelNodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15,5 +15,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		
 		try {
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/AtomZ510NodeEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/AtomZ510NodeEEP.java	(revision 1243)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/AtomZ510NodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -17,5 +17,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		try {
 			if(jobRegistry.getRunningTasks().size() > 0) {
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/AmdNodeEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/AmdNodeEEP.java	(revision 1243)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/AmdNodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -18,5 +18,5 @@
 		double powerConsumption = 0;
 		
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		try {
 			if(jobRegistry.getRunningTasks().size() > 0) {
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/RecsNodeBaseEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/RecsNodeBaseEEP.java	(revision 1245)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/RecsNodeBaseEEP.java	(revision 1247)
@@ -9,5 +9,5 @@
 import java.util.ResourceBundle;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
@@ -54,6 +54,6 @@
 		
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return ((ComputingNode)pe.get(0)).getCategory();
+		if(pe.get(0) instanceof Node)
+			return ((Node)pe.get(0)).getCategory();
 		Core core = (Core)pe.get(0);
 		return core.getParent().getParent().getCategory();
@@ -62,6 +62,6 @@
 	private int getFrequency(PEUnit peUnit){
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return Double.valueOf(((ComputingNode)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
+		if(pe.get(0) instanceof Node)
+			return Double.valueOf(((Node)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
 		Core core = (Core)pe.get(0);
 		Processor proc = (Processor) core.getParent();
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java	(revision 1120)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java	(revision 1247)
@@ -10,5 +10,5 @@
 
 import schedframe.events.scheduling.SchedulingEvent;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
@@ -75,6 +75,6 @@
 		//System.out.println("rccc");
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return ((ComputingNode)pe.get(0)).getCategory();
+		if(pe.get(0) instanceof Node)
+			return ((Node)pe.get(0)).getCategory();
 		Core core = (Core)pe.get(0);
 		return core.getParent().getParent().getCategory();
@@ -83,6 +83,6 @@
 	private int getFrequency(PEUnit peUnit){
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return Double.valueOf(((ComputingNode)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
+		if(pe.get(0) instanceof Node)
+			return Double.valueOf(((Node)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
 		Core core = (Core)pe.get(0);
 		Processor proc = (Processor) core.getParent();
@@ -98,5 +98,5 @@
 		try {
 			cpuReq = task.getCpuCntRequest();
-			cpuReq = ((ComputingNode)pe.get(0)).getProcessors().get(0).getCores().size();
+			cpuReq = ((Node)pe.get(0)).getProcessors().get(0).getCores().size();
 		} catch (NoSuchFieldException e) {
 				cpuReq = 1;
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessDFSSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessDFSSP.java	(revision 1245)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessDFSSP.java	(revision 1247)
@@ -14,5 +14,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -75,9 +75,9 @@
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
 		
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
-		List<ComputingNode> avNodes = filterNodes(nodes, task);
+		List<Node> nodes = resourceManager.getNodes();
+		List<Node> avNodes = filterNodes(nodes, task);
 		if(avNodes.size() == 0)
 			return null;
-		ComputingNode node = randomNode(avNodes);
+		Node node = randomNode(avNodes);
 
 		int cpuRequest;
@@ -111,7 +111,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -154,5 +154,5 @@
 	}
 	
-	private ComputingNode randomNode(List<ComputingNode> nodes){
+	private Node randomNode(List<Node> nodes){
 		return nodes.get(rand.nextInt(nodes.size()));
 	}
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessEnOptNodePowManSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessEnOptNodePowManSP.java	(revision 1120)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessEnOptNodePowManSP.java	(revision 1247)
@@ -18,5 +18,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -76,5 +76,5 @@
 				}
 			}
-			turnOffIdleNodes(resourceManager.getComputingNodes());
+			turnOffIdleNodes(resourceManager.getNodes());
 			break;
 		}
@@ -86,7 +86,7 @@
 
 		Map<ResourceUnitName, ResourceUnit> map;
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
+		List<Node> nodes = resourceManager.getNodes();
 		Collections.sort(nodes, new EnergyComparator(task));
-		for (ComputingNode node : nodes) {
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -156,5 +156,5 @@
 
 	
-	protected String createQuery(TaskInterface<?> task, ComputingNode node) {
+	protected String createQuery(TaskInterface<?> task, Node node) {
 		String query;
 		query = getApplicationType(task) + "." + getNodeCategory(node) + "." + getFrequency(node) + "." + getCoreCnt(task);
@@ -167,10 +167,10 @@
 	}
 	
-	private String getNodeCategory(ComputingNode node){
+	private String getNodeCategory(Node node){
 
 		return node.getCategory();
 	}
 	
-	private int getFrequency(ComputingNode node){
+	private int getFrequency(Node node){
 		Processor proc = (Processor) node.getProcessors().get(0);
 		double freq = proc.getPowerInterface().getFrequency();
@@ -211,5 +211,5 @@
 		return timeBundle;
 	}
-	class EnergyComparator implements Comparator<ComputingNode>{
+	class EnergyComparator implements Comparator<Node>{
 		private TaskInterface<?> task;
 		
@@ -218,5 +218,5 @@
 		}
 		
-	    public int compare(ComputingNode node1, ComputingNode node2){    
+	    public int compare(Node node1, Node node2){    
 	    	double node1EU = Double.MAX_VALUE;
 	    	double node2EU = Double.MAX_VALUE;
@@ -248,6 +248,6 @@
 	}
 	
-	private void turnOffIdleNodes(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void turnOffIdleNodes(List<Node> nodes){
+		for(Node node : nodes){
 			Processor proc = node.getProcessors().get(0);
 			int freeCores = 0;
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/old/RecsExclusivenessFirstSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/old/RecsExclusivenessFirstSP.java	(revision 1120)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/old/RecsExclusivenessFirstSP.java	(revision 1247)
@@ -10,5 +10,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -67,6 +67,6 @@
 
 		Map<ResourceUnitName, ResourceUnit> map;
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
-		for (ComputingNode node : nodes) {
+		List<Node> nodes = resourceManager.getNodes();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/old/RecsExclusivenessNodePowManSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/old/RecsExclusivenessNodePowManSP.java	(revision 1120)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/old/RecsExclusivenessNodePowManSP.java	(revision 1247)
@@ -10,5 +10,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -55,10 +55,10 @@
 						addToSchedulingPlan(plan, task, choosenResources);
 					} else {
-						if(harnessIdleNodesToWork(task, resourceManager.getComputingNodes()))
+						if(harnessIdleNodesToWork(task, resourceManager.getNodes()))
 							i--;
 					}
 				}
 			}
-			turnOffIdleNodes(resourceManager.getComputingNodes());
+			turnOffIdleNodes(resourceManager.getNodes());
 			break;
 		}
@@ -70,10 +70,10 @@
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
 		
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
-		List<ComputingNode> avNodes = filterNodes(nodes, task);
+		List<Node> nodes = resourceManager.getNodes();
+		List<Node> avNodes = filterNodes(nodes, task);
 		if(avNodes.size() == 0)
 			return null;
 
-		for(ComputingNode node: avNodes){
+		for(Node node: avNodes){
 			int cpuRequest;
 			try {
@@ -105,6 +105,6 @@
 	}
 
-	private void turnOffIdleNodes(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void turnOffIdleNodes(List<Node> nodes){
+		for(Node node : nodes){
 			Processor proc = node.getProcessors().get(0);
 			int freeCores = 0;
@@ -120,5 +120,5 @@
 	}
 	
-	private boolean harnessIdleNodesToWork(TaskInterface<?> task, List<ComputingNode> nodes){
+	private boolean harnessIdleNodesToWork(TaskInterface<?> task, List<Node> nodes){
 
 		int cpuRequest;
@@ -129,5 +129,5 @@
 		}
 		for (int i = 0; i < nodes.size(); i++) {
-			ComputingNode node = nodes.get(i);
+			Node node = nodes.get(i);
 			if(node.getPowerInterface().getPowerState() == StandardPowerStateName.OFF){
 
@@ -144,7 +144,7 @@
 
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/old/RecsExclusivenessDFSSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/old/RecsExclusivenessDFSSP.java	(revision 1120)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/old/RecsExclusivenessDFSSP.java	(revision 1247)
@@ -11,5 +11,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -73,9 +73,9 @@
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
 		
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
-		List<ComputingNode> avNodes = filterNodes(nodes, task);
+		List<Node> nodes = resourceManager.getNodes();
+		List<Node> avNodes = filterNodes(nodes, task);
 		if(avNodes.size() == 0)
 			return null;
-		ComputingNode node = randomNode(avNodes);
+		Node node = randomNode(avNodes);
 
 		int cpuRequest;
@@ -108,7 +108,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -141,5 +141,5 @@
 	}
 	
-	private ComputingNode randomNode(List<ComputingNode> nodes){
+	private Node randomNode(List<Node> nodes){
 		return nodes.get(rand.nextInt(nodes.size()));
 	}
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsSP.java	(revision 1120)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsSP.java	(revision 1247)
@@ -7,5 +7,5 @@
 import java.util.ResourceBundle;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.scheduling.tasks.TaskInterface;
 import test.drs_tst.recs.utils.AppType;
@@ -27,5 +27,5 @@
 	}
 	
-	protected String createExecutivenessQuery(TaskInterface<?> task, ComputingNode node) {
+	protected String createExecutivenessQuery(TaskInterface<?> task, Node node) {
 		Executable exec = (Executable)task;
 		String query = getApplicationType(exec) + "." + getNodeCategory(node);
@@ -38,5 +38,5 @@
 	}
 	
-	private String getNodeCategory(ComputingNode node){
+	private String getNodeCategory(Node node){
 		return node.getCategory();
 	}
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessRandomSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessRandomSP.java	(revision 1120)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessRandomSP.java	(revision 1247)
@@ -14,5 +14,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -73,9 +73,9 @@
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
 		
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
-		List<ComputingNode> avNodes = filterNodes(nodes, task);
+		List<Node> nodes = resourceManager.getNodes();
+		List<Node> avNodes = filterNodes(nodes, task);
 		if(avNodes.size() == 0)
 			return null;
-		ComputingNode node = randomNode(avNodes);
+		Node node = randomNode(avNodes);
 		int cpuRequest;
 		try {
@@ -108,7 +108,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -152,5 +152,5 @@
 	}
 	
-	private ComputingNode randomNode(List<ComputingNode> nodes){
+	private Node randomNode(List<Node> nodes){
 		return nodes.get(rand.nextInt(nodes.size()));
 	}
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessEnOptDFSSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessEnOptDFSSP.java	(revision 1245)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessEnOptDFSSP.java	(revision 1247)
@@ -18,5 +18,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -85,8 +85,8 @@
 
 		Map<ResourceUnitName, ResourceUnit> map;
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
+		List<Node> nodes = resourceManager.getNodes();
 		Collections.sort(nodes, new EnergyComparator(task));
 		//System.out.println("*****");
-		for (ComputingNode node : nodes) {
+		for (Node node : nodes) {
 			//System.out.println(node.getCategory());
 			int cpuRequest;
@@ -153,5 +153,5 @@
 
 	
-	protected String createQuery(TaskInterface<?> task, ComputingNode node) {
+	protected String createQuery(TaskInterface<?> task, Node node) {
 		String query;
 		query = getApplicationType(task) + "." + getNodeCategory(node) + "." + getFrequency(node) + "." + getCoreCnt(task);
@@ -164,10 +164,10 @@
 	}
 	
-	private String getNodeCategory(ComputingNode node){
+	private String getNodeCategory(Node node){
 
 		return node.getCategory();
 	}
 	
-	private int getFrequency(ComputingNode node){
+	private int getFrequency(Node node){
 		Processor proc = (Processor) node.getProcessors().get(0);
 		double freq = proc.getPowerInterface().getFrequency();
@@ -208,5 +208,5 @@
 		return timeBundle;
 	}
-	class EnergyComparator implements Comparator<ComputingNode>{
+	class EnergyComparator implements Comparator<Node>{
 		private TaskInterface<?> task;
 		
@@ -215,5 +215,5 @@
 		}
 		
-	    public int compare(ComputingNode node1, ComputingNode node2){    
+	    public int compare(Node node1, Node node2){    
 	    	double node1EU = Double.MAX_VALUE;
 	    	double node2EU = Double.MAX_VALUE;
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessEnOptSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessEnOptSP.java	(revision 1245)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessEnOptSP.java	(revision 1247)
@@ -18,5 +18,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -83,8 +83,8 @@
 
 		Map<ResourceUnitName, ResourceUnit> map;
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
+		List<Node> nodes = resourceManager.getNodes();
 		Collections.sort(nodes, new EnergyComparator(task));
 		//System.out.println("*****");
-		for (ComputingNode node : nodes) {
+		for (Node node : nodes) {
 			//System.out.println(node.getCategory());
 			int cpuRequest;
@@ -151,5 +151,5 @@
 
 	
-	protected String createQuery(TaskInterface<?> task, ComputingNode node) {
+	protected String createQuery(TaskInterface<?> task, Node node) {
 		String query;
 		query = getApplicationType(task) + "." + getNodeCategory(node) + "." + getFrequency(node) + "." + getCoreCnt(task);
@@ -162,10 +162,10 @@
 	}
 	
-	private String getNodeCategory(ComputingNode node){
+	private String getNodeCategory(Node node){
 
 		return node.getCategory();
 	}
 	
-	private int getFrequency(ComputingNode node){
+	private int getFrequency(Node node){
 		Processor proc = (Processor) node.getProcessors().get(0);
 		double freq = proc.getPowerInterface().getFrequency();
@@ -207,5 +207,5 @@
 		return timeBundle;
 	}
-	class EnergyComparator implements Comparator<ComputingNode>{
+	class EnergyComparator implements Comparator<Node>{
 		private TaskInterface<?> task;
 		
@@ -214,5 +214,5 @@
 		}
 		
-	    public int compare(ComputingNode node1, ComputingNode node2){    
+	    public int compare(Node node1, Node node2){    
 	    	double node1EU = Double.MAX_VALUE;
 	    	double node2EU = Double.MAX_VALUE;
Index: /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessRandomNodePowManSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessRandomNodePowManSP.java	(revision 1120)
+++ /DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/scheduling/RecsExclusivenessRandomNodePowManSP.java	(revision 1247)
@@ -14,5 +14,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -64,5 +64,5 @@
 				}
 			}
-			turnOffIdleNodes(resourceManager.getComputingNodes());
+			turnOffIdleNodes(resourceManager.getNodes());
 			break;
 		}
@@ -75,9 +75,9 @@
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
 		
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
-		List<ComputingNode> avNodes = filterNodes(nodes, task);
+		List<Node> nodes = resourceManager.getNodes();
+		List<Node> avNodes = filterNodes(nodes, task);
 		if(avNodes.size() == 0)
 			return null;
-		ComputingNode node = randomNode(avNodes);
+		Node node = randomNode(avNodes);
 		if(node.getStatus() == ResourceStatus.UNAVAILABLE) {
 			node.getPowerInterface().setPowerState(StandardPowerStateName.ON);
@@ -113,7 +113,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -156,10 +156,10 @@
 	}
 	
-	private ComputingNode randomNode(List<ComputingNode> nodes){
+	private Node randomNode(List<Node> nodes){
 		return nodes.get(rand.nextInt(nodes.size()));
 	}
 	
-	private void turnOffIdleNodes(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void turnOffIdleNodes(List<Node> nodes){
+		for(Node node : nodes){
 			Processor proc = node.getProcessors().get(0);
 			int freeCores = 0;
Index: /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessRandomNodePowManSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessRandomNodePowManSP.java	(revision 734)
+++ /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessRandomNodePowManSP.java	(revision 1247)
@@ -14,5 +14,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -64,5 +64,5 @@
 				}
 			}
-			turnOffIdleNodes(resourceManager.getComputingNodes());
+			turnOffIdleNodes(resourceManager.getNodes());
 			break;
 		}
@@ -75,9 +75,9 @@
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
 		
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
-		List<ComputingNode> avNodes = filterNodes(nodes, task);
+		List<Node> nodes = resourceManager.getNodes();
+		List<Node> avNodes = filterNodes(nodes, task);
 		if(avNodes.size() == 0)
 			return null;
-		ComputingNode node = randomNode(avNodes);
+		Node node = randomNode(avNodes);
 		if(node.getStatus() == ResourceStatus.UNAVAILABLE) {
 			node.getPowerInterface().setPowerState(StandardPowerStateName.ON);
@@ -113,7 +113,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -156,10 +156,10 @@
 	}
 	
-	private ComputingNode randomNode(List<ComputingNode> nodes){
+	private Node randomNode(List<Node> nodes){
 		return nodes.get(rand.nextInt(nodes.size()));
 	}
 	
-	private void turnOffIdleNodes(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void turnOffIdleNodes(List<Node> nodes){
+		for(Node node : nodes){
 			Processor proc = node.getProcessors().get(0);
 			int freeCores = 0;
Index: /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessDFSSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessDFSSP.java	(revision 734)
+++ /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessDFSSP.java	(revision 1247)
@@ -14,5 +14,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -75,9 +75,9 @@
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
 		
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
-		List<ComputingNode> avNodes = filterNodes(nodes, task);
+		List<Node> nodes = resourceManager.getNodes();
+		List<Node> avNodes = filterNodes(nodes, task);
 		if(avNodes.size() == 0)
 			return null;
-		ComputingNode node = randomNode(avNodes);
+		Node node = randomNode(avNodes);
 
 		int cpuRequest;
@@ -111,7 +111,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -154,5 +154,5 @@
 	}
 	
-	private ComputingNode randomNode(List<ComputingNode> nodes){
+	private Node randomNode(List<Node> nodes){
 		return nodes.get(rand.nextInt(nodes.size()));
 	}
Index: /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptNodePowManSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptNodePowManSP.java	(revision 1197)
+++ /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptNodePowManSP.java	(revision 1247)
@@ -18,5 +18,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -75,5 +75,5 @@
 				}
 			}
-			turnOffIdleNodes(resourceManager.getComputingNodes());
+			turnOffIdleNodes(resourceManager.getNodes());
 			break;
 		}
@@ -85,7 +85,7 @@
 
 		Map<ResourceUnitName, ResourceUnit> map;
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
+		List<Node> nodes = resourceManager.getNodes();
 		Collections.sort(nodes, new EnergyComparator(task));
-		for (ComputingNode node : nodes) {
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -155,5 +155,5 @@
 
 	
-	protected String createQuery(TaskInterface<?> task, ComputingNode node) {
+	protected String createQuery(TaskInterface<?> task, Node node) {
 		String query;
 		query = getApplicationType(task) + "." + getNodeCategory(node) + "." + getFrequency(node) + "." + getCoreCnt(task);
@@ -184,5 +184,5 @@
 		return timeBundle;
 	}
-	class EnergyComparator implements Comparator<ComputingNode>{
+	class EnergyComparator implements Comparator<Node>{
 		private TaskInterface<?> task;
 		
@@ -191,5 +191,5 @@
 		}
 		
-	    public int compare(ComputingNode node1, ComputingNode node2){    
+	    public int compare(Node node1, Node node2){    
 	    	double node1EU = Double.MAX_VALUE;
 	    	double node2EU = Double.MAX_VALUE;
@@ -221,6 +221,6 @@
 	}
 	
-	private void turnOffIdleNodes(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void turnOffIdleNodes(List<Node> nodes){
+		for(Node node : nodes){
 			Processor proc = node.getProcessors().get(0);
 			int freeCores = 0;
Index: /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsSP.java	(revision 1197)
+++ /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsSP.java	(revision 1247)
@@ -7,5 +7,5 @@
 import java.util.ResourceBundle;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.scheduling.tasks.TaskInterface;
@@ -27,5 +27,5 @@
 	}
 	
-	protected String createExecutivenessQuery(TaskInterface<?> task, ComputingNode node) {
+	protected String createExecutivenessQuery(TaskInterface<?> task, Node node) {
 		Executable exec = (Executable)task;
 		String query = getApplicationType(exec) + "." + getNodeCategory(node);
@@ -38,5 +38,5 @@
 	}
 	
-	protected String getNodeCategory(ComputingNode node){
+	protected String getNodeCategory(Node node){
 		return node.getCategory();
 	}
@@ -52,5 +52,5 @@
 	}
 	
-	protected int getFrequency(ComputingNode node){
+	protected int getFrequency(Node node){
 		Processor proc = (Processor) node.getProcessors().get(0);
 		double freq = proc.getPowerInterface().getFrequency();
Index: /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessRandomSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessRandomSP.java	(revision 734)
+++ /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessRandomSP.java	(revision 1247)
@@ -14,5 +14,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -73,9 +73,9 @@
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
 		
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
-		List<ComputingNode> avNodes = filterNodes(nodes, task);
+		List<Node> nodes = resourceManager.getNodes();
+		List<Node> avNodes = filterNodes(nodes, task);
 		if(avNodes.size() == 0)
 			return null;
-		ComputingNode node = randomNode(avNodes);
+		Node node = randomNode(avNodes);
 
 		int cpuRequest;
@@ -109,7 +109,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -152,5 +152,5 @@
 	}
 	
-	private ComputingNode randomNode(List<ComputingNode> nodes){
+	private Node randomNode(List<Node> nodes){
 		return nodes.get(rand.nextInt(nodes.size()));
 	}
Index: /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptDFSSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptDFSSP.java	(revision 1208)
+++ /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptDFSSP.java	(revision 1247)
@@ -18,5 +18,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -84,8 +84,8 @@
 
 		Map<ResourceUnitName, ResourceUnit> map;
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
+		List<Node> nodes = resourceManager.getNodes();
 		Collections.sort(nodes, new EnergyComparator(task));
 		//System.out.println("*****");
-		for (ComputingNode node : nodes) {
+		for (Node node : nodes) {
 			//System.out.println(node.getCategory());
 			int cpuRequest;
@@ -152,5 +152,5 @@
 
 	
-	protected String createQuery(TaskInterface<?> task, ComputingNode node) {
+	protected String createQuery(TaskInterface<?> task, Node node) {
 		String query;
 		query = getApplicationType(task) + "." + getNodeCategory(node) + "." + getFrequency(node) + "." + getCoreCnt(task);
@@ -181,5 +181,5 @@
 		return timeBundle;
 	}
-	class EnergyComparator implements Comparator<ComputingNode>{
+	class EnergyComparator implements Comparator<Node>{
 		private TaskInterface<?> task;
 		
@@ -188,5 +188,5 @@
 		}
 		
-	    public int compare(ComputingNode node1, ComputingNode node2){    
+	    public int compare(Node node1, Node node2){    
 	    	double node1EU = Double.MAX_VALUE;
 	    	double node2EU = Double.MAX_VALUE;
Index: /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptSP.java	(revision 1197)
+++ /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptSP.java	(revision 1247)
@@ -18,5 +18,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -81,8 +81,8 @@
 
 		Map<ResourceUnitName, ResourceUnit> map;
-		List<ComputingNode> nodes = resourceManager.getComputingNodes();
+		List<Node> nodes = resourceManager.getNodes();
 		Collections.sort(nodes, new EnergyComparator(task));
 		//System.out.println("*****");
-		for (ComputingNode node : nodes) {
+		for (Node node : nodes) {
 			//System.out.println(node.getCategory());
 			int cpuRequest;
@@ -149,5 +149,5 @@
 
 	
-	protected String createQuery(TaskInterface<?> task, ComputingNode node) {
+	protected String createQuery(TaskInterface<?> task, Node node) {
 		String query;
 		query = getApplicationType(task) + "." + getNodeCategory(node) + "." + getFrequency(node) + "." + getCoreCnt(task);
@@ -178,5 +178,5 @@
 		return timeBundle;
 	}
-	class EnergyComparator implements Comparator<ComputingNode>{
+	class EnergyComparator implements Comparator<Node>{
 		private TaskInterface<?> task;
 		
@@ -185,5 +185,5 @@
 		}
 		
-	    public int compare(ComputingNode node1, ComputingNode node2){    
+	    public int compare(Node node1, Node node2){    
 	    	double node1EU = Double.MAX_VALUE;
 	    	double node2EU = Double.MAX_VALUE;
Index: /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AtomD510NodeEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AtomD510NodeEEP.java	(revision 1208)
+++ /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AtomD510NodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15,5 +15,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		try {
 			if(jobRegistry.getRunningTasks().size() > 0) {
Index: /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/IntelNodeEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/IntelNodeEEP.java	(revision 1208)
+++ /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/IntelNodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15,5 +15,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		
 		try {
Index: /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/RecsNodeModelEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/RecsNodeModelEEP.java	(revision 1208)
+++ /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/RecsNodeModelEEP.java	(revision 1247)
@@ -11,5 +11,5 @@
 import java.util.ResourceBundle;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
@@ -45,5 +45,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		
 		try {
@@ -92,6 +92,6 @@
 		
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return ((ComputingNode)pe.get(0)).getCategory();
+		if(pe.get(0) instanceof Node)
+			return ((Node)pe.get(0)).getCategory();
 		if(pe.get(0) instanceof Processor)
 			return ((Processor)pe.get(0)).getParent().getCategory();
@@ -102,6 +102,6 @@
 	private int getFrequency(PEUnit peUnit){
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return Double.valueOf(((ComputingNode)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
+		if(pe.get(0) instanceof Node)
+			return Double.valueOf(((Node)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
 		if(pe.get(0) instanceof Processor)
 			return Double.valueOf(((Processor)pe.get(0)).getPowerInterface().getFrequency()).intValue();
Index: /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AtomZ510NodeEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AtomZ510NodeEEP.java	(revision 1208)
+++ /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AtomZ510NodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15,5 +15,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		try {
 			if(jobRegistry.getRunningTasks().size() > 0) {
Index: /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AmdNodeEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AmdNodeEEP.java	(revision 1208)
+++ /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/AmdNodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15,5 +15,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		try {
 			if(jobRegistry.getRunningTasks().size() > 0) {
Index: /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/RecsNodeBaseEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/RecsNodeBaseEEP.java	(revision 734)
+++ /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/energy/RecsNodeBaseEEP.java	(revision 1247)
@@ -8,5 +8,5 @@
 import java.util.ResourceBundle;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
@@ -47,6 +47,6 @@
 		
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return ((ComputingNode)pe.get(0)).getCategory();
+		if(pe.get(0) instanceof Node)
+			return ((Node)pe.get(0)).getCategory();
 		Core core = (Core)pe.get(0);
 		return core.getParent().getParent().getCategory();
@@ -55,6 +55,6 @@
 	private int getFrequency(PEUnit peUnit){
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return Double.valueOf(((ComputingNode)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
+		if(pe.get(0) instanceof Node)
+			return Double.valueOf(((Node)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
 		Core core = (Core)pe.get(0);
 		Processor proc = (Processor) core.getParent();
Index: /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java	(revision 734)
+++ /DCWoRMS/branches/coolemall/src/test/article/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java	(revision 1247)
@@ -10,5 +10,5 @@
 
 import schedframe.events.scheduling.SchedulingEvent;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
@@ -74,6 +74,6 @@
 		
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return ((ComputingNode)pe.get(0)).getCategory();
+		if(pe.get(0) instanceof Node)
+			return ((Node)pe.get(0)).getCategory();
 		Core core = (Core)pe.get(0);
 		return core.getParent().getParent().getCategory();
@@ -82,6 +82,6 @@
 	private int getFrequency(PEUnit peUnit){
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return Double.valueOf(((ComputingNode)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
+		if(pe.get(0) instanceof Node)
+			return Double.valueOf(((Node)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
 		Core core = (Core)pe.get(0);
 		Processor proc = (Processor) core.getParent();
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java	(revision 826)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/timeestimation/RecsTimeEstimationPlugin.java	(revision 1247)
@@ -10,5 +10,5 @@
 
 import schedframe.events.scheduling.SchedulingEvent;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
@@ -74,6 +74,6 @@
 		
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return ((ComputingNode)pe.get(0)).getCategory();
+		if(pe.get(0) instanceof Node)
+			return ((Node)pe.get(0)).getCategory();
 		if(pe.get(0) instanceof Processor)
 			return ((Processor)pe.get(0)).getParent().getCategory();
@@ -84,6 +84,6 @@
 	private int getFrequency(PEUnit peUnit){
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return Double.valueOf(((ComputingNode)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
+		if(pe.get(0) instanceof Node)
+			return Double.valueOf(((Node)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
 		if(pe.get(0) instanceof Processor)
 			return Double.valueOf(((Processor)pe.get(0)).getPowerInterface().getFrequency()).intValue();
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInOffSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInOffSP.java	(revision 1211)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInOffSP.java	(revision 1247)
@@ -13,5 +13,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -55,5 +55,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -61,5 +61,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -69,5 +69,5 @@
 				}
 			}
-			turnOffIdleNodes(resourceManager.getComputingNodes());
+			turnOffIdleNodes(resourceManager.getNodes());
 			adjustOtherFans(notSelectedNodes);
 			break;
@@ -76,7 +76,7 @@
 	}
 	
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
-		for(ComputingNode node: nodes){
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
+		for(Node node: nodes){
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if((id >= START_ID  && id <= END_ID)){
@@ -92,5 +92,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -126,7 +126,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -169,6 +169,6 @@
 	}
 
-	private void turnOffIdleNodes(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void turnOffIdleNodes(List<Node> nodes){
+		for(Node node : nodes){
 			Processor proc = node.getProcessors().get(0);
 			int freeCores = 0;
@@ -183,6 +183,6 @@
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.OFF);
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsOutOffSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsOutOffSP.java	(revision 1211)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsOutOffSP.java	(revision 1247)
@@ -14,5 +14,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -56,5 +56,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -62,5 +62,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -70,5 +70,5 @@
 				}
 			}
-			turnOffIdleNodes(resourceManager.getComputingNodes());
+			turnOffIdleNodes(resourceManager.getNodes());
 			adjustOtherFans(notSelectedNodes);
 			break;
@@ -77,7 +77,7 @@
 	}
 	
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
-		for(ComputingNode node: nodes){
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
+		for(Node node: nodes){
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if((id >= START_ID  && id <= END_ID)){
@@ -93,5 +93,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -127,7 +127,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -170,6 +170,6 @@
 	}
 
-	private void turnOffIdleNodes(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void turnOffIdleNodes(List<Node> nodes){
+		for(Node node : nodes){
 			Processor proc = node.getProcessors().get(0);
 			int freeCores = 0;
@@ -184,6 +184,6 @@
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.OFF);
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInIdleSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInIdleSP.java	(revision 1211)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInIdleSP.java	(revision 1247)
@@ -13,5 +13,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -51,5 +51,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -57,5 +57,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -71,7 +71,7 @@
 	}
 	
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
-		for(ComputingNode node: nodes){
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
+		for(Node node: nodes){
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if((id >= START_ID  && id <= END_ID)){
@@ -84,5 +84,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -118,7 +118,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -161,6 +161,6 @@
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				//node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.FAN_OFF);
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsOutIdleSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsOutIdleSP.java	(revision 1211)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsOutIdleSP.java	(revision 1247)
@@ -13,5 +13,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -51,5 +51,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -57,5 +57,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -71,7 +71,7 @@
 	}
 	
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
-		for(ComputingNode node: nodes){
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
+		for(Node node: nodes){
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if((id >= START_ID  && id <= END_ID)){
@@ -84,5 +84,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -118,7 +118,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -161,6 +161,6 @@
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				//node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.FAN_OFF);
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInOutSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInOutSP.java	(revision 1211)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp1/RecsInOutSP.java	(revision 1247)
@@ -16,5 +16,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -54,5 +54,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -60,5 +60,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -74,8 +74,8 @@
 	}
 	
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
 		Collections.sort(nodes, new ResourceIdRandomComparator());
-		for(ComputingNode node: nodes){
+		for(Node node: nodes){
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if((id >= START_ID  && id <= END_ID)){
@@ -88,5 +88,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -122,7 +122,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -165,6 +165,6 @@
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				//node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.FAN_OFF);
@@ -177,5 +177,5 @@
 
 
-class ResourceIdRandomComparator implements Comparator<ComputingNode>{
+class ResourceIdRandomComparator implements Comparator<Node>{
 	
 	protected Random random;
@@ -183,5 +183,5 @@
 		random = new Random(5);
 	}
-	public int compare(ComputingNode node1, ComputingNode node2){    
+	public int compare(Node node1, Node node2){    
 		return random.nextInt(3) - 1;
 	   
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsIn2OutSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsIn2OutSP.java	(revision 1211)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsIn2OutSP.java	(revision 1247)
@@ -15,5 +15,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -53,5 +53,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -59,5 +59,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -73,8 +73,8 @@
 	}
 	
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
 		Collections.sort(nodes, new ResourceIdComparator());
-		for(ComputingNode node: nodes){
+		for(Node node: nodes){
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if((id >= START_ID  && id <= END_ID)){
@@ -88,5 +88,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -122,7 +122,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -165,6 +165,6 @@
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				//node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.FAN_OFF);
@@ -175,7 +175,7 @@
 	}
 	
-	class ResourceIdComparator implements Comparator<ComputingNode> {
-
-		public int compare(ComputingNode node1, ComputingNode node2) {
+	class ResourceIdComparator implements Comparator<Node> {
+
+		public int compare(Node node1, Node node2) {
 			Integer id1 = Integer.parseInt(node1.getName().split("_")[1]);
 			Integer id2 = Integer.parseInt(node2.getName().split("_")[1]);
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsOut2InSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsOut2InSP.java	(revision 1211)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsOut2InSP.java	(revision 1247)
@@ -15,5 +15,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -53,5 +53,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -59,5 +59,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -73,8 +73,8 @@
 	}
 	
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
 		Collections.sort(nodes, new ResourceIdComparator());
-		for(ComputingNode node: nodes){
+		for(Node node: nodes){
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if((id >= START_ID  && id <= END_ID)){
@@ -87,5 +87,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -121,7 +121,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -164,6 +164,6 @@
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				//node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.FAN_OFF);
@@ -174,7 +174,7 @@
 	}
 	
-	class ResourceIdComparator implements Comparator<ComputingNode> {
+	class ResourceIdComparator implements Comparator<Node> {
 
-		public int compare(ComputingNode node1, ComputingNode node2) {
+		public int compare(Node node1, Node node2) {
 			Integer id1 = Integer.parseInt(node1.getName().split("_")[1]);
 			Integer id2 = Integer.parseInt(node2.getName().split("_")[1]);
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsRandomSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsRandomSP.java	(revision 1211)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsRandomSP.java	(revision 1247)
@@ -11,5 +11,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -50,5 +50,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -56,5 +56,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseRandomProvider(resourceManager, task);
+					Node node = chooseRandomProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -70,6 +70,6 @@
 	}
 	
-	private ComputingNode chooseRandomProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
+	private Node chooseRandomProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
 		if(nodes.size() > 0)
 			return randomNode(nodes);
@@ -78,5 +78,5 @@
 
 	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(
-			ComputingNode node, TaskInterface<?> task) {
+			Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -112,7 +112,7 @@
 	}
 	
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task){
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task){
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -145,10 +145,10 @@
 	}
 	
-	private ComputingNode randomNode(List<ComputingNode> nodes){
+	private Node randomNode(List<Node> nodes){
 		return nodes.get(rand.nextInt(nodes.size()));
 	}
 	
-	private void adjustOtherFans(List<ComputingNode> nodes){
-		for(ComputingNode node : nodes){
+	private void adjustOtherFans(List<Node> nodes){
+		for(Node node : nodes){
 			if(node.getFreeProcessorsNumber() == node.getProcessorsNumber()){
 				node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.OFF);
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsLeft2RightSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsLeft2RightSP.java	(revision 1211)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/exp2/RecsLeft2RightSP.java	(revision 1247)
@@ -15,5 +15,5 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -54,5 +54,5 @@
 			TaskQueue q = queues.get(0);
 
-			List<ComputingNode> notSelectedNodes = resourceManager.getComputingNodes();
+			List<Node> notSelectedNodes = resourceManager.getNodes();
 			// check all tasks in queue
 			for (int i = 0; i < q.size(); i++) {
@@ -60,5 +60,5 @@
 				// if status of the tasks in READY
 				if (task.getStatus() == DCWormsTags.READY) {
-					ComputingNode node = chooseProvider(resourceManager, task);
+					Node node = chooseProvider(resourceManager, task);
 					if (node != null) {
 						node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.ON);
@@ -74,8 +74,8 @@
 	}
 
-	private ComputingNode chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
-		List<ComputingNode> nodes = filterNodes(resourceManager.getComputingNodes(), task);
+	private Node chooseProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+		List<Node> nodes = filterNodes(resourceManager.getNodes(), task);
 		Collections.sort(nodes, new ResourceIdComparator());
-		for (ComputingNode node : nodes) {
+		for (Node node : nodes) {
 			Integer id = Integer.parseInt(node.getName().split("_")[1]);
 			if ((id >= START_ID && id <= END_ID)) {
@@ -88,5 +88,5 @@
 	}
 
-	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(ComputingNode node, TaskInterface<?> task) {
+	private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(Node node, TaskInterface<?> task) {
 
 		Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
@@ -122,7 +122,7 @@
 	}
 
-	private List<ComputingNode> filterNodes(List<ComputingNode> nodes, TaskInterface<?> task) {
-		List<ComputingNode> filteredNodes = new ArrayList<ComputingNode>();
-		for (ComputingNode node : nodes) {
+	private List<Node> filterNodes(List<Node> nodes, TaskInterface<?> task) {
+		List<Node> filteredNodes = new ArrayList<Node>();
+		for (Node node : nodes) {
 			int cpuRequest;
 			try {
@@ -165,6 +165,6 @@
 	}
 
-	private void adjustOtherFans(List<ComputingNode> nodes) {
-		for (ComputingNode node : nodes) {
+	private void adjustOtherFans(List<Node> nodes) {
+		for (Node node : nodes) {
 			if (node.getFreeProcessorsNumber() == node.getProcessorsNumber()) {
 				// node.getAirThroughputInterface().setAirThroughputState(StandardAirThroughputStateName.FAN_OFF);
@@ -175,7 +175,7 @@
 	}
 
-	class ResourceIdComparator implements Comparator<ComputingNode> {
+	class ResourceIdComparator implements Comparator<Node> {
 
-		public int compare(ComputingNode node1, ComputingNode node2) {
+		public int compare(Node node1, Node node2) {
 			Integer id1 = Integer.parseInt(node1.getName().split("_")[1]);
 			Integer id2 = Integer.parseInt(node2.getName().split("_")[1]);
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/RecsSP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/RecsSP.java	(revision 828)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/scheduling/RecsSP.java	(revision 1247)
@@ -7,5 +7,5 @@
 import java.util.ResourceBundle;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.scheduling.tasks.TaskInterface;
 import test.article2.recs.utils.AppType;
@@ -27,5 +27,5 @@
 	}
 	
-	protected String createExecutivenessQuery(TaskInterface<?> task, ComputingNode node) {
+	protected String createExecutivenessQuery(TaskInterface<?> task, Node node) {
 		Executable exec = (Executable)task;
 		String query = getApplicationType(exec) + "." + getNodeCategory(node);
@@ -38,5 +38,5 @@
 	}
 	
-	private String getNodeCategory(ComputingNode node){
+	private String getNodeCategory(Node node){
 		return node.getCategory();
 	}
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/AtomD510NodeEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/AtomD510NodeEEP.java	(revision 1210)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/AtomD510NodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15,5 +15,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		try {
 			if(jobRegistry.getRunningTasks().size() > 0) {
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/IntelNodeEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/IntelNodeEEP.java	(revision 1210)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/IntelNodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15,5 +15,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		
 		try {
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/DataCenterEnergyEstimationPlugin.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/DataCenterEnergyEstimationPlugin.java	(revision 1210)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/DataCenterEnergyEstimationPlugin.java	(revision 1247)
@@ -1,5 +1,5 @@
 package test.article2.recs.plugins.energy;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.DataCenter;
@@ -17,5 +17,5 @@
 		double power = 0;
 		DataCenter dataCenter = (DataCenter)resource;
-		for(ComputingNode cn:dataCenter.getComputingNodes()){
+		for(Node cn:dataCenter.getNodes()){
 			PowerUsage powerUsage = cn.getPowerInterface().getRecentPowerUsage();
 			power += (powerUsage == null ? 0 : powerUsage.getValue());
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/AmdNodeEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/AmdNodeEEP.java	(revision 1210)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/AmdNodeEEP.java	(revision 1247)
@@ -4,5 +4,5 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15,5 +15,5 @@
 			PhysicalResource resource) {
 		double powerConsumption = 0;
-		ComputingNode node = (ComputingNode) resource;
+		Node node = (Node) resource;
 		try {
 			if(jobRegistry.getRunningTasks().size() > 0) {
Index: /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/RecsNodeBaseEEP.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/RecsNodeBaseEEP.java	(revision 1210)
+++ /DCWoRMS/branches/coolemall/src/test/article2/recs/plugins/energy/RecsNodeBaseEEP.java	(revision 1247)
@@ -10,5 +10,5 @@
 
 import schedframe.events.scheduling.EventReason;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -137,6 +137,6 @@
 		
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return ((ComputingNode)pe.get(0)).getCategory();
+		if(pe.get(0) instanceof Node)
+			return ((Node)pe.get(0)).getCategory();
 		if(pe.get(0) instanceof Processor)
 			return ((Processor)pe.get(0)).getParent().getCategory();
@@ -147,6 +147,6 @@
 	private int getFrequency(PEUnit peUnit){
 		ProcessingElements pe = (ProcessingElements) peUnit;
-		if(pe.get(0) instanceof ComputingNode)
-			return Double.valueOf(((ComputingNode)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
+		if(pe.get(0) instanceof Node)
+			return Double.valueOf(((Node)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
 		if(pe.get(0) instanceof Processor)
 			return Double.valueOf(((Processor)pe.get(0)).getPowerInterface().getFrequency()).intValue();
Index: /DCWoRMS/branches/coolemall/src/schedframe/resources/devices/DeviceEnergyExtension.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/devices/DeviceEnergyExtension.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/schedframe/resources/devices/DeviceEnergyExtension.java	(revision 1247)
@@ -7,5 +7,4 @@
 
 import schedframe.events.Event;
-import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.extensions.Extension;
 import schedframe.resources.computing.extensions.ExtensionException;
@@ -14,5 +13,4 @@
 import schedframe.resources.computing.profiles.energy.EnergyEventType;
 import schedframe.resources.computing.profiles.energy.EnergyExtension;
-import schedframe.resources.computing.profiles.energy.EnergyExtension.Builder;
 import schedframe.resources.computing.profiles.energy.airthroughput.AirThroughputInterfaceFactory;
 import schedframe.resources.computing.profiles.energy.airthroughput.AirThroughputProfile;
@@ -114,18 +112,4 @@
 			case POWER_STATE_CHANGED:
 				power = powerProfile.getEnergyEstimationPlugin().estimatePowerConsumption(enEvent, new JobRegistryImpl(resource.getFullName()), resource);
-				/*if(computingResource instanceof ComputingNode){
-					ComputingNode node = (ComputingNode)computingResource;
-					if(event.getData() instanceof PowerState){
-						PowerState newState = (PowerState)event.getData();
-						if(newState == PowerState.ON) {
-							addToPowerUsageHistory(power+node.getPowerInterface().START_COST);
-							addToPowerUsageHistory(DateTimeUtils.currentTimeMillis() + node.getPowerInterface().START_TIME, power);
-						}else if(newState == PowerState.OFF){
-							addToPowerUsageHistory(power+node.getPowerInterface().SHUTDOWN_COST);
-							addToPowerUsageHistory(DateTimeUtils.currentTimeMillis() + node.getPowerInterface().SHUTDOWN_TIME, power);
-						}
-					}
-				}
-				else*/ 
 				
 				status = powerProfile.addToPowerUsageHistory(power);
Index: /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/StandardResourceFactory.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/StandardResourceFactory.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/StandardResourceFactory.java	(revision 1247)
@@ -1,5 +1,4 @@
 package schedframe.resources.computing;
 
-import schedframe.resources.CoolEmAllResourceType;
 import schedframe.resources.StandardResourceType;
 import schedframe.resources.computing.description.ComputingResourceDescription;
@@ -23,5 +22,5 @@
 			return new Rack(resDesc);
 		else if (resDesc.getType().equals(StandardResourceType.Node))
-			return new ComputingNode(resDesc);
+			return new Node(resDesc);
 		else if (resDesc.getType().equals(StandardResourceType.Processor))
 			return new Processor(resDesc);
@@ -30,13 +29,5 @@
 		else
 			return new ComputingResource(resDesc);
-	
-		/*switch(resDesc.getType()){
-			case Grid: return new Grid(resDesc);
-			case DataCenter: return new DataCenter(resDesc);
-			case ComputingNode: return new ComputingNode(resDesc);
-			case Processor: return new Processor(resDesc);
-		default:
-			return new ComputingResource(resDesc);
-		}*/
+
 	}
 
Index: /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/PowerInterfaceFactory.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/PowerInterfaceFactory.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/PowerInterfaceFactory.java	(revision 1247)
@@ -18,5 +18,5 @@
 			powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.DataCenterPowerInterface((ComputingResource)resource, pp);
 		else if (resource.getType().getName().equals(StandardResourceType.Node.getName()))
-			powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.ComputingNodePowerInterface((ComputingResource)resource, pp);
+			powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.NodePowerInterface((ComputingResource)resource, pp);
 		else if (resource.getType().getName().equals(StandardResourceType.Processor.getName()))
 			powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.ProcessorPowerInterface((ComputingResource)resource, pp);
Index: /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/ui/NodePowerInterface.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/ui/NodePowerInterface.java	(revision 1247)
+++ /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/ui/NodePowerInterface.java	(revision 1247)
@@ -0,0 +1,66 @@
+package schedframe.resources.computing.profiles.energy.power.ui;
+
+
+
+import schedframe.resources.ResourceStatus;
+import schedframe.resources.computing.ComputingResource;
+import schedframe.resources.computing.Node;
+import schedframe.resources.computing.profiles.energy.EnergyEvent;
+import schedframe.resources.computing.profiles.energy.EnergyEventType;
+import schedframe.resources.computing.profiles.energy.power.PowerProfile;
+import schedframe.resources.computing.profiles.energy.power.PowerStateName;
+import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
+
+public class NodePowerInterface extends ComputingResourcePowerInterface{
+
+	public static long START_TIME = 600000;
+	public static long SHUTDOWN_TIME = 300000;
+	public static double START_COST = 4000;
+	public static double SHUTDOWN_COST = 2000;
+
+	
+	public NodePowerInterface(ComputingResource resource, PowerProfile pp){
+		super(resource, pp);
+		currentPowerState = StandardPowerStateName.ON;
+	}
+
+	public boolean setPowerState(PowerStateName state){
+		if(!supportPowerState(state))
+			return false;
+		currentPowerState = state;
+		Node node = (Node) resource;
+		boolean pePowerStateChangeStatus = false;
+		if(node.getProcessors() != null) {
+			for(ComputingResource child:node.getProcessors()){
+				if(child.getPowerInterface() != null){
+					pePowerStateChangeStatus = child.getPowerInterface().setPowerState(state);	
+				}
+			}
+		} 
+		
+		if(!pePowerStateChangeStatus){
+			node.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, node.getFullName()));
+		}
+
+		if(state == StandardPowerStateName.OFF){
+			node.setStatus(ResourceStatus.UNAVAILABLE);
+		}
+		else if(state == StandardPowerStateName.ON){
+			node.setStatus(ResourceStatus.FREE);
+		}
+		//node.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, computingNode.getName()));
+		//ResourceController.traceResource(new DateTime().getMillis(), resource.getFullName(), "POWER_STATE_CHANGED", state.getName());
+		return true;
+	}
+
+	public void turnOn(){
+		setPowerState(StandardPowerStateName.ON);
+	}
+	
+	public void turnOff(){
+		setPowerState(StandardPowerStateName.OFF);
+	}
+
+
+
+}
Index: WoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/ui/ComputingNodePowerInterface.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/ui/ComputingNodePowerInterface.java	(revision 1207)
+++ 	(revision )
@@ -1,69 +1,0 @@
-package schedframe.resources.computing.profiles.energy.power.ui;
-
-
-
-import org.joda.time.DateTime;
-
-import schedframe.SimulatedEnvironment;
-import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
-import schedframe.resources.computing.ComputingResource;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.EnergyEventType;
-import schedframe.resources.computing.profiles.energy.power.PowerProfile;
-import schedframe.resources.computing.profiles.energy.power.PowerStateName;
-import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
-
-public class ComputingNodePowerInterface extends ComputingResourcePowerInterface{
-
-	public static long START_TIME = 600000;
-	public static long SHUTDOWN_TIME = 300000;
-	public static double START_COST = 4000;
-	public static double SHUTDOWN_COST = 2000;
-
-	
-	public ComputingNodePowerInterface(ComputingResource resource, PowerProfile pp){
-		super(resource, pp);
-		currentPowerState = StandardPowerStateName.ON;
-	}
-
-	public boolean setPowerState(PowerStateName state){
-		if(!supportPowerState(state))
-			return false;
-		currentPowerState = state;
-		ComputingNode computingNode = (ComputingNode) resource;
-		boolean pePowerStateChangeStatus = false;
-		if(computingNode.getProcessors() != null) {
-			for(ComputingResource child:computingNode.getProcessors()){
-				if(child.getPowerInterface() != null){
-					pePowerStateChangeStatus = child.getPowerInterface().setPowerState(state);	
-				}
-			}
-		} 
-		
-		if(!pePowerStateChangeStatus){
-			computingNode.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, computingNode.getFullName()));
-		}
-
-		if(state == StandardPowerStateName.OFF){
-			computingNode.setStatus(ResourceStatus.UNAVAILABLE);
-		}
-		else if(state == StandardPowerStateName.ON){
-			computingNode.setStatus(ResourceStatus.FREE);
-		}
-		//computingNode.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, computingNode.getName()));
-		//ResourceController.traceResource(new DateTime().getMillis(), resource.getFullName(), "POWER_STATE_CHANGED", state.getName());
-		return true;
-	}
-
-	public void turnOn(){
-		setPowerState(StandardPowerStateName.ON);
-	}
-	
-	public void turnOff(){
-		setPowerState(StandardPowerStateName.OFF);
-	}
-
-
-
-}
Index: /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/DataCenter.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/DataCenter.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/DataCenter.java	(revision 1247)
@@ -5,7 +5,4 @@
 import schedframe.resources.StandardResourceType;
 import schedframe.resources.computing.description.ComputingResourceDescription;
-import schedframe.resources.computing.profiles.energy.EnergyExtension;
-import schedframe.resources.computing.profiles.energy.power.PowerInterfaceFactory;
-import schedframe.resources.computing.profiles.energy.power.ui.PowerInterface;
 
 public class DataCenter extends ComputingResource{
@@ -19,6 +16,6 @@
 	
 	@SuppressWarnings("unchecked")
-	public List<ComputingNode> getComputingNodes(){
-		return (List<ComputingNode>) getDescendantsByType(StandardResourceType.Node);
+	public List<Node> getNodes(){
+		return (List<Node>) getDescendantsByType(StandardResourceType.Node);
 	}
 	
Index: /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/properties/NodePropertiesBuilder.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/properties/NodePropertiesBuilder.java	(revision 1247)
+++ /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/properties/NodePropertiesBuilder.java	(revision 1247)
@@ -0,0 +1,41 @@
+package schedframe.resources.computing.properties;
+
+import java.util.Properties;
+
+import schedframe.resources.computing.Node;
+import schedframe.resources.computing.ComputingResource;
+
+public class NodePropertiesBuilder implements PropertiesBuilder{
+	protected Properties properties;
+	private Node node;
+	
+	public Properties getProperties() {
+		return properties;
+	}
+
+	public void createProperties(ComputingResource resource) {
+		this.properties = new Properties();
+		this.node = (Node)resource;
+	}
+
+	public void buildBasicProperties() {
+		properties.setProperty("name", node.getName());
+		properties.setProperty("type", node.getType().getName());
+		properties.setProperty("status", node.getStatus().toString());
+	}
+
+	public void buildCharacteristicsProperties() {
+		try {
+			properties.setProperty("totalmemory", String.valueOf(node.getTotalMemory()));
+			properties.setProperty("freememory", String.valueOf(node.getFreeMemory()));
+			properties.setProperty("cost", String.valueOf(node.getProcessingCost()));
+		} catch (NoSuchFieldException e) {
+			// TODO Auto-generated catch block
+			//e.printStackTrace();
+		}
+	}
+
+	public void buildDescriptionProperties() {
+
+	}
+}
Index: WoRMS/branches/coolemall/src/schedframe/resources/computing/properties/ComputingNodePropertiesBuilder.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/properties/ComputingNodePropertiesBuilder.java	(revision 1053)
+++ 	(revision )
@@ -1,41 +1,0 @@
-package schedframe.resources.computing.properties;
-
-import java.util.Properties;
-
-import schedframe.resources.computing.ComputingNode;
-import schedframe.resources.computing.ComputingResource;
-
-public class ComputingNodePropertiesBuilder implements PropertiesBuilder{
-	protected Properties properties;
-	private ComputingNode node;
-	
-	public Properties getProperties() {
-		return properties;
-	}
-
-	public void createProperties(ComputingResource resource) {
-		this.properties = new Properties();
-		this.node = (ComputingNode)resource;
-	}
-
-	public void buildBasicProperties() {
-		properties.setProperty("name", node.getName());
-		properties.setProperty("type", node.getType().getName());
-		properties.setProperty("status", node.getStatus().toString());
-	}
-
-	public void buildCharacteristicsProperties() {
-		try {
-			properties.setProperty("totalmemory", String.valueOf(node.getTotalMemory()));
-			properties.setProperty("freememory", String.valueOf(node.getFreeMemory()));
-			properties.setProperty("cost", String.valueOf(node.getProcessingCost()));
-		} catch (NoSuchFieldException e) {
-			// TODO Auto-generated catch block
-			//e.printStackTrace();
-		}
-	}
-
-	public void buildDescriptionProperties() {
-
-	}
-}
Index: /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/Processor.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/Processor.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/Processor.java	(revision 1247)
@@ -25,12 +25,12 @@
 	}
 
-	public ComputingNode getNode(){
+	public Node getNode(){
 		ComputingResource compRes = parent;
 		while(compRes != null && !compRes.getType().equals(StandardResourceType.Node)){
 			compRes = compRes.getParent();
 		}
-		ComputingNode compNode = null;
+		Node compNode = null;
 		try{
-			compNode = (ComputingNode)compRes;
+			compNode = (Node)compRes;
 		} catch(Exception e) {
 		}
Index: /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/Rack.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/Rack.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/Rack.java	(revision 1247)
@@ -16,6 +16,6 @@
 
 	@SuppressWarnings("unchecked")
-	public List<ComputingNode> getComputingNodes(){
-		return (List<ComputingNode>) getDescendantsByType(StandardResourceType.Node);
+	public List<Node> getNodes(){
+		return (List<Node>) getDescendantsByType(StandardResourceType.Node);
 	}
 	
Index: /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/Node.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/Node.java	(revision 1247)
+++ /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/Node.java	(revision 1247)
@@ -0,0 +1,117 @@
+package schedframe.resources.computing;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import schedframe.resources.ResourceStatus;
+import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.description.ComputingResourceDescription;
+import schedframe.resources.computing.extensions.ExtensionType;
+import schedframe.resources.computing.profiles.energy.EnergyExtension;
+import schedframe.resources.computing.profiles.energy.power.ui.NodePowerInterface;
+import schedframe.resources.computing.properties.NodePropertiesBuilder;
+import schedframe.resources.computing.properties.PropertiesDirector;
+import schedframe.resources.units.Cost;
+import schedframe.resources.units.Memory;
+import schedframe.resources.units.StandardResourceUnitName;
+
+public class Node extends ComputingResource{
+	
+
+	public Node (ComputingResourceDescription resDesc) {
+		super(resDesc);
+		
+		//extensionList.add(new EnergyExtension(this, resDesc.getPowerInterface(), resDesc.getEnergyEstimationPlugin()));
+		//PowerInterface pi = PowerInterfaceFactory.createPowerInterface(this, resDesc.getPowerProfile());
+		//AirThroughputInterface ai = AirThroughputInterfaceFactory.createAirThroughputInterface(this, resDesc.getAirThroughputProfile());
+		//accept(new EnergyExtension(pi, resDesc.getPowerProfile()));
+		//accept(new EnergyExtension(pi, resDesc.getPowerProfile(), ai, resDesc.getAirThroughputProfile()));	
+	}	
+	
+	public NodePowerInterface getPowerInterface(){
+		NodePowerInterface powerInterface = null;
+		if(extensionList.isExtensionAvailable(ExtensionType.ENERGY_EXTENSION)){
+			EnergyExtension ee = (EnergyExtension)extensionList.getExtension(ExtensionType.ENERGY_EXTENSION);
+			powerInterface = (NodePowerInterface)ee.getPowerInterface();
+		}
+		return powerInterface;
+	}
+
+	@SuppressWarnings("unchecked")
+	public List<Processor> getProcessors(){
+		return (List<Processor>) getDescendantsByType(StandardResourceType.Processor);
+	}
+	
+	@SuppressWarnings("unchecked")
+	public List<Processor> getFreeProcessors(){
+		return (List<Processor>) getDescendantsByTypeAndStatus(StandardResourceType.Processor, ResourceStatus.FREE);
+	}
+
+	public List<Core> getCores(){
+		List<Core> cores = new ArrayList<Core>();
+		for(Processor proc: getProcessors()){
+			cores.addAll(proc.getCores());
+		}
+		return cores;
+	}
+
+	public List<Core> getFreeCores(){
+		List<Core> freeCores = new ArrayList<Core>();
+		for(Processor proc: getProcessors()){
+			freeCores.addAll(proc.getFreeCores());
+		}
+		return freeCores;
+	}
+	
+	public int getProcessorsNumber() {
+		return getProcessors().size();
+	}
+
+	public int getFreeProcessorsNumber() {
+		return getFreeProcessors().size();
+	}
+	
+	
+	//MEMORY 
+	public int getFreeMemory() throws NoSuchFieldException {
+		return getMemory().getFreeAmount();
+	}
+	
+	public int getTotalMemory() throws NoSuchFieldException {
+		return getMemory().getAmount();
+	}
+
+	public boolean isMemRequirementSatisfied(int memoryReq) throws NoSuchFieldException {
+		if (getFreeMemory() < memoryReq)
+			return false;
+		return true;
+	}
+	
+	public Memory getMemory() throws NoSuchFieldException {
+		return (Memory) ((ComputingResourceCharacteristics)resourceCharacteristic).getResourceUnit(StandardResourceUnitName.MEMORY);
+	}
+	
+	//COST
+	public int getProcessingCost() throws NoSuchFieldException {
+		return getCost().getAmount();
+	}
+	
+	private Cost getCost() throws NoSuchFieldException {
+		return (Cost) ((ComputingResourceCharacteristics)resourceCharacteristic).getResourceUnit(StandardResourceUnitName.COST);
+	}
+
+	
+	public Properties getProperties(){
+		PropertiesDirector propDirector = new PropertiesDirector();
+		propDirector.setPropertiesBuilder(new NodePropertiesBuilder());
+		propDirector.constructProperties(this);
+		return propDirector.getProperties();
+	}
+	
+	
+	/*private void accept(EnergyExtension e){
+		extensionList.add(e);
+		e.setResource(this);
+	}*/
+}
Index: /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/coolemall/NodeGroup.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/coolemall/NodeGroup.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/coolemall/NodeGroup.java	(revision 1247)
@@ -4,4 +4,5 @@
 
 import schedframe.resources.StandardResourceType;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Processor;
Index: /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/coolemall/ComputeBox1.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/coolemall/ComputeBox1.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/coolemall/ComputeBox1.java	(revision 1247)
@@ -4,6 +4,4 @@
 
 import schedframe.resources.CoolEmAllResourceType;
-import schedframe.resources.StandardResourceType;
-import schedframe.resources.computing.ComputingNode;
 import schedframe.resources.computing.Rack;
 import schedframe.resources.computing.description.ComputingResourceDescription;
@@ -19,10 +17,4 @@
 		return (List<NodeGroup>) getDescendantsByType(CoolEmAllResourceType.NodeGroup);
 	}
-	
-	@SuppressWarnings("unchecked")
-	public List<ComputingNode> getNodes(){
-		return (List<ComputingNode>) getDescendantsByType(StandardResourceType.Node);
-	}
-
 
 }
Index: WoRMS/branches/coolemall/src/schedframe/resources/computing/coolemall/Node.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/coolemall/Node.java	(revision 1207)
+++ 	(revision )
@@ -1,34 +1,0 @@
-package schedframe.resources.computing.coolemall;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import schedframe.resources.computing.ComputingNode;
-import schedframe.resources.computing.Core;
-import schedframe.resources.computing.Processor;
-import schedframe.resources.computing.description.ComputingResourceDescription;
-
-public class Node extends ComputingNode{
-
-	public Node(ComputingResourceDescription resDesc) {
-		super(resDesc);
-		// TODO Auto-generated constructor stub
-	}
-	
-	public List<Core> getCores(){
-		List<Core> cores = new ArrayList<Core>();
-		for(Processor proc: getProcessors()){
-			cores.addAll(proc.getCores());
-		}
-		return cores;
-	}
-
-	public List<Core> getFreeCores(){
-		List<Core> freeCores = new ArrayList<Core>();
-		for(Processor proc: getProcessors()){
-			freeCores.addAll(proc.getFreeCores());
-		}
-		return freeCores;
-	}
-
-}
Index: /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/Core.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/Core.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/Core.java	(revision 1247)
@@ -28,12 +28,12 @@
 	}
 	
-	public ComputingNode getNode(){
+	public Node getNode(){
 		ComputingResource compRes = parent;
 		while(compRes != null && !compRes.getType().equals(StandardResourceType.Node)){
 			compRes = compRes.getParent();
 		}
-		ComputingNode compNode = null;
+		Node compNode = null;
 		try{
-			compNode = (ComputingNode)compRes;
+			compNode = (Node)compRes;
 		} catch(ClassCastException e) {
 		}
Index: WoRMS/branches/coolemall/src/schedframe/resources/computing/ComputingNode.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/computing/ComputingNode.java	(revision 1207)
+++ 	(revision )
@@ -1,100 +1,0 @@
-package schedframe.resources.computing;
-
-import java.util.List;
-import java.util.Properties;
-
-import schedframe.resources.ResourceStatus;
-import schedframe.resources.StandardResourceType;
-import schedframe.resources.computing.description.ComputingResourceDescription;
-import schedframe.resources.computing.extensions.ExtensionType;
-import schedframe.resources.computing.profiles.energy.EnergyExtension;
-import schedframe.resources.computing.profiles.energy.power.ui.ComputingNodePowerInterface;
-import schedframe.resources.computing.properties.ComputingNodePropertiesBuilder;
-import schedframe.resources.computing.properties.PropertiesDirector;
-import schedframe.resources.units.Cost;
-import schedframe.resources.units.Memory;
-import schedframe.resources.units.StandardResourceUnitName;
-
-public class ComputingNode extends ComputingResource{
-	
-
-	public ComputingNode (ComputingResourceDescription resDesc) {
-		super(resDesc);
-		
-		//extensionList.add(new EnergyExtension(this, resDesc.getPowerInterface(), resDesc.getEnergyEstimationPlugin()));
-		//PowerInterface pi = PowerInterfaceFactory.createPowerInterface(this, resDesc.getPowerProfile());
-		//AirThroughputInterface ai = AirThroughputInterfaceFactory.createAirThroughputInterface(this, resDesc.getAirThroughputProfile());
-		//accept(new EnergyExtension(pi, resDesc.getPowerProfile()));
-		//accept(new EnergyExtension(pi, resDesc.getPowerProfile(), ai, resDesc.getAirThroughputProfile()));	
-	}	
-	
-	public ComputingNodePowerInterface getPowerInterface(){
-		ComputingNodePowerInterface powerInterface = null;
-		if(extensionList.isExtensionAvailable(ExtensionType.ENERGY_EXTENSION)){
-			EnergyExtension ee = (EnergyExtension)extensionList.getExtension(ExtensionType.ENERGY_EXTENSION);
-			powerInterface = (ComputingNodePowerInterface)ee.getPowerInterface();
-		}
-		return powerInterface;
-	}
-
-	@SuppressWarnings("unchecked")
-	public List<Processor> getProcessors(){
-		return (List<Processor>) getDescendantsByType(StandardResourceType.Processor);
-	}
-	
-	@SuppressWarnings("unchecked")
-	public List<Processor> getFreeProcessors(){
-		return (List<Processor>) getDescendantsByTypeAndStatus(StandardResourceType.Processor, ResourceStatus.FREE);
-	}
-
-	public int getProcessorsNumber() {
-		return getProcessors().size();
-	}
-
-	public int getFreeProcessorsNumber() {
-		return getFreeProcessors().size();
-	}
-	
-	
-	//MEMORY 
-	public int getFreeMemory() throws NoSuchFieldException {
-		return getMemory().getFreeAmount();
-	}
-	
-	public int getTotalMemory() throws NoSuchFieldException {
-		return getMemory().getAmount();
-	}
-
-	public boolean isMemRequirementSatisfied(int memoryReq) throws NoSuchFieldException {
-		if (getFreeMemory() < memoryReq)
-			return false;
-		return true;
-	}
-	
-	public Memory getMemory() throws NoSuchFieldException {
-		return (Memory) ((ComputingResourceCharacteristics)resourceCharacteristic).getResourceUnit(StandardResourceUnitName.MEMORY);
-	}
-	
-	//COST
-	public int getProcessingCost() throws NoSuchFieldException {
-		return getCost().getAmount();
-	}
-	
-	private Cost getCost() throws NoSuchFieldException {
-		return (Cost) ((ComputingResourceCharacteristics)resourceCharacteristic).getResourceUnit(StandardResourceUnitName.COST);
-	}
-
-	
-	public Properties getProperties(){
-		PropertiesDirector propDirector = new PropertiesDirector();
-		propDirector.setPropertiesBuilder(new ComputingNodePropertiesBuilder());
-		propDirector.constructProperties(this);
-		return propDirector.getProperties();
-	}
-	
-	
-	/*private void accept(EnergyExtension e){
-		extensionList.add(e);
-		e.setResource(this);
-	}*/
-}
Index: /DCWoRMS/branches/coolemall/src/schedframe/resources/CoolEmAllResourceFactory.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/resources/CoolEmAllResourceFactory.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/schedframe/resources/CoolEmAllResourceFactory.java	(revision 1247)
@@ -1,4 +1,5 @@
 package schedframe.resources;
 
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
@@ -7,5 +8,4 @@
 import schedframe.resources.computing.ResourceFactory;
 import schedframe.resources.computing.coolemall.ComputeBox1;
-import schedframe.resources.computing.coolemall.Node;
 import schedframe.resources.computing.coolemall.NodeGroup;
 import schedframe.resources.computing.description.ComputingResourceDescription;
Index: /DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/resources/ClusterResourceManager.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/resources/ClusterResourceManager.java	(revision 1207)
+++ /DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/resources/ClusterResourceManager.java	(revision 1247)
@@ -7,5 +7,5 @@
 import schedframe.exceptions.ResourceException;
 import schedframe.resources.StandardResourceType;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Processor;
@@ -21,9 +21,9 @@
 
 	@SuppressWarnings("unchecked")
-	public List<ComputingNode> getComputingNodes(){
+	public List<Node> getNodes(){
 		try {
-			return (List<ComputingNode>) getResourcesOfType(StandardResourceType.Node);
+			return (List<Node>) getResourcesOfType(StandardResourceType.Node);
 		} catch (ResourceException e) {
-			return new ArrayList<ComputingNode>();
+			return new ArrayList<Node>();
 		}
 	}
@@ -39,7 +39,7 @@
 
 	@SuppressWarnings("unchecked")
-	public List<ComputingNode> getComputingNodes(Properties properties){
+	public List<Node> getNodes(Properties properties){
 		properties.setProperty("type", StandardResourceType.Node.toString());
-		return (List<ComputingNode>) filterResources(properties);
+		return (List<Node>) filterResources(properties);
 
 	}
Index: /DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/resources/ResourceManagerFactory.java
===================================================================
--- /DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/resources/ResourceManagerFactory.java	(revision 1005)
+++ /DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/resources/ResourceManagerFactory.java	(revision 1247)
@@ -1,4 +1,5 @@
 package schedframe.scheduling.manager.resources;
 
+import schedframe.resources.StandardResourceType;
 import schedframe.scheduling.GridResourceDiscovery;
 import schedframe.scheduling.Scheduler;
@@ -10,11 +11,11 @@
 		ManagedComputingResources managedResource = scheduler.getCompResources();
 		
-		if(managedResources == null || managedResource.getType().getName().equals("DataCenter"))
+		if(managedResources == null || managedResource.getType().getName().equals(StandardResourceType.DataCenter))
 			return new GridResourceDiscovery(scheduler);
-		else if (managedResource.getType().getName().equals("Rack"))
+		else if (managedResource.getType().getName().equals(StandardResourceType.Rack))
 			return new ClusterResourceManager(scheduler.getCompResources(), scheduler.getChildren(), managedResources);
-		else if (managedResource.getType().getName().equals("ComputingNode"))
+		else if (managedResource.getType().getName().equals(StandardResourceType.Node))
 			return new ClusterResourceManager(scheduler.getCompResources(), scheduler.getChildren(), managedResources);
-		else if (managedResource.getType().getName().equals("Processor"))
+		else if (managedResource.getType().getName().equals(StandardResourceType.Processor))
 			return new ClusterResourceManager(scheduler.getCompResources(), scheduler.getChildren(), managedResources);
 		else return new ClusterResourceManager(scheduler.getCompResources(), scheduler.getChildren(), managedResources);
