diff --git a/.classpath b/.classpath
index c0a2b67..9b372a2 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/tabular-data-manager-2.13.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/tabular-data-manager-2.14.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/tabular-data-manager-2.13.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/tabular-data-manager-2.14.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -45,5 +45,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/tabular-data-manager-2.13.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/tabular-data-manager-2.14.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 8ce62da..9c1addd 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-14-0"
+		date="2017-02-15">
+		<Change>Updated to PortalContext [ticket #6548]</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-13-0"
 		date="2016-12-01">
 		<Change>Fixed Portal compatibility</Change>
diff --git a/pom.xml b/pom.xml
index ee783ab..052e31f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>tabular-data-manager</artifactId>
-	<version>2.13.0-SNAPSHOT</version>
+	<version>2.14.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 
@@ -182,13 +182,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.gcube.portal</groupId>
-			<artifactId>custom-portal-handler</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.gcube.applicationsupportlayer</groupId>
-			<artifactId>aslcore</artifactId>
+			<groupId>org.gcube.common.portal</groupId>
+			<artifactId>portal-manager</artifactId>
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
@@ -197,6 +193,13 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.gcube.portal</groupId>
+			<artifactId>client-context-library</artifactId>
+			<version>[1.0.0-SNAPSHOT,)</version>
+			<scope>compile</scope>
+		</dependency>
+
 
 		<!-- Authorization -->
 		<dependency>
@@ -211,12 +214,12 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- GCube Widgets -->
+		<!-- GCube Widgets 
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>gcube-widgets</artifactId>
 			<scope>compile</scope>
-		</dependency>
+		</dependency> -->
 		
 
 		<!-- Social -->
diff --git a/src/main/java/org/gcube/portlets/user/td/client/logs/TDMLogs.java b/src/main/java/org/gcube/portlets/user/td/client/logs/TDMLogs.java
index d6505ff..319096d 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/logs/TDMLogs.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/logs/TDMLogs.java
@@ -1,9 +1,11 @@
 package org.gcube.portlets.user.td.client.logs;
 
+import org.gcube.portal.clientcontext.client.GCubeClientContext;
 import org.gcube.portlets.user.td.client.resource.TabularDataResources;
 import org.gcube.portlets.user.td.informationwidget.client.util.UtilsGXT3;
 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.tdwx.shared.Constants;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.core.client.GWT;
@@ -104,6 +106,9 @@ public class TDMLogs extends Window {
 		String path = GWT.getModuleBaseURL() + TDMLogsServlet;
 		Log.debug("TDMLogsServlet path:" + path);
 		RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, path);
+		builder.setHeader(Constants.CURR_GROUP_ID,
+				GCubeClientContext.getCurrentContextId());
+
 
 		try {
 			builder.sendRequest(null, new RequestCallback() {