diff --git a/.classpath b/.classpath
index 7708023..9cc2a54 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/service-endpoint-editor-2.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/service-endpoint-editor-2.5.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/service-endpoint-editor-2.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/service-endpoint-editor-2.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -15,11 +15,13 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
@@ -36,8 +38,8 @@
 	<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.8">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/service-endpoint-editor-2.4.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/service-endpoint-editor-2.5.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.project b/.project
index 798e1de..ea401fd 100644
--- a/.project
+++ b/.project
@@ -40,6 +40,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>com.gwtplugins.gdt.eclipse.core.webAppProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.gwtplugins.gwt.eclipse.core.gwtProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -56,5 +66,6 @@
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>com.google.gwt.eclipse.core.gwtNature</nature>
 		<nature>com.liferay.ide.core.liferayNature</nature>
+		<nature>com.gwtplugins.gwt.eclipse.core.gwtNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
new file mode 100644
index 0000000..b6c55a4
--- /dev/null
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+lastWarOutDir=/Users/massi/Documents/workspace/service-endpoint-editor/target/service-endpoint-editor-2.5.0-SNAPSHOT
+warSrcDir=src/main/webapp
+warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 6e80039..4e4a3ad 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 9e01acd..0626dad 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="service-endpoint-editor-portlet">
+  <wb-module deploy-name="service-endpoint-editor">
         <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.8.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rmp-common-library/rmp-common-library">
+        <dependent-module archiveName="rmp-common-library-2.8.2-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 15eea05..6bcfc01 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -5,4 +5,5 @@
   <installed facet="liferay.portlet" version="6.0"/>
   <installed facet="jst.web" version="3.0"/>
   <installed facet="java" version="1.8"/>
+  <installed facet="com.gwtplugins.gwt.facet" version="1.0"/>
 </faceted-project>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index d003573..6e78258 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.2-5-0"
+		date="2019-04-15">
+		<Change>Just updated service map configuration file</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-admin.runtime-resource-creator.2-4-0"
 		date="2018-11-05">
 		<Change>Feature #12726
diff --git a/pom.xml b/pom.xml
index 6b81d19..991fa07 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>2.4.0-SNAPSHOT</version>
+	<version>2.5.0-SNAPSHOT</version>
 	<name>gCube Service End Point Editor Management Portlet</name>
 	<description>
 		gCube Service End Point Editor Management Portlet
@@ -29,7 +29,7 @@
 		<distroDirectory>distro</distroDirectory>
 		<!-- GWT needs at least java 1.6 -->
 		<maven.compiler.source>1.7</maven.compiler.source>
-		<maven.compiler.target>1.7</maven.compiler.target>
+		<maven.compiler.target>1.8</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 CATALINA_HOME /Users/massi/portal/ 
diff --git a/src/main/webapp/WEB-INF/xml/scopedata_admin.xml b/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
index d394304..1bb6510 100644
--- a/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
+++ b/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
@@ -9,6 +9,11 @@
 				<src>ServiceMap_d4science.research-infrastructures.eu.xml</src>
 				<scope>/d4science.research-infrastructures.eu</scope>
 			</vo>
+			<vo>
+				<name>d4science/D4OS</name>
+				<src>ServiceMap_D4OS.xml</src>
+				<scope>/d4science.research-infrastructures.eu/D4OS</scope>
+			</vo>
 			<vo>
 				<name>d4science/D4Research</name>
 				<src>ServiceMap_D4Research.xml</src>
@@ -33,12 +38,7 @@
 				<name>d4science/ParthenosVO</name>
 				<src>ServiceMap_ParthenosVO.xml</src>
 				<scope>/d4science.research-infrastructures.eu/ParthenosVO</scope>
-			</vo>							
-			<vo>
-				<name>d4science/SmartArea</name>
-				<src>ServiceMap_SmartArea.xml</src>
-				<scope>/d4science.research-infrastructures.eu/SmartArea</scope>
-			</vo>
+			</vo>						
 			<vo>
 				<name>d4science/SoBigData</name>
 				<src>ServiceMap_SoBigData.xml</src>
@@ -47,6 +47,17 @@
 		</vos>
 	</infrastructure>
 
+	<infrastructure>
+		<name>pred4s</name>
+		<vos>
+			<vo>
+				<name>pred4s</name>
+				<src>ServiceMap_pred4s.xml</src>
+				<scope>/pred4s</scope>
+			</vo>
+		</vos>
+	</infrastructure>
+
 	<infrastructure>
 		<name>gcube</name>
 		<vos>
@@ -65,10 +76,20 @@
 				<src>ServiceMap_devNext.xml</src>
 				<scope>/gcube/devNext</scope>
 			</vo>
+		</vos>
+	</infrastructure>
+	<infrastructure>
+		<name>pred4s</name>
+		<vos>
 			<vo>
-				<name>gcube/preprod</name>
+				<name>pred4s</name>
+				<src>ServiceMap_pred4s.xml</src>
+				<scope>/pred4s</scope>
+			</vo>
+			<vo>
+				<name>pred4s/preprod</name>
 				<src>ServiceMap_preprod.xml</src>
-				<scope>/gcube/preprod</scope>
+				<scope>/pred4s/preprod</scope>
 			</vo>
 		</vos>
 	</infrastructure>