Add DLT to HMI and do some code clean up

23 files changed, 935 insertions, 937 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b2bec7d..2f6810f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,6 +45,7 @@ message(STATUS "WITH_DLT = ${WITH_DLT}")
 set(NAVIGATION_API_DIR "${CMAKE_CURRENT_SOURCE_DIR}/navigation/api")
 set(POSITIONING_API_DIR "${CMAKE_CURRENT_SOURCE_DIR}/navigation/src/navigation/positioning/enhanced-position-service/dbus/api")
 set(FUEL_STOP_ADVISOR_API_DIR "${CMAKE_CURRENT_SOURCE_DIR}/fuel-stop-advisor")
+set(NAVIGATION_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/navigation/src/navigation/navigation-common")
 
 set(AUTOMOTIVE_MESSAGE_BROKER "automotive-message-broker")
 set(AUTOMOTIVE_MESSAGE_BROKER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${AUTOMOTIVE_MESSAGE_BROKER}")
diff --git a/src/build.sh b/src/build.sh
index 1537cc8..a22d18f 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -89,16 +89,18 @@ do
 	n)
 		navit=1
 		;;
+	p)
+		pack_for_gdp=1
+		;;
 	t)
 		theme_option="ON"
-		pack_for_gdp=1
 		;;
 	w)
 		html="ON"
 		;;
 	h)
 		echo "Usage:"
-		echo "$0 [-cdghlmntw]"
+		echo "$0 [-cdghlmnptw]"
 		echo "-c: Rebuild with clean"
 		echo "-d: Enable the debug messages"
 		echo "-g: Build the vehicle gateway"
@@ -106,6 +108,7 @@ do
 		echo "-l: Build with dlt (only with -c)"
 		echo "-m: Build with commonAPI plugins (only with -c)"
 		echo "-n: Build navit"
+		echo "-p: Pack the hmi (for GDP)"
 		echo "-t: Generate the HMI theme (only with -c)"
 		echo "-w: Enable migration to the html based hmi"
 		exit 1
diff --git a/src/fuel-stop-advisor/fuel-stop-advisor.cpp b/src/fuel-stop-advisor/fuel-stop-advisor.cpp
index 071fbec..605711b 100644
--- a/src/fuel-stop-advisor/fuel-stop-advisor.cpp
+++ b/src/fuel-stop-advisor/fuel-stop-advisor.cpp
@@ -317,7 +317,7 @@ class FuelStopAdvisor
 	double enhancedDistance(double level, double &remaining)
 	{
 		double distance=0;
-        LOG_INFO(gCtx,"routeHandle %d\n",routeHandle);
+        LOG_INFO(gCtx,"routeHandle %d",routeHandle);
         if (routeHandle) {
             std::vector< std::map< int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > > > RouteShape;
             std::vector< int32_t > valuesToReturn;
@@ -346,10 +346,10 @@ class FuelStopAdvisor
 					level-=fuel_consumption;
 				}
 			}
-            LOG_INFO(gCtx,"%d segments\n",totalNumberOfSegments);
+            LOG_INFO(gCtx,"%d segments",totalNumberOfSegments);
 		}
 		remaining=level/fuel_consumption_l_100km*100;
-        LOG_INFO(gCtx,"distance_on_route %f remaining %f\n",distance/1000,remaining);
+        LOG_INFO(gCtx,"distance_on_route %f remaining %f",distance/1000,remaining);
 		return distance/1000+(remaining > 0 ? remaining:0);
 	}
 	
@@ -436,9 +436,9 @@ class FuelStopAdvisor
         double remaining;
         if (advisorMode) {
             enhancedDistance(fuelLevel, remaining);
-            LOG_INFO(gCtx,"Advisor %f vs %d\n",remaining, distanceThreshold);
+            LOG_INFO(gCtx,"Advisor %f vs %d",remaining, distanceThreshold);
             if (remaining < distanceThreshold) {
-                LOG_INFO(gCtx,"Warning %f < %d\n",remaining, distanceThreshold);
+                LOG_INFO(gCtx,"Warning %f < %d",remaining, distanceThreshold);
                 destinationCantBeReached = true;
             }
             else
@@ -520,8 +520,8 @@ update_enhanced_distance(gpointer user_data)
 
 int main(int argc, char **argv)
 {
-    DLT_REGISTER_APP("FSAD","FUEL STOP ADVISOR");
-    DLT_REGISTER_CONTEXT(gCtx,"FSAD","Global Context");
+    DLT_REGISTER_APP("FSAS","FUEL STOP ADVISOR SERVER");
+    DLT_REGISTER_CONTEXT(gCtx,"FSAS","Global Context");
 
     loop=g_main_loop_new(NULL, false);
 	dispatcher.attach(NULL);
diff --git a/src/hmi/config/fsa_london.conf b/src/hmi/config/fsa_london.conf
index c8d05c6..74376a6 100644
--- a/src/hmi/config/fsa_london.conf
+++ b/src/hmi/config/fsa_london.conf
@@ -15,4 +15,7 @@ number=1
 simulationMode=true
 showroom=true
 autoguidance=false
+[Log]
+verbose=true
+dlt=false
 
diff --git a/src/hmi/config/fsa_paris.conf b/src/hmi/config/fsa_paris.conf
index 873a3d1..befe073 100644
--- a/src/hmi/config/fsa_paris.conf
+++ b/src/hmi/config/fsa_paris.conf
@@ -15,4 +15,7 @@ number=13
 simulationMode=false
 showroom=false
 autoguidance=false
+[Log]
+verbose=true
+dlt=false
 
diff --git a/src/hmi/config/fsa_switzerland.conf b/src/hmi/config/fsa_switzerland.conf
index 4b0e76a..6e6e616 100644
--- a/src/hmi/config/fsa_switzerland.conf
+++ b/src/hmi/config/fsa_switzerland.conf
@@ -15,4 +15,7 @@ number=8
 simulationMode=true
 showroom=true
 autoguidance=false
+[Log]
+verbose=true
+dlt=true
 
diff --git a/src/hmi/config/fsa_tokyo.conf b/src/hmi/config/fsa_tokyo.conf
index f0dea7f..30cf121 100644
--- a/src/hmi/config/fsa_tokyo.conf
+++ b/src/hmi/config/fsa_tokyo.conf
@@ -15,4 +15,5 @@ number=17
 simulationMode=true
 showroom=true
 autoguidance=false
-
+[Log]
+verbose=true
diff --git a/src/hmi/hmi-launcher/CMakeLists.txt b/src/hmi/hmi-launcher/CMakeLists.txt
index 319a001..202ab1e 100644
--- a/src/hmi/hmi-launcher/CMakeLists.txt
+++ b/src/hmi/hmi-launcher/CMakeLists.txt
@@ -49,6 +49,7 @@ include_directories(
     ${QT5_GUI_INCLUDE_DIRS}
     ${QT5_NETWORK_INCLUDE_DIRS}
     ${DBUS_INCLUDE_DIRS}
+    ${NAVIGATION_COMMON_DIR}
 )
 
 message(STATUS "${DBUS_INCLUDE_DIRS}")
@@ -83,6 +84,7 @@ link_directories(
 )
  
 set(LIBRARIES 
+    ${LIBRARIES}
     ${QT5_CORE_LIBRARIES}
     ${QT5_QML_LIBRARIES}
     ${QT5_QUICK_LIBRARIES}
@@ -123,6 +125,7 @@ configure_file(${FILE_RESOURCE_IN} ${FILE_RESOURCE_OUT} @ONLY)
 # for some reason, automoc doesn't run, so moc is made manually
 set (SRC_TO_MOC
     ${CMAKE_CURRENT_SOURCE_DIR}/dbusif.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/dltif.h
     ${CMAKE_CURRENT_SOURCE_DIR}/dbusifsignal.h
     ${CMAKE_CURRENT_SOURCE_DIR}/wheelarea.h
     ${CMAKE_CURRENT_SOURCE_DIR}/wheelareaplugin.h
@@ -149,9 +152,21 @@ foreach (RAW_FILE ${SRC_TO_MOC})
 endforeach()
 file(GLOB MOC_SOURCES ${MOC_DIR}/moc_*.cpp)
 
+if(${WITH_DEBUG})
+    add_definitions("-DDEBUG_ENABLED=1")
+endif()
+
+if(${WITH_DLT})
+    add_definitions("-DDLT_ENABLED=1")
+    pkg_check_modules(DLT REQUIRED automotive-dlt)
+    include_directories( ${DLT_INCLUDE_DIRS} )
+    set(LIBRARIES ${LIBRARIES} ${DLT_LIBRARIES})
+endif()
+
 add_executable(hmi-launcher
     ${MOC_SOURCES}
     main.cpp
+    dltif.cpp
     dbusif.cpp
     wheelareaplugin.cpp
     preference.cpp
diff --git a/src/hmi/hmi-launcher/dltif.cpp b/src/hmi/hmi-launcher/dltif.cpp
new file mode 100644
index 0000000..f9620b9
--- /dev/null
+++ b/src/hmi/hmi-launcher/dltif.cpp
@@ -0,0 +1,62 @@
+/**
+* @licence app begin@
+* SPDX-License-Identifier: MPL-2.0
+*
+* \copyright Copyright (C) 2017, PSA GROUP
+*
+* \file dltif.cpp
+*
+* \brief This file is part of the FSA HMI.
+*
+* \author Philippe COLLIOT <philippe.colliot@mpsa.com>
+*
+* \version 1.0
+*
+* This Source Code Form is subject to the terms of the
+* Mozilla Public License (MPL), v. 2.0.
+* If a copy of the MPL was not distributed with this file,
+* You can obtain one at http://mozilla.org/MPL/2.0/.
+*
+* For further information see http://www.genivi.org/.
+*
+* List of changes:
+*
+* <date>, <name>, <description of change>
+*
+* @licence end@
+*/
+
+#include "log.h"
+#include "dltif.h"
+
+DLT_DECLARE_CONTEXT(gCtx);
+
+DLTIf::DLTIf(QQuickItem * parent)
+:  QQuickItem(parent)
+{
+    DLT_REGISTER_APP("FSAC","FUEL STOP ADVISOR CLIENT");
+    DLT_REGISTER_CONTEXT(gCtx,"FSAC","Global Context");
+}
+
+DLTIf::~DLTIf()
+{
+
+}
+
+QString
+DLTIf::name() const
+{
+    return m_name;
+}
+
+void
+DLTIf::setName(const QString & name)
+{
+    m_name = name;
+    LOG_INFO(gCtx,"Menu: %s",name.toStdString().c_str());
+}
+
+void DLTIf::log_info_msg(QString message)
+{
+    LOG_INFO(gCtx,"%s",message.toStdString().c_str());
+}
diff --git a/src/hmi/hmi-launcher/dltif.h b/src/hmi/hmi-launcher/dltif.h
new file mode 100644
index 0000000..7fca122
--- /dev/null
+++ b/src/hmi/hmi-launcher/dltif.h
@@ -0,0 +1,48 @@
+/**
+* @licence app begin@
+* SPDX-License-Identifier: MPL-2.0
+*
+* \copyright Copyright (C) 2017, PSA GROUP
+*
+* \file dltif.h
+*
+* \brief This file is part of the FSA HMI.
+*
+* \author Philippe COLLIOT <philippe.colliot@mpsa.com>
+*
+* \version 1.0
+*
+* This Source Code Form is subject to the terms of the
+* Mozilla Public License (MPL), v. 2.0.
+* If a copy of the MPL was not distributed with this file,
+* You can obtain one at http://mozilla.org/MPL/2.0/.
+*
+* For further information see http://www.genivi.org/.
+*
+* List of changes:
+*
+* <date>, <name>, <description of change>
+*
+* @licence end@
+*/
+#include <QtQuick/qquickitem.h>
+#include <QtDBus>
+
+#include <QObject>
+#include <log.h>
+
+class DLTIf:public QQuickItem {
+    Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName)
+public:
+    DLTIf(QQuickItem * parent = 0);
+    ~DLTIf();
+
+    QString name() const;
+    void setName(const QString & name);
+
+    Q_INVOKABLE void log_info_msg(QString);
+
+private:
+    QString m_name;
+};
+
diff --git a/src/hmi/hmi-launcher/main.cpp b/src/hmi/hmi-launcher/main.cpp
index 6bc7e73..38dadf9 100644
--- a/src/hmi/hmi-launcher/main.cpp
+++ b/src/hmi/hmi-launcher/main.cpp
@@ -36,6 +36,7 @@
 #include <QSurfaceFormat>
 #include <QQmlContext>
 #include "dbusif.h"
+#include "dltif.h"
 #include "wheelarea.h"
 #include "preference.h"
 #include "settings.h"
@@ -48,6 +49,7 @@ int main(int argc, char ** argv)
     qmlRegisterType<DBusIf>("lbs.plugin.dbusif", 1, 0, "DBusIf");
     qmlRegisterType<Preference>("lbs.plugin.preference", 1,0, "Preference");
     qmlRegisterType<WheelArea>("lbs.plugin.wheelarea", 1, 0, "WheelArea");
+    qmlRegisterType<DLTIf>("lbs.plugin.dltif", 1, 0, "DLTIf");
 
     //get settings stored into the conf file (in $HOME/.config/navigation/fsa.conf)
 
diff --git a/src/hmi/qml/Core/NavigationAppHMIMenu.qml b/src/hmi/qml/Core/NavigationAppHMIMenu.qml
index f55643d..935555e 100644
--- a/src/hmi/qml/Core/NavigationAppHMIMenu.qml
+++ b/src/hmi/qml/Core/NavigationAppHMIMenu.qml
@@ -172,8 +172,5 @@ Rectangle {
         }
 
     Component.onCompleted: {
-        if(Genivi.verbose===true){
-            console.log("Level: ",Genivi.entrybackheapsize," Menu: ",pagefile);
-        }
     }
 }
diff --git a/src/hmi/qml/Core/genivi-capi.js b/src/hmi/qml/Core/genivi-capi.js
index 697a571..e674fba 100644
--- a/src/hmi/qml/Core/genivi-capi.js
+++ b/src/hmi/qml/Core/genivi-capi.js
@@ -30,13 +30,12 @@
 
 Qt.include("resource.js")
 
-var dbusIf;
+var dbusInterface;
 var g_nav_session=["uint32",0];
 var g_locationinput_handle=["uint32",0];
 var g_routing_handle=["uint32",0];
 var g_mapviewer_session=["uint32",0];
 var g_mapviewer_handle=["uint32",0];
-var g_mapviewer_handle2=["uint32",0];
 var g_poisearch_handle=["uint32",0];
 var g_language,g_country,g_script; //initialized by conf file
 var g_default_category_name='fuel'
@@ -58,6 +57,8 @@ var translations=new Array;
 var simulationMode; //initialized by conf file
 var showroom; //initialized by conf file
 var autoguidance; //initialized by conf file
+var verbose; //initialized by conf file
+var dlt; //initialized by conf file
 
 var guidance_activated=false;
 var route_calculated=false;
@@ -194,18 +195,6 @@ function dump(prefix,args)
 	dump2(prefix,"",args);
 }	
 
-function hookContext()
-{
-    if(verbose===true){
-        console.log("Routing: ",route_calculated," Guidance: ",guidance_activated," Simulation: ",simulationMode);
-    }
-}
-
-function setVerbose()
-{
-    verbose=true;
-}
-
 //Manage the historyOfLastEnteredLocation
 function updateHistoryOfLastEnteredLocation(enteredLocation,enteredLat,enteredLon)
 {
@@ -425,54 +414,56 @@ function gettext(arg)
 
 //----------------- Management of the DBus messages -----------------
 
-function hookMethod(arg)
+function hookMethod(dltInterface,arg)
 {
-    if(verbose===true){
+    if(dlt===true)
+        dltInterface.log_info_msg(arg);
+    else
         console.log("Method: ",arg);
-    }
 }
 
 // Send a dbus message to layer manager
-function lm_message(par, func, args)
+function lm_message(dbusInterface, dltInterface, func, args)
 {
 //    console.log("Method: ",func);
-    return par.message("org.genivi.layermanagementservice","/org/genivi/layermanagementservice","org.genivi.layermanagementservice", func, args);
+    return dbusInterface.message("org.genivi.layermanagementservice","/org/genivi/layermanagementservice","org.genivi.layermanagementservice", func, args);
 }
 
 // Send a message to navigationcore (basic)
-function navigationcore_message(par, iface, func, args)
+function navigationcore_message(dbusInterface, dltInterface, iface, func, args)
 {
-    hookMethod(func);
-    return par.message("org.genivi.navigation.navigationcore."+iface+".v4_0_"+iface,"/"+iface,"org.genivi.navigation.navigationcore."+iface+".v4_0", func, args);
+    hookMethod(dltInterface,func);
+    return dbusInterface.message("org.genivi.navigation.navigationcore."+iface+".v4_0_"+iface,"/"+iface,"org.genivi.navigation.navigationcore."+iface+".v4_0", func, args);
 }
 
 // Send a message to mapviewer (basic)
-function mapviewer_message(par, iface, func, args)
+function mapviewer_message(dbusInterface, dltInterface, iface, func, args)
 {
-    hookMethod(func);
-    return par.message("org.genivi.navigation.mapviewer."+iface+".v4_0_"+iface,"/"+iface,"org.genivi.navigation.mapviewer."+iface+".v4_0", func, args);
+    hookMethod(dltInterface,func);
+    return dbusInterface.message("org.genivi.navigation.mapviewer."+iface+".v4_0_"+iface,"/"+iface,"org.genivi.navigation.mapviewer."+iface+".v4_0", func, args);
 }
 
 // Send a message to poiservice (basic)
-function poi_message(par, iface, func, args)
+function poi_message(dbusInterface, dltInterface, iface, func, args)
 {
-    hookMethod(func);
-    return par.message("org.genivi.navigation.poiservice."+iface+".v2_0_"+iface,"/"+iface,"org.genivi.navigation.poiservice."+iface+".v2_0", func, args);
+    hookMethod(dltInterface,func);
+    return dbusInterface.message("org.genivi.navigation.poiservice."+iface+".v2_0_"+iface,"/"+iface,"org.genivi.navigation.poiservice."+iface+".v2_0", func, args);
 }
 
 // Send a message to demonstrator (basic)
-function demonstrator_message(par, iface, func, args)
+function demonstrator_message(dbusInterface, dltInterface, iface, func, args)
 {
-    hookMethod(func);
-    return par.message("org.genivi.demonstrator."+iface+".v1_0_"+iface,"/"+iface,"org.genivi.demonstrator."+iface+".v1_0", func, args);
+    hookMethod(dltInterface,func);
+    return dbusInterface.message("org.genivi.demonstrator."+iface+".v1_0_"+iface,"/"+iface,"org.genivi.demonstrator."+iface+".v1_0", func, args);
 }
 
 //----------------- DBus signals -----------------
-function hookSignal(arg)
+function hookSignal(dltInterface,arg)
 {
-    if(verbose===true){
+    if(dlt===true)
+        dltInterface.log_info_msg(arg);
+    else
         console.log("Signal: ",arg);
-    }
 }
 
 function connect_simulationStatusChangedSignal(interface,menu)
@@ -579,207 +570,194 @@ function connect_mapViewScaleChangedSignal(interface,menu)
 
 //----------------- Navigation core Session messages -----------------
 
-function navigationcore_session_message(par, func, args)
+function navigationcore_session_message(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "Session", func, args);
+    return navigationcore_message(dbusInterface, dltInterface, "Session", func, args);
 }
 
-// Create a new session or get the current session
-function navigationcore_session(par) {
-    if (!g_nav_session[1])
-    {
-        var res=navigationcore_session_message(par,"createSession", ["string","TestHMI"]);
-        g_nav_session[1]=res[3];
-    }
-    return g_nav_session;
+function navigationcore_session_CreateSession(dbusInterface,dltInterface)
+{
+    return navigationcore_session_message(dbusInterface,dltInterface,"createSession", ["string","TestHMI"]);
 }
 
-// Delete the current session if exists
-function navigationcore_session_clear(par)
+function navigationcore_session_DeleteSession(dbusInterface,dltInterface)
 {
-    if (g_nav_session[1]) {
-        var res=navigationcore_session_message(par,"deleteSession", g_nav_session);
-        g_nav_session[1]=0;
-    }
+    return navigationcore_session_message(dbusInterface,dltInterface,"deleteSession", g_nav_session);
+}
+
+// Create a new session or get the current session
+function navigationcore_session() {
+    return g_nav_session;
 }
 
-function navigationcore_session_GetVersion(par)
+function navigationcore_session_GetVersion(dbusInterface,dltInterface)
 {
-    return navigationcore_session_message(par,"getVersion",[]);
+    return navigationcore_session_message(dbusInterface,dltInterface,"getVersion",[]);
 }
 
 
 //----------------- Navigation core Configuration messages -----------------
 
-function navigationcore_configuration_message(par, func, args)
+function navigationcore_configuration_message(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "Configuration", func,args);
+    return navigationcore_message(dbusInterface, dltInterface, "Configuration", func,args);
 }
 
-function navigationcore_configuration_GetSupportedLocales(dbusIf)
+function navigationcore_configuration_GetSupportedLocales(dbusInterface,dltInterface)
 {
-    return navigationcore_configuration_message(dbusIf,"getSupportedLocales",[]);
+    return navigationcore_configuration_message(dbusInterface,dltInterface,"getSupportedLocales",[]);
 }
 
-function navigationcore_configuration_GetLocale(dbusIf)
+function navigationcore_configuration_GetLocale(dbusInterface,dltInterface)
 {
-    return navigationcore_configuration_message(dbusIf,"getLocale",[]);
+    return navigationcore_configuration_message(dbusInterface,dltInterface,"getLocale",[]);
 }
 
-function navigationcore_configuration_SetLocale(dbusIf,language,country,script)
+function navigationcore_configuration_SetLocale(dbusInterface,dltInterface,language,country,script)
 {
-    navigationcore_configuration_message(dbusIf,"setLocale",["string",language,"string",country,"string",script]);
+    navigationcore_configuration_message(dbusInterface,dltInterface,"setLocale",["string",language,"string",country,"string",script]);
 }
 
-function navigationcore_configuration_GetUnitsOfMeasurement(dbusIf)
+function navigationcore_configuration_GetUnitsOfMeasurement(dbusInterface,dltInterface)
 {
-    return navigationcore_configuration_message(dbusIf,"getUnitsOfMeasurement",[]);
+    return navigationcore_configuration_message(dbusInterface,dltInterface,"getUnitsOfMeasurement",[]);
 }
 
-function navigationcore_configuration_SetUnitsOfMeasurementLength(dbusIf,unit)
+function navigationcore_configuration_SetUnitsOfMeasurementLength(dbusInterface,dltInterface,unit)
 {
-    navigationcore_configuration_message(dbusIf,"setUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"int32",unit]]);
+    navigationcore_configuration_message(dbusInterface,dltInterface,"setUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"int32",unit]]);
 }
 
 //----------------- LocationInput messages -----------------
+function locationinput_CreateLocationInput(dbusInterface,dltInterface)
+{
+    return navigationcore_message(dbusInterface, dltInterface, "LocationInput","createLocationInput", g_nav_session);
+}
 
-// Create a new location handle or get the current handle
-function locationinput_handle(par)
+function locationinput_DeleteLocationInput(dbusInterface,dltInterface)
 {
-    if (!g_locationinput_handle[1])
-    {
-        var res=navigationcore_message(par, "LocationInput","createLocationInput", navigationcore_session(par));
-        g_locationinput_handle[1]=res[3];
-    }
-    return g_locationinput_handle;
+    return locationinput_message(dbusInterface, dltInterface, "deleteLocationInput", []);
 }
 
-function locationinput_message(par, func, args)
+// Get the current handle
+function locationinput_handle(dbusInterface,dltInterface)
 {
-    return navigationcore_message(par, "LocationInput", func, navigationcore_session(par).concat(locationinput_handle(par),args));
+    return g_locationinput_handle;
 }
 
-function locationinput_Spell(dbusIf,inputCharacter,maxWindowSize)
+function locationinput_message(dbusInterface, dltInterface, func, args)
 {
-    locationinput_message(dbusIf,"spell",["string",inputCharacter,"uint16",maxWindowSize]);
+    return navigationcore_message(dbusInterface, dltInterface, "LocationInput", func, navigationcore_session().concat(locationinput_handle(dbusInterface),args));
 }
 
-function locationinput_RequestListUpdate(dbusIf,offset,maxWindowSize)
+function locationinput_Spell(dbusInterface,dltInterface,inputCharacter,maxWindowSize)
 {
-    locationinput_message(dbusIf,"requestListUpdate",["uint16",offset,"uint16",maxWindowSize]);
+    locationinput_message(dbusInterface,dltInterface,"spell",["string",inputCharacter,"uint16",maxWindowSize]);
 }
 
-function locationinput_SetSelectionCriterion(dbusIf,selectionCriterion)
+function locationinput_RequestListUpdate(dbusInterface,dltInterface,offset,maxWindowSize)
 {
-    locationinput_message(dbusIf,"setSelectionCriterion",["int32",selectionCriterion]);
+    locationinput_message(dbusInterface,dltInterface,"requestListUpdate",["uint16",offset,"uint16",maxWindowSize]);
 }
 
-function locationinput_Search(dbusIf,inputString,maxWindowSize)
+function locationinput_SetSelectionCriterion(dbusInterface,dltInterface,selectionCriterion)
 {
-    locationinput_message(dbusIf,"search",["string",inputString,"uint16",maxWindowSize]);
+    locationinput_message(dbusInterface,dltInterface,"setSelectionCriterion",["int32",selectionCriterion]);
 }
 
-function locationinput_SelectEntry(dbusIf,index)
+function locationinput_Search(dbusInterface,dltInterface,inputString,maxWindowSize)
 {
-    locationinput_message(dbusIf,"selectEntry",["uint16",index]);
+    locationinput_message(dbusInterface,dltInterface,"search",["string",inputString,"uint16",maxWindowSize]);
 }
 
-// Delete the location handle if exists
-function locationinput_handle_clear(par)
+function locationinput_SelectEntry(dbusInterface,dltInterface,index)
 {
-    if (g_locationinput_handle[1]) {
-        var res=locationinput_message(par, "deleteLocationInput", []);
-        g_locationinput_handle[1]=0;
-    }
+    locationinput_message(dbusInterface,dltInterface,"selectEntry",["uint16",index]);
 }
 
 //----------------- Routing messages -----------------
 
 // Send a message to routing with session handle and route handle
-function routing_message(par, func, args)
+function routing_message(dbusInterface, dltInterface, func, args)
 { //session handle sent
-    return navigationcore_message(par, "Routing", func, navigationcore_session(par).concat(routing_handle(par),args));
+    return navigationcore_message(dbusInterface, dltInterface, "Routing", func, navigationcore_session().concat(routing_handle(),args));
 }
 
 // Send a message to routing with route handle
-function routing_get(par, func, args)
+function routing_get(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "Routing", func, routing_handle(par).concat(args));
+    return navigationcore_message(dbusInterface, dltInterface, "Routing", func, routing_handle().concat(args));
 }
 
 // Send a message to routing
-function routing(par, func, args)
+function routing(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "Routing", func, args);
+    return navigationcore_message(dbusInterface, dltInterface, "Routing", func, args);
 }
 
-// Create a new routing handle or get the current handle
-function routing_handle(par) {
-    if (!g_routing_handle[1])
-    {
-        var res=navigationcore_message(par, "Routing","createRoute", navigationcore_session(par));
-        g_routing_handle[1]=res[3];
-    }
-    return g_routing_handle;
+function routing_CreateRoute(dbusInterface,dltInterface)
+{
+    return navigationcore_message(dbusInterface, dltInterface, "Routing","createRoute", navigationcore_session(dbusInterface,dltInterface));
 }
 
-// Delete the routing handle if exists
-function routing_handle_clear(par)
+function routing_DeleteRoute(dbusInterface,dltInterface)
 {
-    if (g_routing_handle[1]) {
-        var res=routing_message(par, "deleteRoute", []);
-        g_routing_handle[1]=0;
-    }
+    return routing_message(dbusInterface, dltInterface, "deleteRoute", []);
+}
+
+// Get the current handle
+function routing_handle() {
+    return g_routing_handle;
 }
 
-function routing_GetRouteOverviewTimeAndDistance(dbusIf)
+function routing_GetRouteOverviewTimeAndDistance(dbusInterface,dltInterface)
 {
     var valuesToReturn=[], pref=[];
     pref=pref.concat("int32",NAVIGATIONCORE_TOTAL_TIME,"int32",NAVIGATIONCORE_TOTAL_DISTANCE);
     valuesToReturn = valuesToReturn.concat("array",[pref]);
 
-    return routing_get(dbusIf,"getRouteOverview",valuesToReturn);
+    return routing_get(dbusInterface,dltInterface,"getRouteOverview",valuesToReturn);
 }
 
-function routing_GetCostModel(dbusIf)
+function routing_GetCostModel(dbusInterface,dltInterface)
 {
-    return routing_get(dbusIf,"getCostModel",[]);
+    return routing_get(dbusInterface,dltInterface,"getCostModel",[]);
 }
 
-function routing_SetCostModel(dbusIf,costModel)
+function routing_SetCostModel(dbusInterface,dltInterface,costModel)
 {
-    var res=routing_message(dbusIf,"setCostModel",["int32",costModel]);
+    var res=routing_message(dbusInterface,dltInterface,"setCostModel",["int32",costModel]);
 }
 
-function routing_GetSupportedCostModels(dbusIf)
+function routing_GetSupportedCostModels(dbusInterface,dltInterface)
 {
-    return routing(dbusIf,"getSupportedCostModels",[]);
+    return routing(dbusInterface,dltInterface,"getSupportedCostModels",[]);
 }
 
-function routing_GetSupportedRoutePreferences(dbusIf)
+function routing_GetSupportedRoutePreferences(dbusInterface,dltInterface)
 {
-    return routing(dbusIf,"getSupportedRoutePreferences",[]);
+    return routing(dbusInterface,dltInterface,"getSupportedRoutePreferences",[]);
 }
 
-function routing_GetRoutePreferences(dbusIf,countryCode)
+function routing_GetRoutePreferences(dbusInterface,dltInterface,countryCode)
 {
-    return routing_get(dbusIf,"getRoutePreferences",["string",countryCode]);
+    return routing_get(dbusInterface,dltInterface,"getRoutePreferences",["string",countryCode]);
 }
 
-function routing_SetRoutePreferences(dbusIf,countryCode)
+function routing_SetRoutePreferences(dbusInterface,dltInterface,countryCode)
 {
     var roadMessage=["array",["structure",["int32",roadPreferenceList[NAVIGATIONCORE_FERRY],"int32",NAVIGATIONCORE_FERRY],"structure",["int32",roadPreferenceList[NAVIGATIONCORE_TOLL_ROADS],"int32",NAVIGATIONCORE_TOLL_ROADS],"structure",["int32",roadPreferenceList[NAVIGATIONCORE_HIGHWAYS_MOTORWAYS],"int32",NAVIGATIONCORE_HIGHWAYS_MOTORWAYS]]];
     var conditionMessage=["array",["structure",["int32",conditionPreferenceList[NAVIGATIONCORE_TRAFFIC_REALTIME],"int32",NAVIGATIONCORE_TRAFFIC_REALTIME]]];
     var message=["string",countryCode];
     message=message.concat(roadMessage.concat(conditionMessage));
-    var res=routing_message(dbusIf,"setRoutePreferences",message);
+    var res=routing_message(dbusInterface,dltInterface,"setRoutePreferences",message);
 }
 
-function routing_GetRouteSegments(dbusIf,detailLevel,numberOfSegments,offset)
+function routing_GetRouteSegments(dbusInterface,dltInterface,detailLevel,numberOfSegments,offset)
 {
     var routeSegmentType=["int32",NAVIGATIONCORE_DISTANCE,"int32",NAVIGATIONCORE_TIME,"int32",NAVIGATIONCORE_ROAD_NAME];
 
-    return routing_get(dbusIf,"getRouteSegments",["int16",detailLevel,"array",routeSegmentType,"uint32",numberOfSegments,"uint32",offset]);
+    return routing_get(dbusInterface,dltInterface,"getRouteSegments",["int16",detailLevel,"array",routeSegmentType,"uint32",numberOfSegments,"uint32",offset]);
 }
 
 function latlon_to_map(latlon)
@@ -790,7 +768,7 @@ function latlon_to_map(latlon)
     ];
 }
 
-function routing_SetWaypoints(dbusIf,startFromCurrentPosition,position,destination)
+function routing_SetWaypoints(dbusInterface,dltInterface,startFromCurrentPosition,position,destination)
 {
     var message=[];
     if(startFromCurrentPosition==false)
@@ -801,405 +779,356 @@ function routing_SetWaypoints(dbusIf,startFromCurrentPosition,position,destinati
     {
         message=message.concat(["boolean",startFromCurrentPosition,"array",["map",destination]]);
     }
-    var res=routing_message(dbusIf,"setWaypoints",message);
+    var res=routing_message(dbusInterface,dltInterface,"setWaypoints",message);
 }
 
-function routing_CalculateRoute(dbusIf)
+function routing_CalculateRoute(dbusInterface,dltInterface)
 {
-    var res=routing_message(dbusIf,"calculateRoute",[]);
+    var res=routing_message(dbusInterface,dltInterface,"calculateRoute",[]);
 }
 
-function routing_GetRouteBoundingBox(dbusIf,routeHandle)
+function routing_GetRouteBoundingBox(dbusInterface,dltInterface,routeHandle)
 {
     var message=[];
-    return navigationcore_message(dbusIf, "Routing", "getRouteBoundingBox", message.concat(routeHandle));
+    return navigationcore_message(dbusInterface,dltInterface, "Routing", "getRouteBoundingBox", message.concat(routeHandle));
 }
 
 //----------------- Guidance messages -----------------
 
 // Send a message to guidance with session handle
-function guidance_message(par, func, args)
+function guidance_message(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "Guidance", func, navigationcore_session(par).concat(args));
+    return navigationcore_message(dbusInterface, dltInterface, "Guidance", func, navigationcore_session().concat(args));
 }
 // Send a message to guidance without session handle
-function guidance_get(par, func, args)
+function guidance_get(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "Guidance", func, args);
+    return navigationcore_message(dbusInterface, dltInterface, "Guidance", func, args);
 }
 
