diff --git a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistOperationInProgressCard.java
index efefd39..2062e1f 100644
--- a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistOperationInProgressCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistOperationInProgressCard.java
@@ -19,7 +19,6 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.OperationResult;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
-import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeMap;
 import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
 
 import com.allen_sauer.gwt.log.client.Log;
@@ -166,10 +165,10 @@ public class ExtractCodelistOperationInProgressCard extends WizardCard
 
 	private void createChangeColumnSession(ArrayList<ColumnData> refColumns) {
 		ColumnData orig = extractCodelistSession.getAttachColumn();
-		ColumnTypeCode origColumnTypeCode = ColumnTypeMap
-				.getColumnTypeCode(orig.getTypeCode());
-		ColumnDataType origColumnDataType = ColumnTypeMap
-				.getColumnDataType(orig.getDataTypeName());
+		ColumnTypeCode origColumnTypeCode = ColumnTypeCode
+				.getColumnTypeCodeFromId(orig.getTypeCode());
+		ColumnDataType origColumnDataType = ColumnDataType
+				.getColumnDataTypeFromId(orig.getDataTypeName());
 
 		String labelOfAttachColumn = null;
 		ColumnTypeCode typeCodeOfColumnAttach = null;
@@ -184,8 +183,8 @@ public class ExtractCodelistOperationInProgressCard extends WizardCard
 				} else {
 					labelOfAttachColumn = targetCol.getTargetColumn()
 							.getLabel();
-					typeCodeOfColumnAttach = ColumnTypeMap
-							.getColumnTypeCode(targetCol.getTargetColumn()
+					typeCodeOfColumnAttach = ColumnTypeCode
+							.getColumnTypeCodeFromId(targetCol.getTargetColumn()
 									.getTypeCode());
 				}
 				break;
@@ -203,8 +202,8 @@ public class ExtractCodelistOperationInProgressCard extends WizardCard
 		} else {
 			for (ColumnData refColumn : refColumns) {
 				if (refColumn.getLabel().compareTo(labelOfAttachColumn) == 0) {
-					if (ColumnTypeMap
-							.getColumnTypeCode(refColumn.getTypeCode())
+					if (ColumnTypeCode
+							.getColumnTypeCodeFromId(refColumn.getTypeCode())
 							.compareTo(typeCodeOfColumnAttach) == 0) {
 						codelistColumnReference = refColumn;
 						break;