diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 0cbf19b..29e3120 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -399,15 +399,12 @@
             List<Poi> tempPoiList = params[0]; //This is only one list
             for(int i=0; i<tempPoiList.size(); ++i){
                 Poi poi = tempPoiList.get(i);
-                GeoPoint gp = new GeoPoint(poi.getLat(), poi.getLon(), poi.getAlt());
-                String snippetText = res.getString(R.string.osm_marker_snippet, gp.getLatitude(), gp.getLongitude(), gp.getAltitude(), df_full.format(new Date(poi.getTime())));
+                DbGeoPoint dbgp = poi.getGp();
+                GeoPoint gp = new GeoPoint(dbgp.getLat(), dbgp.getLon(), dbgp.getAlt());
+                String snippetText = res.getString(R.string.osm_marker_snippet, gp.getLatitude(), gp.getLongitude(), gp.getAltitude(), df_full.format(new Date(dbgp.getTime())));
                 String subDescText;
 
-                ArrayList<Properties> optList = dbHandler.getPoiOptions(poi.getId());
-                for(int j=0; j<optList.size(); ++j){
-                    Properties prop = optList.get(j);
-                    if(type == Types.FOUNTAIN) title += " (" + fountainSizes[(int)prop.get_opt_id()] + ")";
-                }
+                if(type == Types.FOUNTAIN) title += " (" + fountainSizes[((Fountain) poi).getSize()] + ")";
 
                 Marker positionMarker = new Marker(mapView);
                 positionMarker.setPosition(gp);
@@ -878,9 +875,6 @@
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             //Add POI to DB
-                            int _type = Types.FOUNTAIN;
-                            long rowId = addPoi(_type);
-
                             int size = 0;
                             switch (which) {
                                 case 0:
@@ -895,7 +889,7 @@
                                 default:
                                     Log.e(TAG, "Wrong fountain size " + which);
                             }
-                            dbHandler.addPoiOptions(rowId, size);
+                            addPoi(new Fountain(0, size, null));
                         }
                     });
             return builder.create();
