diff --git a/data/op_internal_connectivity.csv b/data/op_internal_connectivity.csv
new file mode 100644
index 0000000..21c8775
--- /dev/null
+++ b/data/op_internal_connectivity.csv
@@ -0,0 +1,232 @@
+UOPID,OP_Name,IncomingRemoteOP,IncomingSOL,IncomingTrack,OutgoingTrack,OutgoingSOL,OutgoingRemoteOP,Connected
+NLBHV,Bilthoven,NLBLOA,Ut-Htba,BM,AC,Ut-Htba,NLDLD,NO
+NLBHV,Bilthoven,NLBLOA,Ut-Htba,BM,BE,Ut-Htba,NLDLD,YES
+NLBHV,Bilthoven,NLBLOA,Ut-Htba,BM,CC,Ut-Htba,NLDLD,YES
+NLBHV,Bilthoven,NLBLOA,Ut-Htba,BY,AC,Ut-Htba,NLDLD,YES
+NLBHV,Bilthoven,NLBLOA,Ut-Htba,BY,BE,Ut-Htba,NLDLD,NO
+NLBHV,Bilthoven,NLBLOA,Ut-Htba,BY,CC,Ut-Htba,NLDLD,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,AC1,UR4,Asa-Zvg,NLMAS,NO
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,AC1,UD4,Asa-Zvg,NLMAS,NO
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,AC1,AR1,Asa-Zvg,NLMAS,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,AC1,AD1,Asa-Zvg,NLMAS,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,AC1,BA,Bkl-Hmla,NLHMLA,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,AC1,BN,Bkl-Hmla,NLHMLA,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,AP1,UR4,Asa-Zvg,NLMAS,NO
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,AP1,UD4,Asa-Zvg,NLMAS,NO
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,AP1,AR1,Asa-Zvg,NLMAS,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,AP1,AD1,Asa-Zvg,NLMAS,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,AP1,BA,Bkl-Hmla,NLHMLA,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,AP1,BN,Bkl-Hmla,NLHMLA,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,UC7,UR4,Asa-Zvg,NLMAS,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,UC7,UD4,Asa-Zvg,NLMAS,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,UC7,AR1,Asa-Zvg,NLMAS,NO
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,UC7,AD1,Asa-Zvg,NLMAS,NO
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,UC7,BA,Bkl-Hmla,NLHMLA,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,UC7,BN,Bkl-Hmla,NLHMLA,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,UP7,UR4,Asa-Zvg,NLMAS,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,UP7,UD4,Asa-Zvg,NLMAS,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,UP7,AR1,Asa-Zvg,NLMAS,NO
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,UP7,AD1,Asa-Zvg,NLMAS,NO
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,UP7,BA,Bkl-Hmla,NLHMLA,YES
+NLBKLA,Breukelen aansl.,NLAC,Asa-Zvg,UP7,BN,Bkl-Hmla,NLHMLA,YES
+NLBKP,Blauwkapel,NLHVS,Hvs-Utm,HE,BJ,Ut-Htba,NLBLOA,NO
+NLBKP,Blauwkapel,NLHVS,Hvs-Utm,HE,BV,Ut-Htba,NLBLOA,NO
+NLBKP,Blauwkapel,NLHVS,Hvs-Utm,HE,BE,Ut-Htba,NLBLOA,NO
+NLBKP,Blauwkapel,NLHVS,Hvs-Utm,HE,BR,Ut-Htba,NLBLOA,NO
+NLBKP,Blauwkapel,NLHVS,Hvs-Utm,HQ,BJ,Ut-Htba,NLBLOA,NO
+NLBKP,Blauwkapel,NLHVS,Hvs-Utm,HQ,BV,Ut-Htba,NLBLOA,NO
+NLBKP,Blauwkapel,NLHVS,Hvs-Utm,HQ,BE,Ut-Htba,NLBLOA,NO
+NLBKP,Blauwkapel,NLHVS,Hvs-Utm,HQ,BR,Ut-Htba,NLBLOA,NO
+NLBKP,Blauwkapel,NLUT,Ut-Htba,BA,BR,Ut-Htba,NLBLOA,YES
+NLBKP,Blauwkapel,NLUT,Ut-Htba,BA,BE,Ut-Htba,NLBLOA,YES
+NLBKP,Blauwkapel,NLUT,Ut-Htba,BA,BV,Ut-Htba,NLBLOA,YES
+NLBKP,Blauwkapel,NLUT,Ut-Htba,BA,BJ,Ut-Htba,NLBLOA,YES
+NLBKP,Blauwkapel,NLUT,Ut-Htba,BN,BR,Ut-Htba,NLBLOA,YES
+NLBKP,Blauwkapel,NLUT,Ut-Htba,BN,BE,Ut-Htba,NLBLOA,NO
+NLBKP,Blauwkapel,NLUT,Ut-Htba,BN,BV,Ut-Htba,NLBLOA,NO
+NLBKP,Blauwkapel,NLUT,Ut-Htba,BN,BJ,Ut-Htba,NLBLOA,NO
+NLBKP,Blauwkapel,NLUT,Ut-Htba,HA,BR,Ut-Htba,NLBLOA,NO
+NLBKP,Blauwkapel,NLUT,Ut-Htba,HA,BE,Ut-Htba,NLBLOA,NO
+NLBKP,Blauwkapel,NLUT,Ut-Htba,HA,BV,Ut-Htba,NLBLOA,YES
+NLBKP,Blauwkapel,NLUT,Ut-Htba,HA,BJ,Ut-Htba,NLBLOA,YES
+NLBKP,Blauwkapel,NLUT,Ut-Htba,HN,BR,Ut-Htba,NLBLOA,YES
+NLBKP,Blauwkapel,NLUT,Ut-Htba,HN,BE,Ut-Htba,NLBLOA,YES
+NLBKP,Blauwkapel,NLUT,Ut-Htba,HN,BV,Ut-Htba,NLBLOA,YES
+NLBKP,Blauwkapel,NLUT,Ut-Htba,HN,BJ,Ut-Htba,NLBLOA,YES
+NLBLOA,Blauwkapel Oost aansl.,NLBKP,Ut-Htba,BJ,BM,Ut-Htba,NLBHV,YES
+NLBLOA,Blauwkapel Oost aansl.,NLBKP,Ut-Htba,BJ,BY,Ut-Htba,NLBHV,YES
+NLBLOA,Blauwkapel Oost aansl.,NLBKP,Ut-Htba,BV,BM,Ut-Htba,NLBHV,YES
+NLBLOA,Blauwkapel Oost aansl.,NLBKP,Ut-Htba,BV,BY,Ut-Htba,NLBHV,YES
+NLBLOA,Blauwkapel Oost aansl.,NLBKP,Ut-Htba,BE,BM,Ut-Htba,NLBHV,YES
+NLBLOA,Blauwkapel Oost aansl.,NLBKP,Ut-Htba,BE,BY,Ut-Htba,NLBHV,YES
+NLBLOA,Blauwkapel Oost aansl.,NLBKP,Ut-Htba,BR,BM,Ut-Htba,NLBHV,YES
+NLBLOA,Blauwkapel Oost aansl.,NLBKP,Ut-Htba,BR,BY,Ut-Htba,NLBHV,YES
+NLCR,Crailoo,NLNDB,Asd-Zp,GG,GH,Asd-Zp,NLHVS,NO
+NLCR,Crailoo,NLNDB,Asd-Zp,GG,GS,Asd-Zp,NLHVS,NO
+NLCR,Crailoo,NLNDB,Asd-Zp,GR,GH,Asd-Zp,NLHVS,NO
+NLCR,Crailoo,NLNDB,Asd-Zp,GR,GS,Asd-Zp,NLHVS,NO
+NLDB,Driebergen-Zeist,NLUTZA,Asa-Zvg,AA,AT,Asa-Zvg,NLMRG,YES
+NLDB,Driebergen-Zeist,NLUTZA,Asa-Zvg,AA,AF,Asa-Zvg,NLMRG,YES
+NLDB,Driebergen-Zeist,NLUTZA,Asa-Zvg,AO,AF,Asa-Zvg,NLMRG,YES
+NLDB,Driebergen-Zeist,NLUTZA,Asa-Zvg,AO,AT,Asa-Zvg,NLMRG,YES
+NLDLD,Den Dolder,NLBHV,Ut-Htba,AC,AD,Ut-Htba,NLAMF,YES
+NLDLD,Den Dolder,NLBHV,Ut-Htba,AC,BF,Ut-Htba,NLAMF,YES
+NLDLD,Den Dolder,NLBHV,Ut-Htba,AC,YA,Dld-Brn,NLST,YES
+NLDLD,Den Dolder,NLBHV,Ut-Htba,BE,AD,Ut-Htba,NLAMF,YES
+NLDLD,Den Dolder,NLBHV,Ut-Htba,BE,BF,Ut-Htba,NLAMF,YES
+NLDLD,Den Dolder,NLBHV,Ut-Htba,BE,YA,Dld-Brn,NLST,YES
+NLDLD,Den Dolder,NLBHV,Ut-Htba,CC,AD,Ut-Htba,NLAMF,YES
+NLDLD,Den Dolder,NLBHV,Ut-Htba,CC,BF,Ut-Htba,NLAMF,YES
+NLDLD,Den Dolder,NLBHV,Ut-Htba,CC,YA,Dld-Brn,NLST,YES
+NLHMLA,Harmelen aansl.,NLBKLA,Bkl-Hmla,BA,DF,Ut-Rtd,NLWD,YES
+NLHMLA,Harmelen aansl.,NLBKLA,Bkl-Hmla,BA,DH,Ut-Rtd,NLWD,YES
+NLHMLA,Harmelen aansl.,NLBKLA,Bkl-Hmla,BA,KD,Ut-Rtd,NLWD,YES
+NLHMLA,Harmelen aansl.,NLBKLA,Bkl-Hmla,BA,KL,Ut-Rtd,NLWD,YES
+NLHMLA,Harmelen aansl.,NLBKLA,Bkl-Hmla,BN,DF,Ut-Rtd,NLWD,YES
+NLHMLA,Harmelen aansl.,NLBKLA,Bkl-Hmla,BN,DH,Ut-Rtd,NLWD,YES
+NLHMLA,Harmelen aansl.,NLBKLA,Bkl-Hmla,BN,KD,Ut-Rtd,NLWD,YES
+NLHMLA,Harmelen aansl.,NLBKLA,Bkl-Hmla,BN,KL,Ut-Rtd,NLWD,YES
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,691,DF,Ut-Rtd,NLWD,NO
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,691,DH,Ut-Rtd,NLWD,NO
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,691,KD,Ut-Rtd,NLWD,YES
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,691,KL,Ut-Rtd,NLWD,NO
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,692,DF,Ut-Rtd,NLWD,NO
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,692,DH,Ut-Rtd,NLWD,NO
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,692,KD,Ut-Rtd,NLWD,NO
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,692,KL,Ut-Rtd,NLWD,YES
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,693,DF,Ut-Rtd,NLWD,YES
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,693,DH,Ut-Rtd,NLWD,NO
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,693,KD,Ut-Rtd,NLWD,NO
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,693,KL,Ut-Rtd,NLWD,NO
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,694,KL,Ut-Rtd,NLWD,NO
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,694,KD,Ut-Rtd,NLWD,NO
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,694,DH,Ut-Rtd,NLWD,YES
+NLHMLA,Harmelen aansl.,NLVTN,Ut-Rtd,694,DF,Ut-Rtd,NLWD,YES
+NLHVS,Hilversum,NLCR,Asd-Zp,GH,RC,Asd-Zp,NLBRN,NO
+NLHVS,Hilversum,NLCR,Asd-Zp,GH,PC,Asd-Zp,NLBRN,NO
+NLHVS,Hilversum,NLCR,Asd-Zp,GH,HQ,Hvs-Utm,NLBKP,NO
+NLHVS,Hilversum,NLCR,Asd-Zp,GH,HE,Hvs-Utm,NLBKP,NO
+NLHVS,Hilversum,NLCR,Asd-Zp,GS,RC,Asd-Zp,NLBRN,NO
+NLHVS,Hilversum,NLCR,Asd-Zp,GS,PC,Asd-Zp,NLBRN,NO
+NLHVS,Hilversum,NLCR,Asd-Zp,GS,HQ,Hvs-Utm,NLBKP,NO
+NLHVS,Hilversum,NLCR,Asd-Zp,GS,HE,Hvs-Utm,NLBKP,NO
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,AD1,UE5,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,AD1,AS5,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,AD1,AE6,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,AD1,US5,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,AR1,UE5,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,AR1,AS5,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,AR1,AE6,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,AR1,US5,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,UD4,UE5,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,UD4,AS5,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,UD4,AE6,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,UD4,US5,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,UR4,UE5,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,UR4,AS5,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,UR4,AE6,Asa-Zvg,NLUT,YES
+NLMAS,Maarssen,NLBKLA,Asa-Zvg,UR4,US5,Asa-Zvg,NLUT,YES
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,WH,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,WE,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,WG,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,WF,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,243,Ut-Btl,NLUTZA,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,242,Ut-Btl,NLUTZA,YES
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,BA,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,BN,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,241,Ut-Btl,NLUTZA,YES
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,HA,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,HN,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,SE,Ut-Btl,NLHTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,SA,Ut-Btl,NLUTZA,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,SJ,Ut-Btl,NLHTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,240,Ut-Btl,NLUTZA,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,US5,FA,Ut-Btl,NLUTZA,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,BA,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,241,Ut-Btl,NLUTZA,YES
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,242,Ut-Btl,NLUTZA,YES
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,243,Ut-Btl,NLUTZA,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,BN,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,WF,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,HA,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,WG,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,HN,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,SA,Ut-Btl,NLUTZA,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,WE,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,SE,Ut-Btl,NLHTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,WH,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,SJ,Ut-Btl,NLHTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,240,Ut-Btl,NLUTZA,YES
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AE6,FA,Ut-Btl,NLUTZA,YES
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,BA,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,BN,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,HA,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,HN,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,SE,Ut-Btl,NLHTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,SJ,Ut-Btl,NLHTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,FA,Ut-Btl,NLUTZA,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,240,Ut-Btl,NLUTZA,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,WH,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,WE,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,WG,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,SA,Ut-Btl,NLUTZA,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,WF,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,243,Ut-Btl,NLUTZA,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,242,Ut-Btl,NLUTZA,YES
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,AS5,241,Ut-Btl,NLUTZA,YES
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,FA,Ut-Btl,NLUTZA,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,SJ,Ut-Btl,NLHTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,240,Ut-Btl,NLUTZA,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,WH,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,SE,Ut-Btl,NLHTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,WE,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,HN,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,WG,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,HA,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,WF,Ut-Rtd,NLVTN,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,SA,Ut-Btl,NLUTZA,YES
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,BN,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,243,Ut-Btl,NLUTZA,YES
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,242,Ut-Btl,NLUTZA,YES
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,BA,Ut-Htba,NLBKP,NO
+NLUT,Utrecht Centraal,NLMAS,Asa-Zvg,UE5,241,Ut-Btl,NLUTZA,YES
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,FA,AA,Asa-Zvg,NLDB,YES
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,FA,SN,Ut-Btl,NLHTN,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,FA,FE,Ut-Btl,NLHTN,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,FA,AO,Asa-Zvg,NLDB,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,240,SN,Ut-Btl,NLHTN,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,240,FE,Ut-Btl,NLHTN,YES
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,240,AO,Asa-Zvg,NLDB,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,240,AA,Asa-Zvg,NLDB,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,SA,AO,Asa-Zvg,NLDB,YES
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,SA,FE,Ut-Btl,NLHTN,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,SA,AA,Asa-Zvg,NLDB,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,SA,SN,Ut-Btl,NLHTN,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,241,AO,Asa-Zvg,NLDB,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,241,AA,Asa-Zvg,NLDB,YES
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,241,FE,Ut-Btl,NLHTN,YES
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,241,SN,Ut-Btl,NLHTN,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,242,AO,Asa-Zvg,NLDB,YES
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,242,AA,Asa-Zvg,NLDB,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,242,FE,Ut-Btl,NLHTN,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,242,SN,Ut-Btl,NLHTN,YES
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,243,AA,Asa-Zvg,NLDB,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,243,AO,Asa-Zvg,NLDB,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,243,FE,Ut-Btl,NLHTN,NO
+NLUTZA,Utrecht Zuid aansluiting,NLUT,Ut-Btl,243,SN,Ut-Btl,NLHTN,YES
+NLVTN,Vleuten,NLUT,Ut-Rtd,WF,691,Ut-Rtd,NLHMLA,NO
+NLVTN,Vleuten,NLUT,Ut-Rtd,WF,692,Ut-Rtd,NLHMLA,NO
+NLVTN,Vleuten,NLUT,Ut-Rtd,WF,693,Ut-Rtd,NLHMLA,YES
+NLVTN,Vleuten,NLUT,Ut-Rtd,WF,694,Ut-Rtd,NLHMLA,YES
+NLVTN,Vleuten,NLUT,Ut-Rtd,WG,691,Ut-Rtd,NLHMLA,YES
+NLVTN,Vleuten,NLUT,Ut-Rtd,WG,692,Ut-Rtd,NLHMLA,YES
+NLVTN,Vleuten,NLUT,Ut-Rtd,WG,693,Ut-Rtd,NLHMLA,NO
+NLVTN,Vleuten,NLUT,Ut-Rtd,WG,694,Ut-Rtd,NLHMLA,NO
+NLVTN,Vleuten,NLUT,Ut-Rtd,WE,691,Ut-Rtd,NLHMLA,NO
+NLVTN,Vleuten,NLUT,Ut-Rtd,WE,692,Ut-Rtd,NLHMLA,NO
+NLVTN,Vleuten,NLUT,Ut-Rtd,WE,693,Ut-Rtd,NLHMLA,NO
+NLVTN,Vleuten,NLUT,Ut-Rtd,WE,694,Ut-Rtd,NLHMLA,YES
+NLVTN,Vleuten,NLUT,Ut-Rtd,WH,691,Ut-Rtd,NLHMLA,YES
+NLVTN,Vleuten,NLUT,Ut-Rtd,WH,692,Ut-Rtd,NLHMLA,YES
+NLVTN,Vleuten,NLUT,Ut-Rtd,WH,693,Ut-Rtd,NLHMLA,NO
+NLVTN,Vleuten,NLUT,Ut-Rtd,WH,694,Ut-Rtd,NLHMLA,NO
\ No newline at end of file
diff --git a/mappings/internal-node-links.yml b/mappings/internal-node-links-artificial.yml
similarity index 88%
rename from mappings/internal-node-links.yml
rename to mappings/internal-node-links-artificial.yml
index 68e2fa4..f06f770 100644
--- a/mappings/internal-node-links.yml
+++ b/mappings/internal-node-links-artificial.yml
@@ -13,6 +13,7 @@ variables:
     referenceFormulation: &referenceFormulation csv
 
 mappings:
+  #### Artificial internal node links based on full connectivity assumption ####
   internal-node-link-in-out:
     sources:
       - access: *host
@@ -20,12 +21,12 @@ mappings:
         credentials: *credentials
         queryFormulation: *queryFormulation
         referenceFormulation: *referenceFormulation
-        query: SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND LineEdges2.LineNodeEndID = LineNodes2.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.LineNodeStartID = LineNodes1.ID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineEdges1.ID != LineEdges2.ID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID;
+        query: SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND LineEdges2.LineNodeEndID = LineNodes2.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.LineNodeStartID = LineNodes1.ID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineEdges1.ID != LineEdges2.ID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID AND OP1.UOPID NOT IN ('NLBHV', 'NLBKLA', 'NLBKP', 'NLBLOA', 'NLDB', 'NLDLD', 'NLHMLA', 'NLMAS', 'NLUT', 'NLUTZA', 'NLVTN');
     s: http://era.europa.eu/abstraction#INL_$(INCOMING_REMOTE_OP)_$(INCOMING)_$(UOPID)_$(OUTGOING)_$(OUTGOING_REMOTE_OP)
     po:
       - [a, era:InternalNodeLink]
-      - [era:bidirectional, "true", xsd:boolean]
-      - [era:startPort, http://era.europa.eu/abstraction#NP_$(INCOMING_REMOTE_OP)_$(INCOMING)_$(UOPID)~iri]
+      - [era:bidirectional, "false", xsd:boolean]
+      - [era:startPort, http://era.europa.eu/abstraction#NP_$(UOPID)_$(INCOMING)_$(INCOMING_REMOTE_OP)~iri]
       - [era:endPort, http://era.europa.eu/abstraction#NP_$(UOPID)_$(OUTGOING)_$(OUTGOING_REMOTE_OP)~iri]
   
   internal-node-link-out-in:
@@ -35,12 +36,12 @@ mappings:
         credentials: *credentials
         queryFormulation: *queryFormulation
         referenceFormulation: *referenceFormulation
-        query: SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND Tracks2.ID != Tracks1.ID AND LineEdges2.LineNodeStartID = LineNodes2.ID AND LineEdges1.LineNodeEndID = LineNodes1.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID;
+        query: SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND Tracks2.ID != Tracks1.ID AND LineEdges2.LineNodeStartID = LineNodes2.ID AND LineEdges1.LineNodeEndID = LineNodes1.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID AND OP1.UOPID NOT IN ('NLBHV', 'NLBKLA', 'NLBKP', 'NLBLOA', 'NLDB', 'NLDLD', 'NLHMLA', 'NLMAS', 'NLUT', 'NLUTZA', 'NLVTN');
     s: http://era.europa.eu/abstraction#INL_$(INCOMING_REMOTE_OP)_$(INCOMING)_$(UOPID)_$(OUTGOING)_$(OUTGOING_REMOTE_OP)
     po:
       - [a, era:InternalNodeLink]
-      - [era:bidirectional, "true", xsd:boolean]
-      - [era:startPort, http://era.europa.eu/abstraction#NP_$(INCOMING_REMOTE_OP)_$(INCOMING)_$(UOPID)~iri]
+      - [era:bidirectional, "false", xsd:boolean]
+      - [era:startPort, http://era.europa.eu/abstraction#NP_$(UOPID)_$(INCOMING)_$(INCOMING_REMOTE_OP)~iri]
       - [era:endPort, http://era.europa.eu/abstraction#NP_$(UOPID)_$(OUTGOING)_$(OUTGOING_REMOTE_OP)~iri]
   
   internal-node-link-no-out:
@@ -50,13 +51,13 @@ mappings:
         credentials: *credentials
         queryFormulation: *queryFormulation
         referenceFormulation: *referenceFormulation
-        query: SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND Tracks2.ID != Tracks1.ID AND LineEdges2.LineNodeEndID = LineNodes2.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.LineNodeEndID = LineNodes1.ID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID;
+        query: SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND Tracks2.ID != Tracks1.ID AND LineEdges2.LineNodeEndID = LineNodes2.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.LineNodeEndID = LineNodes1.ID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID AND OP1.UOPID NOT IN ('NLBHV', 'NLBKLA', 'NLBKP', 'NLBLOA', 'NLDB', 'NLDLD', 'NLHMLA', 'NLMAS', 'NLUT', 'NLUTZA', 'NLVTN');
     s: http://era.europa.eu/abstraction#INL_$(INCOMING_REMOTE_OP)_$(INCOMING)_$(UOPID)_$(OUTGOING)_$(OUTGOING_REMOTE_OP)
     po:
       - [a, era:InternalNodeLink]
-      - [era:bidirectional, "true", xsd:boolean]
-      - [era:startPort, http://era.europa.eu/abstraction#NP_$(INCOMING_REMOTE_OP)_$(INCOMING)_$(UOPID)~iri]
-      - [era:endPort, http://era.europa.eu/abstraction#NP_$(OUTGOING_REMOTE_OP)_$(OUTGOING)_$(UOPID)~iri]
+      - [era:bidirectional, "false", xsd:boolean]
+      - [era:startPort, http://era.europa.eu/abstraction#NP_$(UOPID)_$(INCOMING)_$(INCOMING_REMOTE_OP)~iri]
+      - [era:endPort, http://era.europa.eu/abstraction#NP_$(UOPID)_$(OUTGOING)_$(OUTGOING_REMOTE_OP)~iri]
 
   internal-node-link-no-in:
     sources:
@@ -65,10 +66,10 @@ mappings:
         credentials: *credentials
         queryFormulation: *queryFormulation
         referenceFormulation: *referenceFormulation
-        query: SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND Tracks2.ID != Tracks1.ID AND LineEdges2.LineNodeStartID = LineNodes2.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.LineNodeStartID = LineNodes1.ID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID
+        query: SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND Tracks2.ID != Tracks1.ID AND LineEdges2.LineNodeStartID = LineNodes2.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.LineNodeStartID = LineNodes1.ID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID AND OP1.UOPID NOT IN ('NLBHV', 'NLBKLA', 'NLBKP', 'NLBLOA', 'NLDB', 'NLDLD', 'NLHMLA', 'NLMAS', 'NLUT', 'NLUTZA', 'NLVTN');
     s: http://era.europa.eu/abstraction#INL_$(INCOMING_REMOTE_OP)_$(INCOMING)_$(UOPID)_$(OUTGOING)_$(OUTGOING_REMOTE_OP)
     po:
       - [a, era:InternalNodeLink]
-      - [era:bidirectional, "true", xsd:boolean]
+      - [era:bidirectional, "false", xsd:boolean]
       - [era:startPort, http://era.europa.eu/abstraction#NP_$(UOPID)_$(INCOMING)_$(INCOMING_REMOTE_OP)~iri]
       - [era:endPort, http://era.europa.eu/abstraction#NP_$(UOPID)_$(OUTGOING)_$(OUTGOING_REMOTE_OP)~iri]
\ No newline at end of file
diff --git a/mappings/internal-node-links-real.yml b/mappings/internal-node-links-real.yml
new file mode 100644
index 0000000..782a0f2
--- /dev/null
+++ b/mappings/internal-node-links-real.yml
@@ -0,0 +1,32 @@
+prefixes:
+  idlab-fn: "http://example.com/idlab/function/"
+  grel: "http://users.ugent.be/~bjdmeest/function/grel.ttl#"
+  rdfs: "http://www.w3.org/2000/01/rdf-schema#"
+  era: "http://era.europa.eu/ns#"
+  xsd: "http://www.w3.org/2001/XMLSchema#"
+variables:
+  connection: 
+    access: &host //10.10.160.21:1433
+    type: &typeMSSQL mssql
+    credentials: &credentials
+      username: SA
+      password: ChooChoo2020
+    queryFormulation: &queryFormulation sql2008 
+    referenceFormulation: &referenceFormulation csv
+
+mappings:
+  #### Real internal node links based on external connectivity table ###
+  internal-node-link-connectivity-table:
+    sources:
+      - ["data/op_internal_connectivity.csv~csv"]
+    s: http://era.europa.eu/abstraction#INL_$(IncomingRemoteOP)_$(IncomingTrack)_$(UOPID)_$(OutgoingTrack)_$(OutgoingRemoteOP)
+    condition:
+      function: idlab-fn:equal
+      parameters:
+        - [grel:valueParameter, $(Connected)]
+        - [grel:valueParameter2, "YES"]
+    po:
+      - [a, era:InternalNodeLink]
+      - [era:bidirectional, "true", xsd:boolean] # this is still uncertain
+      - [era:startPort, http://era.europa.eu/abstraction#NP_$(UOPID)_$(IncomingTrack)_$(IncomingRemoteOP)~iri]
+      - [era:endPort, http://era.europa.eu/abstraction#NP_$(UOPID)_$(OutgoingTrack)_$(OutgoingRemoteOP)~iri]
\ No newline at end of file
diff --git a/rml/internal-node-links_rml.ttl b/rml/internal-node-links-artificial_rml.ttl
similarity index 93%
rename from rml/internal-node-links_rml.ttl
rename to rml/internal-node-links-artificial_rml.ttl
index 293ff4c..955f945 100644
--- a/rml/internal-node-links_rml.ttl
+++ b/rml/internal-node-links-artificial_rml.ttl
@@ -13,7 +13,7 @@
 :map_internal-node-link-in-out_0 rml:logicalSource :source_0.
 :source_0 a rml:LogicalSource;
     rml:source :database_0;
-    rml:query "SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND LineEdges2.LineNodeEndID = LineNodes2.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.LineNodeStartID = LineNodes1.ID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineEdges1.ID != LineEdges2.ID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID;".
+    rml:query "SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND LineEdges2.LineNodeEndID = LineNodes2.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.LineNodeStartID = LineNodes1.ID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineEdges1.ID != LineEdges2.ID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID AND OP1.UOPID NOT IN ('NLBHV', 'NLBKLA', 'NLBKP', 'NLBLOA', 'NLDB', 'NLDLD', 'NLHMLA', 'NLMAS', 'NLUT', 'NLUTZA', 'NLVTN');".
 :database_0 a d2rq:Database;
     d2rq:jdbcDSN "//10.10.160.21:1433";
     d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver";
@@ -41,7 +41,7 @@
 :pm_1 rr:constant era:bidirectional.
 :pom_1 rr:objectMap :om_1.
 :om_1 a rr:ObjectMap;
-    rr:constant "true";
+    rr:constant "false";
     rr:termType rr:Literal;
     rr:datatype xsd:boolean.
 :pom_2 a rr:PredicateObjectMap.
@@ -51,7 +51,7 @@
 :pm_2 rr:constant era:startPort.
 :pom_2 rr:objectMap :om_2.
 :om_2 a rr:ObjectMap;
-    rr:template "http://era.europa.eu/abstraction#NP_{INCOMING_REMOTE_OP}_{INCOMING}_{UOPID}";
+    rr:template "http://era.europa.eu/abstraction#NP_{UOPID}_{INCOMING}_{INCOMING_REMOTE_OP}";
     rr:termType rr:IRI.
 :pom_3 a rr:PredicateObjectMap.
 :map_internal-node-link-in-out_0 rr:predicateObjectMap :pom_3.
@@ -65,7 +65,7 @@
 :map_internal-node-link-out-in_0 rml:logicalSource :source_1.
 :source_1 a rml:LogicalSource;
     rml:source :database_1;
-    rml:query "SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND Tracks2.ID != Tracks1.ID AND LineEdges2.LineNodeStartID = LineNodes2.ID AND LineEdges1.LineNodeEndID = LineNodes1.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID;".
+    rml:query "SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND Tracks2.ID != Tracks1.ID AND LineEdges2.LineNodeStartID = LineNodes2.ID AND LineEdges1.LineNodeEndID = LineNodes1.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID AND OP1.UOPID NOT IN ('NLBHV', 'NLBKLA', 'NLBKP', 'NLBLOA', 'NLDB', 'NLDLD', 'NLHMLA', 'NLMAS', 'NLUT', 'NLUTZA', 'NLVTN');".
 :database_1 a d2rq:Database;
     d2rq:jdbcDSN "//10.10.160.21:1433";
     d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver";
@@ -93,7 +93,7 @@
 :pm_5 rr:constant era:bidirectional.
 :pom_5 rr:objectMap :om_5.
 :om_5 a rr:ObjectMap;
-    rr:constant "true";
+    rr:constant "false";
     rr:termType rr:Literal;
     rr:datatype xsd:boolean.
 :pom_6 a rr:PredicateObjectMap.
@@ -103,7 +103,7 @@
 :pm_6 rr:constant era:startPort.
 :pom_6 rr:objectMap :om_6.
 :om_6 a rr:ObjectMap;
-    rr:template "http://era.europa.eu/abstraction#NP_{INCOMING_REMOTE_OP}_{INCOMING}_{UOPID}";
+    rr:template "http://era.europa.eu/abstraction#NP_{UOPID}_{INCOMING}_{INCOMING_REMOTE_OP}";
     rr:termType rr:IRI.
 :pom_7 a rr:PredicateObjectMap.
 :map_internal-node-link-out-in_0 rr:predicateObjectMap :pom_7.
@@ -117,7 +117,7 @@
 :map_internal-node-link-no-out_0 rml:logicalSource :source_2.
 :source_2 a rml:LogicalSource;
     rml:source :database_2;
-    rml:query "SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND Tracks2.ID != Tracks1.ID AND LineEdges2.LineNodeEndID = LineNodes2.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.LineNodeEndID = LineNodes1.ID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID;".
+    rml:query "SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeStartID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND Tracks2.ID != Tracks1.ID AND LineEdges2.LineNodeEndID = LineNodes2.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.LineNodeEndID = LineNodes1.ID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID AND OP1.UOPID NOT IN ('NLBHV', 'NLBKLA', 'NLBKP', 'NLBLOA', 'NLDB', 'NLDLD', 'NLHMLA', 'NLMAS', 'NLUT', 'NLUTZA', 'NLVTN');".
 :database_2 a d2rq:Database;
     d2rq:jdbcDSN "//10.10.160.21:1433";
     d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver";
@@ -145,7 +145,7 @@
 :pm_9 rr:constant era:bidirectional.
 :pom_9 rr:objectMap :om_9.
 :om_9 a rr:ObjectMap;
-    rr:constant "true";
+    rr:constant "false";
     rr:termType rr:Literal;
     rr:datatype xsd:boolean.
 :pom_10 a rr:PredicateObjectMap.
@@ -155,7 +155,7 @@
 :pm_10 rr:constant era:startPort.
 :pom_10 rr:objectMap :om_10.
 :om_10 a rr:ObjectMap;
-    rr:template "http://era.europa.eu/abstraction#NP_{INCOMING_REMOTE_OP}_{INCOMING}_{UOPID}";
+    rr:template "http://era.europa.eu/abstraction#NP_{UOPID}_{INCOMING}_{INCOMING_REMOTE_OP}";
     rr:termType rr:IRI.
 :pom_11 a rr:PredicateObjectMap.
 :map_internal-node-link-no-out_0 rr:predicateObjectMap :pom_11.
@@ -164,12 +164,12 @@
 :pm_11 rr:constant era:endPort.
 :pom_11 rr:objectMap :om_11.
 :om_11 a rr:ObjectMap;
-    rr:template "http://era.europa.eu/abstraction#NP_{OUTGOING_REMOTE_OP}_{OUTGOING}_{UOPID}";
+    rr:template "http://era.europa.eu/abstraction#NP_{UOPID}_{OUTGOING}_{OUTGOING_REMOTE_OP}";
     rr:termType rr:IRI.
 :map_internal-node-link-no-in_0 rml:logicalSource :source_3.
 :source_3 a rml:LogicalSource;
     rml:source :database_3;
-    rml:query "SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND Tracks2.ID != Tracks1.ID AND LineEdges2.LineNodeStartID = LineNodes2.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.LineNodeStartID = LineNodes1.ID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID".
+    rml:query "SELECT (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges2.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS INCOMING_REMOTE_OP, Tracks2.UUID AS INCOMING, TRIM(OP2.UOPID) AS UOPID, Tracks1.UUID AS OUTGOING, (SELECT TRIM(UOPID) FROM RINF.dbo.OperationalPoints, RINF.dbo.LineNodes WHERE LineNodes.OperationalPointID = OperationalPoints.ID AND LineNodes.ID = LineEdges1.LineNodeEndID AND OperationalPoints.VersionID=LineNodes.VersionID) AS OUTGOING_REMOTE_OP FROM RINF.dbo.Tracks AS Tracks2, RINF.dbo.SOLTracks AS SOLTracks2, RINF.dbo.SectionOfLines AS SectionOfLines2, RINF.dbo.Tracks AS Tracks1, RINF.dbo.SOLTracks AS SOLTracks1, RINF.dbo.SectionOfLines AS SectionOfLines1, RINF.dbo.LineEdges AS LineEdges2, RINF.dbo.LineEdges AS LineEdges1, RINF.dbo.LineNodes AS LineNodes1, RINF.dbo.LineNodes AS LineNodes2, RINF.dbo.OperationalPoints AS OP1, RINF.dbo.OperationalPoints AS OP2, RINF.dbo.LookupValues WHERE Tracks2.ID = SOLTracks2.TrackID AND SOLTracks2.SectionOfLineID = SectionOfLines2.ID AND SectionOfLines2.LineEdgeID = LineEdges2.ID AND Tracks2.VersionID = LineEdges2.VersionID AND Tracks1.ID = SOLTracks1.TrackID AND SOLTracks1.SectionOfLineID = SectionOfLines1.ID AND SectionOfLines1.LineEdgeID = LineEdges1.ID AND Tracks1.VersionID = LineEdges1.VersionID AND Tracks2.ID != Tracks1.ID AND LineEdges2.LineNodeStartID = LineNodes2.ID AND LineEdges2.VersionID = LineNodes2.VersionID AND LineEdges1.LineNodeStartID = LineNodes1.ID AND LineEdges1.VersionID = LineNodes1.VersionID AND LineNodes2.OperationalPointID = OP2.ID AND LineNodes1.OperationalPointID = OP1.ID AND LineNodes2.VersionID = OP2.VersionID AND LineNodes1.VersionID = OP1.VersionID AND OP2.UOPID = OP1.UOPID AND OP1.[Type] = LookupValues.ID AND OP2.[Type] = LookupValues.ID AND OP1.UOPID NOT IN ('NLBHV', 'NLBKLA', 'NLBKP', 'NLBLOA', 'NLDB', 'NLDLD', 'NLHMLA', 'NLMAS', 'NLUT', 'NLUTZA', 'NLVTN');".
 :database_3 a d2rq:Database;
     d2rq:jdbcDSN "//10.10.160.21:1433";
     d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver";
@@ -197,7 +197,7 @@
 :pm_13 rr:constant era:bidirectional.
 :pom_13 rr:objectMap :om_13.
 :om_13 a rr:ObjectMap;
-    rr:constant "true";
+    rr:constant "false";
     rr:termType rr:Literal;
     rr:datatype xsd:boolean.
 :pom_14 a rr:PredicateObjectMap.
diff --git a/rml/internal-node-links-real_rml.ttl b/rml/internal-node-links-real_rml.ttl
new file mode 100644
index 0000000..e01ef4f
--- /dev/null
+++ b/rml/internal-node-links-real_rml.ttl
@@ -0,0 +1,111 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#>.
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
+@prefix fnml: <http://semweb.mmlab.be/ns/fnml#>.
+@prefix fno: <https://w3id.org/function/ontology#>.
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#>.
+@prefix rml: <http://semweb.mmlab.be/ns/rml#>.
+@prefix ql: <http://semweb.mmlab.be/ns/ql#>.
+@prefix : <http://mapping.example.com/>.
+@prefix idlab-fn: <http://example.com/idlab/function/>.
+@prefix grel: <http://users.ugent.be/~bjdmeest/function/grel.ttl#>.
+@prefix era: <http://era.europa.eu/ns#>.
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
+
+:map_internal-node-link-connectivity-table_0 rml:logicalSource :source_0.
+:source_0 a rml:LogicalSource;
+    rml:source "data/op_internal_connectivity.csv";
+    rml:referenceFormulation ql:CSV.
+:map_internal-node-link-connectivity-table_0 a rr:TriplesMap;
+    rdfs:label "internal-node-link-connectivity-table".
+:s_0 a rr:SubjectMap.
+:map_internal-node-link-connectivity-table_0 rr:subjectMap :s_0.
+:s_0 a fnml:FunctionTermMap;
+    rr:termType rr:IRI;
+    fnml:functionValue :fn_0.
+:fn_0 rml:logicalSource :source_0;
+    rr:predicateObjectMap :pomexec_0.
+:pomexec_0 rr:predicateMap :pmexec_0.
+:pmexec_0 rr:constant fno:executes.
+:pomexec_0 rr:objectMap :omexec_0.
+:omexec_0 rr:constant "http://example.com/idlab/function/trueCondition";
+    rr:termType rr:IRI.
+:fn_0 rr:predicateObjectMap :pom_0.
+:pom_0 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_0.
+:pm_0 a rr:PredicateMap;
+    rr:constant idlab-fn:strBoolean.
+:pom_0 rr:objectMap :om_0.
+:om_0 a rr:ObjectMap, fnml:FunctionTermMap;
+    fnml:functionValue :fn_1.
+:fn_1 rml:logicalSource :source_0;
+    rr:predicateObjectMap :pomexec_1.
+:pomexec_1 rr:predicateMap :pmexec_1.
+:pmexec_1 rr:constant fno:executes.
+:pomexec_1 rr:objectMap :omexec_1.
+:omexec_1 rr:constant "http://example.com/idlab/function/equal";
+    rr:termType rr:IRI.
+:fn_1 rr:predicateObjectMap :pom_1.
+:pom_1 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_1.
+:pm_1 a rr:PredicateMap;
+    rr:constant grel:valueParameter.
+:pom_1 rr:objectMap :om_1.
+:om_1 a rr:ObjectMap;
+    rml:reference "Connected";
+    rr:termType rr:Literal.
+:fn_1 rr:predicateObjectMap :pom_2.
+:pom_2 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_2.
+:pm_2 a rr:PredicateMap;
+    rr:constant grel:valueParameter2.
+:pom_2 rr:objectMap :om_2.
+:om_2 a rr:ObjectMap;
+    rr:constant "YES";
+    rr:termType rr:Literal.
+:fn_0 rr:predicateObjectMap :pom_3.
+:pom_3 a rr:PredicateObjectMap;
+    rr:predicateMap :pm_3.
+:pm_3 a rr:PredicateMap;
+    rr:constant idlab-fn:str.
+:pom_3 rr:objectMap :om_3.
+:om_3 a rr:ObjectMap;
+    rr:template "http://era.europa.eu/abstraction#INL_{IncomingRemoteOP}_{IncomingTrack}_{UOPID}_{OutgoingTrack}_{OutgoingRemoteOP}";
+    rr:termType rr:Literal.
+:pom_4 a rr:PredicateObjectMap.
+:map_internal-node-link-connectivity-table_0 rr:predicateObjectMap :pom_4.
+:pm_4 a rr:PredicateMap.
+:pom_4 rr:predicateMap :pm_4.
+:pm_4 rr:constant rdf:type.
+:pom_4 rr:objectMap :om_4.
+:om_4 a rr:ObjectMap;
+    rr:constant "http://era.europa.eu/ns#InternalNodeLink";
+    rr:termType rr:IRI.
+:pom_5 a rr:PredicateObjectMap.
+:map_internal-node-link-connectivity-table_0 rr:predicateObjectMap :pom_5.
+:pm_5 a rr:PredicateMap.
+:pom_5 rr:predicateMap :pm_5.
+:pm_5 rr:constant era:bidirectional.
+:pom_5 rr:objectMap :om_5.
+:om_5 a rr:ObjectMap;
+    rr:constant "true";
+    rr:termType rr:Literal;
+    rr:datatype xsd:boolean.
+:pom_6 a rr:PredicateObjectMap.
+:map_internal-node-link-connectivity-table_0 rr:predicateObjectMap :pom_6.
+:pm_6 a rr:PredicateMap.
+:pom_6 rr:predicateMap :pm_6.
+:pm_6 rr:constant era:startPort.
+:pom_6 rr:objectMap :om_6.
+:om_6 a rr:ObjectMap;
+    rr:template "http://era.europa.eu/abstraction#NP_{UOPID}_{IncomingTrack}_{IncomingRemoteOP}";
+    rr:termType rr:IRI.
+:pom_7 a rr:PredicateObjectMap.
+:map_internal-node-link-connectivity-table_0 rr:predicateObjectMap :pom_7.
+:pm_7 a rr:PredicateMap.
+:pom_7 rr:predicateMap :pm_7.
+:pm_7 rr:constant era:endPort.
+:pom_7 rr:objectMap :om_7.
+:om_7 a rr:ObjectMap;
+    rr:template "http://era.europa.eu/abstraction#NP_{UOPID}_{OutgoingTrack}_{OutgoingRemoteOP}";
+    rr:termType rr:IRI.