diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/DatabaseHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/DatabaseHandler.java
index 53c94c0..f85ad95 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/DatabaseHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/DatabaseHandler.java
@@ -15,8 +15,18 @@
 public class DatabaseHandler extends SQLiteOpenHelper {
     private static final int DATABASE_VERSION = 1;
     private static final String DATABASE_NAME = "mountainNavigation";
-    private static final String TABLE_POI = "pois";
-    private static final String TABLE_PROPERTIES = "poi_properties";
+    //private static final String TABLE_POI = "pois";
+    private static final String TABLE_GP = "geopoint";
+    private static final String TABLE_FOUNTAIN = "fountain";
+    private static final String TABLE_PATH = "path";
+    private static final String TABLE_HUT = "hut";
+    private static final String TABLE_PEAK = "peak";
+    private static final String TABLE_BREAK_POINT = "break_point";
+    private static final String TABLE_TRASH_BIN = "trash_bin";
+    private static final String TABLE_IMAGE = "image";
+    private static final String TABLE_CELL_RECEPTION = "cell_reception";
+    private static final String TABLE_WIFI = "wifi";
+    private static final String TABLE_LIFT = "lift";
 
     private static final String KEY_POI_ID = "_id";
     private static final String KEY_POI_LAT = "_lat";
@@ -24,11 +34,29 @@
     private static final String KEY_POI_ALT = "_alt";
     private static final String KEY_POI_TYPE = "_type";
     private static final String KEY_POI_TIME = "_time";
-    private static final String KEY_POI_EXT_POI_ID = "_ext_poi_id";
 
-    private static final String KEY_PROPERTIES_ID = "_id";
-    private static final String KEY_PROPERTIES_POI_ID = "_poi_id";
-    private static final String KEY_PROPERTIES_OPT_ID = "_opt_id";
+    private static final String KEY_LAT_END = "_lat_end";
+    private static final String KEY_LON_END = "_lon_end";
+    private static final String KEY_ALT_END = "_alt_end";
+    private static final String KEY_FOUNTAIN_SIZE = "_size";
+    private static final String KEY_PATH_LENGTH = "_length";
+    private static final String KEY_PATH_PATH_EXPOSED = "_path_exp";
+    private static final String KEY_PATH_DIFF_WET = "_path_diff";
+    private static final String KEY_PATH_GIDDINESS = "_path_giddiness";
+    private static final String KEY_PATH_CLIMBING = "_path_climbing";
+    private static final String KEY_BREAK_POINT_STONE = "_break_point_stone";
+    private static final String KEY_BREAK_POINT_BENCH = "_break_point_bench";
+    private static final String KEY_BREAK_POINT_TABLE = "_break_point_table";
+    private static final String KEY_BREAK_POINT_ROOFED = "_break_point_roofed";
+    private static final String KEY_HUT_TYPE = "_hut_type";
+    private static final String KEY_HUT_WINTER_ROOM = "_hut_winter_room";
+    private static final String KEY_CELL_RECEPTION_STRENGTH = "_cell_reception_strength";
+    private static final String KEY_CELL_RECEPTION_OP_NAME = "_cell_reception_op_name";
+    private static final String KEY_CELL_RECEPTION_OP_COUNTRY = "_cell_reception_op_country";
+    private static final String KEY_CELL_RECEPTION_NW_TYPE = "_cell_reception_nw_type";
+    private static final String KEY_CELL_RECEPTION_ROAMING = "_cell_reception_roaming";
+    private static final String KEY_WIFI_SSID = "_wifi_ssid";
+    private static final String KEY_WIFI_LEVELS = "_wifi_levels";
 
     public DatabaseHandler(Context context){
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
@@ -37,28 +65,21 @@
     @Override
     public void onCreate(SQLiteDatabase db) {
         //create POI table
-        String CREATE_POI_TABLE = "CREATE TABLE " + TABLE_POI + "("
+        String CREATE_GP_TABLE = "CREATE TABLE " + TABLE_GP + "("
                 + KEY_POI_ID + " INTEGER PRIMARY KEY,"
                 + KEY_POI_LAT + " REAL,"
                 + KEY_POI_LON + " REAL,"
                 + KEY_POI_ALT + " REAL,"
                 + KEY_POI_TYPE + " TEXT,"
-                + KEY_POI_TIME + " INTEGER,"
-                + KEY_POI_EXT_POI_ID + " INTEGER" + ")";
-        db.execSQL(CREATE_POI_TABLE);
+                + KEY_POI_TIME + " INTEGER" + ")";
+        db.execSQL(CREATE_GP_TABLE);
 
-        //create POI properties table
-        String CREATE_PROP_TABLE = "CREATE TABLE " + TABLE_PROPERTIES + "("
-                + KEY_PROPERTIES_ID + " INTEGER PRIMARY KEY,"
-                + KEY_PROPERTIES_POI_ID + " INTEGER,"
-                + KEY_PROPERTIES_OPT_ID + " INTEGER" + ")";
-        db.execSQL(CREATE_PROP_TABLE);
+        //TODO add other tables
     }
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        db.execSQL("DROP TABLE IF EXISTS " + TABLE_POI);
-        db.execSQL("DROP TABLE IF EXISTS " + TABLE_PROPERTIES);
+        db.execSQL("DROP TABLE IF EXISTS " + TABLE_GP);
         onCreate(db);
     }
 
@@ -70,7 +91,6 @@
         values.put(KEY_POI_ALT, poi.getAlt());
         values.put(KEY_POI_TYPE, poi.getType());
         values.put(KEY_POI_TIME, poi.getTime());
-        values.put(KEY_POI_EXT_POI_ID, poi.getExtPoiId());
         long rowId = db.insert(TABLE_POI, null, values);
         db.close();
         return rowId;
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/Poi.java b/app/src/main/java/de/apps4ics/mountainnavigation/Poi.java
index 3a14268..850307d 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/Poi.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/Poi.java
@@ -1,7 +1,5 @@
 package de.apps4ics.mountainnavigation;
 
-import org.osmdroid.api.Marker;
-
 /**
  * Created by Vinz on 06.10.2015.
  */
@@ -119,4 +117,44 @@
     public int getExtPoiId(){
         return _ext_poi_id;
     }
+}
+
+class Fountain extends Poi {
+
+}
+
+class Path extends Poi {
+
+}
+
+class Hut extends Poi {
+
+}
+
+class Peak extends Poi {
+
+}
+
+class BreakPoint extends Poi {
+
+}
+
+class TrashBin extends Poi {
+
+}
+
+class Image extends Poi {
+    String asso_type;
+}
+
+class CellReception extends Poi {
+
+}
+
+class Wifi extends Poi {
+
+}
+
+class Lift extends Poi {
+
 }
\ No newline at end of file