diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/DatabaseHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/DatabaseHandler.java
index 10056c5..86ea739 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/DatabaseHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/DatabaseHandler.java
@@ -173,9 +173,7 @@
         onCreate(db);
     }
 
-    public long addPoi(Poi poi){
-        SQLiteDatabase db = this.getWritableDatabase();
-        String table = "";
+    private ContentValues getValues(Poi poi){
         ContentValues values = new ContentValues();
         switch(poi.getType()){
             case Types.FOUNTAIN:
@@ -253,6 +251,13 @@
                 values.put(KEY_POI_TIME, dbgp.getTime());
                 break;
         }
+        return values;
+    }
+
+    public long addPoi(Poi poi){
+        SQLiteDatabase db = this.getWritableDatabase();
+        String table = getTableName(poi.getType());
+        ContentValues values = getValues(poi);
         long rowId = db.insert(table, null, values);
         db.close();
         return rowId;
@@ -568,15 +573,14 @@
         return count;
     }
 
-    public int updatePoi(long id, int type){
+    public long updatePoi(Poi poi){
         SQLiteDatabase db = this.getWritableDatabase();
-        ContentValues values = new ContentValues();
-        String table = "";
-
-        //TODO set values
-
-        return db.update(table, values, KEY_POI_ID + "=?",
-                new String[]{ String.valueOf(id) });
+        String table = getTableName(poi.getType());
+        ContentValues values = getValues(poi);
+        long rowId = db.update(table, values, KEY_POI_ID + "=?",
+                new String[]{String.valueOf(poi.getId())});;
+        db.close();
+        return rowId;
     }
 
     //TODO recursive delete