diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java
index 24751e0..0b18400 100644
--- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java
+++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java
@@ -65,7 +65,8 @@ public class RestPoolManager implements PoolManager {
 		return service.getLogById(logUrl);
 ***REMOVED***
 
-	@Override
+	
+		@Override
 	public Algorithm extractAlgorithm(String url) throws IOException {
 		***REMOVED*** TODO Auto-generated method stub
 		return null;
diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java
index 9f86312..98411fe 100644
--- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java
+++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java
@@ -17,9 +17,9 @@ public class DataminerPoolManager {
 
 	private SVNUpdater svnUpdater;
 
-	public DataminerPoolManager(){
+	public DataminerPoolManager() {
 		try {
-			***REMOVED***TODO: read this from configuration - fatto
+			***REMOVED***TODO: read this from configuration
 			this.svnUpdater = new SVNUpdater(new Props().getSVNrepo());
 	***REMOVED*** catch (SVNException e) {
 			e.printStackTrace();
diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/ClusterBuilder.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/ClusterBuilder.java
index 65ca353..33b52cd 100644
--- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/ClusterBuilder.java
+++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/ClusterBuilder.java
@@ -1,5 +1,6 @@
 package org.gcube.dataanalysis.dataminer.poolmanager.util;
 
+import java.io.FileNotFoundException;
 ***REMOVED***
 
 ***REMOVED***
@@ -12,7 +13,7 @@ public class ClusterBuilder {
 
 	
 	***REMOVED***1. to complete
-	public static Cluster getStagingDataminerCluster(){
+	public static Cluster getStagingDataminerCluster() throws FileNotFoundException{
 		Cluster cluster = new Cluster();
 		Props p = new Props();
 		Host h = new Host(p.getStagingHost());
diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/Props.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/Props.java
index c006ea5..4fe4f92 100644
--- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/Props.java
+++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/Props.java
@@ -1,6 +1,9 @@
 package org.gcube.dataanalysis.dataminer.poolmanager.util;
 
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 ***REMOVED***
+import java.io.InputStream;
 import java.util.Properties;
 
 public class Props {
@@ -11,17 +14,25 @@ public class Props {
 
 	public String getCSVUrl() {
 		Properties props = new Properties();
-		java.io.InputStream input = Props.class.getClassLoader().getResourceAsStream("service.properties");
-
-		***REMOVED*** loading properites from properties file
+		***REMOVED***read from war
+		***REMOVED***java.io.InputStream input = Props.class.getClassLoader().getResourceAsStream("service.properties");
+				
+		***REMOVED***read from filesystem
+		FileInputStream input;
 		try {
-			props.load(input);
-	***REMOVED*** catch (IOException e) {
+			input = new FileInputStream(home+"/dpmConfig/service.properties");
+			***REMOVED*** loading properites from properties file
+			try {
+				props.load(input);
+		***REMOVED*** catch (IOException e) {
+				***REMOVED*** TODO Auto-generated catch block
+				e.printStackTrace();
+		***REMOVED***
+	***REMOVED*** catch (FileNotFoundException e1) {
 			***REMOVED*** TODO Auto-generated catch block
-			e.printStackTrace();
+			e1.printStackTrace();
 	***REMOVED***
-
-		***REMOVED*** reading proeprty
+		***REMOVED*** reading propeprty
 		String path = props.getProperty("HAPROXY_CSV");
 		return path;
 
@@ -30,17 +41,25 @@ public class Props {
 	
 	public String getSVNrepo() {
 		Properties props = new Properties();
-		java.io.InputStream input = Props.class.getClassLoader().getResourceAsStream("service.properties");
-
-		***REMOVED*** loading properites from properties file
+		***REMOVED***read from war
+		***REMOVED***java.io.InputStream input = Props.class.getClassLoader().getResourceAsStream("service.properties");
+				
+		***REMOVED***read from filesystem
+		FileInputStream input;
 		try {
-			props.load(input);
-	***REMOVED*** catch (IOException e) {
+			input = new FileInputStream(home+"/dpmConfig/service.properties");
+			***REMOVED*** loading properites from properties file
+			try {
+				props.load(input);
+		***REMOVED*** catch (IOException e) {
+				***REMOVED*** TODO Auto-generated catch block
+				e.printStackTrace();
+		***REMOVED***
+	***REMOVED*** catch (FileNotFoundException e1) {
 			***REMOVED*** TODO Auto-generated catch block
-			e.printStackTrace();
+			e1.printStackTrace();
 	***REMOVED***
-
-		***REMOVED*** reading proeprty
+		***REMOVED*** reading propeprty
 		String path = props.getProperty("SVN_REPO");
 		return path;
 
@@ -48,28 +67,37 @@ public class Props {
 	
 	
 	
-	
 	public String getStagingHost() {
 		Properties props = new Properties();
-		java.io.InputStream input = Props.class.getClassLoader().getResourceAsStream("service.properties");
-
-		***REMOVED*** loading properites from properties file
+		***REMOVED***read from war
+		***REMOVED***java.io.InputStream input = Props.class.getClassLoader().getResourceAsStream("service.properties");
+				
+		***REMOVED***read from filesystem
+		FileInputStream input;
 		try {
-			props.load(input);
-	***REMOVED*** catch (IOException e) {
+			input = new FileInputStream(home+"/dpmConfig/service.properties");
+			***REMOVED*** loading properites from properties file
+			try {
+				props.load(input);
+		***REMOVED*** catch (IOException e) {
+				***REMOVED*** TODO Auto-generated catch block
+				e.printStackTrace();
+		***REMOVED***
+	***REMOVED*** catch (FileNotFoundException e1) {
 			***REMOVED*** TODO Auto-generated catch block
-			e.printStackTrace();
+			e1.printStackTrace();
 	***REMOVED***
-
-		***REMOVED*** reading proeprty
+	
+		***REMOVED*** reading propeprty
 		String path = props.getProperty("STAGING_HOST");
 		return path;
 
 ***REMOVED***
 
-	public static void main(String[] args) {
-		***REMOVED***Props a = new Props();
+	public static void main(String[] args) throws FileNotFoundException {
+		Props a = new Props();
 		System.out.println(new Props().getSVNrepo());
-		***REMOVED***System.out.println(a.getStagingHost());
+		System.out.println(a.getStagingHost());
+		System.out.println(a.getCSVUrl());
 ***REMOVED***
 ***REMOVED***