diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp
index b9006a2..898b38d 100644
--- a/library/BSSGP_Emulation.ttcnpp
+++ b/library/BSSGP_Emulation.ttcnpp
@@ -553,6 +553,7 @@
 	var template (present) NsUnitdataIndication udi := {
 		bvci := bvci,
 		nsei := g_cfg.nsei,
+		nsvci := ?,
 		sdu := *,
 		bssgp := pdu
 	}
@@ -1232,6 +1233,7 @@
 template (present) NsUnitdataIndication tr_ptp_BnsUdInd(template (present) PDU_BSSGP pdu, template (present) BssgpBvci bvci) := {
 	bvci := bvci,
 	nsei := ?,
+	nsvci := ?,
 	sdu := *,
 	bssgp := pdu
 }
diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp
index 2e03880..ab1c136 100644
--- a/library/NS_Emulation.ttcnpp
+++ b/library/NS_Emulation.ttcnpp
@@ -53,6 +53,7 @@
 	type record NsUnitdataIndication {
 		BssgpBvci	bvci,
 		Nsei		nsei,
+		Nsvci		nsvci,
 		octetstring	sdu optional,
 		PDU_BSSGP	bssgp optional
 	}
@@ -62,13 +63,15 @@
 							   template octetstring sdu) := {
 		bvci := bvci,
 		nsei := nsei,
+		nsvci := ?,
 		sdu := sdu,
 		bssgp := ?
 	}
 
-	template (value) NsUnitdataIndication ts_NsUdInd(Nsei nsei, BssgpBvci bvci, octetstring sdu) := {
+	template (value) NsUnitdataIndication ts_NsUdInd(Nsei nsei, Nsvci nsvci, BssgpBvci bvci, octetstring sdu) := {
 		bvci := bvci,
 		nsei := nsei,
+		nsvci := nsvci,
 		sdu := sdu,
 		bssgp := dec_PDU_BSSGP(sdu)
 	}
@@ -582,7 +585,7 @@
 		}
 		/* NS-UNITDATA PDU from network to NS-UNITDATA.ind to user */
 		[] NSCP.receive(tr_NS_UNITDATA(?, ?, ?)) -> value rf {
-			NS_SP.send(ts_NsUdInd(g_config.nsei,
+			NS_SP.send(ts_NsUdInd(g_config.nsei, g_nsvc_config.nsvci,
 					     oct2int(rf.pDU_NS_Unitdata.bVCI),
 					     rf.pDU_NS_Unitdata.nS_SDU));
 		}