diff --git a/src/main/java/org/gcube/portlets/user/tdwx/TabularDataWidgetX.gwt.xml b/src/main/java/org/gcube/portlets/user/tdwx/TabularDataWidgetX.gwt.xml
index 9a5b7f0..57e167c 100644
--- a/src/main/java/org/gcube/portlets/user/tdwx/TabularDataWidgetX.gwt.xml
+++ b/src/main/java/org/gcube/portlets/user/tdwx/TabularDataWidgetX.gwt.xml
@@ -4,14 +4,15 @@
 	<inherits name='com.google.gwt.user.User' />
 	<!-- <inherits name="com.google.gwt.i18n.I18N" /> -->
 	
-	
-	<!-- Other module inherits -->
+	<!--  -->
 	<inherits name='com.sencha.gxt.ui.GXT' />
-
 	<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
+	
+	<!--Inherit the GCubeClientContext widget code -->
+	<inherits name='org.gcube.portal.clientcontext.GCubeClientContext' />
 
+	<!--Other -->
     <inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
-
 	<!--  
 	<set-configuration-property name="locale.cookie"
 		value="TDLangCookie" />
diff --git a/src/main/resources/org/gcube/portlets/user/tdwx/TabularDataWidgetX.gwt.xml b/src/main/resources/org/gcube/portlets/user/tdwx/TabularDataWidgetX.gwt.xml
index 82bcc6f..60dbc6a 100644
--- a/src/main/resources/org/gcube/portlets/user/tdwx/TabularDataWidgetX.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/tdwx/TabularDataWidgetX.gwt.xml
@@ -4,11 +4,14 @@
 	<inherits name='com.google.gwt.user.User' />
 	<!-- <inherits name="com.google.gwt.i18n.I18N" /> -->
 	
-	<!-- Other module inherits -->
+	<!-- -->
 	<inherits name='com.sencha.gxt.ui.GXT' />
-
 	<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
 	
+	<!--Inherit the GCubeClientContext widget code -->
+	<inherits name='org.gcube.portal.clientcontext.GCubeClientContext' />
+
+	<!--Other -->
     <inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
 
 	<!--