-function guidance_StartGuidance(dbusIf,routeHandle)
+function guidance_StartGuidance(dbusInterface,dltInterface,routeHandle)
 {
-    guidance_message(dbusIf,"startGuidance",routeHandle);
+    guidance_message(dbusInterface,dltInterface,"startGuidance",routeHandle);
 }
 
-function guidance_StopGuidance(dbusIf)
+function guidance_StopGuidance(dbusInterface,dltInterface)
 {
-    guidance_message(dbusIf,"stopGuidance",[]);
+    guidance_message(dbusInterface,dltInterface,"stopGuidance",[]);
 }
 
-function guidance_GetGuidanceStatus(dbusIf)
+function guidance_GetGuidanceStatus(dbusInterface,dltInterface)
 {
-    return guidance_get(dbusIf,"getGuidanceStatus",[]);
+    return guidance_get(dbusInterface,dltInterface,"getGuidanceStatus",[]);
 }
 
-function guidance_GetDestinationInformation(dbusIf)
+function guidance_GetDestinationInformation(dbusInterface,dltInterface)
 {
-    return guidance_get(dbusIf,"getDestinationInformation",[]);
+    return guidance_get(dbusInterface,dltInterface,"getDestinationInformation",[]);
 }
 
-function guidance_GetManeuversList(dbusIf,requestedNumberOfManeuvers,maneuverOffset)
+function guidance_GetManeuversList(dbusInterface,dltInterface,requestedNumberOfManeuvers,maneuverOffset)
 {
-    return guidance_get(dbusIf,"getManeuversList",["uint16",requestedNumberOfManeuvers,"uint32",maneuverOffset]);
+    return guidance_get(dbusInterface,dltInterface,"getManeuversList",["uint16",requestedNumberOfManeuvers,"uint32",maneuverOffset]);
 }
 
 //---------------- Map matched position messages ----------------
 
 // Send a message to mapmatchedposition with session handle
-function mapmatchedposition_message(par, func, args)
+function mapmatchedposition_message(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "MapMatchedPosition", func, navigationcore_session(par).concat(args));
+    return navigationcore_message(dbusInterface, dltInterface, "MapMatchedPosition", func, navigationcore_session().concat(args));
 }
 
 // Send a message to mapmatchedposition without session handle
-function mapmatchedposition_get(par, func, args)
+function mapmatchedposition_get(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "MapMatchedPosition", func, args);
+    return navigationcore_message(dbusInterface, dltInterface, "MapMatchedPosition", func, args);
 }
 
-function mapmatchedposition_GetCurrentAddress(dbusIf)
+function mapmatchedposition_GetCurrentAddress(dbusInterface,dltInterface)
 {
     var valuesToReturn=["int32",NAVIGATIONCORE_STREET];
 
-    return mapmatchedposition_get(dbusIf,"getCurrentAddress",["array",valuesToReturn]);
+    return mapmatchedposition_get(dbusInterface,dltInterface,"getCurrentAddress",["array",valuesToReturn]);
 }
 
-function mapmatchedposition_SetSimulationMode(dbusIf,activate)
+function mapmatchedposition_SetSimulationMode(dbusInterface,dltInterface,activate)
 {
-    mapmatchedposition_message(dbusIf,"setSimulationMode",["boolean",activate]);
+    mapmatchedposition_message(dbusInterface,dltInterface,"setSimulationMode",["boolean",activate]);
 }
 
-function mapmatchedposition_StartSimulation(dbusIf)
+function mapmatchedposition_StartSimulation(dbusInterface,dltInterface)
 {
-    mapmatchedposition_message(dbusIf,"startSimulation",[]);
+    mapmatchedposition_message(dbusInterface,dltInterface,"startSimulation",[]);
 }
 
-function mapmatchedposition_PauseSimulation(dbusIf)
+function mapmatchedposition_PauseSimulation(dbusInterface,dltInterface)
 {
-    mapmatchedposition_message(dbusIf,"pauseSimulation",[]);
+    mapmatchedposition_message(dbusInterface,dltInterface,"pauseSimulation",[]);
 }
 
-function mapmatchedposition_GetSimulationStatus(dbusIf)
+function mapmatchedposition_GetSimulationStatus(dbusInterface,dltInterface)
 {
-    return mapmatchedposition_get(dbusIf,"getSimulationStatus",[]);
+    return mapmatchedposition_get(dbusInterface,dltInterface,"getSimulationStatus",[]);
 }
 
-function mapmatchedposition_GetSimulationSpeed(dbusIf)
+function mapmatchedposition_GetSimulationSpeed(dbusInterface,dltInterface)
 {
-    return mapmatchedposition_get(dbusIf,"getSimulationSpeed",[]);
+    return mapmatchedposition_get(dbusInterface,dltInterface,"getSimulationSpeed",[]);
 }
 
-function mapmatchedposition_SetSimulationSpeed(dbusIf,speedFactor)
+function mapmatchedposition_SetSimulationSpeed(dbusInterface,dltInterface,speedFactor)
 {
-    mapmatchedposition_message(dbusIf,"setSimulationSpeed",["uint8",speedFactor]);
+    mapmatchedposition_message(dbusInterface,dltInterface,"setSimulationSpeed",["uint8",speedFactor]);
 }
 
-function mapmatchedposition_GetPosition(dbusIf)
+function mapmatchedposition_GetPosition(dbusInterface,dltInterface)
 {
     var valuesToReturn=["int32",NAVIGATIONCORE_SPEED,"int32",NAVIGATIONCORE_LATITUDE,"int32",NAVIGATIONCORE_LONGITUDE];
 
-    return mapmatchedposition_get(dbusIf,"getPosition",["array",valuesToReturn]);
+    return mapmatchedposition_get(dbusInterface,dltInterface,"getPosition",["array",valuesToReturn]);
 }
 
 //---------------- MapViewer messages (handle 1) ----------------
+function mapviewer_session_CreateSession(dbusInterface,dltInterface)
+{
+    return mapviewer_message(dbusInterface, dltInterface, "Session", "createSession", ["string","TestHMI"]);
+}
 
