diff --git a/.classpath b/.classpath
index ebadd93..964a918 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/service-endpoint-editor-1.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/service-endpoint-editor-1.6.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -25,11 +25,11 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER/GWT (5)"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER/GWT (5)"/>
-	<classpathentry kind="output" path="target/service-endpoint-editor-1.4.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/service-endpoint-editor-1.6.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 0fc4de4..05fd8b0 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/Users/massi/Documents/workspace/service-endpoint-editor/target/service-endpoint-editor-1.4.0-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/service-endpoint-editor/target/service-endpoint-editor-1.6.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index cecf53b..7119a71 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,11 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
   <wb-module deploy-name="${module}">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
     <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="/target/generated-sources/gwt"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <dependent-module archiveName="rmp-common-library-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rmp-common-library/rmp-common-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="service-endpoint-editor"/>
   </wb-module>
diff --git a/pom.xml b/pom.xml
index da20929..3b5f392 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>service-endpoint-editor</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.0-SNAPSHOT</version>
+	<version>1.6.0-SNAPSHOT</version>
 	<name>gCube Service End Point Editor Management Portlet</name>
 	<description>
 		gCube Service End Point Editor Management Portlet
@@ -32,9 +32,9 @@
 		<maven.compiler.target>1.7</maven.compiler.target>
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
 		<!-- To make this work on gwt-run you need to set up global env vars. on 
-			MacOSX edit this file /etc/launchd.conf and put "setenv GLOBUS_LOCATION /Users/massi/portal/Portal-Bundle/gCore" 
+			MacOSX edit this file /etc/launchd.conf and put "setenv CATALINA_HOME /Users/massi/portal/ etc etc" 
 			on Linux? -->
-		<GLOBUS_LOCATION>${env.GLOBUS_LOCATION}</GLOBUS_LOCATION>
+		<CATALINA_HOME>${env.CATALINA_HOME}</CATALINA_HOME>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
@@ -49,18 +49,12 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-	<dependencies>
-		<!-- This dependency is needed and is need on TOP to use GWT UI BInder 
-			without old Xerces and Xalan version of gCore complaining -->
+	<dependencies>		
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-user</artifactId>
 			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>xalan</groupId>
-			<artifactId>xalan</artifactId>
-		</dependency>
+		</dependency>	
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-servlet</artifactId>
@@ -86,7 +80,6 @@
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.resourcemanagement</groupId>
@@ -97,8 +90,6 @@
 		<dependency>
 			<groupId>org.gcube.resources</groupId>
 			<artifactId>registry-publisher</artifactId>
-			<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.resourcemanagement</groupId>
@@ -108,9 +99,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>
-			<artifactId>common-encryption</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-			<scope>compile</scope>
+			<artifactId>common-encryption</artifactId>			
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
@@ -127,17 +116,10 @@
 			<artifactId>custom-portal-handler</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<!-- Liferay, Servlets Etc -->
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>javax.mail-api</artifactId>
-			<version>1.4.5</version>
-			<scope>provided</scope>
-		</dependency>
+		<!-- Liferay, Servlets Etc -->	
 		<dependency>
 			<groupId>com.liferay.portal</groupId>
 			<artifactId>portal-service</artifactId>
-			<version>6.0.6</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -182,7 +164,7 @@
 				<!-- Plugin configuration. There are many available options, see gwt-maven-plugin 
 					documentation at codehaus.org -->
 				<configuration>
-					<extraJvmArgs>-Xmx512M -DGLOBUS_LOCATION=${GLOBUS_LOCATION}</extraJvmArgs>
+					<extraJvmArgs>-Xmx512M -DCATALINA_HOME=${CATALINA_HOME}</extraJvmArgs>
 					<runTarget>RuntimeResourceCreator.html</runTarget>
 					<hostedWebapp>${webappDirectory}</hostedWebapp>
 					<!-- <logLevel>DEBUG</logLevel> -->