diff --git a/hnbgw/osmo-hnbgw-with-pfcp.cfg b/hnbgw/osmo-hnbgw-with-pfcp.cfg
index 178369a..550657b 100644
--- a/hnbgw/osmo-hnbgw-with-pfcp.cfg
+++ b/hnbgw/osmo-hnbgw-with-pfcp.cfg
@@ -20,30 +20,112 @@
  logging level lpfcp info
  logging level lsua notice
  logging level lsccp notice
+ logging print timestamp date
 !
 line vty
  no login
 !
 cs7 instance 0
  point-code 0.23.5
- sccp-address msc
+
+ sccp-address msc-naught
   routing-indicator PC
   point-code 0.23.4
- sccp-address sgsn
+
+ sccp-address msc-one
+  routing-indicator PC
+  point-code 0.0.2
+
+ sccp-address msc-two
+  routing-indicator PC
+  point-code 0.0.3
+
+ sccp-address msc-three
+  routing-indicator PC
+  point-code 0.0.4
+
+ sccp-address sgsn-naught
   routing-indicator PC
   point-code 0.23.1
+
+ sccp-address sgsn-one
+  routing-indicator PC
+  point-code 0.1.2
+
+ sccp-address sgsn-two
+  routing-indicator PC
+  point-code 0.1.3
+
+ sccp-address sgsn-three
+  routing-indicator PC
+  point-code 0.1.4
+
 hnbgw
  log-prefix hnb-id
  iuh
   local-ip 127.0.0.1
   local-port 29169
   hnbap-allow-tmsi 1
- iucs
-  remote-addr msc
- iups
-  remote-addr sgsn
  pfcp
   remote-addr 127.0.0.1
   local-addr 127.0.0.2
   local-port 8805
  timer pfcp x26 5
+
+msc 0
+ remote-addr msc-naught
+
+msc 1
+ remote-addr msc-one
+
+msc 2
+ remote-addr msc-two
+
+msc 3
+ remote-addr msc-three
+
+sgsn 0
+ remote-addr sgsn-naught
+
+sgsn 1
+ remote-addr sgsn-one
+
+sgsn 2
+ remote-addr sgsn-two
+
+sgsn 3
+ remote-addr sgsn-three
+
+hnbgw
+ iucs
+  nri bitlen 10
+  # a NULL NRI that is outside the NRI ranges used by the MSCs:
+  nri null add 0
+  # a NULL NRI that is also used by an MSC:
+  nri null add 1
+msc 0
+ nri add 1 255
+msc 1
+ nri add 256 511
+msc 2
+ nri add 512 767
+ # range 768-1000 is not assigned to any MSC on purpose
+msc 3
+ nri add 1001 1023
+
+hnbgw
+ iups
+  nri bitlen 10
+  # a NULL NRI that is outside the NRI ranges used by the SGSNs:
+  nri null add 0
+  # a NULL NRI that is also used by an SGSN:
+  nri null add 1
+sgsn 0
+ nri add 1 255
+sgsn 1
+ nri add 256 511
+sgsn 2
+ nri add 512 767
+ # range 768-1000 is not assigned to any SGSN on purpose
+sgsn 3
+ nri add 1001 1023