-// Create a new session or get the current session
-function mapviewer_session(par) {
-    if (!g_mapviewer_session[1])
-    {
-        var res=mapviewer_message(par, "Session", "createSession", ["string","TestHMI"]);
-        g_mapviewer_session[1]=res[3];
-    }
-    return g_mapviewer_session;
+function mapviewer_session_DeleteSession(dbusInterface,dltInterface)
+{
+    return mapviewer_message(dbusInterface, dltInterface, "Session", "deleteSession", g_mapviewer_session);
 }
 
-// Delete the current session if exists
-function mapviewer_session_clear(par)
+function mapviewer_CreateMapViewInstance(dbusInterface,dltInterface,width,height,type)
 {
-    if (g_mapviewer_session[1]) {
-        var res=mapviewer_message(par, "Session", "deleteSession", [g_mapviewer_session]);
-        g_mapviewer_session[1]=0;
-    }
+    return mapviewer_message(dbusInterface, dltInterface, "MapViewerControl","createMapViewInstance", mapviewer_session().concat(["structure",["uint16",width,"uint16",height],"int32",type]));
 }
 
-// Create a new map handle or get the current handle
-function mapviewer_handle(par,w,h,type)
+function mapviewer_ReleaseMapViewInstance(dbusInterface,dltInterface)
 {
-    if (!g_mapviewer_handle[1])
-    {
-        var res=mapviewer_message(par, "MapViewerControl","createMapViewInstance", mapviewer_session(par).concat(["structure",["uint16",w,"uint16",h],"int32",type]));
-        g_mapviewer_handle[1]=res[3];
-    }
-    return g_mapviewer_handle;
+    return mapviewercontrol_message(dbusInterface, dltInterface, "releaseMapViewInstance", []);
 }
 
-// Delete the map handle if exists
-function mapviewer_handle_clear(par)
+// Get the current session
+function mapviewer_session() {
+    return g_mapviewer_session;
+}
+
+// Create a new map handle or get the current handle
+function mapviewer_handle(dbusInterface,w,h,type)
 {
-    if (g_mapviewer_handle[1]) {
-        var res=mapviewercontrol_message(par, "releaseMapViewInstance", []);
-        g_mapviewer_handle[1]=0;
-    }
+    return g_mapviewer_handle;
 }
 
 // Send a message to map viewer control with session handle
-function mapviewercontrol_message(par, func, args)
+function mapviewercontrol_message(dbusInterface, dltInterface, func, args)
 {
-    return mapviewer_message(par, "MapViewerControl", func, mapviewer_session(par).concat(g_mapviewer_handle,args));
+    return mapviewer_message(dbusInterface, dltInterface, "MapViewerControl", func, mapviewer_session().concat(g_mapviewer_handle,args));
 }
 
 // Send a message to map viewer control without session handle
-function mapviewercontrol_get(par, func, args)
+function mapviewercontrol_get(dbusInterface, dltInterface, func, args)
 {
-    return mapviewer_message(par, "MapViewerControl", func, g_mapviewer_handle,args);
+    return mapviewer_message(dbusInterface, dltInterface, "MapViewerControl", func, g_mapviewer_handle,args);
 }
 
-function mapviewer_GetMapViewScale(dbusIf)
+function mapviewer_GetMapViewScale(dbusInterface,dltInterface)
 {
-    return mapviewercontrol_get(dbusIf,"getMapViewScale", []);
+    return mapviewercontrol_get(dbusInterface,dltInterface,"getMapViewScale", []);
 }
 
-function mapviewer_GetScaleList(dbusIf)
+function mapviewer_GetScaleList(dbusInterface,dltInterface)
 {
-    return mapviewercontrol_get(dbusIf,"getScaleList", []);
+    return mapviewercontrol_get(dbusInterface,dltInterface,"getScaleList", []);
 }
 
-function mapviewer_GetDisplayedRoutes(dbusIf)
+function mapviewer_GetDisplayedRoutes(dbusInterface,dltInterface)
 {
-    return mapviewercontrol_get(dbusIf,"getDisplayedRoutes", []);
+    return mapviewercontrol_get(dbusInterface,dltInterface,"getDisplayedRoutes", []);
 }
 
-function mapviewer_SetMapViewScale(dbusIf,scaleID)
+function mapviewer_SetMapViewScale(dbusInterface,dltInterface,scaleID)
 {
-    mapviewercontrol_message(dbusIf,"setMapViewScale", ["uint8",scaleID]);
+    mapviewercontrol_message(dbusInterface,dltInterface,"setMapViewScale", ["uint8",scaleID]);
 }
 
-function mapviewer_SetMapViewScaleByDelta(dbusIf,scaleDelta)
+function mapviewer_SetMapViewScaleByDelta(dbusInterface,dltInterface,scaleDelta)
 {
-    mapviewercontrol_message(dbusIf,"setMapViewScaleByDelta", ["int16",scaleDelta]);
+    mapviewercontrol_message(dbusInterface,dltInterface,"setMapViewScaleByDelta", ["int16",scaleDelta]);
 }
 
-function mapviewer_GetMapViewTheme(dbusIf)
+function mapviewer_GetMapViewTheme(dbusInterface,dltInterface)
 {
-    return mapviewercontrol_get(dbusIf,"getMapViewTheme", []);
+    return mapviewercontrol_get(dbusInterface,dltInterface,"getMapViewTheme", []);
 }
 
-function mapviewer_SetMapViewTheme(dbusIf,mapViewTheme)
+function mapviewer_SetMapViewTheme(dbusInterface,dltInterface,mapViewTheme)
 {
-    mapviewercontrol_message(dbusIf,"setMapViewTheme", ["int32",mapViewTheme]);
+    mapviewercontrol_message(dbusInterface,dltInterface,"setMapViewTheme", ["int32",mapViewTheme]);
 }
 
-function mapviewer_GetMapViewPerspective(dbusIf)
+function mapviewer_GetMapViewPerspective(dbusInterface,dltInterface)
 {
-    return mapviewercontrol_get(dbusIf,"getMapViewPerspective", []);
+    return mapviewercontrol_get(dbusInterface,dltInterface,"getMapViewPerspective", []);
 }
 
-function mapviewer_SetMapViewPerspective(dbusIf,perspective)
+function mapviewer_SetMapViewPerspective(dbusInterface,dltInterface,perspective)
 {
-    mapviewercontrol_message(dbusIf,"setMapViewPerspective", ["int32",perspective]);
+    mapviewercontrol_message(dbusInterface,dltInterface,"setMapViewPerspective", ["int32",perspective]);
 }
 
-function mapviewer_SetFollowCarMode(dbusIf,followCarMode)
+function mapviewer_SetFollowCarMode(dbusInterface,dltInterface,followCarMode)
 {
-    mapviewercontrol_message(dbusIf,"setFollowCarMode", ["boolean",followCarMode]);
+    mapviewercontrol_message(dbusInterface,dltInterface,"setFollowCarMode", ["boolean",followCarMode]);
 }
 
-function mapviewer_DisplayRoute(dbusIf,routeHandle,highlighted)
+function mapviewer_DisplayRoute(dbusInterface,dltInterface,routeHandle,highlighted)
 {
     var args=[];
     args=args.concat(routeHandle);
-    mapviewercontrol_message(dbusIf,"displayRoute", args.concat("boolean",highlighted));
+    mapviewercontrol_message(dbusInterface,dltInterface,"displayRoute", args.concat("boolean",highlighted));
 }
 
-function mapviewer_SetTargetPoint(dbusIf,latitude,longitude,altitude)
+function mapviewer_SetTargetPoint(dbusInterface,dltInterface,latitude,longitude,altitude)
 {
-    mapviewercontrol_message(dbusIf, "setTargetPoint", ["structure",["double",latitude,"double",longitude,"double",altitude]]);
+    mapviewercontrol_message(dbusInterface,dltInterface, "setTargetPoint", ["structure",["double",latitude,"double",longitude,"double",altitude]]);
 }
 
-function mapviewer_SetMapViewBoundingBox(dbusIf,boundingBox)
+function mapviewer_SetMapViewBoundingBox(dbusInterface,dltInterface,boundingBox)
 {
-    mapviewercontrol_message(dbusIf,"setMapViewBoundingBox", boundingBox);
+    mapviewercontrol_message(dbusInterface,dltInterface,"setMapViewBoundingBox", boundingBox);
 }
 
-function mapviewer_GetTargetPoint(dbusIf)
+function mapviewer_GetTargetPoint(dbusInterface,dltInterface)
 {
-    return mapviewercontrol_get(dbusIf,"getTargetPoint", []);
+    return mapviewercontrol_get(dbusInterface,dltInterface,"getTargetPoint", []);
 }
 
-function mapviewer_GetCameraValue(dbusIf,camera)
+function mapviewer_GetCameraValue(dbusInterface,dltInterface,camera)
 {
-    return mapviewercontrol_get(dbusIf,"get"+camera, []);
+    return mapviewercontrol_get(dbusInterface,dltInterface,"get"+camera, []);
 }
 
-function mapviewer_SetCameraValue(dbusIf,camera,value)
+function mapviewer_SetCameraValue(dbusInterface,dltInterface,camera,value)
 {
-    mapviewercontrol_message(dbusIf,"set"+camera, value);
+    mapviewercontrol_message(dbusInterface,dltInterface,"set"+camera, value);
 }
 
-function mapviewer_SetMapViewRotation(dbusIf,angle)
+function mapviewer_SetMapViewRotation(dbusInterface,dltInterface,angle)
 {
-    mapviewercontrol_message(dbusIf, "setMapViewRotation", ["int32",angle,"int32",15]);
+    mapviewercontrol_message(dbusInterface,dltInterface, "setMapViewRotation", ["int32",angle,"int32",15]);
 }
 
-function mapviewer_SetCameraHeadingAngle(dbusIf,angle)
+function mapviewer_SetCameraHeadingAngle(dbusInterface,dltInterface,angle)
 {
-    mapviewercontrol_message(dbusIf, "setCameraHeadingAngle", ["int32",angle]);
+    mapviewercontrol_message(dbusInterface,dltInterface, "setCameraHeadingAngle", ["int32",angle]);
 }
 
-function mapviewer_SetCameraHeadingTrackUp(dbusIf)
+function mapviewer_SetCameraHeadingTrackUp(dbusInterface,dltInterface)
 {
-    mapviewercontrol_message(dbusIf, "setCameraHeadingTrackUp", []);
+    mapviewercontrol_message(dbusInterface,dltInterface, "setCameraHeadingTrackUp", []);
 }
 
-function mapviewer_SetMapViewPan(dbusIf,panningAction,x,y)
+function mapviewer_SetMapViewPan(dbusInterface,dltInterface,panningAction,x,y)
 {
-    mapviewercontrol_message(dbusIf, "setMapViewPan", ["int32",panningAction,"structure",["uint16",x,"uint16",y]]);
+    mapviewercontrol_message(dbusInterface,dltInterface, "setMapViewPan", ["int32",panningAction,"structure",["uint16",x,"uint16",y]]);
 }
 
-function mapviewer_ConvertPixelCoordsToGeoCoords(dbusIf,x,y)
+function mapviewer_ConvertPixelCoordsToGeoCoords(dbusInterface,dltInterface,x,y)
 {
-    return mapviewercontrol_message(dbusIf, "convertPixelCoordsToGeoCoords",["array",["structure",["uint16",x,"uint16",y]]]);
+    return mapviewercontrol_message(dbusInterface,dltInterface, "convertPixelCoordsToGeoCoords",["array",["structure",["uint16",x,"uint16",y]]]);
 }
 
-function initScale(dbusIf)
+function initScale(dbusInterface,dltInterface)
 {
-    var res=mapviewer_GetScaleList(dbusIf);
+    var res=mapviewer_GetScaleList(dbusInterface,dltInterface);
     scaleList=res[1];
     minZoomId=scaleList[1][1];
     maxZoomId=scaleList[scaleList.length-1][1];
 }
 
-//---------------- MapViewer messages (handle 2) ----------------
-
-// Create a new map handle or get the current handle
-function mapviewer_handle2(par,w,h,type)
-{
-    if (!g_mapviewer_handle2[1])
-    {
-        var res=mapviewer_message(par, "MapViewerControl","createMapViewInstance", mapviewer_session(par).concat(["structure",["uint16",w,"uint16",h],"int32",type]));
-        g_mapviewer_handle2[1]=res[3];
-    }
-    return g_mapviewer_handle2;
-}
-
-// Delete the map handle if exists
-function mapviewer_handle_clear2(par)
-{
-    if (g_mapviewer_handle2[1]) {
-        var res=mapviewercontrol_message2(par, "releaseMapViewInstance", []);
-        g_mapviewer_handle2[1]=0;
-    }
-}
+//---------------- Mapviewer Configuration messages ----------------
 
-// Send a message to map viewer control with session handle on handle 2
-function mapviewercontrol_message2(par, func, args)
+function mapviewer_configuration_message(dbusInterface, dltInterface, func, args)
 {
-    return mapviewer_message(par, "MapViewerControl", func, mapviewer_session(par).concat(g_mapviewer_handle2,args));
+    return mapviewer_message(dbusInterface, dltInterface, "Configuration", func,args);
 }
 
-function mapviewer2_SetMapViewTheme(dbusIf,mapViewTheme)
+function mapviewer_configuration_GetSupportedLocales(dbusInterface,dltInterface)
 {
-    mapviewercontrol_message2(dbusIf,"setMapViewTheme", ["int32",mapViewTheme]);
+    return mapviewer_configuration_message(dbusInterface,dltInterface,"getSupportedLocales",[]);
 }
 
-function mapviewer2_SetMapViewBoundingBox(dbusIf,boundingBox)
+function mapviewer_configuration_GetLocale(dbusInterface,dltInterface)
 {
-    mapviewercontrol_message2(dbusIf,"setMapViewBoundingBox", boundingBox);
+    return mapviewer_configuration_message(dbusInterface,dltInterface,"getLocale",[]);
 }
 
-function mapviewer2_DisplayRoute(dbusIf,routeHandle,highlighted)
+function mapviewer_configuration_SetLocale(dbusInterface,dltInterface,language,country,script)
 {
-    var args=[];
-    args=args.concat(routeHandle);
-    mapviewercontrol_message2(dbusIf,"displayRoute", args.concat("boolean",highlighted));
+    mapviewer_configuration_message(dbusInterface,dltInterface,"setLocale",["string",language,"string",country,"string",script]);
 }
 
-//---------------- Mapviewer Configuration messages ----------------
-
-function mapviewer_configuration_message(par, func, args)
+function mapviewer_configuration_GetUnitsOfMeasurement(dbusInterface,dltInterface)
 {
-    return mapviewer_message(par, "Configuration", func,args);
+    return mapviewer_configuration_message(dbusInterface,dltInterface,"getUnitsOfMeasurement",[]);
 }
 
-function mapviewer_configuration_GetSupportedLocales(dbusIf)
+function mapviewer_configuration_SetUnitsOfMeasurementLength(dbusInterface,dltInterface,unit)
 {
-    return mapviewer_configuration_message(dbusIf,"getSupportedLocales",[]);
+    mapviewer_configuration_message(dbusInterface,dltInterface,"setUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"int32",unit]]);
 }
 
-function mapviewer_configuration_GetLocale(dbusIf)
-{
-    return mapviewer_configuration_message(dbusIf,"getLocale",[]);
-}
+// -------------------- POISearch dbus messages --------------------
 
-function mapviewer_configuration_SetLocale(dbusIf,language,country,script)
-{
-    mapviewer_configuration_message(dbusIf,"setLocale",["string",language,"string",country,"string",script]);
+// Send a message to poisearch with session handle
+function poisearch_message(dbusInterface, dltInterface, func, args)
+{ //session handle sent
+    return poi_message(dbusInterface, dltInterface, "POISearch", func, poisearch_handle().concat(args));
 }
 
-function mapviewer_configuration_GetUnitsOfMeasurement(dbusIf)
+// Send a message to poisearch without session handle
+function poisearch_message_get(dbusInterface, dltInterface, func, args)
 {
-    return mapviewer_configuration_message(dbusIf,"getUnitsOfMeasurement",[]);
+    return poi_message(dbusInterface, dltInterface, "POISearch", func, args);
 }
 
-function mapviewer_configuration_SetUnitsOfMeasurementLength(dbusIf,unit)
+function poisearch_CreatePoiSearchHandle(dbusInterface,dltInterface)
 {
-    mapviewer_configuration_message(dbusIf,"setUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"int32",unit]]);
+    return poisearch_message_get(dbusInterface, dltInterface, "createPoiSearchHandle", []);
 }
 
-// -------------------- POISearch dbus messages --------------------
-
-// Send a message to poisearch with session handle
-function poisearch_message(par, func, args)
-{ //session handle sent
-    return poi_message(par, "POISearch", func, poisearch_handle(par).concat(args));
-}
-
-// Send a message to poisearch without session handle
-function poisearch_message_get(par, func, args)
+function poisearch_DeletePoiSearchHandle(dbusInterface,dltInterface)
 {
-    return poi_message(par, "POISearch", func, args);
+    poisearch_message(dbusInterface, dltInterface, "deletePoiSearchHandle", []);
 }
 
 // Create a new poisearch handle or get the current handle
-function poisearch_handle(par) {
-    if (!g_poisearch_handle[1])
-    {
-        var res=poisearch_message_get(par, "createPoiSearchHandle", []);
-        g_poisearch_handle[1]=res[1];
-    }
+function poisearch_handle(dbusInterface,dltInterface) {
     return g_poisearch_handle;
 }
 
 // Delete the poisearch handle if exists
-function poisearch_handle_clear(par)
+function poisearch_handle_clear(dbusInterface,dltInterface)
 {
     if (g_poisearch_handle[1]) {
-        poisearch_message(par, "deletePoiSearchHandle", []);
+        poisearch_message(dbusInterface, dltInterface, "deletePoiSearchHandle", []);
         g_poisearch_handle[1]=0;
     }
 }
 
-function poisearch_StartPoiSearch(dbusIf,inputString,sortOption)
+function poisearch_StartPoiSearch(dbusInterface,dltInterface,inputString,sortOption)
 {
-    poisearch_message(dbusIf,"startPoiSearch",["string",inputString,"int32",sortOption]);
+    poisearch_message(dbusInterface,dltInterface,"startPoiSearch",["string",inputString,"int32",sortOption]);
 }
 
-function poisearch_SetCenter(dbusIf,latitude,longitude,altitude)
+function poisearch_SetCenter(dbusInterface,dltInterface,latitude,longitude,altitude)
 {
-    poisearch_message(dbusIf, "setCenter", ["structure",["double",latitude,"double",longitude,"double",altitude]]);
+    poisearch_message(dbusInterface,dltInterface, "setCenter", ["structure",["double",latitude,"double",longitude,"double",altitude]]);
 }
 
-function poisearch_SetCategories(dbusIf,poiCategories)
+function poisearch_SetCategories(dbusInterface,dltInterface,poiCategories)
 {
     var value=[];
     for(var i=0;i<poiCategories.length;i+=1)
@@ -1207,74 +1136,74 @@ function poisearch_SetCategories(dbusIf,poiCategories)
         value=value.concat(["structure",["uint32",poiCategories[i][0],"uint32",poiCategories[i][1]]]);
     }
 
-    poisearch_message(dbusIf, "setCategories", ["array",value]);
+    poisearch_message(dbusInterface,dltInterface, "setCategories", ["array",value]);
 }
 
-function poisearch_GetAvailableCategories(dbusIf)
+function poisearch_GetAvailableCategories(dbusInterface,dltInterface)
 {
-    return poisearch_message_get(dbusIf,"getAvailableCategories",[]);
+    return poisearch_message_get(dbusInterface,dltInterface,"getAvailableCategories",[]);
 }
 
-function poisearch_RequestResultList(dbusIf,offset,maxWindowSize,attributeList)
+function poisearch_RequestResultList(dbusInterface,dltInterface,offset,maxWindowSize,attributeList)
 {
     var value=[];
     for(var i=0;i<attributeList.length;i+=1)
     {
         value=value.concat(["uint32",attributeList[i]]);
     }
-    return poisearch_message(dbusIf,"requestResultList",["uint16",offset,"uint16",maxWindowSize,"array",value]);
+    return poisearch_message(dbusInterface,dltInterface,"requestResultList",["uint16",offset,"uint16",maxWindowSize,"array",value]);
 }
 
-function poisearch_GetPoiDetails(dbusIf,ids)
+function poisearch_GetPoiDetails(dbusInterface,dltInterface,ids)
 {
     var value=[];
     for(var i=0;i<ids.length;i+=1)
     {
         value=value.concat(["uint32",ids[i]]);
     }
-    return poisearch_message_get(dbusIf,"getPoiDetails",["array",value]);
+    return poisearch_message_get(dbusInterface,dltInterface,"getPoiDetails",["array",value]);
 }
 
 //----------------- Trip Computer messages -----------------
 
 // Send a message to tripcomputer (basic)
-function tripcomputer_message(par, func, args)
+function tripcomputer_message(dbusInterface, dltInterface, func, args)
 {
-    return demonstrator_message(par, "TripComputer", func, args);
+    return demonstrator_message(dbusInterface, dltInterface, "TripComputer", func, args);
 }
 
 // Send a message to fuel stop advisor (basic)
-function fuelstopadvisor_message(par, func, args)
+function fuelstopadvisor_message(dbusInterface, dltInterface, func, args)
 {
-    return demonstrator_message(par, "FuelStopAdvisor", func, args);
+    return demonstrator_message(dbusInterface, dltInterface, "FuelStopAdvisor", func, args);
 }
 
-function fuelstopadvisor_ReleaseRouteHandle(dbusIf,routeHandle)
+function fuelstopadvisor_ReleaseRouteHandle(dbusInterface,dltInterface,routeHandle)
 {
-    fuelstopadvisor_message(dbusIf,"releaseRouteHandle",routeHandle);
+    fuelstopadvisor_message(dbusInterface,dltInterface,"releaseRouteHandle",routeHandle);
 }
 
-function fuelstopadvisor_SetRouteHandle(dbusIf,routeHandle)
+function fuelstopadvisor_SetRouteHandle(dbusInterface,dltInterface,routeHandle)
 {
-    fuelstopadvisor_message(dbusIf,"setRouteHandle",routeHandle);
+    fuelstopadvisor_message(dbusInterface,dltInterface,"setRouteHandle",routeHandle);
 }
 
-function fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,advisorMode,distanceThreshold)
+function fuelstopadvisor_SetFuelAdvisorSettings(dbusInterface,dltInterface,advisorMode,distanceThreshold)
 {
-    fuelstopadvisor_message(dbusIf,"setFuelAdvisorSettings",["boolean",advisorMode,"uint8",distanceThreshold]);
+    fuelstopadvisor_message(dbusInterface,dltInterface,"setFuelAdvisorSettings",["boolean",advisorMode,"uint8",distanceThreshold]);
 }
 
-function fuelstopadvisor_GetTripData(dbusIf,trip)
+function fuelstopadvisor_GetTripData(dbusInterface,dltInterface,trip)
 {
-    return fuelstopadvisor_message(dbusIf,"getTripData",["uint8",trip]);
+    return fuelstopadvisor_message(dbusInterface,dltInterface,"getTripData",["uint8",trip]);
 }
 
-function fuelstopadvisor_GetInstantData(dbusIf)
+function fuelstopadvisor_GetInstantData(dbusInterface,dltInterface)
 {
-    return fuelstopadvisor_message(dbusIf,"getInstantData",[]);
+    return fuelstopadvisor_message(dbusInterface,dltInterface,"getInstantData",[]);
 }
 
-function fuelstopadvisor_ResetTripData(dbusIf,trip)
+function fuelstopadvisor_ResetTripData(dbusInterface,dltInterface,trip)
 {
-    fuelstopadvisor_message(dbusIf,"resetTripData",["uint8",trip]);
+    fuelstopadvisor_message(dbusInterface,dltInterface,"resetTripData",["uint8",trip]);
 }
diff --git a/src/hmi/qml/Core/genivi-origin.js b/src/hmi/qml/Core/genivi-origin.js
index 26dc7ea..c469efc 100644
--- a/src/hmi/qml/Core/genivi-origin.js
+++ b/src/hmi/qml/Core/genivi-origin.js
@@ -30,13 +30,12 @@
 
 Qt.include("resource.js")
 
-var dbusIf;
+var dbusInterface;
 var g_nav_session=["uint32",0];
 var g_locationinput_handle=["uint32",0];
 var g_routing_handle=["uint32",0];
 var g_mapviewer_session=["uint32",0];
 var g_mapviewer_handle=["uint32",0];
-var g_mapviewer_handle2=["uint32",0];
 var g_poisearch_handle=["uint32",0];
 var g_language,g_country,g_script; //initialized by conf file
 var g_default_category_name='fuel'
@@ -58,6 +57,8 @@ var translations=new Array;
 var simulationMode; //initialized by conf file
 var showroom; //initialized by conf file
 var autoguidance; //initialized by conf file
+var verbose; //initialized by conf file
+var dlt; //initialized by conf file
 
 var guidance_activated=false;
 var route_calculated=false;
@@ -194,18 +195,6 @@ function dump(prefix,args)
 	dump2(prefix,"",args);
 }	
 
-function hookContext()
-{
-    if(verbose===true){
-        console.log("Routing: ",route_calculated," Guidance: ",guidance_activated," Simulation: ",simulationMode);
-    }
-}
-
-function setVerbose()
-{
-    verbose=true;
-}
-
 //Manage the historyOfLastEnteredLocation
 function updateHistoryOfLastEnteredLocation(enteredLocation,enteredLat,enteredLon)
 {
@@ -424,54 +413,56 @@ function gettext(arg)
 
 //----------------- Management of the DBus messages -----------------
 
-function hookMethod(arg)
+function hookMethod(dltInterface,arg)
 {
-    if(verbose===true){
+    if(dlt===true)
+        dltInterface.log_info_msg(arg);
+    else
         console.log("Method: ",arg);
-    }
 }
 
 // Send a dbus message to layer manager
-function lm_message(par, func, args)
+function lm_message(dbusInterface, dltInterface, func, args)
 {
     //    console.log("Method: ",func);
-    return par.message("org.genivi.layermanagementservice","/org/genivi/layermanagementservice","org.genivi.layermanagementservice", func, args);
+    return dbusInterface.message("org.genivi.layermanagementservice","/org/genivi/layermanagementservice","org.genivi.layermanagementservice", func, args);
 }
 
 // Send a message to navigationcore (basic)
-function navigationcore_message(par, iface, func, args)
+function navigationcore_message(dbusInterface, dltInterface, iface, func, args)
 {
-    hookMethod(func);
-    return par.message("org.genivi.navigation.navigationcore."+iface,"/org/genivi/navigationcore","org.genivi.navigation.navigationcore."+iface, func, args);
+    hookMethod(dltInterface,func);
+    return dbusInterface.message("org.genivi.navigation.navigationcore."+iface,"/org/genivi/navigationcore","org.genivi.navigation.navigationcore."+iface, func, args);
 }
 
 // Send a message to mapviewer (basic)
-function mapviewer_message(par, iface, func, args)
+function mapviewer_message(dbusInterface, dltInterface, iface, func, args)
 {
-    hookMethod(func);
-    return par.message("org.genivi.navigation.mapviewer."+iface,"/org/genivi/mapviewer","org.genivi.navigation.mapviewer."+iface, func, args);
+    hookMethod(dltInterface,func);
+    return dbusInterface.message("org.genivi.navigation.mapviewer."+iface,"/org/genivi/mapviewer","org.genivi.navigation.mapviewer."+iface, func, args);
 }
 
 // Send a message to poiservice (basic)
-function poi_message(par, iface, func, args)
+function poi_message(dbusInterface, dltInterface, iface, func, args)
 {
-    hookMethod(func);
-    return par.message("org.genivi.navigation.poiservice."+iface,"/org/genivi/poiservice/"+iface,"org.genivi.navigation.poiservice."+iface, func, args);
+    hookMethod(dltInterface,func);
+    return dbusInterface.message("org.genivi.navigation.poiservice."+iface,"/org/genivi/poiservice/"+iface,"org.genivi.navigation.poiservice."+iface, func, args);
 }
 
 // Send a message to demonstrator (basic)
-function demonstrator_message(par, iface, func, args)
+function demonstrator_message(dbusInterface, dltInterface, iface, func, args)
 {
-    hookMethod(func);
-    return par.message("org.genivi.demonstrator."+iface,"/org/genivi/demonstrator/"+iface,"org.genivi.demonstrator."+iface, func, args);
+    hookMethod(dltInterface,func);
+    return dbusInterface.message("org.genivi.demonstrator."+iface,"/org/genivi/demonstrator/"+iface,"org.genivi.demonstrator."+iface, func, args);
 }
 
 //----------------- DBus signals -----------------
-function hookSignal(arg)
+function hookSignal(dltInterface,arg)
 {
-    if(verbose===true){
+    if(dlt===true)
+        dltInterface.log_info_msg(arg);
+    else
         console.log("Signal: ",arg);
-    }
 }
 
 function connect_simulationStatusChangedSignal(interface,menu)
@@ -578,205 +569,193 @@ function connect_mapViewScaleChangedSignal(interface,menu)
 
 //----------------- Navigation core Session messages -----------------
 
-function navigationcore_session_message(par, func, args)
+function navigationcore_session_message(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "Session", func, args);
+    return navigationcore_message(dbusInterface, dltInterface, "Session", func, args);
 }
 
-// Create a new session or get the current session
-function navigationcore_session(par) {
-    if (!g_nav_session[1])
-    {
-        var res=navigationcore_session_message(par,"CreateSession", ["string","TestHMI"]);
-        g_nav_session[1]=res[3];
-    }
-    return g_nav_session;
+function navigationcore_session_CreateSession(dbusInterface,dltInterface)
+{
+    return navigationcore_session_message(dbusInterface,dltInterface,"CreateSession", ["string","TestHMI"]);
 }
 
-// Delete the current session if exists
-function navigationcore_session_clear(par)
+function navigationcore_session_DeleteSession(dbusInterface,dltInterface)
 {
-    if (g_nav_session[1]) {
-        var res=navigationcore_session_message(par,"DeleteSession", g_nav_session);
-        g_nav_session[1]=0;
-    }
+    return navigationcore_session_message(dbusInterface,dltInterface,"DeleteSession", g_nav_session);
 }
 
-function navigationcore_session_GetVersion(par)
+// Create a new session or get the current session
+function navigationcore_session() {
+    return g_nav_session;
+}
+
+function navigationcore_session_GetVersion(dbusInterface,dltInterface)
 {
-    return navigationcore_session_message(par,"GetVersion",[]);
+    return navigationcore_session_message(dbusInterface,dltInterface,"GetVersion",[]);
 }
 
 //----------------- Navigation core Configuration messages -----------------
 
-function navigationcore_configuration_message(par, func, args)
+function navigationcore_configuration_message(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "Configuration", func,args);
+    return navigationcore_message(dbusInterface, dltInterface, "Configuration", func,args);
 }
 
-function navigationcore_configuration_GetSupportedLocales(dbusIf)
+function navigationcore_configuration_GetSupportedLocales(dbusInterface,dltInterface)
 {
-    return navigationcore_configuration_message(dbusIf,"GetSupportedLocales",[]);
+    return navigationcore_configuration_message(dbusInterface,dltInterface,"GetSupportedLocales",[]);
 }
 
-function navigationcore_configuration_GetLocale(dbusIf)
+function navigationcore_configuration_GetLocale(dbusInterface,dltInterface)
 {
-    return navigationcore_configuration_message(dbusIf,"GetLocale",[]);
+    return navigationcore_configuration_message(dbusInterface,dltInterface,"GetLocale",[]);
 }
 
-function navigationcore_configuration_SetLocale(dbusIf,language,country,script)
+function navigationcore_configuration_SetLocale(dbusInterface,dltInterface,language,country,script)
 {
-    navigationcore_configuration_message(dbusIf,"SetLocale",["string",language,"string",country,"string",script]);
+    navigationcore_configuration_message(dbusInterface,dltInterface,"SetLocale",["string",language,"string",country,"string",script]);
 }
 
-function navigationcore_configuration_GetUnitsOfMeasurement(dbusIf)
+function navigationcore_configuration_GetUnitsOfMeasurement(dbusInterface,dltInterface)
 {
-    return navigationcore_configuration_message(dbusIf,"GetUnitsOfMeasurement",[]);
+    return navigationcore_configuration_message(dbusInterface,dltInterface,"GetUnitsOfMeasurement",[]);
 }
 
-function navigationcore_configuration_SetUnitsOfMeasurementLength(dbusIf,unit)
+function navigationcore_configuration_SetUnitsOfMeasurementLength(dbusInterface,dltInterface,unit)
 {
-    navigationcore_configuration_message(dbusIf,"SetUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"int32",unit]]);
+    navigationcore_configuration_message(dbusInterface,dltInterface,"SetUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"int32",unit]]);
 }
 
 //----------------- LocationInput messages -----------------
+function locationinput_CreateLocationInput(dbusInterface,dltInterface)
+{
+    return navigationcore_message(dbusInterface, dltInterface, "LocationInput","CreateLocationInput", g_nav_session);
+}
 
-// Create a new location handle or get the current handle
-function locationinput_handle(par)
+function locationinput_DeleteLocationInput(dbusInterface,dltInterface)
 {
-    if (!g_locationinput_handle[1])
-    {
-        var res=navigationcore_message(par, "LocationInput","CreateLocationInput", navigationcore_session(par));
-        g_locationinput_handle[1]=res[3];
-    }
-    return g_locationinput_handle;
+    return locationinput_message(dbusInterface, dltInterface, "DeleteLocationInput", []);
 }
 
-function locationinput_message(par, func, args)
+// Get the current handle
+function locationinput_handle(dbusInterface,dltInterface)
 {
-    return navigationcore_message(par, "LocationInput", func, navigationcore_session(par).concat(locationinput_handle(par),args));
+    return g_locationinput_handle;
 }
 
-function locationinput_Spell(dbusIf,inputCharacter,maxWindowSize)
+function locationinput_message(dbusInterface, dltInterface, func, args)
 {
-    locationinput_message(dbusIf,"Spell",["string",inputCharacter,"uint16",maxWindowSize]);
+    return navigationcore_message(dbusInterface, dltInterface, "LocationInput", func, navigationcore_session().concat(locationinput_handle(dbusInterface),args));
 }
 
-function locationinput_RequestListUpdate(dbusIf,offset,maxWindowSize)
+function locationinput_Spell(dbusInterface,dltInterface,inputCharacter,maxWindowSize)
 {
-    locationinput_message(dbusIf,"RequestListUpdate",["uint16",offset,"uint16",maxWindowSize]);
+    locationinput_message(dbusInterface,dltInterface,"Spell",["string",inputCharacter,"uint16",maxWindowSize]);
 }
 
-function locationinput_SetSelectionCriterion(dbusIf,selectionCriterion)
+function locationinput_RequestListUpdate(dbusInterface,dltInterface,offset,maxWindowSize)
 {
-    locationinput_message(dbusIf,"SetSelectionCriterion",["int32",selectionCriterion]);
+    locationinput_message(dbusInterface,dltInterface,"RequestListUpdate",["uint16",offset,"uint16",maxWindowSize]);
 }
 
-function locationinput_Search(dbusIf,inputString,maxWindowSize)
+function locationinput_SetSelectionCriterion(dbusInterface,dltInterface,selectionCriterion)
 {
-    locationinput_message(dbusIf,"Search",["string",inputString,"uint16",maxWindowSize]);
+    locationinput_message(dbusInterface,dltInterface,"SetSelectionCriterion",["int32",selectionCriterion]);
 }
 
-function locationinput_SelectEntry(dbusIf,index)
+function locationinput_Search(dbusInterface,dltInterface,inputString,maxWindowSize)
 {
-    locationinput_message(dbusIf,"SelectEntry",["uint16",index]);
+    locationinput_message(dbusInterface,dltInterface,"Search",["string",inputString,"uint16",maxWindowSize]);
 }
 
-function locationinput_handle_clear(par)
+function locationinput_SelectEntry(dbusInterface,dltInterface,index)
 {
-    if (g_locationinput_handle[1]) {
-        var res=locationinput_message(par, "DeleteLocationInput", []);
-        g_locationinput_handle[1]=0;
-    }
+    locationinput_message(dbusInterface,dltInterface,"SelectEntry",["uint16",index]);
 }
 
 //----------------- Routing messages -----------------
 
 // Send a message to routing with session handle and route handle
-function routing_message(par, func, args)
+function routing_message(dbusInterface, dltInterface, func, args)
 { //session handle sent
-    return navigationcore_message(par, "Routing", func, navigationcore_session(par).concat(routing_handle(par),args));
+    return navigationcore_message(dbusInterface, dltInterface, "Routing", func, navigationcore_session().concat(routing_handle(),args));
 }
 
 // Send a message to routing with route handle
-function routing_get(par, func, args)
+function routing_get(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "Routing", func, routing_handle(par).concat(args));
+    return navigationcore_message(dbusInterface, dltInterface, "Routing", func, routing_handle().concat(args));
 }
 
 // Send a message to routing
-function routing(par, func, args)
+function routing(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "Routing", func, args);
+    return navigationcore_message(dbusInterface, dltInterface, "Routing", func, args);
 }
 
-// Create a new routing handle or get the current handle
-function routing_handle(par) {
-    if (!g_routing_handle[1])
-    {
-        var res=navigationcore_message(par, "Routing","CreateRoute", navigationcore_session(par));
-        g_routing_handle[1]=res[3];
-    }
-    return g_routing_handle;
+function routing_CreateRoute(dbusInterface,dltInterface)
+{
+    return navigationcore_message(dbusInterface, dltInterface, "Routing","CreateRoute", navigationcore_session(dbusInterface,dltInterface));
 }
 
-// Delete the routing handle if exists
-function routing_handle_clear(par)
+function routing_DeleteRoute(dbusInterface,dltInterface)
 {
-    if (g_routing_handle[1]) {
-        var res=routing_message(par, "DeleteRoute", []);
-        g_routing_handle[1]=0;
-    }
+    return routing_message(dbusInterface, dltInterface, "DeleteRoute", []);
+}
+
+// Get the current handle
+function routing_handle() {
+    return g_routing_handle;
 }
 
-function routing_GetRouteOverviewTimeAndDistance(dbusIf)
+function routing_GetRouteOverviewTimeAndDistance(dbusInterface,dltInterface)
 {
     var valuesToReturn=[], pref=[];
     pref=pref.concat("int32",NAVIGATIONCORE_TOTAL_TIME,"int32",NAVIGATIONCORE_TOTAL_DISTANCE);
     valuesToReturn = valuesToReturn.concat("array",[pref]);
 
-    return routing_get(dbusIf,"GetRouteOverview",valuesToReturn);
+    return routing_get(dbusInterface,dltInterface,"GetRouteOverview",valuesToReturn);
 }
 
-function routing_GetCostModel(dbusIf)
+function routing_GetCostModel(dbusInterface,dltInterface)
 {
-    return routing_get(dbusIf,"GetCostModel",[]);
+    return routing_get(dbusInterface,dltInterface,"GetCostModel",[]);
 }
 
-function routing_SetCostModel(dbusIf,costModel)
+function routing_SetCostModel(dbusInterface,dltInterface,costModel)
 {
-    var res=routing_message(dbusIf,"SetCostModel",["int32",costModel]);
+    var res=routing_message(dbusInterface,dltInterface,"SetCostModel",["int32",costModel]);
 }
 
-function routing_GetSupportedCostModels(dbusIf)
+function routing_GetSupportedCostModels(dbusInterface,dltInterface)
 {
-    return routing(dbusIf,"GetSupportedCostModels",[]);
+    return routing(dbusInterface,dltInterface,"GetSupportedCostModels",[]);
 }
 
-function routing_GetSupportedRoutePreferences(dbusIf)
+function routing_GetSupportedRoutePreferences(dbusInterface,dltInterface)
 {
-    return routing(dbusIf,"GetSupportedRoutePreferences",[]);
+    return routing(dbusInterface,dltInterface,"GetSupportedRoutePreferences",[]);
 }
 
-function routing_GetRoutePreferences(dbusIf,countryCode)
+function routing_GetRoutePreferences(dbusInterface,dltInterface,countryCode)
 {
-    return routing_get(dbusIf,"GetRoutePreferences",["string",countryCode]);
+    return routing_get(dbusInterface,dltInterface,"GetRoutePreferences",["string",countryCode]);
 }
 
-function routing_SetRoutePreferences(dbusIf,countryCode)
+function routing_SetRoutePreferences(dbusInterface,dltInterface,countryCode)
 {
     var roadMessage=["array",["structure",["int32",roadPreferenceList[NAVIGATIONCORE_FERRY],"int32",NAVIGATIONCORE_FERRY],"structure",["int32",roadPreferenceList[NAVIGATIONCORE_TOLL_ROADS],"int32",NAVIGATIONCORE_TOLL_ROADS],"structure",["int32",roadPreferenceList[NAVIGATIONCORE_HIGHWAYS_MOTORWAYS],"int32",NAVIGATIONCORE_HIGHWAYS_MOTORWAYS]]];
     var conditionMessage=["array",["structure",["int32",conditionPreferenceList[NAVIGATIONCORE_TRAFFIC_REALTIME],"int32",NAVIGATIONCORE_TRAFFIC_REALTIME]]];
     var message=["string",countryCode];
     message=message.concat(roadMessage.concat(conditionMessage));
-    var res=routing_message(dbusIf,"SetRoutePreferences",message);
+    var res=routing_message(dbusInterface,dltInterface,"SetRoutePreferences",message);
 }
 
-function routing_GetRouteSegments(dbusIf,detailLevel,numberOfSegments,offset)
+function routing_GetRouteSegments(dbusInterface,dltInterface,detailLevel,numberOfSegments,offset)
 {
     var routeSegmentType=["int32",NAVIGATIONCORE_DISTANCE,"int32",NAVIGATIONCORE_TIME,"int32",NAVIGATIONCORE_ROAD_NAME];
 
-    return routing_get(dbusIf,"GetRouteSegments",["int16",detailLevel,"array",routeSegmentType,"uint32",numberOfSegments,"uint32",offset]);
+    return routing_get(dbusInterface,dltInterface,"GetRouteSegments",["int16",detailLevel,"array",routeSegmentType,"uint32",numberOfSegments,"uint32",offset]);
 }
 
 function latlon_to_map(latlon)
@@ -787,7 +766,7 @@ function latlon_to_map(latlon)
     ];
 }
 
-function routing_SetWaypoints(dbusIf,startFromCurrentPosition,position,destination)
+function routing_SetWaypoints(dbusInterface,dltInterface,startFromCurrentPosition,position,destination)
 {
     var message=[];
     if(startFromCurrentPosition==false)
@@ -798,405 +777,356 @@ function routing_SetWaypoints(dbusIf,startFromCurrentPosition,position,destinati
     {
         message=message.concat(["boolean",startFromCurrentPosition,"array",["map",destination]]);
     }
-    var res=routing_message(dbusIf,"SetWaypoints",message);
+    var res=routing_message(dbusInterface,dltInterface,"SetWaypoints",message);
 }
 
-function routing_CalculateRoute(dbusIf)
+function routing_CalculateRoute(dbusInterface,dltInterface)
 {
-    var res=routing_message(dbusIf,"CalculateRoute",[]);
+    var res=routing_message(dbusInterface,dltInterface,"CalculateRoute",[]);
 }
 
-function routing_GetRouteBoundingBox(dbusIf,routeHandle)
+function routing_GetRouteBoundingBox(dbusInterface,dltInterface,routeHandle)
 {
     var message=[];
-    return navigationcore_message(dbusIf, "Routing", "GetRouteBoundingBox", message.concat(routeHandle));
+    return navigationcore_message(dbusInterface,dltInterface, "Routing", "GetRouteBoundingBox", message.concat(routeHandle));
 }
 
 //----------------- Guidance messages -----------------
 
 // Send a message to guidance with session handle
-function guidance_s(par, func, args)
+function guidance_s(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "Guidance", func, navigationcore_session(par).concat(args));
+    return navigationcore_message(dbusInterface, dltInterface, "Guidance", func, navigationcore_session().concat(args));
 }
 // Send a message to guidance without session handle
-function guidance_get(par, func, args)
+function guidance_get(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "Guidance", func, args);
+    return navigationcore_message(dbusInterface, dltInterface, "Guidance", func, args);
 }
 
