diff --git a/pom.xml b/pom.xml
index 81a3c38..b53d9ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>org.gcube.distribution</groupId>
 	<artifactId>gcube-portal-bundle</artifactId>
-	<version>4.1.0-SNAPSHOT</version>
+	<version>4.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>gcube-portal-bundle</name>
@@ -26,20 +26,23 @@
 		<!-- As long as we do not automatize this make sure the version correspond 
 			with the enabling portlets one -->
 
-		<!-- <gcubeLoggedinVersionLayout>310SNAPSHOT</gcubeLoggedinVersionLayout> -->
-		<!-- <usersManagementVersionLayout>300SNAPSHOT</usersManagementVersionLayout> -->
-		<!-- <rolesManagementVersionLayout>160SNAPSHOT</rolesManagementVersionLayout> -->
-		<!-- <addUsersVersionLayout>200SNAPSHOT</addUsersVersionLayout> -->
-		<!-- <resourceManagementVersionLayout>600SNAPSHOT</resourceManagementVersionLayout> -->
+		<gcubeLoggedinVersionLayout>310SNAPSHOT</gcubeLoggedinVersionLayout>
+		<usersManagementVersionLayout>300SNAPSHOT</usersManagementVersionLayout>
+		<rolesManagementVersionLayout>160SNAPSHOT</rolesManagementVersionLayout>
+		<addUsersVersionLayout>200SNAPSHOT</addUsersVersionLayout>
+		<resourceManagementVersionLayout>600SNAPSHOT</resourceManagementVersionLayout>
 
-		<gcubeLoggedinVersionLayout>310410</gcubeLoggedinVersionLayout>
-		<usersManagementVersionLayout>310400</usersManagementVersionLayout>
-		<rolesManagementVersionLayout>300400</rolesManagementVersionLayout>
-		<addUsersVersionLayout>210410</addUsersVersionLayout>
-		<resourceManagementVersionLayout>600410</resourceManagementVersionLayout>
+		<!-- <gcubeLoggedinVersionLayout>310410</gcubeLoggedinVersionLayout> -->
+		<!-- <usersManagementVersionLayout>310400</usersManagementVersionLayout> -->
+		<!-- <rolesManagementVersionLayout>300400</rolesManagementVersionLayout> -->
+		<!-- <addUsersVersionLayout>210410</addUsersVersionLayout> -->
+		<!-- <resourceManagementVersionLayout>600410</resourceManagementVersionLayout> -->
 
 		<asl-artifactsid>aslcontent,aslcore,aslsearch,aslsocial,accesslogger</asl-artifactsid>
-		<fws-artifactsid>common-clients,common-configuration-scanner,common-fw-clients,common-gcore-resources,common-gcore-stubs,common-scope,common-scope-maps,common-uri,discovery-client,ic-client,registry-publisher,common-authorization,authorization-client,document-store-lib,accounting-lib,document-store-lib-couchdb,threadlocal-vars-cleaner,common-generic-clients</fws-artifactsid>
+		<fws-artifactsid>common-clients,common-configuration-scanner,common-fw-clients,common-gcore-resources,
+			common-gcore-stubs,common-scope,common-scope-maps,common-uri,discovery-client,ic-client,
+			registry-publisher,common-authorization,authorization-client,document-store-lib,
+			accounting-lib,document-store-lib-couchdb,threadlocal-vars-cleaner,common-generic-clients</fws-artifactsid>
 		<hl-artifactsid>home-library,home-library-model,home-library-jcr,jackrabbit-jcr-commons,jackrabbit-jcr-rmi-custom,jcr</hl-artifactsid>
 		<snl-artifactsid>social-networking-library,notifications-common-library,tour-manager</snl-artifactsid>
 		<ep-artifactsid>gcube-login-portlet,gcube-loggedin,UsersManagementPortlet,register-vre-users,resource-management,service-endpoint-editor</ep-artifactsid>
@@ -276,24 +279,24 @@
 			<scope>provided</scope>
 		</dependency>
 		<!-- Custom Portal Plugins -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.gcube.portal.liferay</groupId> -->
-		<!-- <artifactId>social-dockbar-hook</artifactId> -->
-		<!-- <version>[6.3.0-SNAPSHOT,)</version> -->
-		<!-- <type>war</type> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.gcube.portal.liferay</groupId> -->
-		<!-- <artifactId>gcube-responsive-theme</artifactId> -->
-		<!-- <version>[6.3.0-SNAPSHOT,)</version> -->
-		<!-- <type>war</type> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.gcube.portal.liferay</groupId> -->
-		<!-- <artifactId>VREHome-template</artifactId> -->
-		<!-- <version>[6.3.0-SNAPSHOT,)</version> -->
-		<!-- <type>war</type> -->
-		<!-- </dependency> -->
+		<dependency>
+			<groupId>org.gcube.portal.liferay</groupId>
+			<artifactId>social-dockbar-hook</artifactId>
+			<version>[6.3.0-SNAPSHOT,)</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.portal.liferay</groupId>
+			<artifactId>gcube-responsive-theme</artifactId>
+			<version>[6.3.0-SNAPSHOT,)</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.portal.liferay</groupId>
+			<artifactId>VREHome-template</artifactId>
+			<version>[6.3.0-SNAPSHOT,)</version>
+			<type>war</type>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal.plugins</groupId>
 			<artifactId>VREFolder-hook</artifactId>
@@ -400,7 +403,7 @@
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>threadlocal-vars-cleaner</artifactId>
-			<version>[2.0.0-SNAPSHOT,)</version>
+			<version>[2.1.0-SNAPSHOT,)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.common</groupId>
@@ -746,6 +749,11 @@
 			<artifactId>commons-logging</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.liferay.portal</groupId>
+			<artifactId>util-java</artifactId>
+			<scope>provided</scope>
+		</dependency>
 		<!-- storage layer -->
 		<dependency>
 			<groupId>org.gcube.contentmanagement</groupId>