@@ -913,15 +907,16 @@
 
         List<OverlayItem> overlayItemList = new ArrayList<>();
         for(Location l : foundLocations){
-            OverlayItem oI = new OverlayItem(null, null, new GeoPoint(l.getLatitude(), l.getLongitude(), l.getAltitude()));
+            OverlayItem oI = new OverlayItem(String.valueOf(l.getTime()), null, null, new GeoPoint(l.getLatitude(), l.getLongitude(), l.getAltitude()));
             oI.setMarker(res.getDrawable(R.mipmap.ic_poi_red));
             overlayItemList.add(oI);
         }
 
         List<Poi> poiMarker = dbHandler.getAllPois();
         for(Poi p : poiMarker){
-            GeoPoint gp = new GeoPoint(p.getLat(), p.getLon(), p.getAlt());
-            OverlayItem oI = new OverlayItem(String.valueOf(p.getId()), String.valueOf(p.getType()), gp);
+            DbGeoPoint dbgp = p.getGp();
+            GeoPoint gp = new GeoPoint(dbgp.getLat(), dbgp.getLon(), dbgp.getAlt());
+            OverlayItem oI = new OverlayItem(String.valueOf(dbgp.getTime()), String.valueOf(p.getId()), String.valueOf(p.getType()), gp);
             Drawable[] iconLayer = new Drawable[2];
             iconLayer[0] = res.getDrawable(R.mipmap.ic_poi);
             BitmapDrawable bd = (BitmapDrawable) res.getDrawable(entryImgs[getPos(p.getType())]);
@@ -988,19 +983,27 @@
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             int[] options = adapter.getCheckedItems();
+                            int exposed = 0;
+                            int diffWet = 0;
+                            int giddiness = 0;
+                            int climbing = 0;
                             for (int i = 0; i < options.length; ++i) {
                                 switch (options[i]) {
                                     case 0:
                                         options[i] = Features.PATH_EXPOSED;
+                                        exposed = 1;
                                         break;
                                     case 1:
                                         options[i] = Features.PATH_DIFF_WET;
+                                        diffWet = 1;
                                         break;
                                     case 2:
                                         options[i] = Features.PATH_GIDDINESS;
+                                        giddiness = 1;
                                         break;
                                     case 3:
                                         options[i] = Features.PATH_CLIMBING;
+                                        climbing = 1;
                                         break;
                                 }
                             }
@@ -1011,20 +1014,26 @@
 
                             RoadManager roadManager = new OSRMRoadManager();
                             ArrayList<GeoPoint> waypoints = new ArrayList<>();
+                            DbGeoPoint current = null;
+                            DbGeoPoint last = null;
                             for(int i=0; i<pathMarkers.size(); ++i){
                                 GeoPoint gp = (GeoPoint) pathMarkers.get(i).getPoint();
                                 waypoints.add(gp);
-                                if(pathMarkers.get(i).getTitle() == null) Log.d(TAG, "Waypoint #" + i + " is new!");
+                                current = new DbGeoPoint(gp.getLatitude(), gp.getLongitude(), gp.getAltitude(), Long.parseLong(pathMarkers.get(i).getUid()) / 1000);
+                                if(pathMarkers.get(i).getTitle() == null){
+                                    Log.d(TAG, "Waypoint #" + i + " is new!");
+                                    addPoi(current);
+                                }
+                                if(current != null && last != null){
+                                    addPoi(new Path(0, 0, exposed, diffWet, giddiness, climbing, last, current));
+                                }
+                                last = current;
                             }
                             Road road = roadManager.getRoad(waypoints);
                             Polyline line = RoadManager.buildRoadOverlay(road, getApplicationContext());
                             mapView.getOverlays().add(line);
                             mapView.invalidate();
                             pathMarkers = new ArrayList<>();
-
-                            int _type = Types.PATH;
-                            long rowId = addPoi(_type);
-                            dbHandler.addPoiOptions(rowId, options);
                         }
                     })
                     .setNegativeButton(R.string.cancel_button, new DialogInterface.OnClickListener() {
@@ -1052,25 +1061,31 @@
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             int[] options = adapter.getCheckedItems();
+                            int stone = 0;
+                            int bench = 0;
+                            int table = 0;
+                            int roofed = 0;
                             for(int i=0; i<options.length; ++i){
                                 switch(options[i]){
                                     case 0:
                                         options[i] = Features.BREAK_STONE;
+                                        stone = 1;
                                         break;
                                     case 1:
                                         options[i] = Features.BREAK_BENCH;
+                                        bench = 1;
                                         break;
                                     case 2:
                                         options[i] = Features.BREAK_TABLE;
+                                        table = 1;
                                         break;
                                     case 3:
                                         options[i] = Features.BREAK_ROOFED;
+                                        roofed = 1;
                                         break;
                                 }
                             }
-                            int _type = Types.BREAK_POINT;
-                            long rowId = addPoi(_type);
-                            dbHandler.addPoiOptions(rowId, options);
+                            addPoi(new BreakPoint(0, stone, bench, table, roofed, null));
                         }
                     })
                     .setNegativeButton(R.string.cancel_button, new DialogInterface.OnClickListener() {
@@ -1095,9 +1110,9 @@
                 String opName = tm.getNetworkOperatorName();
                 String opCountry = tm.getNetworkCountryIso();
                 String nwType = activeNetwork.getSubtypeName();
-                boolean isRoaming = tm.isNetworkRoaming();
+                int roaming = (tm.isNetworkRoaming()) ? 1 : 0;
                 int strength = networkStrength;
-                addPoi(Types.CELL_RECEPTION);
+                addPoi(new CellReception(0, strength, opName, opCountry, roaming, nwType, null));
             } else {
                 Log.d(TAG, "Mobile network not available/connected");
             }
@@ -1146,22 +1161,34 @@
     }
 
     private long addPoi(Poi poi){
-        double _lat = mLocation.getLatitude();
-        double _lon = mLocation.getLongitude();
-        double _alt = mLocation.getAltitude();
-        long _time = System.currentTimeMillis() / 1000;
+        DbGeoPoint dbgp = poi.getGp();
+        if(dbgp == null){
+            double _lat = mLocation.getLatitude();
+            double _lon = mLocation.getLongitude();
+            double _alt = mLocation.getAltitude();
+            long _time = System.currentTimeMillis() / 1000;
 
-        DbGeoPoint dbgp = new DbGeoPoint(_lat, _lon, _alt, _time);
-        long gp_id = dbHandler.addPoi(dbgp);
-        dbgp.setId(gp_id);
+            dbgp = new DbGeoPoint(_lat, _lon, _alt, _time);
+            long gp_id = dbHandler.addPoi(dbgp);
+            dbgp.setId(gp_id);
 
-        poi.setGp(dbgp);
+            poi.setGp(dbgp);
+        }
         long rowId = dbHandler.addPoi(poi);
         if(rowId >= 0) Toaster(getString(R.string.add_poi_success), true);
         dbgp.setTypeId(getTypeName(poi.getType()) + "_" + rowId);
-
         dbHandler.updatePoi(dbgp);
 
+        if(poi.getType() == Types.PATH){
+            Path path = (Path) poi;
+            path.getEndGp().setTypeId(getTypeName(poi.getType()) + "_" + rowId);
+            dbHandler.updatePoi(path.getEndGp());
+        } else if(poi.getType() == Types.LIFT){
+            Lift lift = (Lift) poi;
+            lift.getEndGp().setTypeId(getTypeName(poi.getType()) + "_" + rowId);
+            dbHandler.updatePoi(lift.getEndGp());
+        }
+
         return rowId;
     }