diff --git a/src/tam/network.js b/src/tam/network.js
index eef439d..69188e9 100644
--- a/src/tam/network.js
+++ b/src/tam/network.js
@@ -70,7 +70,7 @@ out body qt;
         for (let [routeRef, {ref: routeId}] of routeMaster.members.entries())
         {
             const route = elements[routeId];
-            const {from, to, name} = route.tags;
+            const {from, via, to, name} = route.tags;
             const state = route.tags.state || 'normal';
 
             // Add missing stops to the global stops object
@@ -255,9 +255,8 @@ different sequence of nodes in two or more lines.`);
             }
 
             routes.push({
-                from, to,
+                from, via, to,
                 name, state,
-                stops: lineStops.map(id => elements[id].tags.ref),
             });
         }
 
diff --git a/src/tam/network.json b/src/tam/network.json
index 47deabe..9f3880e 100644
--- a/src/tam/network.json
+++ b/src/tam/network.json
@@ -2657,155 +2657,27 @@
                     "from": "Odysseum",
                     "to": "Mosson",
                     "name": "Tram 1: Odysseum => Mosson",
-                    "state": "normal",
-                    "stops": [
-                        "41201",
-                        "41261",
-                        "41203",
-                        "41205",
-                        "41207",
-                        "41209",
-                        "41211",
-                        "41213",
-                        "41215",
-                        "41217",
-                        "41218",
-                        "41221",
-                        "41223",
-                        "41225",
-                        "41227",
-                        "41229",
-                        "41231",
-                        "41233",
-                        "41235",
-                        "41237",
-                        "41239",
-                        "41241",
-                        "41243",
-                        "41245",
-                        "41247",
-                        "41249",
-                        "41251",
-                        "41253",
-                        "41263",
-                        "41255"
-                    ]
+                    "state": "normal"
                 },
                 {
                     "from": "Odysseum",
+                    "via": "Peyrou - Arc de Triomphe",
                     "to": "Mosson",
                     "name": "Tram 1: Odysseum => Peyrou - Arc de Triomphe => Mosson",
-                    "state": "alternate",
-                    "stops": [
-                        "41201",
-                        "41261",
-                        "41203",
-                        "41205",
-                        "41207",
-                        "41209",
-                        "41211",
-                        "41213",
-                        "41215",
-                        "41217",
-                        "41218",
-                        "43127",
-                        "43233",
-                        "44104",
-                        "44103",
-                        "44102",
-                        "41229",
-                        "41231",
-                        "41233",
-                        "41235",
-                        "41237",
-                        "41239",
-                        "41241",
-                        "41243",
-                        "41245",
-                        "41247",
-                        "41249",
-                        "41251",
-                        "41253",
-                        "41263",
-                        "41255"
-                    ]
+                    "state": "alternate"
                 },
                 {
                     "from": "Mosson",
                     "to": "Odysseum",
                     "name": "Tram 1: Mosson => Odysseum",
-                    "state": "normal",
-                    "stops": [
-                        "41101",
-                        "41163",
-                        "41103",
-                        "41105",
-                        "41107",
-                        "41109",
-                        "41111",
-                        "41113",
-                        "41115",
-                        "41117",
-                        "41119",
-                        "41121",
-                        "41123",
-                        "41125",
-                        "41127",
-                        "41129",
-                        "41131",
-                        "41133",
-                        "41135",
-                        "41138",
-                        "41139",
-                        "41141",
-                        "41143",
-                        "41145",
-                        "41147",
-                        "41149",
-                        "41151",
-                        "41153",
-                        "41161",
-                        "41155"
-                    ]
+                    "state": "normal"
                 },
                 {
                     "from": "Mosson",
+                    "via": "Peyrou - Arc de Triomphe",
                     "to": "Odysseum",
                     "name": "Tram 1: Mosson => Peyrou - Arc de Triomphe => Odysseum",
-                    "state": "alternate",
-                    "stops": [
-                        "41101",
-                        "41163",
-                        "41103",
-                        "41105",
-                        "41107",
-                        "41109",
-                        "41111",
-                        "41113",
-                        "41115",
-                        "41117",
-                        "41119",
-                        "41121",
-                        "41123",
-                        "41125",
-                        "41127",
-                        "44202",
-                        "44203",
-                        "44204",
-                        "43125",
-                        "43231",
-                        "41138",
-                        "41139",
-                        "41141",
-                        "41143",
-                        "41145",
-                        "41147",
-                        "41149",
-                        "41151",
-                        "41153",
-                        "41161",
-                        "41155"
-                    ]
+                    "state": "alternate"
                 }
             ]
         },
@@ -2816,73 +2688,13 @@
                     "from": "Saint-Jean-de-Védas Centre",
                     "to": "Jacou",
                     "name": "Tram 2: Saint-Jean-de-Védas Centre => Jacou",
-                    "state": "normal",
-                    "stops": [
-                        "42101",
-                        "42103",
-                        "42105",
-                        "42107",
-                        "42111",
-                        "42113",
-                        "42115",
-                        "42117",
-                        "42119",
-                        "42121",
-                        "42123",
-                        "42125",
-                        "41221",
-                        "41223",
-                        "42141",
-                        "42143",
-                        "42145",
-                        "42147",
-                        "42149",
-                        "42151",
-                        "42153",
-                        "42155",
-                        "42157",
-                        "42159",
-                        "42163",
-                        "42165",
-                        "42167",
-                        "42169"
-                    ]
+                    "state": "normal"
                 },
                 {
                     "from": "Jacou",
                     "to": "Saint-Jean-de-Védas Centre",
                     "name": "Tram 2: Jacou => Saint-Jean-de-Védas Centre",
-                    "state": "normal",
-                    "stops": [
-                        "42201",
-                        "42203",
-                        "42205",
-                        "42207",
-                        "42211",
-                        "42213",
-                        "42215",
-                        "42217",
-                        "42219",
-                        "42221",
-                        "42223",
-                        "42225",
-                        "42227",
-                        "42229",
-                        "41133",
-                        "41135",
-                        "42245",
-                        "42247",
-                        "42249",
-                        "42251",
-                        "42253",
-                        "42255",
-                        "42257",
-                        "42259",
-                        "42263",
-                        "42265",
-                        "42267",
-                        "42269"
-                    ]
+                    "state": "normal"
                 }
             ]
         },
@@ -2893,129 +2705,25 @@
                     "from": "Lattes Centre",
                     "to": "Juvignac",
                     "name": "Tram 3: Lattes Centre => Juvignac",
-                    "state": "normal",
-                    "stops": [
-                        "43259",
-                        "43261",
-                        "43209",
-                        "43213",
-                        "41207",
-                        "41209",
-                        "42237",
-                        "42239",
-                        "42241",
-                        "43127",
-                        "43233",
-                        "43235",
-                        "43237",
-                        "43239",
-                        "43241",
-                        "43243",
-                        "43245",
-                        "43247",
-                        "43249",
-                        "43251",
-                        "43253",
-                        "43255",
-                        "43257"
-                    ]
+                    "state": "normal"
                 },
                 {
                     "from": "Pérols Étang de l'Or",
                     "to": "Juvignac",
                     "name": "Tram 3: Pérols Étang de l'Or => Juvignac",
-                    "state": "normal",
-                    "stops": [
-                        "43201",
-                        "43203",
-                        "43205",
-                        "43207",
-                        "43209",
-                        "43213",
-                        "41207",
-                        "41209",
-                        "42237",
-                        "42239",
-                        "42241",
-                        "43127",
-                        "43233",
-                        "43235",
-                        "43237",
-                        "43239",
-                        "43241",
-                        "43243",
-                        "43245",
-                        "43247",
-                        "43249",
-                        "43251",
-                        "43253",
-                        "43255",
-                        "43257"
-                    ]
+                    "state": "normal"
                 },
                 {
                     "from": "Juvignac",
                     "to": "Lattes Centre",
                     "name": "Tram 3: Juvignac => Lattes Centre",
-                    "state": "normal",
-                    "stops": [
-                        "43101",
-                        "43103",
-                        "43105",
-                        "43107",
-                        "43109",
-                        "43111",
-                        "43113",
-                        "43115",
-                        "43117",
-                        "43119",
-                        "43121",
-                        "43123",
-                        "43125",
-                        "43231",
-                        "42129",
-                        "42131",
-                        "42133",
-                        "41147",
-                        "41149",
-                        "43145",
-                        "43149",
-                        "43161",
-                        "43159"
-                    ]
+                    "state": "normal"
                 },
                 {
                     "from": "Juvignac",
                     "to": "Pérols Étang de l'Or",
                     "name": "Tram 3: Juvignac => Pérols Étang de l'Or",
-                    "state": "normal",
-                    "stops": [
-                        "43101",
-                        "43103",
-                        "43105",
-                        "43107",
-                        "43109",
-                        "43111",
-                        "43113",
-                        "43115",
-                        "43117",
-                        "43119",
-                        "43121",
-                        "43123",
-                        "43125",
-                        "43231",
-                        "42129",
-                        "42131",
-                        "42133",
-                        "41147",
-                        "41149",
-                        "43145",
-                        "43149",
-                        "43151",
-                        "43153",
-                        "43155",
-                        "43157"
-                    ]
+                    "state": "normal"
                 }
             ]
         },
@@ -3026,99 +2734,27 @@
                     "from": "Garcia Lorca",
                     "to": "Garcia Lorca",
                     "name": "Tram 4A: Garcia Lorca => Gare Saint-Roch => Albert 1er => Garcia Lorca",
-                    "state": "normal",
-                    "stops": [
-                        "44105",
-                        "43223",
-                        "43225",
-                        "42123",
-                        "42125",
-                        "43127",
-                        "43233",
-                        "44104",
-                        "44103",
-                        "44102",
-                        "41129",
-                        "41131",
-                        "42231",
-                        "42233",
-                        "41143",
-                        "41145",
-                        "43217",
-                        "43219",
-                        "44105"
-                    ]
+                    "state": "normal"
                 },
                 {
                     "from": "Garcia Lorca",
+                    "via": "Antigone",
                     "to": "Garcia Lorca",
                     "name": "Tram 4A: Garcia Lorca => Gare Saint-Roch => Antigone => Garcia Lorca",
-                    "state": "alternate",
-                    "stops": [
-                        "44105",
-                        "43223",
-                        "43225",
-                        "42123",
-                        "42125",
-                        "42127",
-                        "41138",
-                        "41139",
-                        "41141",
-                        "41143",
-                        "41145",
-                        "43217",
-                        "43219",
-                        "44105"
-                    ]
+                    "state": "alternate"
                 },
                 {
                     "from": "Garcia Lorca",
                     "to": "Garcia Lorca",
                     "name": "Tram 4B: Garcia Lorca => Albert 1er => Gare Saint-Roch => Garcia Lorca",
-                    "state": "normal",
-                    "stops": [
-                        "44201",
-                        "43139",
-                        "43141",
-                        "41211",
-                        "41213",
-                        "42137",
-                        "42139",
-                        "41225",
-                        "41227",
-                        "44202",
-                        "44203",
-                        "44204",
-                        "43125",
-                        "43231",
-                        "42245",
-                        "42247",
-                        "43133",
-                        "43135",
-                        "44201"
-                    ]
+                    "state": "normal"
                 },
                 {
                     "from": "Garcia Lorca",
+                    "via": "Antigone",
                     "to": "Garcia Lorca",
                     "name": "Tram 4B: Garcia Lorca => Antigone => Gare Saint-Roch => Garcia Lorca",
-                    "state": "alternate",
-                    "stops": [
-                        "44201",
-                        "43139",
-                        "43141",
-                        "41211",
-                        "41213",
-                        "41215",
-                        "41217",
-                        "41218",
-                        "42243",
-                        "42245",
-                        "42247",
-                        "43133",
-                        "43135",
-                        "44201"
-                    ]
+                    "state": "alternate"
                 }
             ]
         }