diff --git a/src/se/koc/hal/HalContext.java b/src/se/koc/hal/HalContext.java
index f639ba7c..34e72ec4 100755
--- a/src/se/koc/hal/HalContext.java
+++ b/src/se/koc/hal/HalContext.java
@@ -1,11 +1,10 @@
 package se.koc.hal;
 
 import zutil.db.DBConnection;
-import zutil.db.handler.PropertiesSQLHandler;
+import zutil.db.handler.PropertiesSQLResult;
 import zutil.io.file.FileUtil;
 import zutil.log.LogUtil;
 
-import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.sql.SQLException;
@@ -52,12 +51,12 @@ public class HalContext {
 
             // Read DB conf
             dbConf =
-                    db.exec("SELECT * FROM conf", new PropertiesSQLHandler());
+                    db.exec("SELECT * FROM conf", new PropertiesSQLResult());
 
             // Upgrade DB needed?
             DBConnection defaultDB = new DBConnection(DBConnection.DBMS.SQLite, DEFAULT_DB_FILE);
             Properties defaultDBConf =
-                    db.exec("SELECT * FROM conf", new PropertiesSQLHandler());
+                    db.exec("SELECT * FROM conf", new PropertiesSQLResult());
             if(defaultDBConf.getProperty("db_version") != null &&
                     defaultDBConf.getProperty("db_version").compareTo(dbConf.getProperty("db_version")) > 0) {
                 logger.info("Upgrading DB (from: v"+dbConf.getProperty("db_version") +", to: v"+defaultDBConf.getProperty("db_version") +")...");
diff --git a/src/se/koc/hal/deamon/DataAggregatorDaemon.java b/src/se/koc/hal/deamon/DataAggregatorDaemon.java
index ebb8671c..18d5bdeb 100755
--- a/src/se/koc/hal/deamon/DataAggregatorDaemon.java
+++ b/src/se/koc/hal/deamon/DataAggregatorDaemon.java
@@ -14,7 +14,7 @@ import se.koc.hal.HalContext;
 import se.koc.hal.struct.Sensor;
 import zutil.db.DBConnection;
 import zutil.db.SQLResultHandler;
-import zutil.db.handler.SimpleSQLHandler;
+import zutil.db.handler.SimpleSQLResult;
 import zutil.log.LogUtil;
 
 /**
@@ -50,7 +50,7 @@ public class DataAggregatorDaemon extends TimerTask implements HalDaemon {
     public void aggregateSensor(long sensorId) {
     	DBConnection db = HalContext.getDB();
     	try {
-    		Long maxDBTimestamp = db.exec("SELECT MAX(timestamp_end) FROM sensor_data_aggr WHERE sensor_id == "+sensorId, new SimpleSQLHandler<Long>());
+    		Long maxDBTimestamp = db.exec("SELECT MAX(timestamp_end) FROM sensor_data_aggr WHERE sensor_id == "+sensorId, new SimpleSQLResult<Long>());
     		if(maxDBTimestamp == null)
     			maxDBTimestamp = 0l;
     		// 5 minute aggregation
@@ -62,7 +62,7 @@ public class DataAggregatorDaemon extends TimerTask implements HalDaemon {
     				new FiveMinuteAggregator());
     		
     		// hour aggregation
-    		maxDBTimestamp = db.exec("SELECT MAX(timestamp_end) FROM sensor_data_aggr WHERE sensor_id == "+sensorId+" AND timestamp_end-timestamp_start == " + (HOUR_IN_MS-1), new SimpleSQLHandler<Long>());
+    		maxDBTimestamp = db.exec("SELECT MAX(timestamp_end) FROM sensor_data_aggr WHERE sensor_id == "+sensorId+" AND timestamp_end-timestamp_start == " + (HOUR_IN_MS-1), new SimpleSQLResult<Long>());
     		if(maxDBTimestamp == null)
     			maxDBTimestamp = 0l;
     		long hourPeriodTimestamp = getTimestampMinutePeriodStart(60, System.currentTimeMillis()-HOUR_AGGREGATION_OFFSET);
@@ -73,7 +73,7 @@ public class DataAggregatorDaemon extends TimerTask implements HalDaemon {
     				new HourAggregator());
     		
     		// day aggregation
-    		maxDBTimestamp = db.exec("SELECT MAX(timestamp_end) FROM sensor_data_aggr WHERE sensor_id == "+sensorId+" AND timestamp_end-timestamp_start == " + (DAY_IN_MS-1), new SimpleSQLHandler<Long>());
+    		maxDBTimestamp = db.exec("SELECT MAX(timestamp_end) FROM sensor_data_aggr WHERE sensor_id == "+sensorId+" AND timestamp_end-timestamp_start == " + (DAY_IN_MS-1), new SimpleSQLResult<Long>());
     		if(maxDBTimestamp == null)
     			maxDBTimestamp = 0l;
     		long dayPeriodTimestamp = getTimestampHourPeriodStart(24, System.currentTimeMillis()-DAY_AGGREGATION_OFFSET);
diff --git a/src/se/koc/hal/struct/Sensor.java b/src/se/koc/hal/struct/Sensor.java
index 3fda7f9c..f8e4fc16 100755
--- a/src/se/koc/hal/struct/Sensor.java
+++ b/src/se/koc/hal/struct/Sensor.java
@@ -8,7 +8,7 @@ import se.koc.hal.HalContext;
 import zutil.db.DBConnection;
 import zutil.db.bean.DBBean;
 import zutil.db.bean.DBBeanSQLResultHandler;
-import zutil.db.handler.SimpleSQLHandler;
+import zutil.db.handler.SimpleSQLResult;
 
 /**
  * Created by Ziver on 2015-12-03.
@@ -39,7 +39,7 @@ public class Sensor extends DBBean{
 
 	
     public static long getHighestSequenceId(long sensorId) throws SQLException{
-   	 Integer id = HalContext.getDB().exec("SELECT MAX(sequence_id) FROM sensor_data_aggr WHERE sensor_id == "+ sensorId, new SimpleSQLHandler<Integer>());
+   	 Integer id = HalContext.getDB().exec("SELECT MAX(sequence_id) FROM sensor_data_aggr WHERE sensor_id == "+ sensorId, new SimpleSQLResult<Integer>());
    	 return (id != null ? id+1 : 1);
    }