diff --git a/pom.xml b/pom.xml
index 32f179c..33d1179 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,15 +105,15 @@
 		</dependency>
 
 
-		<!-- tabular-data-gwt-service -->
+		
+		
+		<!-- tabular-data-widget-common-event -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
-			<artifactId>tabular-data-gwt-service</artifactId>
-			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
+			<artifactId>tabular-data-widget-common-event</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
-
-
 		<!-- LOGGING -->
 		<dependency>
 			<groupId>com.allen-sauer.gwt.log</groupId>
diff --git a/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardListener.java b/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardListener.java
index ff13915..27c5b37 100644
--- a/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardListener.java
+++ b/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardListener.java
@@ -3,7 +3,7 @@
  */
 package org.gcube.portlets.user.td.wizardwidget.client;
 
-import org.gcube.portlets.user.td.gwtservice.shared.tr.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 
 
 /**
diff --git a/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardWindow.java b/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardWindow.java
index 489a6cc..48938e2 100644
--- a/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardWindow.java
+++ b/src/main/java/org/gcube/portlets/user/td/wizardwidget/client/WizardWindow.java
@@ -5,8 +5,8 @@ package org.gcube.portlets.user.td.wizardwidget.client;
 
 import java.util.ArrayList;
 
+import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 import org.gcube.portlets.user.td.wizardwidget.client.util.ErrorMessageBox;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.TRId;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.core.client.Callback;
diff --git a/src/main/resources/org/gcube/portlets/user/td/wizardwidget/Wizard.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/wizardwidget/Wizard.gwt.xml
index 6b9dcc1..57dce87 100644
--- a/src/main/resources/org/gcube/portlets/user/td/wizardwidget/Wizard.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/wizardwidget/Wizard.gwt.xml
@@ -17,7 +17,8 @@
   <!-- Other module inherits                                      -->
   <inherits name='com.sencha.gxt.ui.GXT' />
   <inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
-  <inherits name='org.gcube.portlets.user.td.gwtservice.TDGWTService' />
+  
+  <inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
   
   <!-- Specify the app entry point class.                         -->  
   <!--   <entry-point class='org.gcube.portlets.user.td.wizardwidget.client.WizardEntry' /> -->
diff --git a/src/test/java/org/gcube/portlets/user/td/wizardwidget/client/GwtTestWizard.java b/src/test/java/org/gcube/portlets/user/td/wizardwidget/client/GwtTestWizard.java
index 9fddfbb..8fc6041 100644
--- a/src/test/java/org/gcube/portlets/user/td/wizardwidget/client/GwtTestWizard.java
+++ b/src/test/java/org/gcube/portlets/user/td/wizardwidget/client/GwtTestWizard.java
@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.wizardwidget.client;
 
 
-import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
+//import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.junit.client.GWTTestCase;
@@ -32,10 +32,10 @@ public class GwtTestWizard extends GWTTestCase {
    */
   public void testWizard() {
     // Create the service that we will test.
-    TDGWTServiceAsync tdGWTService = TDGWTServiceAsync.INSTANCE;
-    ServiceDefTarget target = (ServiceDefTarget) tdGWTService;
-    System.out.println(GWT.getModuleBaseURL() + "/TDGWTService");
-    target.setServiceEntryPoint(GWT.getModuleBaseURL() + "/TDGWTService");
+    //TDGWTServiceAsync tdGWTService = TDGWTServiceAsync.INSTANCE;
+    //ServiceDefTarget target = (ServiceDefTarget) tdGWTService;
+    //System.out.println(GWT.getModuleBaseURL() + "/TDGWTService");
+    //target.setServiceEntryPoint(GWT.getModuleBaseURL() + "/TDGWTService");
 
     // Since RPC calls are asynchronous, we will need to wait for a response
     // after this test method returns. This line tells the test runner to wait
diff --git a/src/test/resources/org/gcube/portlets/user/td/wizardwidget/WizardJUnit.gwt.xml b/src/test/resources/org/gcube/portlets/user/td/wizardwidget/WizardJUnit.gwt.xml
index 9485045..32b7368 100644
--- a/src/test/resources/org/gcube/portlets/user/td/wizardwidget/WizardJUnit.gwt.xml
+++ b/src/test/resources/org/gcube/portlets/user/td/wizardwidget/WizardJUnit.gwt.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module rename-to="WizardJUnit">
 	<!-- Inherit our applications main module. -->
-	<inherits name='org.gcube.portlets.user.td.gwtservice.TDGWTService' />
+	<!-- <inherits name='org.gcube.portlets.user.td.gwtservice.TDGWTService' /> -->
+	<inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
+  
 
-	<!-- Specify the path to any remote services. -->
+	<!-- Specify the path to any remote services. 
 	<servlet path="/TDGWTService"
 		class="org.gcube.portlets.user.td.gwtservice.server.TDGWTServiceImpl" />
-
+	-->
 
 	<!-- Specify the paths for translatable code -->
 	<source path='client' />
+	<source path='share' />
+	
 </module>