diff --git a/architecture.json b/architecture.json
index de5140392f11c8792bd73a655fe13558d8b9e54e..8d1ff54bc2c0b507b713ba5eafadfa229ba2694d 100644
--- a/architecture.json
+++ b/architecture.json
@@ -8,66 +8,6 @@
       },
       {
          "connections" : [
-            {
-               "from" : "e9861836-caed-4c19-87e2-13ba1a380613:/h/p/personID/expression",
-               "name" : "anonymous",
-               "to" : "bc526a14-c5aa-466e-ba5b-30a78b14d672:/h/p/personID",
-               "uuid" : "5dc5fa89-bcb0-457c-b062-01f7a8523c3b"
-            },
-            {
-               "from" : "a284bd3a-0273-4d81-89ce-bc8d042b2674:/camera_head/color/image_raw [sensor_msgs/Image]",
-               "name" : "anonymous",
-               "to" : "c9c1df26-7274-4765-8772-b06e15f87c3c:/camera_head/color/image_raw [sensor_msgs/Image]",
-               "uuid" : "8350e9d1-a6df-40bc-b74a-03efc53c5254"
-            },
-            {
-               "from" : "35d5af59-53e3-466c-874d-89131352c403:interaction state",
-               "name" : "anonymous",
-               "to" : "bc526a14-c5aa-466e-ba5b-30a78b14d672:robot state",
-               "uuid" : "0a79dcb8-dd0c-44de-ab5a-69905131ab0e"
-            },
-            {
-               "from" : "3cf3e598-266f-4c7b-bf1f-fd5cc48a7cd3:/h/v/voiceID/audio",
-               "name" : "anonymous",
-               "to" : "e9861836-caed-4c19-87e2-13ba1a380613:voices",
-               "uuid" : "bcf61ec7-9e2d-4b9b-a753-33f2a011e819"
-            },
-            {
-               "from" : "5e2b8998-87f5-46a0-b925-aa5ca3708b7e:/h/f/*/demographics [hri_msgs/AgeAndGender]",
-               "name" : "anonymous",
-               "to" : "35d5af59-53e3-466c-874d-89131352c403:demographics",
-               "uuid" : "8497fa30-5d68-4f2d-809d-c596395cc58f"
-            },
-            {
-               "from" : "dc52fa2f-b098-4f96-a830-eb329bcf282b:scene graph",
-               "name" : "anonymous",
-               "to" : "d4ce24fa-1d84-4929-b6b5-eab4994efeef:scene graph",
-               "uuid" : "b10cbc39-5513-44e6-81ef-1c010a9c940b"
-            },
-            {
-               "from" : "46e542fd-7a41-4d9a-b3fc-981a724bf538:GazeDirection",
-               "name" : "anonymous",
-               "to" : "9f0f2859-8e0e-4f48-829f-8d828cbab1d5:gaze direction",
-               "uuid" : "0de8cacd-26a8-4d65-b9d1-266658e3c74c"
-            },
-            {
-               "from" : "9ab39362-e233-44d2-9d06-dd24694446f2:next utterance",
-               "name" : "anonymous",
-               "to" : "a8fd53b3-bfe1-43fc-b95a-4c949042fa3d:speech output",
-               "uuid" : "426656f1-0bfe-4b24-b55c-f1fbe35d0f24"
-            },
-            {
-               "from" : "f24bbad8-6031-41f9-9ba3-56a4b3335ef9:/h/f/*/roi [hri_msgs/RegionOfInterestStamped]",
-               "name" : "anonymous",
-               "to" : "5e2b8998-87f5-46a0-b925-aa5ca3708b7e:/h/f/*/roi [hri_msgs/RegionOfInterestStamped]",
-               "uuid" : "b819aafe-995f-4dfa-9249-a5ac05b0eb87"
-            },
-            {
-               "from" : "bc526a14-c5aa-466e-ba5b-30a78b14d672:who to look at",
-               "name" : "anonymous",
-               "to" : "328fd73c-ead7-4b87-a815-401958fa77a2:look at",
-               "uuid" : "24403468-2363-4349-b05e-8800f239e890"
-            },
             {
                "from" : "48ed53a1-16b6-42b8-9c8f-6df5dce5b604:tf: /voice_id",
                "name" : "anonymous",
@@ -93,28 +33,34 @@
                "uuid" : "30e6e7f9-cf27-4ae4-b695-058b48809f98"
             },
             {
-               "from" : "814e358a-b568-4082-99f3-4629d35e7f2e:tf: /odom",
+               "from" : "46e542fd-7a41-4d9a-b3fc-981a724bf538:GazeDirection",
                "name" : "anonymous",
-               "to" : "1e291716-8134-4fd0-8bfa-0d910d026fec:localisation prior",
-               "uuid" : "b5c8c9c8-32a9-431a-ad91-a8c3f873bee5"
+               "to" : "d715b004-7177-4001-bd9d-725e87789c94:gaze direction",
+               "uuid" : "030d86be-bbbc-4e20-8ec6-07484f776a21"
             },
             {
-               "from" : "d4ce24fa-1d84-4929-b6b5-eab4994efeef:semantic description",
+               "from" : "b357b248-d5a8-445d-9c09-5c567d074966:[TBD] /detected_objects [spring_msgs/Objects]",
                "name" : "anonymous",
-               "to" : "35d5af59-53e3-466c-874d-89131352c403:semantic scene description",
-               "uuid" : "c8b7ebbb-8ba7-4c32-9b99-76a5806b9e3b"
+               "to" : "d4ce24fa-1d84-4929-b6b5-eab4994efeef:scene graph",
+               "uuid" : "9c1781a3-c390-4628-acdc-cc8617942046"
             },
             {
-               "from" : "35d5af59-53e3-466c-874d-89131352c403:interaction state",
+               "from" : "bc526a14-c5aa-466e-ba5b-30a78b14d672:active personID",
                "name" : "anonymous",
-               "to" : "9ab39362-e233-44d2-9d06-dd24694446f2:interaction messages",
-               "uuid" : "ed16d30f-ff2e-4f62-b96d-ba128166c0f6"
+               "to" : "a8fd53b3-bfe1-43fc-b95a-4c949042fa3d:speech input",
+               "uuid" : "edb7145b-77e7-463a-8b29-f8f2df17cfee"
             },
             {
-               "from" : "9ab39362-e233-44d2-9d06-dd24694446f2:DialogueState",
+               "from" : "b357b248-d5a8-445d-9c09-5c567d074966:[TBD] /detected_objects [spring_msgs/Objects]",
                "name" : "anonymous",
-               "to" : "bc526a14-c5aa-466e-ba5b-30a78b14d672:dialogue state",
-               "uuid" : "edb67b60-5748-4e4f-bc1c-66f386b4a870"
+               "to" : "dc52fa2f-b098-4f96-a830-eb329bcf282b:detected_objects",
+               "uuid" : "7c0fa9d2-5c6c-402b-bc90-78d2f32807e5"
+            },
+            {
+               "from" : "1929373a-59ae-474d-bc1b-a2d0be2417cd:/camera_torso/color/image_raw [sensor_msgs/Image]",
+               "name" : "anonymous",
+               "to" : "1e291716-8134-4fd0-8bfa-0d910d026fec:/camera_torso/color/image_torso [sensor_msgs/Image]",
+               "uuid" : "e7e489c0-507d-4ddb-97fd-a397ca6a74a0"
             },
             {
                "from" : "43da963c-18a8-4ad7-86f6-f361a9d25d36:/h/p/personID/...",
@@ -141,28 +87,34 @@
                "uuid" : "467474d3-a155-434e-9203-4a9fe8b18b84"
             },
             {
-               "from" : "35d5af59-53e3-466c-874d-89131352c403:nav goals",
+               "from" : "e9861836-caed-4c19-87e2-13ba1a380613:/h/p/personID/expression",
                "name" : "anonymous",
-               "to" : "328fd73c-ead7-4b87-a815-401958fa77a2:following/nav goals",
-               "uuid" : "8349f12e-ea96-4d0d-a315-1ad231539936"
+               "to" : "bc526a14-c5aa-466e-ba5b-30a78b14d672:/h/p/personID",
+               "uuid" : "5dc5fa89-bcb0-457c-b062-01f7a8523c3b"
             },
             {
-               "from" : "1e291716-8134-4fd0-8bfa-0d910d026fec:dense 3d map",
+               "from" : "d609252f-2fd4-4439-86c3-ece9fd387a3a:/h/b/*/roi [hri_msgs/RegionOfInterestStamped]",
                "name" : "anonymous",
-               "to" : "b62de7f5-7899-48fd-a64d-3226e68bb21f:dense 3d map",
-               "uuid" : "24a4329e-5669-4cd5-bc57-08fbb0c1f859"
+               "to" : "4071a411-0acc-401d-8bbb-bb47fdc00697:people RoIs",
+               "uuid" : "5f1d7cad-c4ba-4c81-a411-241505837aa1"
             },
             {
-               "from" : "3e7d7601-34c6-4975-9e36-f50968f141b2:/audio/raw_audio [respeaker_ros/RawAudioData]",
+               "from" : "3cf3e598-266f-4c7b-bf1f-fd5cc48a7cd3:/h/v/voiceID/audio",
                "name" : "anonymous",
-               "to" : "3cf3e598-266f-4c7b-bf1f-fd5cc48a7cd3:input",
-               "uuid" : "725d3768-1e9d-4591-8590-c2ad18a22db6"
+               "to" : "49998d33-7c64-4557-b1c9-56b241b59600:input",
+               "uuid" : "e0f50043-61b7-4e94-a91e-f9a4f519e511"
             },
             {
-               "from" : "49998d33-7c64-4557-b1c9-56b241b59600:/h/v/voiceID/speech",
+               "from" : "b62de7f5-7899-48fd-a64d-3226e68bb21f:/map_refined [nav_msgs/OccupancyGrid]",
                "name" : "anonymous",
-               "to" : "a8fd53b3-bfe1-43fc-b95a-4c949042fa3d:speech input",
-               "uuid" : "db3221a7-783a-4ffb-9ca2-8d074e9706fd"
+               "to" : "328fd73c-ead7-4b87-a815-401958fa77a2:occupancy map",
+               "uuid" : "fd48565b-cdbc-4fcd-a5fd-f3983311a074"
+            },
+            {
+               "from" : "f24bbad8-6031-41f9-9ba3-56a4b3335ef9:/h/f/*/roi [hri_msgs/RegionOfInterestStamped]",
+               "name" : "anonymous",
+               "to" : "e9861836-caed-4c19-87e2-13ba1a380613:faces",
+               "uuid" : "a2a69657-28ce-4f09-96d3-d68d1f73dced"
             },
             {
                "from" : "d609252f-2fd4-4439-86c3-ece9fd387a3a:/h/b/*/roi [hri_msgs/RegionOfInterestStamped]",
@@ -188,6 +140,30 @@
                "to" : "43da963c-18a8-4ad7-86f6-f361a9d25d36:demographics",
                "uuid" : "524ee896-7eeb-4b36-96f8-e03fa454f837"
             },
+            {
+               "from" : "814e358a-b568-4082-99f3-4629d35e7f2e:tf: /odom",
+               "name" : "anonymous",
+               "to" : "1e291716-8134-4fd0-8bfa-0d910d026fec:localisation prior",
+               "uuid" : "b5c8c9c8-32a9-431a-ad91-a8c3f873bee5"
+            },
+            {
+               "from" : "d4ce24fa-1d84-4929-b6b5-eab4994efeef:semantic description",
+               "name" : "anonymous",
+               "to" : "35d5af59-53e3-466c-874d-89131352c403:semantic scene description",
+               "uuid" : "c8b7ebbb-8ba7-4c32-9b99-76a5806b9e3b"
+            },
+            {
+               "from" : "35d5af59-53e3-466c-874d-89131352c403:interaction state",
+               "name" : "anonymous",
+               "to" : "9ab39362-e233-44d2-9d06-dd24694446f2:interaction messages",
+               "uuid" : "ed16d30f-ff2e-4f62-b96d-ba128166c0f6"
+            },
+            {
+               "from" : "9ab39362-e233-44d2-9d06-dd24694446f2:DialogueState",
+               "name" : "anonymous",
+               "to" : "bc526a14-c5aa-466e-ba5b-30a78b14d672:dialogue state",
+               "uuid" : "edb67b60-5748-4e4f-bc1c-66f386b4a870"
+            },
             {
                "from" : "328fd73c-ead7-4b87-a815-401958fa77a2:low-level actions",
                "name" : "anonymous",
@@ -261,28 +237,52 @@
                "uuid" : "438c370d-ac3d-4bce-a3b1-288ac9d99671"
             },
             {
-               "from" : "d609252f-2fd4-4439-86c3-ece9fd387a3a:/h/b/*/roi [hri_msgs/RegionOfInterestStamped]",
+               "from" : "a284bd3a-0273-4d81-89ce-bc8d042b2674:/camera_head/color/image_raw [sensor_msgs/Image]",
                "name" : "anonymous",
-               "to" : "4071a411-0acc-401d-8bbb-bb47fdc00697:people RoIs",
-               "uuid" : "5f1d7cad-c4ba-4c81-a411-241505837aa1"
+               "to" : "4071a411-0acc-401d-8bbb-bb47fdc00697:ground plane",
+               "uuid" : "bc98685f-cced-4a13-9b13-6590f31fc577"
             },
             {
-               "from" : "3cf3e598-266f-4c7b-bf1f-fd5cc48a7cd3:/h/v/voiceID/audio",
+               "from" : "43da963c-18a8-4ad7-86f6-f361a9d25d36:/h/p/personID/...",
                "name" : "anonymous",
-               "to" : "49998d33-7c64-4557-b1c9-56b241b59600:input",
-               "uuid" : "e0f50043-61b7-4e94-a91e-f9a4f519e511"
+               "to" : "bc526a14-c5aa-466e-ba5b-30a78b14d672:/h/p/personID",
+               "uuid" : "9c3a70db-3bc2-46bb-9af3-2402bf296ceb"
             },
             {
-               "from" : "b62de7f5-7899-48fd-a64d-3226e68bb21f:/map_refined [nav_msgs/OccupancyGrid]",
+               "from" : "bc526a14-c5aa-466e-ba5b-30a78b14d672:gestures",
                "name" : "anonymous",
-               "to" : "328fd73c-ead7-4b87-a815-401958fa77a2:occupancy map",
-               "uuid" : "fd48565b-cdbc-4fcd-a5fd-f3983311a074"
+               "to" : "20eb61ac-3243-41ed-b855-451cd88e4ae5:input",
+               "uuid" : "1b666d89-6a0a-46bb-9b96-72e8a7cbe369"
             },
             {
                "from" : "f24bbad8-6031-41f9-9ba3-56a4b3335ef9:/h/f/*/roi [hri_msgs/RegionOfInterestStamped]",
                "name" : "anonymous",
-               "to" : "e9861836-caed-4c19-87e2-13ba1a380613:faces",
-               "uuid" : "a2a69657-28ce-4f09-96d3-d68d1f73dced"
+               "to" : "8a4e7f8e-3ade-4e30-9f41-1bfeee90055b:/h/f/*/roi [hri_msgs/RegionOfInterestStamped]",
+               "uuid" : "c379435f-7cba-4ecc-9b49-405379374dfe"
+            },
+            {
+               "from" : "a284bd3a-0273-4d81-89ce-bc8d042b2674:/camera_head/color/image_raw [sensor_msgs/Image]",
+               "name" : "anonymous",
+               "to" : "46e542fd-7a41-4d9a-b3fc-981a724bf538:images",
+               "uuid" : "b3a71142-345b-4c68-b172-a31a74ba1626"
+            },
+            {
+               "from" : "43da963c-18a8-4ad7-86f6-f361a9d25d36:tf: /person_id",
+               "name" : "anonymous",
+               "to" : "cea219fc-27ef-457e-8e99-3540074dc430:input",
+               "uuid" : "4236dfb6-3852-45d6-a061-05af75a502cf"
+            },
+            {
+               "from" : "f6a0a5cf-aee4-4220-a3d1-ac219aaa3104:/tts/feedback",
+               "name" : "anonymous",
+               "to" : "a8fd53b3-bfe1-43fc-b95a-4c949042fa3d:/tts/feedback",
+               "uuid" : "d18bf8c0-9a5e-478d-9d8a-a6ebc5ac0188"
+            },
+            {
+               "from" : "49998d33-7c64-4557-b1c9-56b241b59600:/h/v/voiceID/speech",
+               "name" : "anonymous",
+               "to" : "9ab39362-e233-44d2-9d06-dd24694446f2:speech",
+               "uuid" : "ffdb876d-4113-4a72-808d-a0a624d50ca7"
             },
             {
                "from" : "3cf3e598-266f-4c7b-bf1f-fd5cc48a7cd3:/h/v/voiceID/audio",
@@ -309,153 +309,208 @@
                "uuid" : "fc419899-3ae9-4c37-93e0-39a8ea402c21"
             },
             {
-               "from" : "a284bd3a-0273-4d81-89ce-bc8d042b2674:/camera_head/color/image_raw [sensor_msgs/Image]",
+               "from" : "46e542fd-7a41-4d9a-b3fc-981a724bf538:GazeDirection",
                "name" : "anonymous",
-               "to" : "4071a411-0acc-401d-8bbb-bb47fdc00697:ground plane",
-               "uuid" : "bc98685f-cced-4a13-9b13-6590f31fc577"
+               "to" : "9f0f2859-8e0e-4f48-829f-8d828cbab1d5:gaze direction",
+               "uuid" : "0de8cacd-26a8-4d65-b9d1-266658e3c74c"
             },
             {
-               "from" : "43da963c-18a8-4ad7-86f6-f361a9d25d36:/h/p/personID/...",
+               "from" : "9ab39362-e233-44d2-9d06-dd24694446f2:next utterance",
                "name" : "anonymous",
-               "to" : "bc526a14-c5aa-466e-ba5b-30a78b14d672:/h/p/personID",
-               "uuid" : "9c3a70db-3bc2-46bb-9af3-2402bf296ceb"
+               "to" : "a8fd53b3-bfe1-43fc-b95a-4c949042fa3d:speech output",
+               "uuid" : "426656f1-0bfe-4b24-b55c-f1fbe35d0f24"
             },
             {
-               "from" : "bc526a14-c5aa-466e-ba5b-30a78b14d672:gestures",
+               "from" : "f24bbad8-6031-41f9-9ba3-56a4b3335ef9:/h/f/*/roi [hri_msgs/RegionOfInterestStamped]",
                "name" : "anonymous",
-               "to" : "20eb61ac-3243-41ed-b855-451cd88e4ae5:input",
-               "uuid" : "1b666d89-6a0a-46bb-9b96-72e8a7cbe369"
+               "to" : "5e2b8998-87f5-46a0-b925-aa5ca3708b7e:/h/f/*/roi [hri_msgs/RegionOfInterestStamped]",
+               "uuid" : "b819aafe-995f-4dfa-9249-a5ac05b0eb87"
             },
             {
-               "from" : "f24bbad8-6031-41f9-9ba3-56a4b3335ef9:/h/f/*/roi [hri_msgs/RegionOfInterestStamped]",
+               "from" : "bc526a14-c5aa-466e-ba5b-30a78b14d672:who to look at",
                "name" : "anonymous",
-               "to" : "8a4e7f8e-3ade-4e30-9f41-1bfeee90055b:/h/f/*/roi [hri_msgs/RegionOfInterestStamped]",
-               "uuid" : "c379435f-7cba-4ecc-9b49-405379374dfe"
+               "to" : "328fd73c-ead7-4b87-a815-401958fa77a2:look at",
+               "uuid" : "24403468-2363-4349-b05e-8800f239e890"
             },
             {
-               "from" : "46e542fd-7a41-4d9a-b3fc-981a724bf538:GazeDirection",
+               "from" : "35d5af59-53e3-466c-874d-89131352c403:nav goals",
                "name" : "anonymous",
-               "to" : "d715b004-7177-4001-bd9d-725e87789c94:gaze direction",
-               "uuid" : "030d86be-bbbc-4e20-8ec6-07484f776a21"
+               "to" : "328fd73c-ead7-4b87-a815-401958fa77a2:following/nav goals",
+               "uuid" : "8349f12e-ea96-4d0d-a315-1ad231539936"
             },
             {
-               "from" : "b357b248-d5a8-445d-9c09-5c567d074966:[TBD] /detected_objects [spring_msgs/Objects]",
+               "from" : "1e291716-8134-4fd0-8bfa-0d910d026fec:dense 3d map",
                "name" : "anonymous",
-               "to" : "d4ce24fa-1d84-4929-b6b5-eab4994efeef:scene graph",
-               "uuid" : "9c1781a3-c390-4628-acdc-cc8617942046"
+               "to" : "b62de7f5-7899-48fd-a64d-3226e68bb21f:dense 3d map",
+               "uuid" : "24a4329e-5669-4cd5-bc57-08fbb0c1f859"
             },
             {
-               "from" : "bc526a14-c5aa-466e-ba5b-30a78b14d672:active personID",
+               "from" : "3e7d7601-34c6-4975-9e36-f50968f141b2:/audio/raw_audio [respeaker_ros/RawAudioData]",
                "name" : "anonymous",
-               "to" : "a8fd53b3-bfe1-43fc-b95a-4c949042fa3d:speech input",
-               "uuid" : "edb7145b-77e7-463a-8b29-f8f2df17cfee"
+               "to" : "3cf3e598-266f-4c7b-bf1f-fd5cc48a7cd3:input",
+               "uuid" : "725d3768-1e9d-4591-8590-c2ad18a22db6"
             },
             {
-               "from" : "b357b248-d5a8-445d-9c09-5c567d074966:[TBD] /detected_objects [spring_msgs/Objects]",
+               "from" : "49998d33-7c64-4557-b1c9-56b241b59600:/h/v/voiceID/speech",
                "name" : "anonymous",
-               "to" : "dc52fa2f-b098-4f96-a830-eb329bcf282b:detected_objects",
-               "uuid" : "7c0fa9d2-5c6c-402b-bc90-78d2f32807e5"
+               "to" : "a8fd53b3-bfe1-43fc-b95a-4c949042fa3d:speech input",
+               "uuid" : "db3221a7-783a-4ffb-9ca2-8d074e9706fd"
             },
             {
                "from" : "a284bd3a-0273-4d81-89ce-bc8d042b2674:/camera_head/color/image_raw [sensor_msgs/Image]",
                "name" : "anonymous",
-               "to" : "46e542fd-7a41-4d9a-b3fc-981a724bf538:images",
-               "uuid" : "b3a71142-345b-4c68-b172-a31a74ba1626"
+               "to" : "c9c1df26-7274-4765-8772-b06e15f87c3c:/camera_head/color/image_raw [sensor_msgs/Image]",
+               "uuid" : "8350e9d1-a6df-40bc-b74a-03efc53c5254"
             },
             {
-               "from" : "43da963c-18a8-4ad7-86f6-f361a9d25d36:tf: /person_id",
+               "from" : "35d5af59-53e3-466c-874d-89131352c403:interaction state",
                "name" : "anonymous",
-               "to" : "cea219fc-27ef-457e-8e99-3540074dc430:input",
-               "uuid" : "4236dfb6-3852-45d6-a061-05af75a502cf"
+               "to" : "bc526a14-c5aa-466e-ba5b-30a78b14d672:robot state",
+               "uuid" : "0a79dcb8-dd0c-44de-ab5a-69905131ab0e"
             },
             {
-               "from" : "f6a0a5cf-aee4-4220-a3d1-ac219aaa3104:/tts/feedback",
+               "from" : "3cf3e598-266f-4c7b-bf1f-fd5cc48a7cd3:/h/v/voiceID/audio",
                "name" : "anonymous",
-               "to" : "a8fd53b3-bfe1-43fc-b95a-4c949042fa3d:/tts/feedback",
-               "uuid" : "d18bf8c0-9a5e-478d-9d8a-a6ebc5ac0188"
+               "to" : "e9861836-caed-4c19-87e2-13ba1a380613:voices",
+               "uuid" : "bcf61ec7-9e2d-4b9b-a753-33f2a011e819"
             },
             {
-               "from" : "49998d33-7c64-4557-b1c9-56b241b59600:/h/v/voiceID/speech",
+               "from" : "5e2b8998-87f5-46a0-b925-aa5ca3708b7e:/h/f/*/demographics [hri_msgs/AgeAndGender]",
                "name" : "anonymous",
-               "to" : "9ab39362-e233-44d2-9d06-dd24694446f2:speech",
-               "uuid" : "ffdb876d-4113-4a72-808d-a0a624d50ca7"
+               "to" : "35d5af59-53e3-466c-874d-89131352c403:demographics",
+               "uuid" : "8497fa30-5d68-4f2d-809d-c596395cc58f"
             },
             {
-               "from" : "1929373a-59ae-474d-bc1b-a2d0be2417cd:/camera_torso/color/image_raw [sensor_msgs/Image]",
+               "from" : "dc52fa2f-b098-4f96-a830-eb329bcf282b:scene graph",
                "name" : "anonymous",
-               "to" : "1e291716-8134-4fd0-8bfa-0d910d026fec:/camera_torso/color/image_torso [sensor_msgs/Image]",
-               "uuid" : "e7e489c0-507d-4ddb-97fd-a397ca6a74a0"
+               "to" : "d4ce24fa-1d84-4929-b6b5-eab4994efeef:scene graph",
+               "uuid" : "b10cbc39-5513-44e6-81ef-1c010a9c940b"
             }
          ],
          "description" : "EU H2020 SPRING architecture",
          "name" : "SPRING architecture",
          "nodes" : [
             {
-               "cognitive_function" : "HWU",
-               "name" : "MOCK: Scene understanding [internal HWU, to clarify]",
+               "label" : "HWU",
+               "name" : "MOCK: Dialogue manager",
                "ports" : [
                   {
-                     "direction" : "out",
-                     "name" : "semantic description"
+                     "direction" : "in",
+                     "name" : "interaction messages"
                   },
                   {
                      "direction" : "in",
-                     "name" : "scene graph"
+                     "name" : "speech"
+                  },
+                  {
+                     "direction" : "out",
+                     "name" : "next utterance"
+                  },
+                  {
+                     "direction" : "out",
+                     "name" : "DialogueState"
                   }
                ],
-               "position" : [ 2140, 1880 ],
-               "size" : [ 400, 120 ],
-               "uuid" : "d4ce24fa-1d84-4929-b6b5-eab4994efeef"
+               "position" : [ 2620, 180 ],
+               "size" : [ 240, 169 ],
+               "uuid" : "9ab39362-e233-44d2-9d06-dd24694446f2"
             },
             {
-               "cognitive_function" : "INRIA",
-               "name" : "MOCK: Person manager",
+               "label" : "PAL",
+               "name" : "MOCK: ORB SLAM",
                "ports" : [
                   {
-                     "direction" : "in",
-                     "name" : "TF (faces)"
+                     "direction" : "out",
+                     "name" : "/map [nav_msgs/OccupancyGrid]"
                   },
                   {
                      "direction" : "out",
-                     "name" : "/h/p/personID/..."
+                     "name" : "tf: /odom"
+                  },
+                  {
+                     "direction" : "in",
+                     "name" : "/camera_torso/color/image_raw [sensor_msgs/Image]"
+                  }
+               ],
+               "position" : [ 140, 1500 ],
+               "size" : [ 400, 140 ],
+               "uuid" : "814e358a-b568-4082-99f3-4629d35e7f2e"
+            },
+            {
+               "label" : "UNITN",
+               "name" : "MOCK: Face detection",
+               "ports" : [
+                  {
+                     "direction" : "in",
+                     "name" : "/camera_head/color/image_raw [sensor_msgs/Image]"
                   },
                   {
                      "direction" : "out",
-                     "name" : "tf: /person_id"
+                     "name" : "/h/f/*/roi [hri_msgs/RegionOfInterestStamped]"
+                  }
+               ],
+               "position" : [ 520, 940 ],
+               "size" : [ 400, 120 ],
+               "uuid" : "f24bbad8-6031-41f9-9ba3-56a4b3335ef9"
+            },
+            {
+               "label" : "Other",
+               "name" : "TF",
+               "ports" : [
+                  {
+                     "direction" : "in",
+                     "name" : "input"
+                  }
+               ],
+               "position" : [ 1960, 60 ],
+               "size" : [ 160, 120 ],
+               "uuid" : "2ded2b25-08c5-4cdd-9741-af9a0316c1ae"
+            },
+            {
+               "label" : "ERM",
+               "name" : "MOCK: Robot GUI [tablet]",
+               "ports" : [
+                  {
+                     "direction" : "in",
+                     "name" : "additional support material"
                   },
                   {
                      "direction" : "in",
-                     "name" : "TF (voices)"
+                     "name" : "/tts/feedback"
                   },
                   {
                      "direction" : "in",
-                     "name" : "matchers"
+                     "name" : "speech output"
                   },
                   {
                      "direction" : "in",
-                     "name" : "demographics"
+                     "name" : "speech input"
                   }
                ],
-               "position" : [ 1660, 1040 ],
-               "size" : [ 260, 276 ],
-               "uuid" : "43da963c-18a8-4ad7-86f6-f361a9d25d36"
+               "position" : [ 4520, 400 ],
+               "size" : [ 400, 180 ],
+               "uuid" : "a8fd53b3-bfe1-43fc-b95a-4c949042fa3d"
             },
             {
-               "cognitive_function" : "Other",
-               "name" : "TF",
+               "label" : "INRIA",
+               "name" : "MOCK: Multi-people tracker",
                "ports" : [
                   {
                      "direction" : "in",
-                     "name" : "input"
+                     "name" : "/camera_head/color/image_raw [sensor_msgs/Image]"
+                  },
+                  {
+                     "direction" : "out",
+                     "name" : "/h/b/*/roi [hri_msgs/RegionOfInterestStamped]"
                   }
                ],
-               "position" : [ 1100, 1600 ],
-               "size" : [ 120, 60 ],
-               "uuid" : "e4848564-4b20-4667-b107-b1abe9b97cb5"
+               "position" : [ 580, 1260 ],
+               "size" : [ 440, 120 ],
+               "uuid" : "d609252f-2fd4-4439-86c3-ece9fd387a3a"
             },
             {
-               "cognitive_function" : "PAL",
-               "name" : "MOCK: Speech synthesis",
+               "label" : "HWU",
+               "name" : "MOCK: Robot utterances [passthrough]",
                "ports" : [
                   {
                      "direction" : "in",
@@ -463,15 +518,49 @@
                   },
                   {
                      "direction" : "out",
-                     "name" : "/tts/feedback"
+                     "name" : "speech"
                   }
                ],
-               "position" : [ 4100, 600 ],
-               "size" : [ 160, 120 ],
-               "uuid" : "f6a0a5cf-aee4-4220-a3d1-ac219aaa3104"
+               "position" : [ 3700, 540 ],
+               "size" : [ 300, 120 ],
+               "uuid" : "c05b65cc-b421-49e5-b180-0ab31ca1ee7b"
+            },
+            {
+               "label" : "BIU",
+               "name" : "MOCK: Speech diarization",
+               "ports" : [
+                  {
+                     "direction" : "out",
+                     "name" : "/h/v/voiceID/audio"
+                  },
+                  {
+                     "direction" : "in",
+                     "name" : "input"
+                  }
+               ],
+               "position" : [ 1300, 320 ],
+               "size" : [ 220, 120 ],
+               "uuid" : "3cf3e598-266f-4c7b-bf1f-fd5cc48a7cd3"
+            },
+            {
+               "label" : "UNITN",
+               "name" : "MOCK: Demographics [age/gender]",
+               "ports" : [
+                  {
+                     "direction" : "out",
+                     "name" : "/h/f/*/demographics [hri_msgs/AgeAndGender]"
+                  },
+                  {
+                     "direction" : "in",
+                     "name" : "/h/f/*/roi [hri_msgs/RegionOfInterestStamped]"
+                  }
+               ],
+               "position" : [ 860, 800 ],
+               "size" : [ 320, 120 ],
+               "uuid" : "5e2b8998-87f5-46a0-b925-aa5ca3708b7e"
             },
             {
-               "cognitive_function" : "CVUT",
+               "label" : "CVUT",
                "name" : "MOCK: Visual SLAM + 3D map",
                "ports" : [
                   {
@@ -500,7 +589,7 @@
                "uuid" : "1e291716-8134-4fd0-8bfa-0d910d026fec"
             },
             {
-               "cognitive_function" : "CVUT",
+               "label" : "CVUT",
                "name" : "MOCK: Occupancy map",
                "ports" : [
                   {
@@ -521,7 +610,7 @@
                "uuid" : "b62de7f5-7899-48fd-a64d-3226e68bb21f"
             },
             {
-               "cognitive_function" : "BIU",
+               "label" : "BIU",
                "name" : "MOCK: Sound localisation",
                "ports" : [
                   {
@@ -538,74 +627,24 @@
                "uuid" : "48ed53a1-16b6-42b8-9c8f-6df5dce5b604"
             },
             {
-               "cognitive_function" : "UNITN",
-               "name" : "MOCK: User attention",
+               "label" : "INRIA",
+               "name" : "MOCK: ROS openpose [used by INRIA]",
                "ports" : [
-                  {
-                     "direction" : "out",
-                     "name" : "[?] output"
-                  },
-                  {
-                     "direction" : "in",
-                     "name" : "TF (persons)"
-                  },
-                  {
-                     "direction" : "in",
-                     "name" : "TF (bodies)"
-                  },
-                  {
-                     "direction" : "in",
-                     "name" : "gaze direction"
-                  },
                   {
                      "direction" : "in",
                      "name" : "input"
                   },
-                  {
-                     "direction" : "in",
-                     "name" : "TF (faces)"
-                  },
-                  {
-                     "direction" : "out",
-                     "name" : "current attentive person"
-                  }
-               ],
-               "position" : [ 3300, 600 ],
-               "size" : [ 260, 276 ],
-               "uuid" : "9f0f2859-8e0e-4f48-829f-8d828cbab1d5"
-            },
-            {
-               "cognitive_function" : "PAL",
-               "name" : "MOCK: RGB-D + camera_info",
-               "ports" : [
-                  {
-                     "direction" : "out",
-                     "name" : "/camera_torso/color/image_raw [sensor_msgs/Image]"
-                  }
-               ],
-               "position" : [ -140, 1200 ],
-               "size" : [ 440, 120 ],
-               "uuid" : "1929373a-59ae-474d-bc1b-a2d0be2417cd"
-            },
-            {
-               "cognitive_function" : "UNITN",
-               "name" : "MOCK: F-formation",
-               "ports" : [
-                  {
-                     "direction" : "in",
-                     "name" : "tf: /person_id"
-                  },
                   {
                      "direction" : "out",
-                     "name" : "/h/i/groups [hri_msgs/GroupsStamped]"
+                     "name" : "output"
                   }
                ],
-               "position" : [ 2820, 940 ],
-               "size" : [ 300, 160 ],
-               "uuid" : "4a610776-d94b-4f35-9871-b835e8e0faf7"
+               "position" : [ 760, 440 ],
+               "size" : [ 300, 120 ],
+               "uuid" : "b600af28-8f8a-4da9-89df-12b621f45244"
             },
             {
-               "cognitive_function" : "INRIA",
+               "label" : "INRIA",
                "name" : "MOCK: People 3D tracker [position/orientation]",
                "ports" : [
                   {
@@ -630,7 +669,7 @@
                "uuid" : "4071a411-0acc-401d-8bbb-bb47fdc00697"
             },
             {
-               "cognitive_function" : "Other",
+               "label" : "Other",
                "name" : "TF",
                "ports" : [
                   {
@@ -643,93 +682,41 @@
                "uuid" : "709731e0-4ed1-4681-8f7f-7a96a622db37"
             },
             {
-               "cognitive_function" : "BIU",
-               "name" : "MOCK: ASR",
+               "label" : "INRIA",
+               "name" : "MOCK: Person manager",
                "ports" : [
-                  {
-                     "direction" : "out",
-                     "name" : "/h/v/voiceID/speech"
-                  },
                   {
                      "direction" : "in",
-                     "name" : "input"
-                  }
-               ],
-               "position" : [ 1700, 220 ],
-               "size" : [ 180, 140 ],
-               "uuid" : "49998d33-7c64-4557-b1c9-56b241b59600"
-            },
-            {
-               "cognitive_function" : "PAL",
-               "name" : "MOCK: Fisheye stereo + RGB head",
-               "ports" : [
+                     "name" : "TF (faces)"
+                  },
                   {
                      "direction" : "out",
-                     "name" : "/camera_head/color/image_raw [sensor_msgs/Image]"
-                  }
-               ],
-               "position" : [ -100, 1040 ],
-               "size" : [ 398, 120 ],
-               "uuid" : "a284bd3a-0273-4d81-89ce-bc8d042b2674"
-            },
-            {
-               "cognitive_function" : "UNITN",
-               "name" : "MOCK: User gaze",
-               "ports" : [
+                     "name" : "/h/p/personID/..."
+                  },
                   {
                      "direction" : "out",
-                     "name" : "GazeDirection"
+                     "name" : "tf: /person_id"
                   },
                   {
                      "direction" : "in",
-                     "name" : "TF (faces)"
+                     "name" : "TF (voices)"
                   },
                   {
                      "direction" : "in",
-                     "name" : "images"
+                     "name" : "matchers"
+                  },
+                  {
+                     "direction" : "in",
+                     "name" : "demographics"
                   }
                ],
-               "position" : [ 2920, 740 ],
-               "size" : [ 160, 144 ],
-               "uuid" : "46e542fd-7a41-4d9a-b3fc-981a724bf538"
+               "position" : [ 1660, 1040 ],
+               "size" : [ 260, 276 ],
+               "uuid" : "43da963c-18a8-4ad7-86f6-f361a9d25d36"
             },
             {
-               "cognitive_function" : "BIU",
-               "name" : "MOCK: Speech diarization",
-               "ports" : [
-                  {
-                     "direction" : "out",
-                     "name" : "/h/v/voiceID/audio"
-                  },
-                  {
-                     "direction" : "in",
-                     "name" : "input"
-                  }
-               ],
-               "position" : [ 1300, 320 ],
-               "size" : [ 220, 120 ],
-               "uuid" : "3cf3e598-266f-4c7b-bf1f-fd5cc48a7cd3"
-            },
-            {
-               "cognitive_function" : "UNITN",
-               "name" : "MOCK: Demographics [age/gender]",
-               "ports" : [
-                  {
-                     "direction" : "out",
-                     "name" : "/h/f/*/demographics [hri_msgs/AgeAndGender]"
-                  },
-                  {
-                     "direction" : "in",
-                     "name" : "/h/f/*/roi [hri_msgs/RegionOfInterestStamped]"
-                  }
-               ],
-               "position" : [ 860, 800 ],
-               "size" : [ 320, 120 ],
-               "uuid" : "5e2b8998-87f5-46a0-b925-aa5ca3708b7e"
-            },
-            {
-               "cognitive_function" : "INRIA",
-               "name" : "MOCK: Robot non-verbal behaviours",
+               "label" : "INRIA",
+               "name" : "MOCK: Robot non-verbal behaviours",
                "ports" : [
                   {
                      "direction" : "in",
@@ -765,34 +752,13 @@
                "uuid" : "328fd73c-ead7-4b87-a815-401958fa77a2"
             },
             {
-               "cognitive_function" : "UNITN",
-               "name" : "MOCK: Non-verbal behaviours",
+               "label" : "HWU",
+               "name" : "MOCK: Interaction manager",
                "ports" : [
-                  {
-                     "direction" : "in",
-                     "name" : "voices"
-                  },
                   {
                      "direction" : "out",
-                     "name" : "/h/p/personID/expression"
-                  },
-                  {
-                     "direction" : "in",
-                     "name" : "face/voice mapping"
+                     "name" : "verbal command"
                   },
-                  {
-                     "direction" : "in",
-                     "name" : "faces"
-                  }
-               ],
-               "position" : [ 2260, 580 ],
-               "size" : [ 240, 177 ],
-               "uuid" : "e9861836-caed-4c19-87e2-13ba1a380613"
-            },
-            {
-               "cognitive_function" : "HWU",
-               "name" : "MOCK: Interaction manager",
-               "ports" : [
                   {
                      "direction" : "out",
                      "name" : "nav goals"
@@ -805,10 +771,6 @@
                      "direction" : "out",
                      "name" : "active personID"
                   },
-                  {
-                     "direction" : "out",
-                     "name" : "verbal command"
-                  },
                   {
                      "direction" : "in",
                      "name" : "/h/p/personID"
@@ -843,44 +805,28 @@
                "uuid" : "bc526a14-c5aa-466e-ba5b-30a78b14d672"
             },
             {
-               "cognitive_function" : "HWU",
-               "name" : "MOCK: High-level planner [decision making]",
+               "label" : "UNITN",
+               "name" : "MOCK: Body 2D pose [openpose]",
                "ports" : [
-                  {
-                     "direction" : "out",
-                     "name" : "interaction state"
-                  },
-                  {
-                     "direction" : "out",
-                     "name" : "output"
-                  },
                   {
                      "direction" : "in",
-                     "name" : "demographics"
-                  },
-                  {
-                     "direction" : "out",
-                     "name" : "nav goals"
-                  },
-                  {
-                     "direction" : "in",
-                     "name" : "semantic scene description"
+                     "name" : "/camera_head/color/image_raw [sensor_msgs/Image]"
                   },
                   {
                      "direction" : "in",
-                     "name" : "dialogue state"
+                     "name" : "/h/b/*/roi [hri_msgs/RegionOfInterestStamped]"
                   },
                   {
-                     "direction" : "in",
-                     "name" : "TF (persons)"
+                     "direction" : "out",
+                     "name" : "/h/b/*/skeleton2d [hri_msgs/Skeleton2D]"
                   }
                ],
-               "position" : [ 3400, 1700 ],
-               "size" : [ 400, 293 ],
-               "uuid" : "35d5af59-53e3-466c-874d-89131352c403"
+               "position" : [ 580, 600 ],
+               "size" : [ 440, 140 ],
+               "uuid" : "c9c1df26-7274-4765-8772-b06e15f87c3c"
             },
             {
-               "cognitive_function" : "PAL",
+               "label" : "PAL",
                "name" : "MOCK: Robot functional layer",
                "ports" : [
                   {
@@ -893,62 +839,103 @@
                "uuid" : "20eb61ac-3243-41ed-b855-451cd88e4ae5"
             },
             {
-               "cognitive_function" : "UNITN",
-               "name" : "MOCK: Mask detection",
+               "label" : "CVUT",
+               "name" : "MOCK: Semantic mapping [resources permitting]",
                "ports" : [
                   {
                      "direction" : "in",
-                     "name" : "/h/faces/*/roi [hri_msgs/RegionOfInterestStamped]"
+                     "name" : "detected_objects"
                   },
                   {
                      "direction" : "out",
-                     "name" : "/h/f/*/mask [std_msgs/Bool]"
+                     "name" : "scene graph"
+                  },
+                  {
+                     "direction" : "in",
+                     "name" : "dense 3d map"
                   }
                ],
-               "position" : [ 800, 1100 ],
-               "size" : [ 392, 120 ],
-               "uuid" : "c2585ae1-7f25-41a5-af6c-de742b2a7f9a"
+               "position" : [ 1420, 1640 ],
+               "size" : [ 400, 144 ],
+               "uuid" : "dc52fa2f-b098-4f96-a830-eb329bcf282b"
             },
             {
-               "cognitive_function" : "BIU",
-               "name" : "MOCK: Speaker recognition",
+               "label" : "UNITN",
+               "name" : "MOCK: Activity reco",
                "ports" : [
                   {
                      "direction" : "out",
-                     "name" : "personID"
+                     "name" : "[?] output"
                   },
                   {
                      "direction" : "in",
-                     "name" : "input"
+                     "name" : "TF (bodies)"
+                  },
+                  {
+                     "direction" : "in",
+                     "name" : "gaze direction"
                   }
                ],
-               "position" : [ 1700, 400 ],
-               "size" : [ 200, 120 ],
-               "uuid" : "b70f5085-b32c-47de-b158-73fc4d83fb93"
+               "position" : [ 3360, 940 ],
+               "size" : [ 160, 144 ],
+               "uuid" : "d715b004-7177-4001-bd9d-725e87789c94"
             },
             {
-               "cognitive_function" : "UNITN",
-               "name" : "MOCK: Body 2D pose [openpose]",
+               "label" : "CVUT",
+               "name" : "MOCK: Object detection/identification/localisation",
                "ports" : [
+                  {
+                     "direction" : "out",
+                     "name" : "[TBD] /detected_objects [spring_msgs/Objects]"
+                  },
                   {
                      "direction" : "in",
                      "name" : "/camera_head/color/image_raw [sensor_msgs/Image]"
+                  }
+               ],
+               "position" : [ 680, 1760 ],
+               "size" : [ 420, 120 ],
+               "uuid" : "b357b248-d5a8-445d-9c09-5c567d074966"
+            },
+            {
+               "label" : "UNITN",
+               "name" : "MOCK: User attention",
+               "ports" : [
+                  {
+                     "direction" : "out",
+                     "name" : "[?] output"
                   },
                   {
                      "direction" : "in",
-                     "name" : "/h/b/*/roi [hri_msgs/RegionOfInterestStamped]"
+                     "name" : "TF (persons)"
+                  },
+                  {
+                     "direction" : "in",
+                     "name" : "TF (bodies)"
+                  },
+                  {
+                     "direction" : "in",
+                     "name" : "gaze direction"
+                  },
+                  {
+                     "direction" : "in",
+                     "name" : "input"
+                  },
+                  {
+                     "direction" : "in",
+                     "name" : "TF (faces)"
                   },
                   {
                      "direction" : "out",
-                     "name" : "/h/b/*/skeleton2d [hri_msgs/Skeleton2D]"
+                     "name" : "current attentive person"
                   }
                ],
-               "position" : [ 580, 600 ],
-               "size" : [ 440, 140 ],
-               "uuid" : "c9c1df26-7274-4765-8772-b06e15f87c3c"
+               "position" : [ 3300, 600 ],
+               "size" : [ 260, 276 ],
+               "uuid" : "9f0f2859-8e0e-4f48-829f-8d828cbab1d5"
             },
             {
-               "cognitive_function" : "Other",
+               "label" : "Other",
                "name" : "TF",
                "ports" : [
                   {
@@ -956,37 +943,29 @@
                      "name" : "input"
                   }
                ],
-               "position" : [ 1960, 60 ],
+               "position" : [ 2040, 1300 ],
                "size" : [ 160, 120 ],
-               "uuid" : "2ded2b25-08c5-4cdd-9741-af9a0316c1ae"
+               "uuid" : "cea219fc-27ef-457e-8e99-3540074dc430"
             },
             {
-               "cognitive_function" : "ERM",
-               "name" : "MOCK: Robot GUI [tablet]",
+               "label" : "HWU",
+               "name" : "MOCK: Scene understanding [internal HWU, to clarify]",
                "ports" : [
                   {
-                     "direction" : "in",
-                     "name" : "additional support material"
-                  },
-                  {
-                     "direction" : "in",
-                     "name" : "/tts/feedback"
-                  },
-                  {
-                     "direction" : "in",
-                     "name" : "speech output"
+                     "direction" : "out",
+                     "name" : "semantic description"
                   },
                   {
                      "direction" : "in",
-                     "name" : "speech input"
+                     "name" : "scene graph"
                   }
                ],
-               "position" : [ 4520, 400 ],
-               "size" : [ 400, 180 ],
-               "uuid" : "a8fd53b3-bfe1-43fc-b95a-4c949042fa3d"
+               "position" : [ 2140, 1880 ],
+               "size" : [ 400, 120 ],
+               "uuid" : "d4ce24fa-1d84-4929-b6b5-eab4994efeef"
             },
             {
-               "cognitive_function" : "Other",
+               "label" : "Other",
                "name" : "TF",
                "ports" : [
                   {
@@ -994,71 +973,97 @@
                      "name" : "input"
                   }
                ],
-               "position" : [ 2040, 1300 ],
-               "size" : [ 160, 120 ],
-               "uuid" : "cea219fc-27ef-457e-8e99-3540074dc430"
+               "position" : [ 1100, 1600 ],
+               "size" : [ 120, 60 ],
+               "uuid" : "e4848564-4b20-4667-b107-b1abe9b97cb5"
             },
             {
-               "cognitive_function" : "CVUT",
-               "name" : "MOCK: Semantic mapping [resources permitting]",
+               "label" : "PAL",
+               "name" : "MOCK: Speech synthesis",
                "ports" : [
                   {
                      "direction" : "in",
-                     "name" : "detected_objects"
+                     "name" : "input"
                   },
                   {
                      "direction" : "out",
-                     "name" : "scene graph"
-                  },
-                  {
-                     "direction" : "in",
-                     "name" : "dense 3d map"
+                     "name" : "/tts/feedback"
                   }
                ],
-               "position" : [ 1420, 1640 ],
-               "size" : [ 400, 144 ],
-               "uuid" : "dc52fa2f-b098-4f96-a830-eb329bcf282b"
+               "position" : [ 4100, 600 ],
+               "size" : [ 160, 120 ],
+               "uuid" : "f6a0a5cf-aee4-4220-a3d1-ac219aaa3104"
             },
             {
-               "cognitive_function" : "UNITN",
-               "name" : "MOCK: Activity reco",
+               "label" : "UNITN",
+               "name" : "MOCK: User gaze",
                "ports" : [
                   {
                      "direction" : "out",
-                     "name" : "[?] output"
+                     "name" : "GazeDirection"
                   },
                   {
                      "direction" : "in",
-                     "name" : "TF (bodies)"
+                     "name" : "TF (faces)"
                   },
                   {
                      "direction" : "in",
-                     "name" : "gaze direction"
+                     "name" : "images"
                   }
                ],
-               "position" : [ 3360, 940 ],
+               "position" : [ 2920, 740 ],
                "size" : [ 160, 144 ],
-               "uuid" : "d715b004-7177-4001-bd9d-725e87789c94"
+               "uuid" : "46e542fd-7a41-4d9a-b3fc-981a724bf538"
             },
             {
-               "cognitive_function" : "UNITN",
-               "name" : "MOCK: Face detection",
+               "label" : "PAL",
+               "name" : "MOCK: RGB-D + camera_info",
+               "ports" : [
+                  {
+                     "direction" : "out",
+                     "name" : "/camera_torso/color/image_raw [sensor_msgs/Image]"
+                  }
+               ],
+               "position" : [ -140, 1200 ],
+               "size" : [ 440, 120 ],
+               "uuid" : "1929373a-59ae-474d-bc1b-a2d0be2417cd"
+            },
+            {
+               "label" : "UNITN",
+               "name" : "MOCK: F-formation",
                "ports" : [
                   {
                      "direction" : "in",
-                     "name" : "/camera_head/color/image_raw [sensor_msgs/Image]"
+                     "name" : "tf: /person_id"
                   },
                   {
                      "direction" : "out",
+                     "name" : "/h/i/groups [hri_msgs/GroupsStamped]"
+                  }
+               ],
+               "position" : [ 2820, 940 ],
+               "size" : [ 300, 160 ],
+               "uuid" : "4a610776-d94b-4f35-9871-b835e8e0faf7"
+            },
+            {
+               "label" : "UNITN",
+               "name" : "MOCK: Face recognition [TO CONFIRM UNITN]",
+               "ports" : [
+                  {
+                     "direction" : "out",
+                     "name" : "personID"
+                  },
+                  {
+                     "direction" : "in",
                      "name" : "/h/f/*/roi [hri_msgs/RegionOfInterestStamped]"
                   }
                ],
-               "position" : [ 520, 940 ],
-               "size" : [ 400, 120 ],
-               "uuid" : "f24bbad8-6031-41f9-9ba3-56a4b3335ef9"
+               "position" : [ 1240, 1040 ],
+               "size" : [ 340, 120 ],
+               "uuid" : "8a4e7f8e-3ade-4e30-9f41-1bfeee90055b"
             },
             {
-               "cognitive_function" : "PAL",
+               "label" : "PAL",
                "name" : "respeaker_ros",
                "ports" : [
                   {
@@ -1072,105 +1077,92 @@
                "uuid" : "3e7d7601-34c6-4975-9e36-f50968f141b2"
             },
             {
-               "cognitive_function" : "INRIA",
-               "name" : "MOCK: Multi-people tracker",
+               "label" : "BIU",
+               "name" : "MOCK: ASR",
                "ports" : [
                   {
-                     "direction" : "in",
-                     "name" : "/camera_head/color/image_raw [sensor_msgs/Image]"
+                     "direction" : "out",
+                     "name" : "/h/v/voiceID/speech"
                   },
                   {
-                     "direction" : "out",
-                     "name" : "/h/b/*/roi [hri_msgs/RegionOfInterestStamped]"
+                     "direction" : "in",
+                     "name" : "input"
                   }
                ],
-               "position" : [ 580, 1260 ],
-               "size" : [ 440, 120 ],
-               "uuid" : "d609252f-2fd4-4439-86c3-ece9fd387a3a"
+               "position" : [ 1700, 220 ],
+               "size" : [ 180, 140 ],
+               "uuid" : "49998d33-7c64-4557-b1c9-56b241b59600"
             },
             {
-               "cognitive_function" : "HWU",
-               "name" : "MOCK: Robot utterances [passthrough]",
+               "label" : "PAL",
+               "name" : "MOCK: Fisheye stereo + RGB head",
                "ports" : [
                   {
                      "direction" : "out",
-                     "name" : "speech"
-                  },
-                  {
-                     "direction" : "in",
-                     "name" : "input"
+                     "name" : "/camera_head/color/image_raw [sensor_msgs/Image]"
                   }
                ],
-               "position" : [ 3700, 540 ],
-               "size" : [ 300, 120 ],
-               "uuid" : "c05b65cc-b421-49e5-b180-0ab31ca1ee7b"
+               "position" : [ -100, 1040 ],
+               "size" : [ 398, 120 ],
+               "uuid" : "a284bd3a-0273-4d81-89ce-bc8d042b2674"
             },
             {
-               "cognitive_function" : "CVUT",
-               "name" : "MOCK: Object detection/identification/localisation",
+               "label" : "HWU",
+               "name" : "MOCK: High-level planner [decision making]",
                "ports" : [
                   {
                      "direction" : "out",
-                     "name" : "[TBD] /detected_objects [spring_msgs/Objects]"
+                     "name" : "output"
                   },
                   {
                      "direction" : "in",
-                     "name" : "/camera_head/color/image_raw [sensor_msgs/Image]"
-                  }
-               ],
-               "position" : [ 680, 1760 ],
-               "size" : [ 420, 120 ],
-               "uuid" : "b357b248-d5a8-445d-9c09-5c567d074966"
-            },
-            {
-               "cognitive_function" : "HWU",
-               "name" : "MOCK: Dialogue manager",
-               "ports" : [
+                     "name" : "demographics"
+                  },
                   {
                      "direction" : "out",
-                     "name" : "DialogueState"
+                     "name" : "nav goals"
                   },
                   {
                      "direction" : "in",
-                     "name" : "interaction messages"
+                     "name" : "semantic scene description"
                   },
                   {
                      "direction" : "in",
-                     "name" : "speech"
+                     "name" : "dialogue state"
+                  },
+                  {
+                     "direction" : "in",
+                     "name" : "TF (persons)"
                   },
                   {
                      "direction" : "out",
-                     "name" : "next utterance"
+                     "name" : "interaction state"
                   }
                ],
-               "position" : [ 2620, 180 ],
-               "size" : [ 240, 169 ],
-               "uuid" : "9ab39362-e233-44d2-9d06-dd24694446f2"
+               "position" : [ 3400, 1700 ],
+               "size" : [ 400, 293 ],
+               "uuid" : "35d5af59-53e3-466c-874d-89131352c403"
             },
             {
-               "cognitive_function" : "PAL",
-               "name" : "MOCK: ORB SLAM",
+               "label" : "UNITN",
+               "name" : "MOCK: Mask detection",
                "ports" : [
                   {
                      "direction" : "out",
-                     "name" : "/map [nav_msgs/OccupancyGrid]"
-                  },
-                  {
-                     "direction" : "out",
-                     "name" : "tf: /odom"
+                     "name" : "/h/f/*/mask [std_msgs/Bool]"
                   },
                   {
                      "direction" : "in",
-                     "name" : "/camera_torso/color/image_raw [sensor_msgs/Image]"
+                     "name" : "/h/faces/*/roi [hri_msgs/RegionOfInterestStamped]"
                   }
                ],
-               "position" : [ 140, 1500 ],
-               "size" : [ 400, 140 ],
-               "uuid" : "814e358a-b568-4082-99f3-4629d35e7f2e"
+               "position" : [ 800, 1100 ],
+               "size" : [ 392, 120 ],
+               "uuid" : "c2585ae1-7f25-41a5-af6c-de742b2a7f9a"
             },
             {
-               "cognitive_function" : "INRIA",
-               "name" : "MOCK: ROS openpose [used by INRIA]",
+               "label" : "BIU",
+               "name" : "MOCK: Speaker recognition",
                "ports" : [
                   {
                      "direction" : "in",
@@ -1178,29 +1170,37 @@
                   },
                   {
                      "direction" : "out",
-                     "name" : "output"
+                     "name" : "personID"
                   }
                ],
-               "position" : [ 760, 440 ],
-               "size" : [ 300, 120 ],
-               "uuid" : "b600af28-8f8a-4da9-89df-12b621f45244"
+               "position" : [ 1700, 400 ],
+               "size" : [ 200, 120 ],
+               "uuid" : "b70f5085-b32c-47de-b158-73fc4d83fb93"
             },
             {
-               "cognitive_function" : "UNITN",
-               "name" : "MOCK: Face recognition [TO CONFIRM UNITN]",
+               "label" : "UNITN",
+               "name" : "MOCK: Non-verbal behaviours",
                "ports" : [
                   {
                      "direction" : "in",
-                     "name" : "/h/f/*/roi [hri_msgs/RegionOfInterestStamped]"
+                     "name" : "voices"
                   },
                   {
                      "direction" : "out",
-                     "name" : "personID"
+                     "name" : "/h/p/personID/expression"
+                  },
+                  {
+                     "direction" : "in",
+                     "name" : "face/voice mapping"
+                  },
+                  {
+                     "direction" : "in",
+                     "name" : "faces"
                   }
                ],
-               "position" : [ 1240, 1040 ],
-               "size" : [ 340, 120 ],
-               "uuid" : "8a4e7f8e-3ade-4e30-9f41-1bfeee90055b"
+               "position" : [ 2260, 580 ],
+               "size" : [ 240, 177 ],
+               "uuid" : "e9861836-caed-4c19-87e2-13ba1a380613"
             }
          ],
          "uuid" : "234f40f3-f9bb-4d69-8121-aec26ac8c228",