diff --git a/.classpath b/.classpath
index e527956..97d6747 100644
--- a/.classpath
+++ b/.classpath
@@ -1,33 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/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/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="KEYS"/>
-	<classpathentry kind="var" path="JAVA_HOME"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/pom.xml b/pom.xml
index 771251f..1d4b11d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.dataaccess</groupId>
 	<artifactId>database-resource-manager</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.1-SNAPSHOT</version>
 	<name>DatabaseResourceManager</name>
 	<description>Database resource manager</description>
 
@@ -22,60 +22,7 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.gcube.contentmanagement</groupId>
-			<artifactId>storage-manager-core</artifactId>
-			<version>[1.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>			
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.core</groupId>
-			<artifactId>common-scope-maps</artifactId>
-			<version>[1.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.resources.discovery</groupId>
-			<artifactId>ic-client</artifactId>
-			<version>[1.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-		</dependency>
 
-		<dependency>
-			<groupId>org.gcube.contentmanagement</groupId>
-			<artifactId>storage-manager-wrapper</artifactId>
-			<version>[1.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>			
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.core</groupId>
-			<artifactId>common-scope</artifactId>
-			<version>[1.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.resources</groupId>
-			<artifactId>common-gcore-resources</artifactId>
-			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.gcube.core</groupId>
-			<artifactId>common-encryption</artifactId>
-			<version>[1.0.1-SNAPSHOT,3.0.0-SNAPSHOT)</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.gcube.dataanalysis</groupId>
-			<artifactId>ecological-engine</artifactId>
-			<version>[1.7.2-SNAPSHOT,2.0.0-SNAPSHOT)</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>postgresql</artifactId>
-					<groupId>postgresql</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 
 		<dependency>
 			<groupId>com.mysql</groupId>
@@ -88,18 +35,17 @@
 			<artifactId>postgresql</artifactId>
 			<version>9.1-901-1.jdbc4</version>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.resources.discovery</groupId>
-			<artifactId>discovery-client</artifactId>
-			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 
-		</dependency>
 		<dependency>
 			<groupId>rapidminer-custom</groupId>
 			<artifactId>swissql-api</artifactId>
 			<version>1.0.0</version>
 		</dependency>
-
+		<dependency>
+			<groupId>org.gcube.dataanalysis</groupId>
+			<artifactId>ecological-engine-smart-executor</artifactId>
+			<version>[1.4.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+		</dependency>
 	</dependencies>
 
 	<repositories>
diff --git a/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java
index 5f95f2f..b760cf8 100644
--- a/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java
+++ b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java
@@ -417,7 +417,7 @@ public class DatabaseManagement {
 //				}
 //			}
 
-		}catch (Throwable e) {
+		}catch (Exception e) {
 			throw e;
 		}finally{
 			//close the file
@@ -791,7 +791,7 @@ public class DatabaseManagement {
 					file), "UTF-8"));
 			writeSamplingResultIntoFile(resultSet, DataTypeColumns);
 
-                       }catch (Throwable e) {
+                       }catch (Exception e) {
 			throw e;
 		}finally{
 			//close the file
@@ -884,7 +884,7 @@ public class DatabaseManagement {
 					writeSamplingResultIntoFile(resultSet, DataTypeColumns);
 
 
-				}catch (Throwable e) {
+				}catch (Exception e) {
 					throw e;
 				}finally{
 					//close the file
@@ -988,7 +988,7 @@ public class DatabaseManagement {
 					file), "UTF-8"));
 			writeSamplingResultIntoFile(resultSet, DataTypeColumns);
 
-                       }catch (Throwable e) {
+                       }catch (Exception e) {
 			throw e;
 		}finally{
 			//close the file
@@ -1391,7 +1391,7 @@ public class DatabaseManagement {
 		AnalysisLogger.getLogger().debug(
 				"In DatabaseManagement-> Writing File and Result Map creation operations terminated");
 					
-		}catch (Throwable e) {
+		}catch (Exception e) {
 			throw e;
 		}finally{
 			// close the file
@@ -1623,7 +1623,7 @@ public class DatabaseManagement {
 			AnalysisLogger.getLogger().debug(
 					"In DatabaseManagement-> Writing File and Result Map creation operations terminated");
 						
-			}catch (Throwable e) {
+			}catch (Exception e) {
 				throw e;
 			}finally{
 				// close the file