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 d922b08..8a21030 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
@@ -2,7 +2,6 @@ package org.gcube.common.workspacetaskexecutor.shared.dataminer;
 
 import java.io.Serializable;
 
-import org.gcube.common.workspacetaskexecutor.shared.BaseTaskConfiguration;
 import org.gcube.common.workspacetaskexecutor.shared.BaseTaskExecutionStatus;
 import org.gcube.common.workspacetaskexecutor.shared.TaskStatus;
 
@@ -25,7 +24,7 @@ public class TaskExecutionStatus implements BaseTaskExecutionStatus, Serializabl
 	private String log;
 	private String currentMessage="Waiting to start..";
 	private TaskComputation taskComputation;
-	private BaseTaskConfiguration taskConfiguration;
+	private TaskConfiguration taskConfiguration;
 
 
 	/**
@@ -35,13 +34,14 @@ public class TaskExecutionStatus implements BaseTaskExecutionStatus, Serializabl
 	}
 
 
+
 	/**
 	 * Instantiates a new task execution status.
 	 *
 	 * @param taskConfiguration the task configuration
 	 * @param taskComputation the task computation
 	 */
-	public TaskExecutionStatus(BaseTaskConfiguration taskConfiguration, TaskComputation taskComputation) {
+	public TaskExecutionStatus(TaskConfiguration taskConfiguration, TaskComputation taskComputation) {
 		this.taskConfiguration = taskConfiguration;
 		this.taskComputation = taskComputation;
 	}
@@ -56,12 +56,12 @@ 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
+	 * @param taskComputation the task computation
 	 */
 	public TaskExecutionStatus(
 		Long errorCount, TaskStatus status, Float percentCompleted, String log,
-		String currentMessage, TaskComputation taskComputation, TaskConfiguration taskConfiguration) {
+		String currentMessage, TaskConfiguration taskConfiguration, TaskComputation taskComputation) {
 		this.errorCount = errorCount;
 		this.status = status;
 		this.percentCompleted = percentCompleted;
@@ -82,7 +82,6 @@ public class TaskExecutionStatus implements BaseTaskExecutionStatus, Serializabl
 		return taskComputation;
 	}
 
-
 	/**
 	 * Sets the task computation.
 	 *
@@ -189,12 +188,11 @@ public class TaskExecutionStatus implements BaseTaskExecutionStatus, Serializabl
 	}
 
 
-	/**
-	 * Gets the task configuration.
-	 *
-	 * @return the task configuration
+
+	/* (non-Javadoc)
+	 * @see org.gcube.common.workspacetaskexecutor.shared.BaseTaskExecutionStatus#getTaskConfiguration()
 	 */
-	public BaseTaskConfiguration getTaskConfiguration() {
+	public TaskConfiguration getTaskConfiguration() {
 
 		return taskConfiguration;
 	}