diff --git a/.classpath b/.classpath
index 8811970..e7cd6d0 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/resource-management-5.6.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/resource-management-5.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -36,5 +36,5 @@
 	</classpathentry>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/rmp-common-library"/>
-	<classpathentry kind="output" path="target/resource-management-5.6.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/resource-management-5.7.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 0ec72a9..9a45fb9 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -3,7 +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.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rmp-common-library/rmp-common-library">
+        <dependent-module archiveName="rmp-common-library-2.5.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/distro/changelog.xml b/distro/changelog.xml
index d88029a..4835cc6 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,5 +1,9 @@
 <ReleaseNotes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="xsd/changelog.xsd">
+	<Changeset component="org.gcube.portlets-admin.resource-management-portlet.5-7-0"
+		date="2015-09-28">
+		<Change>Refactored code in dependencies to promote reuse of sweeper features</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-admin.resource-management-portlet.5-6-0"
 		date="2015-08-04">
 		<Change>Implemented Feature #187, remove scope operation with Report</Change>
diff --git a/pom.xml b/pom.xml
index 648ff09..7c27530 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>resource-management</artifactId>
-	<version>5.6.0-SNAPSHOT</version>
+	<version>5.7.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>gCube Resource Management Portlet</name>
 	<description>