-function guidance_StartGuidance(dbusIf,routeHandle)
+function guidance_StartGuidance(dbusInterface,dltInterface,routeHandle)
 {
-    guidance_s(dbusIf,"StartGuidance",routeHandle);
+    guidance_s(dbusInterface,dltInterface,"StartGuidance",routeHandle);
 }
 
-function guidance_StopGuidance(dbusIf)
+function guidance_StopGuidance(dbusInterface,dltInterface)
 {
-    guidance_s(dbusIf,"StopGuidance",[]);
+    guidance_s(dbusInterface,dltInterface,"StopGuidance",[]);
 }
 
-function guidance_GetGuidanceStatus(dbusIf)
+function guidance_GetGuidanceStatus(dbusInterface,dltInterface)
 {
-    return guidance_get(dbusIf,"GetGuidanceStatus",[]);
+    return guidance_get(dbusInterface,dltInterface,"GetGuidanceStatus",[]);
 }
 
-function guidance_GetDestinationInformation(dbusIf)
+function guidance_GetDestinationInformation(dbusInterface,dltInterface)
 {
-    return guidance_get(dbusIf,"GetDestinationInformation",[]);
+    return guidance_get(dbusInterface,dltInterface,"GetDestinationInformation",[]);
 }
 
-function guidance_GetManeuversList(dbusIf,requestedNumberOfManeuvers,maneuverOffset)
+function guidance_GetManeuversList(dbusInterface,dltInterface,requestedNumberOfManeuvers,maneuverOffset)
 {
-    return guidance_get(dbusIf,"GetManeuversList",["uint16",requestedNumberOfManeuvers,"uint32",maneuverOffset]);
+    return guidance_get(dbusInterface,dltInterface,"GetManeuversList",["uint16",requestedNumberOfManeuvers,"uint32",maneuverOffset]);
 }
 
 //---------------- Map matched position messages ----------------
 
 // Send a message to mapmatchedposition with session handle
-function mapmatchedposition_message(par, func, args)
+function mapmatchedposition_message(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "MapMatchedPosition", func, navigationcore_session(par).concat(args));
+    return navigationcore_message(dbusInterface, dltInterface, "MapMatchedPosition", func, navigationcore_session().concat(args));
 }
 
 // Send a message to mapmatchedposition without session handle
-function mapmatchedposition_get(par, func, args)
+function mapmatchedposition_get(dbusInterface, dltInterface, func, args)
 {
-    return navigationcore_message(par, "MapMatchedPosition", func, args);
+    return navigationcore_message(dbusInterface, dltInterface, "MapMatchedPosition", func, args);
 }
 
-function mapmatchedposition_GetCurrentAddress(dbusIf)
+function mapmatchedposition_GetCurrentAddress(dbusInterface,dltInterface)
 {
     var valuesToReturn=["int32",NAVIGATIONCORE_STREET];
 
-    return mapmatchedposition_get(dbusIf,"GetCurrentAddress",["array",valuesToReturn]);
+    return mapmatchedposition_get(dbusInterface,dltInterface,"GetCurrentAddress",["array",valuesToReturn]);
 }
 
-function mapmatchedposition_SetSimulationMode(dbusIf,activate)
+function mapmatchedposition_SetSimulationMode(dbusInterface,dltInterface,activate)
 {
-    mapmatchedposition_message(dbusIf,"SetSimulationMode",["boolean",activate]);
+    mapmatchedposition_message(dbusInterface,dltInterface,"SetSimulationMode",["boolean",activate]);
 }
 
-function mapmatchedposition_StartSimulation(dbusIf)
+function mapmatchedposition_StartSimulation(dbusInterface,dltInterface)
 {
-    mapmatchedposition_message(dbusIf,"StartSimulation",[]);
+    mapmatchedposition_message(dbusInterface,dltInterface,"StartSimulation",[]);
 }
 
-function mapmatchedposition_PauseSimulation(dbusIf)
+function mapmatchedposition_PauseSimulation(dbusInterface,dltInterface)
 {
-    mapmatchedposition_message(dbusIf,"PauseSimulation",[]);
+    mapmatchedposition_message(dbusInterface,dltInterface,"PauseSimulation",[]);
 }
 
-function mapmatchedposition_GetSimulationStatus(dbusIf)
+function mapmatchedposition_GetSimulationStatus(dbusInterface,dltInterface)
 {
-    return mapmatchedposition_get(dbusIf,"GetSimulationStatus",[]);
+    return mapmatchedposition_get(dbusInterface,dltInterface,"GetSimulationStatus",[]);
 }
 
-function mapmatchedposition_GetSimulationSpeed(dbusIf)
+function mapmatchedposition_GetSimulationSpeed(dbusInterface,dltInterface)
 {
-    return mapmatchedposition_get(dbusIf,"GetSimulationSpeed",[]);
+    return mapmatchedposition_get(dbusInterface,dltInterface,"GetSimulationSpeed",[]);
 }
 
-function mapmatchedposition_SetSimulationSpeed(dbusIf,speedFactor)
+function mapmatchedposition_SetSimulationSpeed(dbusInterface,dltInterface,speedFactor)
 {
-    mapmatchedposition_message(dbusIf,"SetSimulationSpeed",["uint8",speedFactor]);
+    mapmatchedposition_message(dbusInterface,dltInterface,"SetSimulationSpeed",["uint8",speedFactor]);
 }
 
-function mapmatchedposition_GetPosition(dbusIf)
+function mapmatchedposition_GetPosition(dbusInterface,dltInterface)
 {
     var valuesToReturn=["int32",NAVIGATIONCORE_SPEED,"int32",NAVIGATIONCORE_LATITUDE,"int32",NAVIGATIONCORE_LONGITUDE];
 
-    return mapmatchedposition_get(dbusIf,"GetPosition",["array",valuesToReturn]);
+    return mapmatchedposition_get(dbusInterface,dltInterface,"GetPosition",["array",valuesToReturn]);
 }
 
 //---------------- MapViewer messages (handle 1) ----------------
+function mapviewer_session_CreateSession(dbusInterface,dltInterface)
+{
+    return mapviewer_message(dbusInterface, dltInterface, "Session", "CreateSession", ["string","TestHMI"]);
+}
 
