diff --git a/.classpath b/.classpath
index 964a918..a6d406a 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.6.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/service-endpoint-editor-1.7.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="com.google.gwt.eclipse.core.GWT_CONTAINER/GWT (5)"/>
+	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
 	<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="output" path="target/service-endpoint-editor-1.6.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/service-endpoint-editor-1.7.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.jst.jsp.core.prefs b/.settings/org.eclipse.jst.jsp.core.prefs
new file mode 100644
index 0000000..3a5c98d
--- /dev/null
+++ b/.settings/org.eclipse.jst.jsp.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+validateFragments=false
+validation.use-project-settings=true
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 7119a71..a30760a 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-  <wb-module deploy-name="${module}">
+  <wb-module deploy-name="service-endpoint-editor-portlet">
         <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">
+        <dependent-module archiveName="rmp-common-library-2.6.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"/>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index 3553009..77add62 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -4,4 +4,5 @@
   <installed facet="jst.web" version="2.5"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="java" version="1.7"/>
+  <installed facet="liferay.portlet" version="6.0"/>
 </faceted-project>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 225294c..be19f38 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,19 +1,28 @@
 <ReleaseNotes>
-<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.1-6-0" date="2014-06-05">
-<Change>Ported to the gCore free Portal</Change>
-</Changeset>
-<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.1-4-0" date="2013-10-21">
-<Change>Ported to Feather Weight Stack</Change>
-<Change>Removed GCF Dependency</Change>
-<Change>Logging with sl4j Enabled</Change>
-</Changeset>
-<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.1-3-0" date="2013-05-29">
-<Change>Fix for Encrypted fields Lost #1748</Change>
-</Changeset>
-<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.1-2-0" date="2013-04-19">
-<Change>Removed password re entering feature, see #990</Change>
-</Changeset>
-<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.1-1-0" date="2012-05-04">
-<Change>Edit feature added</Change>
-</Changeset>
+	<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.1-7-0"
+		date="2015-11-23">
+		<Change>Feature #1506, Enhance Service Endpoint editor portlet to support new AuthZ framework</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.1-6-0"
+		date="2014-06-05">
+		<Change>Ported to the gCore free Portal</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.1-4-0"
+		date="2013-10-21">
+		<Change>Ported to Feather Weight Stack</Change>
+		<Change>Removed GCF Dependency</Change>
+		<Change>Logging with sl4j Enabled</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.1-3-0"
+		date="2013-05-29">
+		<Change>Fix for Encrypted fields Lost #1748</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.1-2-0"
+		date="2013-04-19">
+		<Change>Removed password re entering feature, see #990</Change>
+	</Changeset>
+	<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.1-1-0"
+		date="2012-05-04">
+		<Change>Edit feature added</Change>
+	</Changeset>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1cc9ae7..0f845fc 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.6.0-SNAPSHOT</version>
+	<version>1.7.0-SNAPSHOT</version>
 	<name>gCube Service End Point Editor Management Portlet</name>
 	<description>
 		gCube Service End Point Editor Management Portlet
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 45dddec..42ec6e3 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -5,20 +5,31 @@
 	version="2.5">
 
 
-  <!-- Servlets -->
-  <servlet>
-    <servlet-name>serviceendpointEditor</servlet-name>
-    <servlet-class>org.gcube.portlets.admin.sepeditor.server.RuntimeResourceCreatorServiceImpl</servlet-class>
-  </servlet>
-  
-  <servlet-mapping>
-    <servlet-name>serviceendpointEditor</servlet-name>
-    <url-pattern>/sepeditor/serviceendpointEditor</url-pattern>
-  </servlet-mapping>
-  
-  <!-- Default page to serve -->
-  <welcome-file-list>
-    <welcome-file>RuntimeResourceCreator.html</welcome-file>
-  </welcome-file-list>
+	<!-- Servlets -->
+	<servlet>
+		<servlet-name>serviceendpointEditor</servlet-name>
+		<servlet-class>org.gcube.portlets.admin.sepeditor.server.RuntimeResourceCreatorServiceImpl</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>serviceendpointEditor</servlet-name>
+		<url-pattern>/sepeditor/serviceendpointEditor</url-pattern>
+	</servlet-mapping>
+
+	<!-- AuthZ -->
+	<filter>
+		<filter-name>AuthFilter</filter-name>
+		<filter-class>org.gcube.resourcemanagement.support.shared.util.TokenFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>AuthFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+
+	<!-- Default page to serve -->
+	<welcome-file-list>
+		<welcome-file>RuntimeResourceCreator.html</welcome-file>
+	</welcome-file-list>
 
 </web-app>