Index: CloudConnect/CloudConnect.pro
===================================================================
diff -u -r51e99f2578e0901d9da91a4cb60d1b8858cfe971 -raaebfee335c74b0250864a6dce0555f866adadea
--- CloudConnect/CloudConnect.pro	(.../CloudConnect.pro)	(revision 51e99f2578e0901d9da91a4cb60d1b8858cfe971)
+++ CloudConnect/CloudConnect.pro	(.../CloudConnect.pro)	(revision aaebfee335c74b0250864a6dce0555f866adadea)
@@ -1,7 +1,7 @@
 TEMPLATE    = app
 TARGET      = CloudConnect
 CONFIG     += c++17 moc
-QT         += core network
+QT         += core network mqtt
 QT         -= gui
 
 QMAKE_CXXFLAGS += -Wall -Werror -Wextra
@@ -14,22 +14,22 @@
 LEAHI_MSG_CONF = $$PWD/../data/LeahiUnhandled.conf
 
 # Generate/update the Message-handling INI
-MSG_HANDLING_INI = $$PWD/config/LeahiMsgHandling.ini
+CAN_ROUTING_INI = $$PWD/config/LeahiCanRouting.ini
 
-gen_ini.target          = $$MSG_HANDLING_INI
+gen_ini.target          = $$CAN_ROUTING_INI
 gen_ini.depends         = \
     $$LEAHI_MSG_CONF \
+    $$MSGUTILS_SCRIPTS_DIR/GenerateCanRoutingIni.py \
     $$MSGUTILS_SCRIPTS_DIR/msgutils/MsgData.py \
-    $$MSGUTILS_SCRIPTS_DIR/msgutils/MsgHandlingIni.py \
-    $$MSGUTILS_SCRIPTS_DIR/GenerateMsgHandlingIni.py \
-    $$MSGUTILS_SCRIPTS_DIR/msgutils/templates/MsgHandlingIni.jinja
+    $$MSGUTILS_SCRIPTS_DIR/msgutils/CanRoutingIni.py \
+    $$MSGUTILS_SCRIPTS_DIR/msgutils/templates/CanRoutingIni.jinja
 gen_ini.commands        = \
     $$shell_quote($$PROJECT_PYTHON) \
-    $$MSGUTILS_SCRIPTS_DIR/GenerateMsgHandlingIni.py \
+    $$MSGUTILS_SCRIPTS_DIR/GenerateCanRoutingIni.py \
         $$LEAHI_MSG_CONF \
-        $$MSG_HANDLING_INI
+        $$CAN_ROUTING_INI
 QMAKE_EXTRA_TARGETS    += gen_ini
-PRE_TARGETDEPS         += $$MSG_HANDLING_INI
+PRE_TARGETDEPS         += $$CAN_ROUTING_INI
 
 HEADERS = \
     CloudConnectController.h