-// Create a new session or get the current session
-function mapviewer_session(par) {
-    if (!g_mapviewer_session[1])
-    {
-        var res=mapviewer_message(par, "Session", "CreateSession", ["string","TestHMI"]);
-        g_mapviewer_session[1]=res[3];
-    }
-    return g_mapviewer_session;
+function mapviewer_session_DeleteSession(dbusInterface,dltInterface)
+{
+    return mapviewer_message(dbusInterface, dltInterface, "Session", "DeleteSession", g_mapviewer_session);
 }
 
-// Delete the current session if exists
-function mapviewer_session_clear(par)
+function mapviewer_CreateMapViewInstance(dbusInterface,dltInterface,width,height,type)
 {
-    if (g_mapviewer_session[1]) {
-        var res=mapviewer_message(par, "Session", "DeleteSession", [g_mapviewer_session]);
-        g_mapviewer_session[1]=0;
-	}
+    return mapviewer_message(dbusInterface, dltInterface, "MapViewerControl","CreateMapViewInstance", mapviewer_session().concat(["structure",["uint16",width,"uint16",height],"int32",type]));
 }
 
-// Create a new map handle or get the current handle
-function mapviewer_handle(par,w,h,type)
+function mapviewer_ReleaseMapViewInstance(dbusInterface,dltInterface)
 {
-    if (!g_mapviewer_handle[1])
-    {
-        var res=mapviewer_message(par, "MapViewerControl","CreateMapViewInstance", mapviewer_session(par).concat(["structure",["uint16",w,"uint16",h],"int32",type]));
-        g_mapviewer_handle[1]=res[3];
-    }
-    return g_mapviewer_handle;
+    return mapviewercontrol_message(dbusInterface, dltInterface, "ReleaseMapViewInstance", []);
 }
 
-// Delete the map handle if exists
-function mapviewer_handle_clear(par)
+// Get the current session
+function mapviewer_session() {
+    return g_mapviewer_session;
+}
+
+// Get the current handle
+function mapviewer_handle()
 {
-    if (g_mapviewer_handle[1]) {
-        var res=mapviewercontrol_message(par, "ReleaseMapViewInstance", []);
-        g_mapviewer_handle[1]=0;
-    }
+    return g_mapviewer_handle;
 }
 
 // Send a message to map viewer control with session handle
-function mapviewercontrol_message(par, func, args)
+function mapviewercontrol_message(dbusInterface, dltInterface, func, args)
 {
-    return mapviewer_message(par, "MapViewerControl", func, mapviewer_session(par).concat(g_mapviewer_handle,args));
+    return mapviewer_message(dbusInterface, dltInterface, "MapViewerControl", func, mapviewer_session().concat(g_mapviewer_handle,args));
 }
 
 // Send a message to map viewer control without session handle
-function mapviewercontrol_get(par, func, args)
+function mapviewercontrol_get(dbusInterface, dltInterface, func, args)
 {
-    return mapviewer_message(par, "MapViewerControl", func, g_mapviewer_handle,args);
+    return mapviewer_message(dbusInterface, dltInterface, "MapViewerControl", func, g_mapviewer_handle,args);
 }
 
-function mapviewer_GetMapViewScale(dbusIf)
+function mapviewer_GetMapViewScale(dbusInterface,dltInterface)
 {
-    return mapviewercontrol_get(dbusIf,"GetMapViewScale", []);
+    return mapviewercontrol_get(dbusInterface,dltInterface,"GetMapViewScale", []);
 }
 
-function mapviewer_GetScaleList(dbusIf)
+function mapviewer_GetScaleList(dbusInterface,dltInterface)
 {
-    return mapviewercontrol_get(dbusIf,"GetScaleList", []);
+    return mapviewercontrol_get(dbusInterface,dltInterface,"GetScaleList", []);
 }
 
-function mapviewer_GetDisplayedRoutes(dbusIf)
+function mapviewer_GetDisplayedRoutes(dbusInterface,dltInterface)
 {
-    return mapviewercontrol_get(dbusIf,"GetDisplayedRoutes", []);
+    return mapviewercontrol_get(dbusInterface,dltInterface,"GetDisplayedRoutes", []);
 }
 
-function mapviewer_SetMapViewScale(dbusIf,scaleID)
+function mapviewer_SetMapViewScale(dbusInterface,dltInterface,scaleID)
 {
-    mapviewercontrol_message(dbusIf,"SetMapViewScale", ["uint8",scaleID]);
+    mapviewercontrol_message(dbusInterface,dltInterface,"SetMapViewScale", ["uint8",scaleID]);
 }
 
-function mapviewer_SetMapViewScaleByDelta(dbusIf,scaleDelta)
+function mapviewer_SetMapViewScaleByDelta(dbusInterface,dltInterface,scaleDelta)
 {
-    mapviewercontrol_message(dbusIf,"SetMapViewScaleByDelta", ["int16",scaleDelta]);
+    mapviewercontrol_message(dbusInterface,dltInterface,"SetMapViewScaleByDelta", ["int16",scaleDelta]);
 }
 
-function mapviewer_GetMapViewTheme(dbusIf)
+function mapviewer_GetMapViewTheme(dbusInterface,dltInterface)
 {
-    return mapviewercontrol_get(dbusIf,"GetMapViewTheme", []);
+    return mapviewercontrol_get(dbusInterface,dltInterface,"GetMapViewTheme", []);
 }
 
-function mapviewer_SetMapViewTheme(dbusIf,mapViewTheme)
+function mapviewer_SetMapViewTheme(dbusInterface,dltInterface,mapViewTheme)
 {
-    mapviewercontrol_message(dbusIf,"SetMapViewTheme", ["int32",mapViewTheme]);
+    mapviewercontrol_message(dbusInterface,dltInterface,"SetMapViewTheme", ["int32",mapViewTheme]);
 }
 
-function mapviewer_GetMapViewPerspective(dbusIf)
+function mapviewer_GetMapViewPerspective(dbusInterface,dltInterface)
 {
-    return mapviewercontrol_get(dbusIf,"GetMapViewPerspective", []);
+    return mapviewercontrol_get(dbusInterface,dltInterface,"GetMapViewPerspective", []);
 }
 
-function mapviewer_SetMapViewPerspective(dbusIf,perspective)
+function mapviewer_SetMapViewPerspective(dbusInterface,dltInterface,perspective)
 {
-    mapviewercontrol_message(dbusIf,"SetMapViewPerspective", ["int32",perspective]);
+    mapviewercontrol_message(dbusInterface,dltInterface,"SetMapViewPerspective", ["int32",perspective]);
 }
 
-function mapviewer_SetFollowCarMode(dbusIf,followCarMode)
+function mapviewer_SetFollowCarMode(dbusInterface,dltInterface,followCarMode)
 {
-    mapviewercontrol_message(dbusIf,"SetFollowCarMode", ["boolean",followCarMode]);
+    mapviewercontrol_message(dbusInterface,dltInterface,"SetFollowCarMode", ["boolean",followCarMode]);
 }
 
-function mapviewer_DisplayRoute(dbusIf,routeHandle,highlighted)
+function mapviewer_DisplayRoute(dbusInterface,dltInterface,routeHandle,highlighted)
 {
     var args=[];
     args=args.concat(routeHandle);
-    mapviewercontrol_message(dbusIf,"DisplayRoute", args.concat("boolean",highlighted));
+    mapviewercontrol_message(dbusInterface,dltInterface,"DisplayRoute", args.concat("boolean",highlighted));
 }
 
-function mapviewer_SetTargetPoint(dbusIf,latitude,longitude,altitude)
+function mapviewer_SetTargetPoint(dbusInterface,dltInterface,latitude,longitude,altitude)
 {
-    mapviewercontrol_message(dbusIf, "SetTargetPoint", ["structure",["double",latitude,"double",longitude,"double",altitude]]);
+    mapviewercontrol_message(dbusInterface,dltInterface, "SetTargetPoint", ["structure",["double",latitude,"double",longitude,"double",altitude]]);
 }
 
-function mapviewer_SetMapViewBoundingBox(dbusIf,boundingBox)
+function mapviewer_SetMapViewBoundingBox(dbusInterface,dltInterface,boundingBox)
 {
-    mapviewercontrol_message(dbusIf,"SetMapViewBoundingBox", boundingBox);
+    mapviewercontrol_message(dbusInterface,dltInterface,"SetMapViewBoundingBox", boundingBox);
 }
 
-function mapviewer_GetTargetPoint(dbusIf)
+function mapviewer_GetTargetPoint(dbusInterface,dltInterface)
 {
-    return mapviewercontrol_get(dbusIf,"GetTargetPoint", []);
+    return mapviewercontrol_get(dbusInterface,dltInterface,"GetTargetPoint", []);
 }
 
-function mapviewer_GetCameraValue(dbusIf,camera)
+function mapviewer_GetCameraValue(dbusInterface,dltInterface,camera)
 {
-    return mapviewercontrol_get(dbusIf,"Get"+camera, []);
+    return mapviewercontrol_get(dbusInterface,dltInterface,"Get"+camera, []);
 }
 
-function mapviewer_SetCameraValue(dbusIf,camera,value)
+function mapviewer_SetCameraValue(dbusInterface,dltInterface,camera,value)
 {
-    mapviewercontrol_message(dbusIf,"Set"+camera, value);
+    mapviewercontrol_message(dbusInterface,dltInterface,"Set"+camera, value);
 }
 
-function mapviewer_SetMapViewRotation(dbusIf,angle)
+function mapviewer_SetMapViewRotation(dbusInterface,dltInterface,angle)
 {
-    mapviewercontrol_message(dbusIf, "SetMapViewRotation", ["int32",angle,"int32",15]);
+    mapviewercontrol_message(dbusInterface,dltInterface, "SetMapViewRotation", ["int32",angle,"int32",15]);
 }
 
-function mapviewer_SetCameraHeadingAngle(dbusIf,angle)
+function mapviewer_SetCameraHeadingAngle(dbusInterface,dltInterface,angle)
 {
-    mapviewercontrol_message(dbusIf, "SetCameraHeadingAngle", ["int32",angle]);
+    mapviewercontrol_message(dbusInterface,dltInterface, "SetCameraHeadingAngle", ["int32",angle]);
 }
 
-function mapviewer_SetCameraHeadingTrackUp(dbusIf)
+function mapviewer_SetCameraHeadingTrackUp(dbusInterface,dltInterface)
 {
-    mapviewercontrol_message(dbusIf, "SetCameraHeadingTrackUp", []);
+    mapviewercontrol_message(dbusInterface,dltInterface, "SetCameraHeadingTrackUp", []);
 }
 
-function mapviewer_SetMapViewPan(dbusIf,panningAction,x,y)
+function mapviewer_SetMapViewPan(dbusInterface,dltInterface,panningAction,x,y)
 {
-    mapviewercontrol_message(dbusIf, "SetMapViewPan", ["int32",panningAction,"structure",["uint16",x,"uint16",y]]);
+    mapviewercontrol_message(dbusInterface,dltInterface, "SetMapViewPan", ["int32",panningAction,"structure",["uint16",x,"uint16",y]]);
 }
 
-function mapviewer_ConvertPixelCoordsToGeoCoords(dbusIf,x,y)
+function mapviewer_ConvertPixelCoordsToGeoCoords(dbusInterface,dltInterface,x,y)
 {
-    return mapviewercontrol_message(dbusIf, "ConvertPixelCoordsToGeoCoords",["array",["structure",["uint16",x,"uint16",y]]]);
+    return mapviewercontrol_message(dbusInterface,dltInterface, "ConvertPixelCoordsToGeoCoords",["array",["structure",["uint16",x,"uint16",y]]]);
 }
 
-function initScale(dbusIf)
+function initScale(dbusInterface,dltInterface)
 {
-    var res=mapviewer_GetScaleList(dbusIf);
+    var res=mapviewer_GetScaleList(dbusInterface,dltInterface);
     scaleList=res[1];
     minZoomId=scaleList[1][1];
     maxZoomId=scaleList[scaleList.length-1][1];
 }
 
-//---------------- MapViewer messages (handle 2) ----------------
-
-// Create a new map handle or get the current handle
-function mapviewer_handle2(par,w,h,type)
-{
-    if (!g_mapviewer_handle2[1])
-    {
-        var res=mapviewer_message(par, "MapViewerControl","CreateMapViewInstance", mapviewer_session(par).concat(["structure",["uint16",w,"uint16",h],"int32",type]));
-        g_mapviewer_handle2[1]=res[3];
-    }
-    return g_mapviewer_handle2;
-}
-
-// Delete the map handle if exists
-function mapviewer_handle_clear2(par)
-{
-    if (g_mapviewer_handle2[1]) {
-        var res=mapviewercontrol_message2(par, "ReleaseMapViewInstance", []);
-        g_mapviewer_handle2[1]=0;
-    }
-}
+//---------------- Mapviewer Configuration messages ----------------
 
-// Send a message to map viewer control with session handle on handle 2
-function mapviewercontrol_message2(par, func, args)
+function mapviewer_configuration_message(dbusInterface, dltInterface, func, args)
 {
-    return mapviewer_message(par, "MapViewerControl", func, mapviewer_session(par).concat(g_mapviewer_handle2,args));
+    return mapviewer_message(dbusInterface, dltInterface, "Configuration", func,args);
 }
 
-function mapviewer2_SetMapViewTheme(dbusIf,mapViewTheme)
+function mapviewer_configuration_GetSupportedLocales(dbusInterface,dltInterface)
 {
-    mapviewercontrol_message2(dbusIf,"SetMapViewTheme", ["int32",mapViewTheme]);
+    return mapviewer_configuration_message(dbusInterface,dltInterface,"GetSupportedLocales",[]);
 }
 
-function mapviewer2_SetMapViewBoundingBox(dbusIf,boundingBox)
+function mapviewer_configuration_GetLocale(dbusInterface,dltInterface)
 {
-    mapviewercontrol_message2(dbusIf,"SetMapViewBoundingBox", boundingBox);
+    return mapviewer_configuration_message(dbusInterface,dltInterface,"GetLocale",[]);
 }
 
-function mapviewer2_DisplayRoute(dbusIf,routeHandle,highlighted)
+function mapviewer_configuration_SetLocale(dbusInterface,dltInterface,language,country,script)
 {
-    var args=[];
-    args=args.concat(routeHandle);
-    mapviewercontrol_message2(dbusIf,"DisplayRoute", args.concat("boolean",highlighted));
+    mapviewer_configuration_message(dbusInterface,dltInterface,"SetLocale",["string",language,"string",country,"string",script]);
 }
 
-//---------------- Mapviewer Configuration messages ----------------
-
-function mapviewer_configuration_message(par, func, args)
+function mapviewer_configuration_GetUnitsOfMeasurement(dbusInterface,dltInterface)
 {
-    return mapviewer_message(par, "Configuration", func,args);
+    return mapviewer_configuration_message(dbusInterface,dltInterface,"GetUnitsOfMeasurement",[]);
 }
 
-function mapviewer_configuration_GetSupportedLocales(dbusIf)
+function mapviewer_configuration_SetUnitsOfMeasurementLength(dbusInterface,dltInterface,unit)
 {
-    return mapviewer_configuration_message(dbusIf,"GetSupportedLocales",[]);
+    mapviewer_configuration_message(dbusInterface,dltInterface,"SetUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"int32",unit]]);
 }
 
-function mapviewer_configuration_GetLocale(dbusIf)
-{
-    return mapviewer_configuration_message(dbusIf,"GetLocale",[]);
-}
+// -------------------- POISearch dbus messages --------------------
 
-function mapviewer_configuration_SetLocale(dbusIf,language,country,script)
-{
-    mapviewer_configuration_message(dbusIf,"SetLocale",["string",language,"string",country,"string",script]);
+// Send a message to poisearch with session handle
+function poisearch_message(dbusInterface, dltInterface, func, args)
+{ //session handle sent
+    return poi_message(dbusInterface, dltInterface, "POISearch", func, poisearch_handle().concat(args));
 }
 
-function mapviewer_configuration_GetUnitsOfMeasurement(dbusIf)
+// Send a message to poisearch without session handle
+function poisearch_message_get(dbusInterface, dltInterface, func, args)
 {
-    return mapviewer_configuration_message(dbusIf,"GetUnitsOfMeasurement",[]);
+    return poi_message(dbusInterface, dltInterface, "POISearch", func, args);
 }
 
-function mapviewer_configuration_SetUnitsOfMeasurementLength(dbusIf,unit)
+function poisearch_CreatePoiSearchHandle(dbusInterface,dltInterface)
 {
-    mapviewer_configuration_message(dbusIf,"SetUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"int32",unit]]);
-}
-
-// -------------------- POISearch dbus messages --------------------
-
-// Send a message to poisearch with session handle
-function poisearch_message(par, func, args)
-{ //session handle sent
-    return poi_message(par, "POISearch", func, poisearch_handle(par).concat(args));
+    return poisearch_message_get(dbusInterface, dltInterface, "CreatePoiSearchHandle", []);
 }
 
-// Send a message to poisearch without session handle
-function poisearch_message_get(par, func, args)
+function poisearch_DeletePoiSearchHandle(dbusInterface,dltInterface)
 {
-    return poi_message(par, "POISearch", func, args);
+    poisearch_message(dbusInterface, dltInterface, "DeletePoiSearchHandle", []);
 }
 
 // Create a new poisearch handle or get the current handle
-function poisearch_handle(par) {
-    if (!g_poisearch_handle[1])
-    {
-        var res=poisearch_message_get(par, "CreatePoiSearchHandle", []);
-        g_poisearch_handle[1]=res[1];
-    }
+function poisearch_handle(dbusInterface,dltInterface) {
     return g_poisearch_handle;
 }
 
 // Delete the poisearch handle if exists
-function poisearch_handle_clear(par)
+function poisearch_handle_clear(dbusInterface,dltInterface)
 {
     if (g_poisearch_handle[1]) {
-        poisearch_message(par, "DeletePoiSearchHandle", []);
+        poisearch_message(dbusInterface, dltInterface, "DeletePoiSearchHandle", []);
         g_poisearch_handle[1]=0;
     }
 }
 
-function poisearch_StartPoiSearch(dbusIf,inputString,sortOption)
+function poisearch_StartPoiSearch(dbusInterface,dltInterface,inputString,sortOption)
 {
-    poisearch_message(dbusIf,"StartPoiSearch",["string",inputString,"int32",sortOption]);
+    poisearch_message(dbusInterface,dltInterface,"StartPoiSearch",["string",inputString,"int32",sortOption]);
 }
 
-function poisearch_SetCenter(dbusIf,latitude,longitude,altitude)
+function poisearch_SetCenter(dbusInterface,dltInterface,latitude,longitude,altitude)
 {
-    poisearch_message(dbusIf, "SetCenter", ["structure",["double",latitude,"double",longitude,"double",altitude]]);
+    poisearch_message(dbusInterface,dltInterface, "SetCenter", ["structure",["double",latitude,"double",longitude,"double",altitude]]);
 }
 
-function poisearch_SetCategories(dbusIf,poiCategories)
+function poisearch_SetCategories(dbusInterface,dltInterface,poiCategories)
 {
     var value=[];
     for(var i=0;i<poiCategories.length;i+=1)
@@ -1204,76 +1134,76 @@ function poisearch_SetCategories(dbusIf,poiCategories)
         value=value.concat(["structure",["uint32",poiCategories[i][0],"uint32",poiCategories[i][1]]]);
     }
 
-    poisearch_message(dbusIf, "SetCategories", ["array",value]);
+    poisearch_message(dbusInterface,dltInterface, "SetCategories", ["array",value]);
 }
 
-function poisearch_GetAvailableCategories(dbusIf)
+function poisearch_GetAvailableCategories(dbusInterface,dltInterface)
 {
-    return poisearch_message_get(dbusIf,"GetAvailableCategories",[]);
+    return poisearch_message_get(dbusInterface,dltInterface,"GetAvailableCategories",[]);
 }
 
-function poisearch_RequestResultList(dbusIf,offset,maxWindowSize,attributeList)
+function poisearch_RequestResultList(dbusInterface,dltInterface,offset,maxWindowSize,attributeList)
 {
     var value=[];
     for(var i=0;i<attributeList.length;i+=1)
     {
         value=value.concat(["uint32",attributeList[i]]);
     }
-    return poisearch_message(dbusIf,"RequestResultList",["uint16",offset,"uint16",maxWindowSize,"array",value]);
+    return poisearch_message(dbusInterface,dltInterface,"RequestResultList",["uint16",offset,"uint16",maxWindowSize,"array",value]);
 }
 
-function poisearch_GetPoiDetails(dbusIf,ids)
+function poisearch_GetPoiDetails(dbusInterface,dltInterface,ids)
 {
     var value=[];
     for(var i=0;i<ids.length;i+=1)
     {
         value=value.concat(["uint32",ids[i]]);
     }
-    return poisearch_message_get(dbusIf,"GetPoiDetails",["array",value]);
+    return poisearch_message_get(dbusInterface,dltInterface,"GetPoiDetails",["array",value]);
 }
 
 //----------------- Trip Computer messages -----------------
 
 // Send a message to tripcomputer (basic)
-function tripcomputer_message(par, func, args)
+function tripcomputer_message(dbusInterface, dltInterface, func, args)
 {
-	return demonstrator_message(par, "TripComputer", func, args);
+    return demonstrator_message(dbusInterface, dltInterface, "TripComputer", func, args);
 }
 
 // Send a message to fuel stop advisor (basic)
-function fuelstopadvisor_message(par, func, args)
+function fuelstopadvisor_message(dbusInterface, dltInterface, func, args)
 {
-	return demonstrator_message(par, "FuelStopAdvisor", func, args);
+    return demonstrator_message(dbusInterface, dltInterface, "FuelStopAdvisor", func, args);
 }
 
-function fuelstopadvisor_ReleaseRouteHandle(dbusIf,routeHandle)
+function fuelstopadvisor_ReleaseRouteHandle(dbusInterface,dltInterface,routeHandle)
 {
-    fuelstopadvisor_message(dbusIf,"ReleaseRouteHandle",routeHandle);
+    fuelstopadvisor_message(dbusInterface,dltInterface,"ReleaseRouteHandle",routeHandle);
 }
 
-function fuelstopadvisor_SetRouteHandle(dbusIf,routeHandle)
+function fuelstopadvisor_SetRouteHandle(dbusInterface,dltInterface,routeHandle)
 {
-    fuelstopadvisor_message(dbusIf,"SetRouteHandle",routeHandle);
+    fuelstopadvisor_message(dbusInterface,dltInterface,"SetRouteHandle",routeHandle);
 }
 
-function fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,advisorMode,distanceThreshold)
+function fuelstopadvisor_SetFuelAdvisorSettings(dbusInterface,dltInterface,advisorMode,distanceThreshold)
 {
-    fuelstopadvisor_message(dbusIf,"SetFuelAdvisorSettings",["boolean",advisorMode,"uint8",distanceThreshold]);
+    fuelstopadvisor_message(dbusInterface,dltInterface,"SetFuelAdvisorSettings",["boolean",advisorMode,"uint8",distanceThreshold]);
 }
 
-function fuelstopadvisor_GetTripData(dbusIf,trip)
+function fuelstopadvisor_GetTripData(dbusInterface,dltInterface,trip)
 {
-    return fuelstopadvisor_message(dbusIf,"GetTripData",["uint8",trip]);
+    return fuelstopadvisor_message(dbusInterface,dltInterface,"GetTripData",["uint8",trip]);
 }
 
-function fuelstopadvisor_GetInstantData(dbusIf)
+function fuelstopadvisor_GetInstantData(dbusInterface,dltInterface)
 {
-    return fuelstopadvisor_message(dbusIf,"GetInstantData",[]);
+    return fuelstopadvisor_message(dbusInterface,dltInterface,"GetInstantData",[]);
 }
 
-function fuelstopadvisor_ResetTripData(dbusIf,trip)
+function fuelstopadvisor_ResetTripData(dbusInterface,dltInterface,trip)
 {
-    fuelstopadvisor_message(dbusIf,"ResetTripData",["uint8",trip]);
+    fuelstopadvisor_message(dbusInterface,dltInterface,"ResetTripData",["uint8",trip]);
 }
 
 
diff --git a/src/hmi/qml/NavigationApp.qml b/src/hmi/qml/NavigationApp.qml
index a21746f..58be1a4 100644
--- a/src/hmi/qml/NavigationApp.qml
+++ b/src/hmi/qml/NavigationApp.qml
@@ -33,9 +33,11 @@ import "../style-sheets/NavigationAppBrowseMap-css.js" as StyleSheetMap;
 import "Core/genivi.js" as Genivi;
 import lbs.plugin.dbusif 1.0
 import lbs.plugin.preference 1.0
+import lbs.plugin.dltif 1.0
 
 ApplicationWindow {
 	id: container
+    property string pagefile:"NavigationAppBrowseMap"
     flags: Qt.FramelessWindowHint
     color: "transparent"
     visible: true
@@ -60,6 +62,11 @@ ApplicationWindow {
         Settings.setValue("Locale/script",Genivi.g_script);
     }
 
+    DLTIf {
+        id:dltIf;
+        name: pagefile;
+    }
+
     //------------------------------------------//
     // Management of the DBus exchanges
     //------------------------------------------//
@@ -91,16 +98,30 @@ ApplicationWindow {
             Genivi.autoguidance=true;
         else
             Genivi.autoguidance=false;
+        if(Settings.getValue("Log/verbose")==="true")
+            Genivi.verbose=true;
+        else
+            Genivi.verbose=false;
+
+        if(Settings.getValue("Log/dlt")==="true")
+            Genivi.dlt=true;
+        else
+            Genivi.dlt=false;
+
 
         //configure the middleware
-        Genivi.navigationcore_configuration_SetLocale(dbusIf,Genivi.g_language,Genivi.g_country,Genivi.g_script);
+        Genivi.navigationcore_configuration_SetLocale(dbusIf,dltIf,Genivi.g_language,Genivi.g_country,Genivi.g_script);
 
         //launch the map viewer and init the scale list
-        Genivi.mapviewer_handle(dbusIf,width,height,Genivi.MAPVIEWER_MAIN_MAP);
-        Genivi.initScale(dbusIf);
+        var res=Genivi.mapviewer_session_CreateSession(dbusIf,dltIf); //only one session managed
+        Genivi.g_mapviewer_session[1]=res[3];
+        var res1=Genivi.mapviewer_CreateMapViewInstance(dbusIf,dltIf,width,height,Genivi.MAPVIEWER_MAIN_MAP);
+        Genivi.g_mapviewer_handle[1]=res[3];
+        Genivi.initScale(dbusIf,dltIf);
 
-        //set verbose mode on
-        //Genivi.setVerbose();
+        //create a route by default
+        var res2=Genivi.routing_CreateRoute(dbusIf,dltIf);
+        Genivi.g_routing_handle[1]=res2[3];
 
         //launch the HMI
         load("NavigationAppMain");
@@ -109,7 +130,12 @@ ApplicationWindow {
     Component.onDestruction:  {
         saveSettings();
 
-        //release the map viewer
-        Genivi.mapviewer_handle_clear(dbusIf);
+        //release all created objects
+        var res=Genivi.mapviewer_ReleaseMapViewInstance(dbusIf,dltIf);
+        Genivi.g_mapviewer_handle[1]=0;
+        var res1=Genivi.mapviewer_session_DeleteSession(dbusIf,dltIf);//only one session managed
+        Genivi.g_mapviewer_session[1]=0;
+        var res2=Genivi.routing_DeleteRoute(dbusIf,dltIf);
+        Genivi.g_routing_handle[1]=0;
     }
 }
diff --git a/src/hmi/qml/NavigationAppBrowseMap.qml b/src/hmi/qml/NavigationAppBrowseMap.qml
index c9e0c19..27a851a 100644
--- a/src/hmi/qml/NavigationAppBrowseMap.qml
+++ b/src/hmi/qml/NavigationAppBrowseMap.qml
@@ -43,6 +43,7 @@ import "../style-sheets/NavigationAppBrowseMapCompass-css.js" as StyleSheetCompa
 
 
 import lbs.plugin.dbusif 1.0
+import lbs.plugin.dltif 1.0
 
 NavigationAppHMIMenu {
 	id: menu
@@ -55,6 +56,11 @@ NavigationAppHMIMenu {
     property int currentZoomId;
     property string simulationSpeedRatio;
 
+    DLTIf {
+        id:dltIf;
+        name: pagefile;
+    }
+
     //------------------------------------------//
     // Management of the DBus exchanges
     //------------------------------------------//
@@ -65,7 +71,7 @@ NavigationAppHMIMenu {
     property Item guidanceStatusChangedSignal;
     function guidanceStatusChanged(args)
     {
-        Genivi.hookSignal("guidanceStatusChanged");
+        Genivi.hookSignal(dltIf,"guidanceStatusChanged");
         if(args[1]===Genivi.NAVIGATIONCORE_ACTIVE)
         {
             Genivi.setGuidanceActivated(true);
@@ -73,14 +79,14 @@ NavigationAppHMIMenu {
             showRoute();
             if (Genivi.simulationMode===true)
             {
-                Genivi.mapmatchedposition_SetSimulationMode(dbusIf,Genivi.simulationMode);
+                Genivi.mapmatchedposition_SetSimulationMode(dbusIf,dltIf,Genivi.simulationMode);
                 showSimulation();
                 updateSimulation();
             } else {
                 hideSimulation();
             }
             //Guidance active, so inform the trip computer (refresh)
-            Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,1,50);
+            Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,dltIf,1,50);
             updateGuidance();
         } else {
             hideGuidance();
@@ -95,7 +101,7 @@ NavigationAppHMIMenu {
             }
             Genivi.setGuidanceActivated(false);
             //Guidance inactive, so inform the trip computer
-            Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,0,0);
+            Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,dltIf,0,0);
             maneuverIcon.source=StyleSheetGuidance.maneuverIcon[Constants.SOURCE]; //no icon by default
             distancetomaneuverValue.text="----";
             distancetodestinationValue.text="----";
@@ -107,7 +113,7 @@ NavigationAppHMIMenu {
     property Item guidanceManeuverChangedSignal;
     function guidanceManeuverChanged(args)
     {
-        Genivi.hookSignal("guidanceManeuverChanged");
+        Genivi.hookSignal(dltIf,"guidanceManeuverChanged");
         var advice = Genivi.Maneuver[args[1]];
         maneuverBarCru.visible=false;
         maneuverBarApp.visible=false;
@@ -132,7 +138,7 @@ NavigationAppHMIMenu {
     property Item guidanceWaypointReachedSignal;
     function guidanceWaypointReached(args)
     {
-        Genivi.hookSignal("guidanceWaypointReached");
+        Genivi.hookSignal(dltIf,"guidanceWaypointReached");
         if (args[2]) {
             // "Destination reached" TBD
         } else {
@@ -144,7 +150,7 @@ NavigationAppHMIMenu {
     property Item guidancePositionOnRouteChangedSignal;
     function guidancePositionOnRouteChanged(args)
     {
-        Genivi.hookSignal("guidancePositionOnRouteChanged");
+        Genivi.hookSignal(dltIf,"guidancePositionOnRouteChanged");
         if(simu_mode.status!==0)
         { //for the time being it's necessary because of a bug in simulation use case
             updateGuidance();
@@ -154,8 +160,8 @@ NavigationAppHMIMenu {
     property Item mapmatchedpositionPositionUpdateSignal;
     function mapmatchedpositionPositionUpdate(args)
     {
-        Genivi.hookSignal("mapmatchedpositionPositionUpdate");
-        var res=Genivi.mapmatchedposition_GetPosition(dbusIf);
+        Genivi.hookSignal(dltIf,"mapmatchedpositionPositionUpdate");
+        var res=Genivi.mapmatchedposition_GetPosition(dbusIf,dltIf);
         for (var i=0;i<res[3].length;i+=4){
             if (res[3][i+1]== Genivi.NAVIGATIONCORE_SPEED){
                 vehicleSpeedValue.text=res[3][i+3][3][1];
@@ -178,7 +184,7 @@ NavigationAppHMIMenu {
     property Item simulationSpeedChangedSignal;
     function simulationSpeedChanged(args)
     {
-        Genivi.hookSignal("simulationSpeedChanged");
+        Genivi.hookSignal(dltIf,"simulationSpeedChanged");
         if (args[1] == 0) {
             simulationSpeedRatio="0";
             speedValueSent=0;
@@ -216,7 +222,7 @@ NavigationAppHMIMenu {
     property Item simulationStatusChangedSignal;
     function simulationStatusChanged(args)
     {
-        Genivi.hookSignal("simulationStatusChanged");
+        Genivi.hookSignal(dltIf,"simulationStatusChanged");
         if (args[1] == Genivi.NAVIGATIONCORE_SIMULATION_STATUS_PAUSED || args[1] == Genivi.NAVIGATIONCORE_SIMULATION_STATUS_FIXED_POSITION)
         {
             simu_mode.setState("PAUSE");
@@ -233,14 +239,14 @@ NavigationAppHMIMenu {
     property Item mapmatchedpositionAddressUpdateSignal;
     function mapmatchedpositionAddressUpdate(args)
     {
-        Genivi.hookSignal("mapmatchedpositionAddressUpdate");
+        Genivi.hookSignal(dltIf,"mapmatchedpositionAddressUpdate");
         updateAddress();
     }
 
     property Item fuelStopAdvisorWarningSignal;
     function fuelStopAdvisorWarning(args)
     {
-        Genivi.hookSignal("fuelStopAdvisorWarning");
+        Genivi.hookSignal(dltIf,"fuelStopAdvisorWarning");
         if (args[1] == 1)
         {
             select_search_for_refill_in_top.visible=true;
@@ -256,7 +262,7 @@ NavigationAppHMIMenu {
     property Item mapViewScaleChangedSignal;
     function mapViewScaleChanged(args)
     {
-        Genivi.hookSignal("mapViewScaleChanged");       
+        Genivi.hookSignal(dltIf,"mapViewScaleChanged");
         var text=args[3].toString();
         currentZoomId=args[3];
         zoomin.disabled=false;
@@ -329,11 +335,11 @@ NavigationAppHMIMenu {
         property bool active;
         onTriggered: {
             if (active) {
-                var res=Genivi.mapviewer_GetTargetPoint(dbusIf);
+                var res=Genivi.mapviewer_GetTargetPoint(dbusIf,dltIf);
                 var latitude=res[1][1]+lat;
                 var longitude=res[1][3]+lon;
                 var altitude=res[1][5];
-                Genivi.mapviewer_SetTargetPoint(dbusIf,latitude,longitude,altitude);
+                Genivi.mapviewer_SetTargetPoint(dbusIf,dltIf,latitude,longitude,altitude);
                 interval=50;
                 restart();
             }
@@ -351,7 +357,7 @@ NavigationAppHMIMenu {
         property real clamp_value;
         onTriggered: {
             if (active) {
-                var res=Genivi.mapviewer_GetCameraValue(dbusIf,camera_value);
+                var res=Genivi.mapviewer_GetCameraValue(dbusIf,dltIf,camera_value);
                 res[1]+=step;
                 if (clamp) {
                     if (step > 0 && res[1] > clamp_value) {
@@ -361,7 +367,7 @@ NavigationAppHMIMenu {
                         res[1]=clamp_value;
                     }
                 }
-                Genivi.mapviewer_SetCameraValue(dbusIf,camera_value, res);
+                Genivi.mapviewer_SetCameraValue(dbusIf,dltIf,camera_value, res);
                 interval=50;
                 restart();
             }
@@ -370,7 +376,7 @@ NavigationAppHMIMenu {
 
     function move_start(lat, lon)
     {
-        Genivi.mapviewer_SetFollowCarMode(dbusIf, false);
+        Genivi.mapviewer_SetFollowCarMode(dbusIf,dltIf, false);
         move_timer.lat=lat/10000;
         move_timer.lon=lon/10000;
         move_timer.active=true;
@@ -407,51 +413,34 @@ NavigationAppHMIMenu {
 
     function set_angle(angle)
     {
-        Genivi.mapviewer_SetMapViewRotation(dbusIf,angle);
+        Genivi.mapviewer_SetMapViewRotation(dbusIf,dltIf,angle);
     }
 
     function updateMapViewer()
     {
-        var res=Genivi.mapviewer_GetMapViewPerspective(dbusIf);
+        var res=Genivi.mapviewer_GetMapViewPerspective(dbusIf,dltIf);
         if (res[1] == Genivi.MAPVIEWER_2D) {
             perspective.text=Genivi.gettext("CameraPerspective3d");
         } else {
             perspective.text=Genivi.gettext("CameraPerspective2d");
         }
-        res=Genivi.mapviewer_GetDisplayedRoutes(dbusIf);
-        if (res[1] && res[1].length) {
-            split.disabled=false;
-        } else {
-            split.disabled=true;
-        }
-        if (Genivi.g_mapviewer_handle2) {
-            split.text=Genivi.gettext("Join");
-        } else {
-            split.text=Genivi.gettext("Split");
-        }
     }
 
     function toggleDayNight()
     {
-        var res=Genivi.mapviewer_GetMapViewTheme(dbusIf);
+        var res=Genivi.mapviewer_GetMapViewTheme(dbusIf,dltIf);
         if (res[1] == Genivi.MAPVIEWER_THEME_1) {
-            Genivi.mapviewer_SetMapViewTheme(dbusIf,Genivi.MAPVIEWER_THEME_2);
-            if (Genivi.g_mapviewer_handle2) {
-                Genivi.mapviewer2_SetMapViewTheme(dbusIf,Genivi.MAPVIEWER_THEME_2);
-            }
+            Genivi.mapviewer_SetMapViewTheme(dbusIf,dltIf,Genivi.MAPVIEWER_THEME_2);
             daynight.text=Genivi.gettext("Day");
         } else {
-            Genivi.mapviewer_SetMapViewTheme(dbusIf,Genivi.MAPVIEWER_THEME_1);
-            if (Genivi.g_mapviewer_handle2) {
-                Genivi.mapviewer2_SetMapViewTheme(dbusIf,Genivi.MAPVIEWER_THEME_1);
-            }
+            Genivi.mapviewer_SetMapViewTheme(dbusIf,dltIf,Genivi.MAPVIEWER_THEME_1);
             daynight.text=Genivi.gettext("Night");
         }
     }
 
     function updateDayNight()
     {
-        var res=Genivi.mapviewer_GetMapViewTheme(dbusIf);
+        var res=Genivi.mapviewer_GetMapViewTheme(dbusIf,dltIf);
         if (res[1] == Genivi.MAPVIEWER_THEME_1) {
             daynight.text=Genivi.gettext("Night");
         } else {
@@ -462,56 +451,13 @@ NavigationAppHMIMenu {
     function togglePerspective()
     {
         if (perspective.text == Genivi.gettext("CameraPerspective2d")) {
-            Genivi.mapviewer_SetMapViewPerspective(dbusIf,Genivi.MAPVIEWER_2D);
+            Genivi.mapviewer_SetMapViewPerspective(dbusIf,dltIf,Genivi.MAPVIEWER_2D);
         } else {
-            Genivi.mapviewer_SetMapViewPerspective(dbusIf,Genivi.MAPVIEWER_3D);
+            Genivi.mapviewer_SetMapViewPerspective(dbusIf,dltIf,Genivi.MAPVIEWER_3D);
         }
         updateMapViewer();
     }
 
-    function toggleSplit() //split not tested yet
-    {
-        var displayedRoutes=Genivi.mapviewer_GetDisplayedRoutes(dbusIf);
-        var mapViewTheme=Genivi.mapviewer_GetMapViewTheme(dbusIf);
-        if (split.text == Genivi.gettext("Split")) {
-            Genivi.mapviewer_handle_clear(dbusIf);
-            Genivi.mapviewer_handle2(dbusIf,map.width/2,map.height,Genivi.MAPVIEWER_MAIN_MAP);
-            Genivi.mapviewer_handle(dbusIf,map.width/2,map.height,Genivi.MAPVIEWER_MAIN_MAP);
-            if (displayedRoutes[1] && displayedRoutes[1].length) {
-                var boundingBox=Genivi.routing_GetRouteBoundingBox(dbusIf,[]);
-                Genivi.mapviewer2_SetMapViewBoundingBox(dbusIf,boundingBox);
-            }
-            Genivi.mapviewer_SetMapViewTheme(dbusIf,mapViewTheme[1]);
-            Genivi.mapviewer2_SetMapViewTheme(dbusIf,mapViewTheme[1]);
-            Genivi.mapviewer_SetFollowCarMode(dbusIf,true);
-        } else {
-            Genivi.mapviewer_handle_clear2(dbusIf);
-            Genivi.mapviewer_handle_clear(dbusIf);
-            Genivi.mapviewer_handle(dbusIf,map.width,map.height,Genivi.MAPVIEWER_MAIN_MAP);
-            Genivi.mapviewer_SetMapViewTheme(dbusIf,mapViewTheme[1]);
-            Genivi.mapviewer_SetFollowCarMode(dbusIf,true);
-        }
-        if (displayedRoutes[1] && displayedRoutes[1].length) {
-            var route=[];
-            for (var i = 0 ; i < displayedRoutes[1].length ; i+=2) {
-                route=displayedRoutes[1][i+1][0];
-                route=route.concat(res[1][i+1][1]);
-                Genivi.mapviewer_DisplayRoute(dbusIf,route,res[1][i+1][3]);
-                if (split.text == Genivi.gettext("Split")) {
-                    Genivi.mapviewer2_DisplayRoute(dbusIf,route,res[1][i+1][3]);
-                }
-            }
-        }
-        updateMapViewer();
-    }
-
-    function disableSplit() //split not tested yet
-    {
-        if (Genivi.g_mapviewer_handle2) {
-            toggleSplit();
-        }
-    }
-
     function showMapSettings()
     {
         mapSettings.visible=true;
@@ -540,8 +486,6 @@ NavigationAppHMIMenu {
         west.disabled=false;
         exitSettings.visible=true;
         exitSettings.disabled=false;
-        split.visible=false; //split not tested yet
-        split.disabled=true; //split not tested yet
         perspective.visible=true;
         perspective.disabled=false;
         daynight.visible=true;
@@ -576,8 +520,6 @@ NavigationAppHMIMenu {
         west.disabled=true;
         exitSettings.visible=false;
         exitSettings.disabled=true;
-        split.visible=false;
-        split.disabled=true;
         perspective.visible=false;
         perspective.disabled=true;
         daynight.visible=false;
@@ -589,49 +531,49 @@ NavigationAppHMIMenu {
     //------------------------------------------//
     function updateSimulation()
     {
-        var res=Genivi.mapmatchedposition_GetSimulationStatus(dbusIf);
-        if (res[1] == Genivi.NAVIGATIONCORE_SIMULATION_STATUS_PAUSED || res[1] == Genivi.NAVIGATIONCORE_SIMULATION_STATUS_FIXED_POSITION)
+        var res=Genivi.mapmatchedposition_GetSimulationStatus(dbusIf,dltIf);
+        if (res[1] === Genivi.NAVIGATIONCORE_SIMULATION_STATUS_PAUSED || res[1] === Genivi.NAVIGATIONCORE_SIMULATION_STATUS_FIXED_POSITION)
         {
             simu_mode.setState("PAUSE");
         }
         else
         {
-            if (res[1] == Genivi.NAVIGATIONCORE_SIMULATION_STATUS_RUNNING)
+            if (res[1] === Genivi.NAVIGATIONCORE_SIMULATION_STATUS_RUNNING)
             {
                 simu_mode.setState("PLAY");
             }
         }
 
-        var res1=Genivi.mapmatchedposition_GetSimulationSpeed(dbusIf);
-        if (res1[1] == 0) {
+        var res1=Genivi.mapmatchedposition_GetSimulationSpeed(dbusIf,dltIf);
+        if (res1[1] === 0) {
             simulationSpeedRatio="0";
             speedValueSent=0;
         }
-        if (res1[1] == 1) {
+        if (res1[1] === 1) {
             simulationSpeedRatio="1/4";
             speedValueSent=1;
         }
-        if (res1[1] == 2) {
+        if (res1[1] === 2) {
             simulationSpeedRatio="1/2";
             speedValueSent=2;
         }
-        if (res1[1] == 4) {
+        if (res1[1] === 4) {
             simulationSpeedRatio="1";
             speedValueSent=3;
         }
-        if (res1[1] == 8) {
+        if (res1[1] === 8) {
             simulationSpeedRatio="2";
             speedValueSent=4;
         }
-        if (res1[1] == 16) {
+        if (res1[1] === 16) {
             simulationSpeedRatio="4";
             speedValueSent=5;
         }
-        if (res1[1] == 32) {
+        if (res1[1] === 32) {
             simulationSpeedRatio="8";
             speedValueSent=6;
         }
-        if (res1[1] == 64) {
+        if (res1[1] === 64) {
             simulationSpeedRatio="16";
             speedValueSent=7;
         }
@@ -675,8 +617,8 @@ NavigationAppHMIMenu {
 
 	function updateAddress()
 	{
-        var res=Genivi.mapmatchedposition_GetCurrentAddress(dbusIf);
-        if (res[3][1] == Genivi.NAVIGATIONCORE_STREET) {
+        var res=Genivi.mapmatchedposition_GetCurrentAddress(dbusIf,dltIf);
+        if (res[3][1] === Genivi.NAVIGATIONCORE_STREET) {
             currentroad.text=res[3][3][3][1];
 		} else {
             currentroad.text="";
@@ -685,7 +627,7 @@ NavigationAppHMIMenu {
 
 	function showZoom()
 	{
-        var res=Genivi.mapviewer_GetMapViewScale(dbusIf);
+        var res=Genivi.mapviewer_GetMapViewScale(dbusIf,dltIf);
         var text=res[1].toString();
         currentZoomId=res[1];
         zoomin.disabled=false;
@@ -708,7 +650,7 @@ NavigationAppHMIMenu {
 
     function getManeuversList()
     {
-        var res=Genivi.guidance_GetManeuversList(dbusIf,0xffff,0);
+        var res=Genivi.guidance_GetManeuversList(dbusIf,dltIf,0xffff,0);
         var maneuversList=res[5];
         var model=maneuverArea.model;
         for (var i = 0 ; i < maneuversList.length ; i+=2) {
@@ -734,17 +676,17 @@ NavigationAppHMIMenu {
 	function toggleOrientation()
 	{
         if (!orientation.status) {
-            Genivi.mapviewer_SetCameraHeadingAngle(dbusIf,0);
+            Genivi.mapviewer_SetCameraHeadingAngle(dbusIf,dltIf,0);
             orientation.setState("D");
 		} else {
-            Genivi.mapviewer_SetCameraHeadingTrackUp(dbusIf);
+            Genivi.mapviewer_SetCameraHeadingTrackUp(dbusIf,dltIf);
             orientation.setState("N");
 		}
 	}
 
 	function updateGuidance()
 	{
-        var res=Genivi.guidance_GetManeuversList(dbusIf,1,0);
+        var res=Genivi.guidance_GetManeuversList(dbusIf,dltIf,1,0);
         //only one maneuver is considered
         //var error=res[1]
         var numberOfManeuvers=res[3];
@@ -776,7 +718,7 @@ NavigationAppHMIMenu {
 
         }
 
-        var res1=Genivi.guidance_GetDestinationInformation(dbusIf);
+        var res1=Genivi.guidance_GetDestinationInformation(dbusIf,dltIf);
         distancetodestinationValue.text = Genivi.distance(res1[1]);
         timetodestinationValue.text = Genivi.time(res1[3]);
 
@@ -785,24 +727,24 @@ NavigationAppHMIMenu {
 
 	function stopGuidance()
 	{
-        Genivi.guidance_StopGuidance(dbusIf);
+        Genivi.guidance_StopGuidance(dbusIf,dltIf);
 	}
 
     function startGuidance()
     {
-        Genivi.guidance_StartGuidance(dbusIf,Genivi.routing_handle(dbusIf));
+        Genivi.guidance_StartGuidance(dbusIf,dltIf,Genivi.routing_handle());
         updateSimulation();
         updateAddress();
     }
 
     function stopSimulation()
     {
-        Genivi.mapmatchedposition_PauseSimulation(dbusIf);
+        Genivi.mapmatchedposition_PauseSimulation(dbusIf,dltIf);
     }
 
     function startSimulation()
     {
-        Genivi.mapmatchedposition_StartSimulation(dbusIf);
+        Genivi.mapmatchedposition_StartSimulation(dbusIf,dltIf);
     }
 
     function setScale(scaleId)
@@ -1018,11 +960,9 @@ NavigationAppHMIMenu {
                     source:StyleSheetBottom.calculate_curr[Constants.SOURCE]; x:StyleSheetBottom.calculate_curr[Constants.X]; y:StyleSheetBottom.calculate_curr[Constants.Y]; width:StyleSheetBottom.calculate_curr[Constants.WIDTH]; height:StyleSheetBottom.calculate_curr[Constants.HEIGHT];
                     id:calculate_curr;
                     onClicked: {
-                        if(!Genivi.guidance_activated){
-                            Genivi.guidance_StartGuidance(dbusIf,Genivi.routing_handle(dbusIf));
-                        }
-                        Genivi.mapviewer_SetFollowCarMode(dbusIf,true);
-                        Genivi.mapviewer_SetMapViewScale(dbusIf,Genivi.zoom_guidance);
+                        //todo something here
+                        Genivi.mapviewer_SetFollowCarMode(dbusIf,dltIf,true);
+                        Genivi.mapviewer_SetMapViewScale(dbusIf,dltIf,Genivi.zoom_guidance);
 
                     }
                     disabled:!(Genivi.route_calculated && !Genivi.guidance_activated);
@@ -1157,29 +1097,29 @@ NavigationAppHMIMenu {
                 StdButton {
                     source:StyleSheetScroll.scrollup[Constants.SOURCE]; x:StyleSheetScroll.scrollup[Constants.X]; y:StyleSheetScroll.scrollup[Constants.Y]; width:StyleSheetScroll.scrollup[Constants.WIDTH]; height:StyleSheetScroll.scrollup[Constants.HEIGHT];
                     id:scrollup;  next:scrollleft; prev:scrolldown;
-                    onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
-                    onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2,map.height/2 + scroll.panY);}
+                    onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,dltIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
+                    onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,dltIf,Genivi.MAPVIEWER_PAN_END,map.width/2,map.height/2 + scroll.panY);}
                 }
 
                 StdButton {
                     source:StyleSheetScroll.scrollleft[Constants.SOURCE]; x:StyleSheetScroll.scrollleft[Constants.X]; y:StyleSheetScroll.scrollleft[Constants.Y]; width:StyleSheetScroll.scrollleft[Constants.WIDTH]; height:StyleSheetScroll.scrollleft[Constants.HEIGHT];
                     id:scrollleft;  next:scrollright; prev:scrollup;
-                    onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
-                    onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2 + scroll.panX,map.height/2);}
+                    onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,dltIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
+                    onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,dltIf,Genivi.MAPVIEWER_PAN_END,map.width/2 + scroll.panX,map.height/2);}
                 }
 
                 StdButton {
                     source:StyleSheetScroll.scrollright[Constants.SOURCE]; x:StyleSheetScroll.scrollright[Constants.X]; y:StyleSheetScroll.scrollright[Constants.Y]; width:StyleSheetScroll.scrollright[Constants.WIDTH]; height:StyleSheetScroll.scrollright[Constants.HEIGHT];
                     id:scrollright;  next:scrolldown; prev:scrollleft;
-                    onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
-                    onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2 - scroll.panX,map.height/2);}
+                    onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,dltIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
+                    onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,dltIf,Genivi.MAPVIEWER_PAN_END,map.width/2 - scroll.panX,map.height/2);}
                 }
 
                 StdButton {
                     source:StyleSheetScroll.scrolldown[Constants.SOURCE]; x:StyleSheetScroll.scrolldown[Constants.X]; y:StyleSheetScroll.scrolldown[Constants.Y]; width:StyleSheetScroll.scrolldown[Constants.WIDTH]; height:StyleSheetScroll.scrolldown[Constants.HEIGHT];
                     id:scrolldown;  next:scrollup; prev:scrollright;
-                    onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
-                    onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,Genivi.MAPVIEWER_PAN_END,map.width/2,map.height/2 - scroll.panY);}
+                    onPressed: {Genivi.mapviewer_SetMapViewPan(dbusIf,dltIf,Genivi.MAPVIEWER_PAN_START,map.width/2,map.height/2);}
+                    onReleased: {Genivi.mapviewer_SetMapViewPan(dbusIf,dltIf,Genivi.MAPVIEWER_PAN_END,map.width/2,map.height/2 - scroll.panY);}
                 }
 
                 StdButton {
@@ -1187,10 +1127,10 @@ NavigationAppHMIMenu {
                     id:backtoCurrentLocation;  next:scrollup; prev:scrollright;
                     onClicked: {
                         if (Genivi.data['display_on_map']==='show_current_position') {
-                            Genivi.mapviewer_SetTargetPoint(dbusIf,Genivi.data['current_position']['lat'],Genivi.data['current_position']['lon'],Genivi.data['current_position']['alt']);
+                            Genivi.mapviewer_SetTargetPoint(dbusIf,dltIf,Genivi.data['current_position']['lat'],Genivi.data['current_position']['lon'],Genivi.data['current_position']['alt']);
                         } else {
                             if (Genivi.data['display_on_map']==='show_position') {
-                                Genivi.mapviewer_SetTargetPoint(dbusIf,Genivi.data['position']['lat'],Genivi.data['position']['lon'],Genivi.data['position']['alt']);
+                                Genivi.mapviewer_SetTargetPoint(dbusIf,dltIf,Genivi.data['position']['lat'],Genivi.data['position']['lon'],Genivi.data['position']['alt']);
                             }
                         }
                     }
@@ -1216,7 +1156,7 @@ NavigationAppHMIMenu {
                     id:zoomin;  next:zoomout; prev:orientation;
                     onClicked: {
                         if(currentZoomId>Genivi.minZoomId){
-                            Genivi.mapviewer_SetMapViewScaleByDelta(dbusIf,-1);
+                            Genivi.mapviewer_SetMapViewScaleByDelta(dbusIf,dltIf,-1);
                         }
                     }
                 }
@@ -1226,7 +1166,7 @@ NavigationAppHMIMenu {
                     id:zoomout;  next:settings; prev:zoomin;
                     onClicked: {
                         if(currentZoomId<Genivi.maxZoomId){
-                            Genivi.mapviewer_SetMapViewScaleByDelta(dbusIf,1);
+                            Genivi.mapviewer_SetMapViewScaleByDelta(dbusIf,dltIf,1);
                         }
                     }
                 }
@@ -1309,7 +1249,7 @@ NavigationAppHMIMenu {
                         {
                             speedValueSent = speedValueSent-1;
                         }
-                        Genivi.mapmatchedposition_SetSimulationSpeed(dbusIf,getDBusSpeedValue(speedValueSent));
+                        Genivi.mapmatchedposition_SetSimulationSpeed(dbusIf,dltIf,getDBusSpeedValue(speedValueSent));
                     }
                 }
                 StdButton {
@@ -1321,7 +1261,7 @@ NavigationAppHMIMenu {
                         {
                             speedValueSent = speedValueSent+1;
                         }
-                        Genivi.mapmatchedposition_SetSimulationSpeed(dbusIf,getDBusSpeedValue(speedValueSent));
+                        Genivi.mapmatchedposition_SetSimulationSpeed(dbusIf,dltIf,getDBusSpeedValue(speedValueSent));
                     }
                 }
                 StdButton {
@@ -1363,11 +1303,11 @@ NavigationAppHMIMenu {
                         {
                             case 2: //pause
                                 //pause to resume
-                                Genivi.mapmatchedposition_StartSimulation(dbusIf);
+                                Genivi.mapmatchedposition_StartSimulation(dbusIf,dltIf);
                             break;
                             case 1: //play
                                 //play to pause
-                                Genivi.mapmatchedposition_PauseSimulation(dbusIf);
+                                Genivi.mapmatchedposition_PauseSimulation(dbusIf,dltIf);
                             break;
                             default:
                             break;
@@ -1506,7 +1446,7 @@ NavigationAppHMIMenu {
                  }
                  StdButton {
                      source:StyleSheetSettings.west[Constants.SOURCE]; x:StyleSheetSettings.west[StyleSheetSettings.X]; y:StyleSheetSettings.west[StyleSheetSettings.Y]; width:StyleSheetSettings.west[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.west[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.westText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.westText[StyleSheetSettings.PIXELSIZE];
-                            id:west; text:Genivi.gettext("West");  next:split; prev:east;
+                            id:west; text:Genivi.gettext("West");  next:perspective; prev:east;
                      onClicked: {
                          set_angle(270);
                      }
@@ -1521,13 +1461,8 @@ NavigationAppHMIMenu {
                      }
                  }
                  StdButton {
-                     source:StyleSheetSettings.split[Constants.SOURCE]; x:StyleSheetSettings.split[StyleSheetSettings.X]; y:StyleSheetSettings.split[StyleSheetSettings.Y]; width:StyleSheetSettings.split[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.split[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.splitText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.splitText[StyleSheetSettings.PIXELSIZE];
-                            id:split; text:Genivi.gettext("Split");  next:perspective; prev:west;
-                         onClicked: {toggleSplit();} //split not tested yet
-                 }
-                 StdButton {
                      source:StyleSheetSettings.perspective[Constants.SOURCE]; x:StyleSheetSettings.perspective[StyleSheetSettings.X]; y:StyleSheetSettings.perspective[StyleSheetSettings.Y]; width:StyleSheetSettings.perspective[StyleSheetSettings.WIDTH]; height:StyleSheetSettings.perspective[StyleSheetSettings.HEIGHT];textColor:StyleSheetSettings.perspectiveText[StyleSheetSettings.TEXTCOLOR]; pixelSize:StyleSheetSettings.perspectiveText[StyleSheetSettings.PIXELSIZE];
-                            id:perspective; text:Genivi.gettext("CameraPerspective3d");  next:daynight; prev:split;
+                            id:perspective; text:Genivi.gettext("CameraPerspective3d");  next:daynight; prev:perspective;
                          onClicked: {togglePerspective();}
                  }
                  StdButton {
@@ -1591,10 +1526,10 @@ NavigationAppHMIMenu {
 
         if (Genivi.data['display_on_map']==='show_route') {
             //display the route when it has been calculated
-            var res=Genivi.routing_GetRouteBoundingBox(dbusIf,Genivi.data['zoom_route_handle']);
-            Genivi.mapviewer_SetMapViewBoundingBox(dbusIf,res);
-            Genivi.mapviewer_DisplayRoute(dbusIf,Genivi.data['show_route_handle'],false);
-            Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,1,50); //activate advisor mode
+            var res=Genivi.routing_GetRouteBoundingBox(dbusIf,dltIf,Genivi.data['zoom_route_handle']);
+            Genivi.mapviewer_SetMapViewBoundingBox(dbusIf,dltIf,res);
+            Genivi.mapviewer_DisplayRoute(dbusIf,dltIf,Genivi.data['show_route_handle'],false);
+            Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,dltIf,1,50); //activate advisor mode
             hideGuidance();
             hideRoute();
             hideSimulation();
@@ -1603,21 +1538,21 @@ NavigationAppHMIMenu {
         else {
             if (Genivi.data['display_on_map']==='show_current_position') {
                 //show the current position
-                Genivi.mapviewer_SetFollowCarMode(dbusIf,true);
-                Genivi.mapviewer_SetMapViewScale(dbusIf,Genivi.zoom_guidance);
+                Genivi.mapviewer_SetFollowCarMode(dbusIf,dltIf,true);
+                Genivi.mapviewer_SetMapViewScale(dbusIf,dltIf,Genivi.zoom_guidance);
                 if(Genivi.guidance_activated) {
                     if(Genivi.showroom) {
                         Genivi.data['current_position']=Genivi.data['default_position'];
                     }
-                    Genivi.mapviewer_SetTargetPoint(dbusIf,Genivi.data['current_position']['lat'],Genivi.data['current_position']['lon'],Genivi.data['current_position']['alt']);
-                    Genivi.mapviewer_DisplayRoute(dbusIf,Genivi.data['show_route_handle'],false);
-                    Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,1,50); //activate advisor mode
+                    Genivi.mapviewer_SetTargetPoint(dbusIf,dltIf,Genivi.data['current_position']['lat'],Genivi.data['current_position']['lon'],Genivi.data['current_position']['alt']);
+                    Genivi.mapviewer_DisplayRoute(dbusIf,dltIf,Genivi.data['show_route_handle'],false);
+                    Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,dltIf,1,50); //activate advisor mode
                     showGuidance();
                     showRoute();
                     updateGuidance();
                     if (Genivi.simulationMode===true)
                     {
-                        Genivi.mapmatchedposition_SetSimulationMode(dbusIf,Genivi.simulationMode);
+                        Genivi.mapmatchedposition_SetSimulationMode(dbusIf,dltIf,Genivi.simulationMode);
                         showSimulation();
                         updateSimulation();
                     } else {
@@ -1627,8 +1562,8 @@ NavigationAppHMIMenu {
                     if(Genivi.showroom) {
                         Genivi.data['current_position']=Genivi.data['default_position'];
                     }
-                    Genivi.mapviewer_SetTargetPoint(dbusIf,Genivi.data['current_position']['lat'],Genivi.data['current_position']['lon'],Genivi.data['current_position']['alt']);
-                    Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,0,50); //no advisor mode
+                    Genivi.mapviewer_SetTargetPoint(dbusIf,dltIf,Genivi.data['current_position']['lat'],Genivi.data['current_position']['lon'],Genivi.data['current_position']['alt']);
+                    Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,dltIf,0,50); //no advisor mode
                     hideGuidance();
                     hideRoute();
                     hideSimulation();
@@ -1638,10 +1573,10 @@ NavigationAppHMIMenu {
             else {
                 if (Genivi.data['display_on_map']==='show_position') {
                     //show a given position on the map, used to explore the map
-                    Genivi.mapviewer_SetFollowCarMode(dbusIf,false);
-                    Genivi.mapviewer_SetMapViewScale(dbusIf,Genivi.zoom_guidance);
-                    Genivi.mapviewer_SetTargetPoint(dbusIf,Genivi.data['position']['lat'],Genivi.data['position']['lon'],Genivi.data['position']['alt']);
-                    Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,0,50); //no advisor mode
+                    Genivi.mapviewer_SetFollowCarMode(dbusIf,dltIf,false);
+                    Genivi.mapviewer_SetMapViewScale(dbusIf,dltIf,Genivi.zoom_guidance);
+                    Genivi.mapviewer_SetTargetPoint(dbusIf,dltIf,Genivi.data['position']['lat'],Genivi.data['position']['lon'],Genivi.data['position']['alt']);
+                    Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,dltIf,0,50); //no advisor mode
                     hideGuidance();
                     hideRoute();
                     hideSimulation();
diff --git a/src/hmi/qml/NavigationAppMain.qml b/src/hmi/qml/NavigationAppMain.qml
index a65d065..35bc2cb 100644
--- a/src/hmi/qml/NavigationAppMain.qml
+++ b/src/hmi/qml/NavigationAppMain.qml
@@ -30,6 +30,7 @@ import "Core/genivi.js" as Genivi;
 import "../style-sheets/style-constants.js" as Constants;
 import "../style-sheets/NavigationAppMain-css.js" as StyleSheet;
 import lbs.plugin.dbusif 1.0
+import lbs.plugin.dltif 1.0
 
 NavigationAppHMIMenu {
 	id: menu
@@ -39,6 +40,11 @@ NavigationAppHMIMenu {
     next: navigation
     prev: quit
 
+    DLTIf {
+        id:dltIf;
+        name: pagefile
+    }
+
     //------------------------------------------//
     // Management of the DBus exchanges
     //------------------------------------------//
@@ -49,7 +55,7 @@ NavigationAppHMIMenu {
     property Item mapmatchedpositionPositionUpdateSignal;
     function mapmatchedpositionPositionUpdate(args)
     {
-        Genivi.hookSignal("mapmatchedpositionPositionUpdate");
+        Genivi.hookSignal(dltIf,"mapmatchedpositionPositionUpdate");
         updateCurrentPosition();
     }
 
@@ -65,7 +71,7 @@ NavigationAppHMIMenu {
 
     function updateCurrentPosition()
     {
-        var res=Genivi.mapmatchedposition_GetPosition(dbusIf);
+        var res=Genivi.mapmatchedposition_GetPosition(dbusIf,dltIf);
         var oklat=0;
         var oklong=0;
         for (var i=0;i<res[3].length;i+=4){
@@ -183,7 +189,6 @@ NavigationAppHMIMenu {
             source:StyleSheet.quit[Constants.SOURCE]; x:StyleSheet.quit[Constants.X]; y:StyleSheet.quit[Constants.Y]; width:StyleSheet.quit[Constants.WIDTH]; height:StyleSheet.quit[Constants.HEIGHT];textColor:StyleSheet.quitText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.quitText[Constants.PIXELSIZE];
             id:quit; text: Genivi.gettext("Quit");  next:navigation; prev:trip;
             onClicked:{
-                Genivi.navigationcore_session_clear(dbusIf);
                 disconnectSignals();
                 Qt.quit(); //for the time being quit
             }
@@ -194,9 +199,10 @@ NavigationAppHMIMenu {
         connectSignals();
 
         // Test if the navigation server is connected
-        var res=Genivi.navigationcore_session_GetVersion(dbusIf);
+        var res=Genivi.navigationcore_session_GetVersion(dbusIf,dltIf);
         if (res[0] != "error") {
-            res=Genivi.navigationcore_session(dbusIf);
+            var res1=Genivi.navigationcore_session_CreateSession(dbusIf,dltIf);
+            Genivi.g_nav_session[1]=res1[3];
         } else {
             //to do something here
             Genivi.dump("",res);
diff --git a/src/hmi/qml/NavigationAppPOI.qml b/src/hmi/qml/NavigationAppPOI.qml
index 34f088a..58f50c6 100644
--- a/src/hmi/qml/NavigationAppPOI.qml
+++ b/src/hmi/qml/NavigationAppPOI.qml
@@ -32,6 +32,7 @@ import "Core/genivi.js" as Genivi;
 import "../style-sheets/style-constants.js" as Constants;
 import "../style-sheets/NavigationAppPOI-css.js" as StyleSheet;
 import lbs.plugin.dbusif 1.0
+import lbs.plugin.dltif 1.0
 
 NavigationAppHMIMenu {
 	id: menu
@@ -40,6 +41,11 @@ NavigationAppHMIMenu {
     property string poiCategoryName
     property bool vehicleLocated: false
 
+    DLTIf {
+        id:dltIf;
+        name: pagefile
+    }
+
     //------------------------------------------//
     // Management of the DBus exchanges
     //------------------------------------------//
@@ -50,7 +56,7 @@ NavigationAppHMIMenu {
     property Item mapmatchedpositionPositionUpdateSignal;
     function mapmatchedpositionPositionUpdate(args)
     {
-        Genivi.hookSignal("mapmatchedpositionPositionUpdate");
+        Genivi.hookSignal(dltIf,"mapmatchedpositionPositionUpdate");
         if(!Genivi.showroom) {
             updateCurrentPosition();
         }
@@ -68,7 +74,7 @@ NavigationAppHMIMenu {
 
     function updateCurrentPosition()
     {
-        var res=Genivi.mapmatchedposition_GetPosition(dbusIf);
+        var res=Genivi.mapmatchedposition_GetPosition(dbusIf,dltIf);
         var oklat=0;
         var oklong=0;
         for (var i=0;i<res[3].length;i+=4){
@@ -128,12 +134,16 @@ NavigationAppHMIMenu {
         categoriesAndRadius[1]=Genivi.radius;
         categoriesAndRadiusList.push(categoriesAndRadius);
 
-        Genivi.poisearch_SetCenter(dbusIf,latitude,longitude,0);
-        Genivi.poisearch_SetCategories(dbusIf,categoriesAndRadiusList);
-        Genivi.poisearch_StartPoiSearch(dbusIf,keyboardArea.destination.text,Genivi.POISERVICE_SORT_BY_DISTANCE);
+        Genivi.poisearch_DeletePoiSearchHandle(dbusIf,dltIf)
+        Genivi.g_poisearch_handle[1]=0;
+        var res_poi=Genivi.poisearch_CreatePoiSearchHandle(dbusIf,dltIf)
+        Genivi.g_poisearch_handle[1]=res_poi[1];
+        Genivi.poisearch_SetCenter(dbusIf,dltIf,latitude,longitude,0);
+        Genivi.poisearch_SetCategories(dbusIf,dltIf,categoriesAndRadiusList);
+        Genivi.poisearch_StartPoiSearch(dbusIf,dltIf,keyboardArea.destination.text,Genivi.POISERVICE_SORT_BY_DISTANCE);
         var attributeList=[];
         attributeList[0]=0;
-        var res=Genivi.poisearch_RequestResultList(dbusIf,Genivi.offset,Genivi.maxResultListSize,attributeList);
+        var res=Genivi.poisearch_RequestResultList(dbusIf,dltIf,Genivi.offset,Genivi.maxResultListSize,attributeList);
         if(res[3]===0)
         {
             //no match
@@ -151,7 +161,7 @@ NavigationAppHMIMenu {
             Genivi.poi_data[id].category=Genivi.category_id;
             Genivi.poi_data[id].distance=res_win[i+1][3];
         }
-        var details=Genivi.poisearch_GetPoiDetails(dbusIf,ids);
+        var details=Genivi.poisearch_GetPoiDetails(dbusIf,dltIf,ids);
         for (i = 0 ; i < details[1].length ; i+=2) {
             var poi_details=details[1][i+1];
             id=poi_details[1][1];
@@ -364,7 +374,7 @@ NavigationAppHMIMenu {
                 Genivi.data['destination']=Genivi.poi_data[Genivi.poi_id];
                 Genivi.setLocationInputActivated(false);
                 Genivi.setRerouteRequested(true);
-                Genivi.guidance_StopGuidance(dbusIf);
+                Genivi.guidance_StopGuidance(dbusIf,dltIf);
                 pageOpen("NavigationAppSearch");
 			}
 		}
@@ -408,7 +418,7 @@ NavigationAppHMIMenu {
         connectSignals();
 
         var categoriesIdNameAndRadius=[];
-        var ret=Genivi.poisearch_GetAvailableCategories(dbusIf);
+        var ret=Genivi.poisearch_GetAvailableCategories(dbusIf,dltIf);
         Genivi.categoriesIdNameList=ret[1];
 
         if(Genivi.poi_id !== null){
diff --git a/src/hmi/qml/NavigationAppSearch.qml b/src/hmi/qml/NavigationAppSearch.qml
index 32e0e10..5e840cc 100644
--- a/src/hmi/qml/NavigationAppSearch.qml
+++ b/src/hmi/qml/NavigationAppSearch.qml
@@ -30,6 +30,7 @@ import "Core/genivi.js" as Genivi;
 import "../style-sheets/style-constants.js" as Constants;
 import "../style-sheets/NavigationAppSearch-css.js" as StyleSheet;
 import lbs.plugin.dbusif 1.0
+import lbs.plugin.dltif 1.0
 
 NavigationAppHMIMenu {
     id: menu
@@ -48,6 +49,11 @@ NavigationAppHMIMenu {
     property bool vehicleLocated: false
     property real delayToGetManeuverList: 200 //in ms
 
+    DLTIf {
+        id:dltIf;
+        name: pagefile;
+    }
+
     //------------------------------------------//
     // Miscellaneous
     //------------------------------------------//
@@ -71,18 +77,18 @@ NavigationAppHMIMenu {
     property Item guidanceStatusChangedSignal;
     function guidanceStatusChanged(args)
     {
-        Genivi.hookSignal("guidanceStatusChanged");
+        Genivi.hookSignal(dltIf,"guidanceStatusChanged");
         if(args[1]===Genivi.NAVIGATIONCORE_ACTIVE)
         {
             Genivi.setGuidanceActivated(true);
             guidanceActive();
             //Guidance active, so inform the trip computer (refresh)
-            Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,1,50);
+            Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,dltIf,1,50);
             if(Genivi.autoguidance){
                 //Enter the map browser menu
                 disconnectSignals();
                 Genivi.data['display_on_map']='show_current_position';
-                Genivi.data["show_route_handle"]=Genivi.routing_handle(dbusIf);
+                Genivi.data["show_route_handle"]=Genivi.routing_handle();
                 entryMenu("NavigationAppBrowseMap",menu);
             }else{
                 showGuidance();
@@ -96,18 +102,18 @@ NavigationAppHMIMenu {
             guidanceInactive();
             hideGuidance();
             //Guidance inactive, so inform the trip computer
-            Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,0,0);
+            Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,dltIf,0,0);
         }
     }
 
     property Item currentSelectionCriterionSignal;
     function currentSelectionCriterion(args)
     {// locationInputHandle 1, selectionCriterion 3
-        Genivi.hookSignal("currentSelectionCriterion");
+        Genivi.hookSignal(dltIf,"currentSelectionCriterion");
         var selectionCriterion=args[3];
         Genivi.entrycriterion = selectionCriterion;
         if (Genivi.preloadMode === true) {
-            Genivi.locationinput_Search(dbusIf,currentTextToSearch,searchWindow); //launch search
+            Genivi.locationinput_Search(dbusIf,dltIf,currentTextToSearch,searchWindow); //launch search
         }
     }
 
@@ -115,7 +121,7 @@ NavigationAppHMIMenu {
     function searchStatus(args)
     { //locationInputHandle 1, statusValue 3
         var statusValue=args[3];
-        Genivi.hookSignal("searchStatus");
+        Genivi.hookSignal(dltIf,"searchStatus");
         if (keyboardActivated === true)
         {
             if (statusValue === Genivi.NAVIGATIONCORE_SEARCHING) {
@@ -125,7 +131,7 @@ NavigationAppHMIMenu {
                 if (statusValue === Genivi.NAVIGATIONCORE_FINISHED)
                 {
                     keyboardArea.destination.text.color='white';
-                    Genivi.locationinput_RequestListUpdate(dbusIf,0,10);
+                    Genivi.locationinput_RequestListUpdate(dbusIf,dltIf,0,10);
                 }
             }
         }
@@ -133,7 +139,7 @@ NavigationAppHMIMenu {
         {
             if (statusValue === Genivi.NAVIGATIONCORE_FINISHED)
             {
-                Genivi.locationinput_SelectEntry(dbusIf,Genivi.entryselectedentry);
+                Genivi.locationinput_SelectEntry(dbusIf,dltIf,Genivi.entryselectedentry);
                 if (Genivi.preloadMode === true)
                 {
                     if (Genivi.entrycriterion === countryValue.criterion)
@@ -171,7 +177,8 @@ NavigationAppHMIMenu {
                                 Genivi.preloadMode=false;
                                 console.log("Error when load a preloaded address");
                             }
-                            Genivi.locationinput_handle_clear(dbusIf); //clear the handle
+                            Genivi.locationinput_DeleteLocationInput(dbusIf,dltIf); //clear the handle
+                            Genivi.g_locationinput_handle[1]=0;
                         }
                     }
                 }
@@ -185,7 +192,7 @@ NavigationAppHMIMenu {
     {
         if (keyboardActivated === true)
         {
-            Genivi.hookSignal("searchResultList");
+            Genivi.hookSignal(dltIf,"searchResultList");
             var model=listArea.model;
             var windowOffset=args[5];
             var resultListWindow=args[9];
@@ -202,20 +209,20 @@ NavigationAppHMIMenu {
             }
             if(numberOfItems===1) {
                 // Set value of corresponding field and hide keyboard and list eventually
-                Genivi.locationinput_SelectEntry(dbusIf,0);
+                Genivi.locationinput_SelectEntry(dbusIf,dltIf,0);
                 manageAddressItem();
             }
         }
         else
         {
-            Genivi.hookSignal("searchResultList");
+            Genivi.hookSignal(dltIf,"searchResultList");
         }
     }
 
     property Item contentUpdatedSignal;
     function contentUpdated(args)
     { //locationInputHandle 1, guidable 3, availableSelectionCriteria 5, address 7
-        Genivi.hookSignal("contentUpdated");
+        Genivi.hookSignal(dltIf,"contentUpdated");
         // Check if the destination is guidable
         var guidable=args[3];
         if (guidable) {
@@ -299,20 +306,20 @@ NavigationAppHMIMenu {
     property Item mapmatchedpositionPositionUpdateSignal;
     function mapmatchedpositionPositionUpdate(args)
     {
-        Genivi.hookSignal("mapmatchedpositionPositionUpdate");
+        Genivi.hookSignal(dltIf,"mapmatchedpositionPositionUpdate");
         updateCurrentPosition();
     }
 
     property Item routeCalculationSuccessfulSignal;
     function routeCalculationSuccessful(args)
     { //routeHandle 1, unfullfilledPreferences 3
-        Genivi.hookSignal("routeCalculationSuccessful");
+        Genivi.hookSignal(dltIf,"routeCalculationSuccessful");
 
         Genivi.setRouteCalculated(true);
         getRouteOverview();
 
         // Give the route handle to the FSA
-        Genivi.fuelstopadvisor_SetRouteHandle(dbusIf,Genivi.g_routing_handle);
+        Genivi.fuelstopadvisor_SetRouteHandle(dbusIf,dltIf,Genivi.g_routing_handle);
 
         show_route_on_map.disabled=false;
         showRoute();
@@ -325,18 +332,18 @@ NavigationAppHMIMenu {
     property Item routeCalculationFailedSignal;
     function routeCalculationFailed(args)
     {
-        Genivi.hookSignal("routeCalculationFailed");
+        Genivi.hookSignal(dltIf,"routeCalculationFailed");
 
         statusValue.text=Genivi.gettext("CalculatedRouteFailed");
         Genivi.setRouteCalculated(false);
         // Tell the FSA that there's no route available
-        Genivi.fuelstopadvisor_ReleaseRouteHandle(dbusIf,Genivi.g_routing_handle);
+        Genivi.fuelstopadvisor_ReleaseRouteHandle(dbusIf,dltIf,Genivi.g_routing_handle);
     }
 
     property Item routeCalculationProgressUpdateSignal;
     function routeCalculationProgressUpdate(args)
     {
-        Genivi.hookSignal("routeCalculationProgressUpdate");
+        Genivi.hookSignal(dltIf,"routeCalculationProgressUpdate");
         statusValue.text=Genivi.gettext("CalculatedRouteInProgress");
         Genivi.setRouteCalculated(false);
     }
@@ -344,7 +351,7 @@ NavigationAppHMIMenu {
     property Item spellResultSignal;
     function spellResult(args)
     {//locationInputHandle 1, uniqueString 3, validCharacters 5, fullMatch 7
-        Genivi.hookSignal("spellResult");
+        Genivi.hookSignal(dltIf,"spellResult");
         var uniqueString=args[3];
         var validCharacters=args[5];
         if (keyboardArea.destination.text.length < uniqueString.length) {
@@ -384,7 +391,7 @@ NavigationAppHMIMenu {
 
     function getManeuversList()
     {
-        var res=Genivi.guidance_GetManeuversList(dbusIf,0xffff,0);
+        var res=Genivi.guidance_GetManeuversList(dbusIf,dltIf,0xffff,0);
         var maneuversList=res[5];
         var model=maneuverArea.model;
         for (var i = 0 ; i < maneuversList.length ; i+=2) {
@@ -409,7 +416,7 @@ NavigationAppHMIMenu {
 
     function updateCurrentPosition()
     {
-        var res=Genivi.mapmatchedposition_GetPosition(dbusIf);
+        var res=Genivi.mapmatchedposition_GetPosition(dbusIf,dltIf);
         var oklat=0;
         var oklong=0;
         for (var i=0;i<res[3].length;i+=4){
@@ -434,7 +441,7 @@ NavigationAppHMIMenu {
 
     function updateStartStop()
     {
-        var res=Genivi.guidance_GetGuidanceStatus(dbusIf);
+        var res=Genivi.guidance_GetGuidanceStatus(dbusIf,dltIf);
         if (res[1] != Genivi.NAVIGATIONCORE_INACTIVE) {
             showRoute();
         } else {
@@ -446,7 +453,7 @@ NavigationAppHMIMenu {
     {
         input=extraspell+input;
         extraspell='';
-        Genivi.locationinput_Spell(dbusIf,input,10);
+        Genivi.locationinput_Spell(dbusIf,dltIf,input,10);
     }
 
     function launchRouteCalculation()
@@ -457,13 +464,13 @@ NavigationAppHMIMenu {
         destination=Genivi.latlon_to_map(Genivi.data['destination']);
         if(Genivi.showroom) {
             position=Genivi.latlon_to_map(Genivi.data['default_position']);
-            Genivi.routing_SetWaypoints(dbusIf,false,position,destination); //start from given position
+            Genivi.routing_SetWaypoints(dbusIf,dltIf,false,position,destination); //start from given position
         }else{
             position=Genivi.latlon_to_map(Genivi.data['current_position']);
-            Genivi.routing_SetWaypoints(dbusIf,true,position,destination); //start from current position
+            Genivi.routing_SetWaypoints(dbusIf,dltIf,true,position,destination); //start from current position
         }
 
-        Genivi.routing_CalculateRoute(dbusIf);
+        Genivi.routing_CalculateRoute(dbusIf,dltIf);
     }
 
     //------------------------------------------//
@@ -488,7 +495,8 @@ NavigationAppHMIMenu {
     { //load an address and test if it's guidable
         if (Genivi.address[Genivi.NAVIGATIONCORE_COUNTRY] !== "")
         {//need to test empty string
-            var res=Genivi.locationinput_handle(dbusIf); //get an handle for the location input
+            var res=Genivi.locationinput_CreateLocationInput(dbusIf,dltIf); //get an handle for the location input
+            Genivi.g_locationinput_handle[1]=res[3];
             countryValue.text=Genivi.address[Genivi.NAVIGATIONCORE_COUNTRY];
             accept(countryValue);
             cityValue.disabled=false;
@@ -540,7 +548,7 @@ NavigationAppHMIMenu {
 
     function accept(what)
     { //load text to search (search will be launched after validation of criterion)
-        Genivi.locationinput_SetSelectionCriterion(dbusIf,what.criterion);
+        Genivi.locationinput_SetSelectionCriterion(dbusIf,dltIf,what.criterion);
         currentTextToSearch = what.text;
     }
 
@@ -634,7 +642,7 @@ NavigationAppHMIMenu {
         if (Genivi.entrycriterion) {
             criterion=Genivi.entrycriterion;
             Genivi.entrycriterion=0;
-            Genivi.locationinput_SetSelectionCriterion(dbusIf,criterion);
+            Genivi.locationinput_SetSelectionCriterion(dbusIf,dltIf,criterion);
         }
         extraspell='';
         if(criterion != Genivi.NAVIGATIONCORE_STREET)
@@ -667,7 +675,7 @@ NavigationAppHMIMenu {
     {
         statusValue.text=Genivi.gettext("CalculatedRouteSuccess");
 
-        var res=Genivi.routing_GetRouteOverviewTimeAndDistance(dbusIf);
+        var res=Genivi.routing_GetRouteOverviewTimeAndDistance(dbusIf,dltIf);
 
         var i, time = 0, distance = 0;
         for (i=0;i<res[1].length;i+=4)
@@ -971,11 +979,11 @@ NavigationAppHMIMenu {
                 disconnectSignals();
                 if(Genivi.guidance_activated){
                     Genivi.data['display_on_map']='show_current_position';
-                    Genivi.data["show_route_handle"]=Genivi.routing_handle(dbusIf);
+                    Genivi.data["show_route_handle"]=Genivi.routing_handle();
                 }else{
                     Genivi.data['display_on_map']='show_route';
-                    Genivi.data['show_route_handle']=Genivi.routing_handle(dbusIf);
-                    Genivi.data['zoom_route_handle']=Genivi.routing_handle(dbusIf);
+                    Genivi.data['show_route_handle']=Genivi.routing_handle();
+                    Genivi.data['zoom_route_handle']=Genivi.routing_handle();
                 }
                 entryMenu("NavigationAppBrowseMap",menu);
             }
@@ -985,7 +993,7 @@ NavigationAppHMIMenu {
             id:guidance_start; text: Genivi.gettext("On"); disabled:true; next:guidance_stop; prev:show_route_on_map
             visible: false;
             onClicked: {
-                Genivi.guidance_StartGuidance(dbusIf,Genivi.routing_handle(dbusIf));
+                Genivi.guidance_StartGuidance(dbusIf,dltIf,Genivi.routing_handle());
             }
         }
         StdButton {
@@ -993,7 +1001,7 @@ NavigationAppHMIMenu {
             id:guidance_stop;text: Genivi.gettext("Off"); disabled:true; next:show_route_on_map; prev:guidance_start
             visible: false;
             onClicked: {
-                Genivi.guidance_StopGuidance(dbusIf);
+                Genivi.guidance_StopGuidance(dbusIf,dltIf);
             }
         }
         BorderImage {
@@ -1053,7 +1061,7 @@ NavigationAppHMIMenu {
             onSelected:{
                 Genivi.entryselectedentry=what.index;
                 // Set value of corresponding field and hide keyboard and list
-                Genivi.locationinput_SelectEntry(dbusIf,Genivi.entryselectedentry-1);
+                Genivi.locationinput_SelectEntry(dbusIf,dltIf,Genivi.entryselectedentry-1);
                 manageAddressItem();
             }
         }
@@ -1098,7 +1106,8 @@ NavigationAppHMIMenu {
             disabled: !(keyboardActivated);
             onClicked: {
                 Genivi.preloadMode=false;
-                Genivi.locationinput_handle_clear(dbusIf); //clear the handle
+                Genivi.locationinput_DeleteLocationInput(dbusIf,dltIf); //clear the handle
+                Genivi.g_locationinput_handle[1]=0;
                 hideKeyboard();
                 initAddress();
             }
@@ -1143,8 +1152,9 @@ NavigationAppHMIMenu {
             disabled: keyboardActivated; next:streetValue; prev:calculate_curr;
             onClicked: {
                 disconnectSignals();
-                Genivi.guidance_StopGuidance(dbusIf);
-                Genivi.locationinput_handle_clear(dbusIf); //clear the handle
+                Genivi.guidance_StopGuidance(dbusIf,dltIf);
+                Genivi.locationinput_DeleteLocationInput(dbusIf,dltIf); //clear the handle
+                Genivi.g_locationinput_handle[1]=0;
                 leaveMenu();
             }
         }
diff --git a/src/hmi/qml/NavigationAppSettings.qml b/src/hmi/qml/NavigationAppSettings.qml
index 9f3feca..5d23d1c 100644
--- a/src/hmi/qml/NavigationAppSettings.qml
+++ b/src/hmi/qml/NavigationAppSettings.qml
@@ -32,6 +32,7 @@ import "Core/genivi.js" as Genivi;
 import "../style-sheets/style-constants.js" as Constants;
 import "../style-sheets/NavigationAppSettings-css.js" as StyleSheet;
 import lbs.plugin.dbusif 1.0
+import lbs.plugin.dltif 1.0
 
 NavigationAppHMIMenu {
 	id: menu
@@ -39,6 +40,11 @@ NavigationAppHMIMenu {
     next: back
     prev: back
 
+    DLTIf {
+        id:dltIf;
+        name: pagefile;
+    }
+
     //------------------------------------------//
     // Management of the DBus exchanges
     //------------------------------------------//
@@ -49,7 +55,7 @@ NavigationAppHMIMenu {
     property Item configurationChangedSignal;
     function configurationChanged(args)
     { //to be improved !
-        Genivi.hookSignal("configurationChanged");
+        Genivi.hookSignal(dltIf,"configurationChanged");
         for (var i=0; i < args[1].length;i+=2) {
             switch (args[1][i+1]) {
             case Genivi.NAVIGATIONCORE_LOCALE:
@@ -78,10 +84,10 @@ NavigationAppHMIMenu {
 
     function updateLanguageAndUnits()
     {
-        var available_nav=Genivi.navigationcore_configuration_GetSupportedLocales(dbusIf);
-        var available_map=Genivi.mapviewer_configuration_GetSupportedLocales(dbusIf);
-        var current_nav=Genivi.navigationcore_configuration_GetLocale(dbusIf);
-        var current_map=Genivi.mapviewer_configuration_GetLocale(dbusIf);
+        var available_nav=Genivi.navigationcore_configuration_GetSupportedLocales(dbusIf,dltIf);
+        var available_map=Genivi.mapviewer_configuration_GetSupportedLocales(dbusIf,dltIf);
+        var current_nav=Genivi.navigationcore_configuration_GetLocale(dbusIf,dltIf);
+        var current_map=Genivi.mapviewer_configuration_GetLocale(dbusIf,dltIf);
         var current_lang_nav;
         var current_lang_map;
         var lang_nav=[];
@@ -115,12 +121,12 @@ NavigationAppHMIMenu {
         Genivi.setlang(current_nav[1],current_nav[3],current_nav[5]);
 
         var units1,units2;
-        var res=Genivi.navigationcore_configuration_GetUnitsOfMeasurement(dbusIf);
+        var res=Genivi.navigationcore_configuration_GetUnitsOfMeasurement(dbusIf,dltIf);
 
         if (res[1][1] == Genivi.NAVIGATIONCORE_LENGTH) {
             units1=res[1][3];
         }
-        var res1=Genivi.mapviewer_configuration_GetUnitsOfMeasurement(dbusIf);
+        var res1=Genivi.mapviewer_configuration_GetUnitsOfMeasurement(dbusIf,dltIf);
         if (res1[1][1] == Genivi.MAPVIEWER_LENGTH) {
             units2=res1[1][3];
         }
@@ -132,16 +138,16 @@ NavigationAppHMIMenu {
 
     function setLocale(language, country, script)
     {
-        Genivi.navigationcore_configuration_SetLocale(dbusIf,language,country,script);
-        Genivi.mapviewer_configuration_SetLocale(dbusIf,language,country,script);
+        Genivi.navigationcore_configuration_SetLocale(dbusIf,dltIf,language,country,script);
+        Genivi.mapviewer_configuration_SetLocale(dbusIf,dltIf,language,country,script);
         Genivi.setlang(language,country,script);
         pageOpen(menu.pagefile); //reload page because of texts...
     }
 
     function setUnitsLength(units1,units2)
     {
-        Genivi.navigationcore_configuration_SetUnitsOfMeasurementLength(dbusIf,units1);
-        Genivi.mapviewer_configuration_SetUnitsOfMeasurementLength(dbusIf,units2);
+        Genivi.navigationcore_configuration_SetUnitsOfMeasurementLength(dbusIf,dltIf,units1);
+        Genivi.mapviewer_configuration_SetUnitsOfMeasurementLength(dbusIf,dltIf,units2);
         updateLanguageAndUnits();
     }
 
@@ -155,8 +161,8 @@ NavigationAppHMIMenu {
 
     function updatePreferences()
     {
-        Genivi.routing_SetRoutePreferences(dbusIf,""); //preferences applied to all countries
-        var active=Genivi.routing_GetRoutePreferences(dbusIf,"");
+        Genivi.routing_SetRoutePreferences(dbusIf,dltIf,""); //preferences applied to all countries
+        var active=Genivi.routing_GetRoutePreferences(dbusIf,dltIf,"");
 
         var roadPreferenceList;
         var conditionPreferenceList;
@@ -482,14 +488,14 @@ NavigationAppHMIMenu {
 
     Component.onCompleted: {
         connectSignals();
-        Genivi.mapmatchedposition_SetSimulationMode(dbusIf,Genivi.simulationMode);
+        Genivi.mapmatchedposition_SetSimulationMode(dbusIf,dltIf,Genivi.simulationMode);
         if(Genivi.simulationMode===true) {
-            Genivi.mapmatchedposition_PauseSimulation(dbusIf);
+            Genivi.mapmatchedposition_PauseSimulation(dbusIf,dltIf);
         }
 
-        var res=Genivi.routing_GetCostModel(dbusIf);
+        var res=Genivi.routing_GetCostModel(dbusIf,dltIf);
         var costmodel=res[1];
-        var costModelsList=Genivi.routing_GetSupportedCostModels(dbusIf);
+        var costModelsList=Genivi.routing_GetSupportedCostModels(dbusIf,dltIf);
         for (var i = 0 ; i < costModelsList[1].length ; i+=2) {
             var button=Qt.createQmlObject('import QtQuick 2.1 ; import "Core"; StdButton { }',content,'dynamic');
             button.source=StyleSheet.cost_model[Constants.SOURCE];
@@ -504,7 +510,7 @@ NavigationAppHMIMenu {
             button.disabled=button.userdata == costmodel;
             button.clicked.connect(
                 function(what) {
-                    Genivi.routing_SetCostModel(dbusIf,what.userdata);
+                    Genivi.routing_SetCostModel(dbusIf,dltIf,what.userdata);
                     pageOpen(menu.pagefile); //reload the page
                 }
             );
diff --git a/src/hmi/qml/NavigationAppTripComputer.qml b/src/hmi/qml/NavigationAppTripComputer.qml
index f438613..9c9118c 100644
--- a/src/hmi/qml/NavigationAppTripComputer.qml
+++ b/src/hmi/qml/NavigationAppTripComputer.qml
@@ -30,19 +30,25 @@ import "Core/genivi.js" as Genivi;
 import "../style-sheets/style-constants.js" as Constants;
 import "../style-sheets/NavigationAppTripComputer-css.js" as StyleSheet;
 import lbs.plugin.dbusif 1.0
+import lbs.plugin.dltif 1.0
 
 NavigationAppHMIMenu {
 	id: menu
     property string pagefile:"NavigationAppTripComputer"
     property Item tripDataUpdatedSignal;
 
-	DBusIf {
+    DLTIf {
+        id:dltIf;
+        name: pagefile;
+    }
+
+    DBusIf {
 		id: dbusIf
 	}
 
     function tripDataUpdated(args)
     {
-        Genivi.hookSignal("tripDataUpdated");
+        Genivi.hookSignal(dltIf,"tripDataUpdated");
         updateTripMode();
     }
 
@@ -181,7 +187,7 @@ NavigationAppHMIMenu {
         var value;
         disableAllValue(); // By default set all the values to "--"
 		if (tripnr > 0) {         
-            res=Genivi.fuelstopadvisor_GetTripData(dbusIf,tripnr-1);
+            res=Genivi.fuelstopadvisor_GetTripData(dbusIf,dltIf,tripnr-1);
             for (var i = 0 ; i < res[1].length ; i+=4) {
                 if (res[1][i+1] == Genivi.FUELSTOPADVISOR_DISTANCE) {
                     value=res[1][i+3][3][1]/10;
@@ -197,7 +203,7 @@ NavigationAppHMIMenu {
                 }
 			}
 		} else {
-            res=Genivi.fuelstopadvisor_GetInstantData(dbusIf);
+            res=Genivi.fuelstopadvisor_GetInstantData(dbusIf,dltIf);
 			for (var i = 0 ; i < res[1].length ; i+=4) {
                 if (res[1][i+1] == Genivi.FUELSTOPADVISOR_FUEL_LEVEL) {
                     fuel_value.text=res[1][i+3][3][1];
@@ -393,10 +399,10 @@ NavigationAppHMIMenu {
             id:reset; text: Genivi.gettext("Reset");  disabled:false; next:select_trip1; prev:back;
             onClicked:{
 		if (Genivi.tripMode == "TRIP_NUMBER1") {
-            Genivi.fuelstopadvisor_ResetTripData(dbusIf,0);
+            Genivi.fuelstopadvisor_ResetTripData(dbusIf,dltIf,0);
 		}
 		if (Genivi.tripMode == "TRIP_NUMBER2") {
-            Genivi.fuelstopadvisor_ResetTripData(dbusIf,1);
+            Genivi.fuelstopadvisor_ResetTripData(dbusIf,dltIf,1);
 		}
     		updateTripMode();
             }
diff --git a/src/run b/src/run
index d74be41..1c0506d 100755
--- a/src/run
+++ b/src/run
@@ -166,7 +166,7 @@ VEHICLE_GATEWAY_BIN_DIR=$BIN_DIR/$VEHICLE_GATEWAY
 devices="/dev/ttyUSB0 /dev/ttyACM0"
 
 # options analysis
-while getopts a:c:df:g:lnoprvx opt
+while getopts a:c:df:g:hlnoprvx opt
 do
 	case $opt in
 	a) #select another hmi panel
@@ -226,13 +226,15 @@ do
 	x) #enable subprocess in a separate xterm
 		xterm=1
 		;;
-	\?)
+	h)
 		echo "Usage:"
-		echo "$0 [-a application][-c center][-glnoprvx]"
+		echo "$0 [-a application][-c center][-ghlnoprvx]"
 		echo "-a: Set application (default application.qml)"
 		echo "-c: Set center (supported values: paris,tokyo,longitude latitude). Default is geneve"
 		echo "-d: Run subprocesses within gdb (only with -x)"
+		echo "-f: Load another database (for poi)"
 		echo "-g: Run the vehicle gateway (only with -r) -g \"<ELM327device> <GNSSdevice>\""
+		echo "-h: Help"
 		echo "-l: Use layermanager"
 		echo "-n: Don't start enhanced positioning service"
 		echo "-o: Create log file of subprocess output"
diff --git a/src/update_third_party.sh b/src/update_third_party.sh
index 01f184f..4e9cfde 100755
--- a/src/update_third_party.sh
+++ b/src/update_third_party.sh
@@ -2,7 +2,7 @@
 
 navigation=0
 navit=0
-navigation_version='db252d95b806c7080c597a14b8011c9d8db0658d'
+navigation_version='14e7e553b2391915b50b2b990bf0d5a959fd5d01'
 positioning_version='9725fe1f553197042d6445997690d452a73490c0'
 navit_version='1e71b5fd4c0bf5ac96e5207c51db7d17057ed798'