diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DataMinerAccessPoint.java b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DataMinerAccessPoint.java
index ee733fd..9e28884 100644
--- a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DataMinerAccessPoint.java
+++ b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/DataMinerAccessPoint.java
@@ -111,7 +111,7 @@ public class DataMinerAccessPoint {
 		SClient sClient;
 		try {
 			sClient = dataMinerService.getClient();
-			sClient.cancelComputation(Converter.toComputationId(task.getComputationId()));
+			sClient.cancelComputation(Converter.toComputationId(task.getTaskComputation()));
 		}
 		catch (Exception e) {
 			String error = "Error on get Client or the Operator for id: "+taskConfiguration.getTaskId();
@@ -153,7 +153,7 @@ public class DataMinerAccessPoint {
 			logger.debug("Start Computation");
 			ComputationId computationId = sClient.startComputation(operator);
 			logger.debug("Started ComputationId: " + computationId);
-			return getTaskStatus(taskConfiguration, 	Converter.toDMComputationId(computationId));
+			return getTaskStatus(taskConfiguration, Converter.toDMComputationId(computationId));
 
 		}
 		catch (Exception e) {
diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskExecutionStatus.java b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskExecutionStatus.java
index 14604ec..d922b08 100644
--- a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskExecutionStatus.java
+++ b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskExecutionStatus.java
@@ -10,22 +10,21 @@ import org.gcube.common.workspacetaskexecutor.shared.TaskStatus;
 /**
  * The Class TaskExecutionStatus.
  *
- * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
- * May 3, 2018
+ * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
+ * May 16, 2018
  */
 public class TaskExecutionStatus implements BaseTaskExecutionStatus, Serializable {
 
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 6733806455721902864L;
-
+	private static final long serialVersionUID = 4801536252236521384L;
 	private Long errorCount;
 	private TaskStatus status;
 	private Float percentCompleted = new Float(0);
 	private String log;
 	private String currentMessage="Waiting to start..";
-	private TaskComputation computationId;
+	private TaskComputation taskComputation;
 	private BaseTaskConfiguration taskConfiguration;
 
 
@@ -40,14 +39,15 @@ public class TaskExecutionStatus implements BaseTaskExecutionStatus, Serializabl
 	 * Instantiates a new task execution status.
 	 *
 	 * @param taskConfiguration the task configuration
-	 * @param computationId the computation id
+	 * @param taskComputation the task computation
 	 */
-	public TaskExecutionStatus(BaseTaskConfiguration taskConfiguration, TaskComputation computationId) {
+	public TaskExecutionStatus(BaseTaskConfiguration taskConfiguration, TaskComputation taskComputation) {
 		this.taskConfiguration = taskConfiguration;
-		this.computationId = computationId;
+		this.taskComputation = taskComputation;
 	}
 
 
+
 	/**
 	 * Instantiates a new task execution status.
 	 *
@@ -56,40 +56,41 @@ public class TaskExecutionStatus implements BaseTaskExecutionStatus, Serializabl
 	 * @param percentCompleted the percent completed
 	 * @param log the log
 	 * @param currentMessage the current message
+	 * @param taskComputation the task computation
 	 * @param taskConfiguration the task configuration
 	 */
 	public TaskExecutionStatus(
 		Long errorCount, TaskStatus status, Float percentCompleted, String log,
-		String currentMessage, TaskConfiguration taskConfiguration) {
+		String currentMessage, TaskComputation taskComputation, TaskConfiguration taskConfiguration) {
 		this.errorCount = errorCount;
 		this.status = status;
 		this.percentCompleted = percentCompleted;
 		this.log = log;
 		this.currentMessage = currentMessage;
+		this.taskComputation = taskComputation;
 		this.taskConfiguration = taskConfiguration;
 	}
 
 
 	/**
-	 * Gets the computation id.
+	 * Gets the task computation.
 	 *
-	 * @return the computationId
+	 * @return the task computation
 	 */
-	public TaskComputation getComputationId() {
+	public TaskComputation getTaskComputation() {
 
-		return computationId;
+		return taskComputation;
 	}
 
 
-
 	/**
-	 * Sets the computation id.
+	 * Sets the task computation.
 	 *
-	 * @param computationId the computationId to set
+	 * @param computationId the new task computation
 	 */
-	public void setComputationId(TaskComputation computationId) {
+	public void setTaskComputation(TaskComputation computationId) {
 
-		this.computationId = computationId;
+		this.taskComputation = computationId;
 	}
 
 
@@ -216,14 +217,12 @@ public class TaskExecutionStatus implements BaseTaskExecutionStatus, Serializabl
 		builder.append(log);
 		builder.append(", currentMessage=");
 		builder.append(currentMessage);
-		builder.append(", computationId=");
-		builder.append(computationId);
+		builder.append(", taskComputation=");
+		builder.append(taskComputation);
 		builder.append(", taskConfiguration=");
 		builder.append(taskConfiguration);
 		builder.append("]");
 		return builder.toString();
 	}
 
-
-
 }