diff --git a/.classpath b/.classpath
index 3f76803..7618bf4 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/resource-management-6.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/resource-management-6.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/resource-management-6.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
@@ -35,5 +39,5 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
-	<classpathentry kind="output" path="target/resource-management-6.0.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/resource-management-6.1.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.project b/.project
index 004b9d5..f074d24 100644
--- a/.project
+++ b/.project
@@ -55,5 +55,6 @@
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>com.google.gwt.eclipse.core.gwtNature</nature>
+		<nature>com.liferay.ide.core.liferayNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 224aee6..83aa556 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -3,9 +3,7 @@
         <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"/>
-        <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>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="resource-management"/>
   </wb-module>
diff --git a/pom.xml b/pom.xml
index 8326bad..6005064 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>resource-management</artifactId>
-	<version>6.0.0-SNAPSHOT</version>
+	<version>6.1.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>gCube Resource Management Portlet</name>
 	<description>
diff --git a/src/main/webapp/WEB-INF/xml/scopedata.xml b/src/main/webapp/WEB-INF/xml/scopedata.xml
index 4b5f442..b84f9cf 100644
--- a/src/main/webapp/WEB-INF/xml/scopedata.xml
+++ b/src/main/webapp/WEB-INF/xml/scopedata.xml
@@ -9,6 +9,11 @@
 				<src>ServiceMap_d4science.research-infrastructures.eu.xml</src>
 				<scope>/d4science.research-infrastructures.eu</scope>
 			</vo>
+			<vo>
+				<name>d4science/D4Research</name>
+				<src>ServiceMap_D4Research.xml</src>
+				<scope>/d4science.research-infrastructures.eu/D4Research</scope>
+			</vo>
 			<vo>
 				<name>d4science/FARM</name>
 				<src>ServiceMap_FARM.xml</src>
@@ -57,21 +62,5 @@
 			</vo>
 		</vos>
 	</infrastructure>
-	
-	<infrastructure>
-		<name>CNR.it</name>
-		<vos>
-			<vo>
-				<name>CNR.it</name>
-				<src>ServiceMap_CNR.it.xml</src>
-				<scope>/CNR.it</scope>
-			</vo>
-			<vo>
-				<name>CNR.it/ISTI</name>
-				<src>ServiceMap_ISTI.xml</src>
-				<scope>/CNR.it/ISTI</scope>
-			</vo>
-		</vos>
-	</infrastructure>
 
 </infrastructures>
diff --git a/src/main/webapp/WEB-INF/xml/scopedata_admin.xml b/src/main/webapp/WEB-INF/xml/scopedata_admin.xml
index 4b5f442..b84f9cf 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/D4Research</name>
+				<src>ServiceMap_D4Research.xml</src>
+				<scope>/d4science.research-infrastructures.eu/D4Research</scope>
+			</vo>
 			<vo>
 				<name>d4science/FARM</name>
 				<src>ServiceMap_FARM.xml</src>
@@ -57,21 +62,5 @@
 			</vo>
 		</vos>
 	</infrastructure>
-	
-	<infrastructure>
-		<name>CNR.it</name>
-		<vos>
-			<vo>
-				<name>CNR.it</name>
-				<src>ServiceMap_CNR.it.xml</src>
-				<scope>/CNR.it</scope>
-			</vo>
-			<vo>
-				<name>CNR.it/ISTI</name>
-				<src>ServiceMap_ISTI.xml</src>
-				<scope>/CNR.it/ISTI</scope>
-			</vo>
-		</vos>
-	</infrastructure>
 
 </infrastructures>