diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingOperationInProgressCard.java
index 1c260b5..dfe130e 100644
--- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingOperationInProgressCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingOperationInProgressCard.java
@@ -12,6 +12,7 @@ import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialog;
 import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialogListener;
 import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
 import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.OperationResult;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
 
@@ -141,8 +142,8 @@ public class CodelistMappingOperationInProgressCard extends WizardCard
 	}
 
 	@Override
-	public void operationComplete(TRId trId) {
-		newTrId = trId;
+	public void operationComplete(OperationResult operationResult) {
+		newTrId = operationResult.getTrId();
 		SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
 		safeHtmlBuilder
 				.appendHtmlConstant("<div style='text-align:center;font-size:large;font-weight:bold; color:#009900;'>Operation Completed</div>");
@@ -205,8 +206,8 @@ public class CodelistMappingOperationInProgressCard extends WizardCard
 	}
 
 	@Override
-	public void operationStopped(TRId trId, String reason, String details) {
-		newTrId = trId;
+	public void operationStopped(OperationResult operationResult, String reason, String details) {
+		newTrId = operationResult.getTrId();
 		SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
 		safeHtmlBuilder
 				.appendHtmlConstant("<div style='text-align:center;font-size:large;font-weight:bold;color: #FF9900;'>Problems in the Operation</div>");
diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingTableDetailCard.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingTableDetailCard.java
index a3cfbbe..0352834 100644
--- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingTableDetailCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingTableDetailCard.java
@@ -13,7 +13,7 @@ import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialog;
 import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialogListener;
 import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
 import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType;
-import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.OperationResult;
 import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
 
 import com.allen_sauer.gwt.log.client.Log;
@@ -210,8 +210,8 @@ public class CodelistMappingTableDetailCard extends WizardCard implements
 	}
 
 	@Override
-	public void operationComplete(TRId trId) {
-		getWizardWindow().fireCompleted(trId);
+	public void operationComplete(OperationResult operationResult) {
+		getWizardWindow().fireCompleted(operationResult.getTrId());
 
 	}
 
@@ -243,8 +243,8 @@ public class CodelistMappingTableDetailCard extends WizardCard implements
 	}
 
 	@Override
-	public void operationStopped(TRId trId, String reason, String details) {
-		getWizardWindow().fireCompleted(trId);
+	public void operationStopped(OperationResult operationResult, String reason, String details) {
+		getWizardWindow().fireCompleted(operationResult.getTrId());
 
 	}