diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 9bf6efc..999a69b 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,18 +4,6 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="tabular-data-expression-widget-1.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-expression-widget/tabular-data-expression-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="tabular-data-widgetx-tdx-source-1.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widgetx-tdx-source/tabular-data-widgetx-tdx-source">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="tabular-data-widgetx-1.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widgetx/tabular-data-widgetx">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="tabular-data-share-widget-1.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-share-widget/tabular-data-share-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="tabular-data-widget-common-event-1.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget-common-event/tabular-data-widget-common-event">
             <dependency-type>uses</dependency-type>
         </dependent-module>
@@ -28,6 +16,18 @@
         <dependent-module archiveName="tabular-data-wizard-widget-1.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-wizard-widget/tabular-data-wizard-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="tabular-data-expression-widget-1.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-expression-widget/tabular-data-expression-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="tabular-data-widgetx-tdx-source-1.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widgetx-tdx-source/tabular-data-widgetx-tdx-source">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="tabular-data-widgetx-1.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widgetx/tabular-data-widgetx">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="tabular-data-share-widget-1.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-share-widget/tabular-data-share-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module archiveName="tabular-data-csv-import-widget-2.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-csv-import-widget/tabular-data-csv-import-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
diff --git a/pom.xml b/pom.xml
index 8546c90..be5e754 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,29 +169,15 @@
 			<!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
 			<scope>provided</scope>
 		</dependency>
-
-
-
-		<!-- TD Expression -->
+		
+		<!-- service-client-impl  -->
 		<dependency>
-			<groupId>org.gcube.portlets.user</groupId>
-			<artifactId>tabular-data-expression-widget</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<groupId>org.gcube.data.analysis.tabulardata</groupId>
+			<artifactId>service-client-impl</artifactId>
+			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 		</dependency>
 
-		<!-- TDX Source -->
-		<dependency>
-			<groupId>org.gcube.portlets.user</groupId>
-			<artifactId>tabular-data-widgetx-tdx-source</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-		</dependency>
-
-		<!-- tabular-data-share-widget -->
-		<dependency>
-			<groupId>org.gcube.portlets.user</groupId>
-			<artifactId>tabular-data-share-widget</artifactId>
-			<version>[0.0.1-SNAPSHOT,2.0.0-SNAPSHOT)</version>
-		</dependency>
+	
 
 		<!-- Apache Common Library -->
 		<dependency>
@@ -223,7 +209,7 @@
 			<version>[0.2.0-SNAPSHOT,1.0.0-SNAPSHOT)</version>
 		</dependency>
 
-
+				
 		<!-- tabular-data-widget-common-event -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
@@ -251,8 +237,28 @@
 			<artifactId>tabular-data-wizard-widget</artifactId>
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
+	
+		<!-- TD Expression -->
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>tabular-data-expression-widget</artifactId>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+		</dependency>
 
+		<!-- TDX Source -->
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>tabular-data-widgetx-tdx-source</artifactId>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+		</dependency>
 
+		<!-- tabular-data-share-widget -->
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>tabular-data-share-widget</artifactId>
+			<version>[0.0.1-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+		</dependency>
+		
 		<!-- tabular-data-csv-import-widget -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>