diff --git a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetConfigCard.java b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetConfigCard.java
index 13cce42..ab43665 100644
--- a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetConfigCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetConfigCard.java
@@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.mapwidget.client;
 import java.util.ArrayList;
 
 import org.gcube.portlets.user.td.gwtservice.shared.map.MapCreationSession;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
 import org.gcube.portlets.user.td.mapwidget.client.grid.ColumnDataGridPanel;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
 import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
 
 import com.allen_sauer.gwt.log.client.Log;
diff --git a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetGeometrySelectionCard.java b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetGeometrySelectionCard.java
index e9b8276..d9ddb02 100644
--- a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetGeometrySelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetGeometrySelectionCard.java
@@ -1,8 +1,8 @@
 package org.gcube.portlets.user.td.mapwidget.client;
 
 import org.gcube.portlets.user.td.gwtservice.shared.map.MapCreationSession;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
 import org.gcube.portlets.user.td.mapwidget.client.grid.GeometrySelectionGridPanel;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
 import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
 
 import com.allen_sauer.gwt.log.client.Log;
diff --git a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetTD.java b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetTD.java
index a985312..ced6609 100644
--- a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetTD.java
+++ b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetTD.java
@@ -8,11 +8,11 @@ import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
 import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException;
 import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
 import org.gcube.portlets.user.td.gwtservice.shared.map.MapCreationSession;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
 import org.gcube.portlets.user.td.gwtservice.shared.user.UserInfo;
 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.tr.column.ColumnData;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
 import org.gcube.portlets.user.td.wizardwidget.client.WizardWindow;
 
diff --git a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/ColumnDataGridPanel.java b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/ColumnDataGridPanel.java
index 75f35f5..cc799c0 100644
--- a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/ColumnDataGridPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/ColumnDataGridPanel.java
@@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.mapwidget.client.grid;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
 import org.gcube.portlets.user.td.mapwidget.client.MapWidgetConfigCard;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
 
 import com.allen_sauer.gwt.log.client.Log;
diff --git a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/ColumnDataProperties.java b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/ColumnDataProperties.java
index 55ec79d..ae75012 100644
--- a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/ColumnDataProperties.java
+++ b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/ColumnDataProperties.java
@@ -1,6 +1,6 @@
 package org.gcube.portlets.user.td.mapwidget.client.grid;
 
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
 
 import com.google.gwt.editor.client.Editor.Path;
 import com.sencha.gxt.core.client.ValueProvider;
diff --git a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/GeometrySelectionGridPanel.java b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/GeometrySelectionGridPanel.java
index 594a1f3..9add6d9 100644
--- a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/GeometrySelectionGridPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/GeometrySelectionGridPanel.java
@@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.mapwidget.client.grid;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
 import org.gcube.portlets.user.td.mapwidget.client.MapWidgetGeometrySelectionCard;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.core.client.GWT;