diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpReachNlri.java b/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpReachNlri.java
index 90a1cc6..fe99d28 100644
--- a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpReachNlri.java
+++ b/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpReachNlri.java
@@ -26,6 +26,7 @@
 import org.onosproject.bgpio.protocol.BGPLSNlri;
 import org.onosproject.bgpio.protocol.linkstate.BGPPrefixIPv4LSNlriVer4;
 import org.onosproject.bgpio.protocol.linkstate.BGPNodeLSNlriVer4;
+import org.onosproject.bgpio.protocol.linkstate.BgpLinkLsNlriVer4;
 import org.onosproject.bgpio.util.Constants;
 import org.onosproject.bgpio.util.Validation;
 import org.slf4j.Logger;
@@ -39,7 +40,6 @@
 public class MpReachNlri implements BGPValueType {
 
     private static final Logger log = LoggerFactory.getLogger(MpReachNlri.class);
-
     public static final byte MPREACHNLRI_TYPE = 14;
     public static final byte LINK_NLRITYPE = 2;
 
@@ -131,8 +131,7 @@
             if ((afi == Constants.AFI_VALUE) && (safi == Constants.SAFI_VALUE) || (afi == Constants.AFI_VALUE)
                                     && (safi == Constants.VPN_SAFI_VALUE)) {
                 byte nextHopLen = tempCb.readByte();
-                //TODO: use Validation.toInetAddress once Validation is merged
-                InetAddress ipAddress = (InetAddress) cb.readBytes(nextHopLen);
+                InetAddress ipAddress = Validation.toInetAddress(nextHopLen, cb);
                 if (ipAddress.isMulticastAddress()) {
                     throw new BGPParseException("Multicast not supported");
                 }
@@ -151,8 +150,8 @@
                     case BGPNodeLSNlriVer4.NODE_NLRITYPE:
                         bgpLSNlri = BGPNodeLSNlriVer4.read(tempBuf, afi, safi);
                         break;
-                    case LINK_NLRITYPE:
-                        //TODO: To be merged later
+                    case BgpLinkLsNlriVer4.LINK_NLRITYPE:
+                        bgpLSNlri = BgpLinkLsNlriVer4.read(tempBuf, afi, safi);
                         break;
                     case BGPPrefixIPv4LSNlriVer4.PREFIX_IPV4_NLRITYPE:
                         bgpLSNlri = BGPPrefixIPv4LSNlriVer4.read(tempBuf, afi, safi);
@@ -163,7 +162,6 @@
                     mpReachNlri.add(bgpLSNlri);
                 }
             } else {
-                //TODO: check with the values got from capability
                 throw new BGPParseException("Not Supporting afi " + afi + "safi " + safi);
             }
         }
diff --git a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpUnReachNlri.java b/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpUnReachNlri.java
index 3efed95..8763ec5 100644
--- a/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpUnReachNlri.java
+++ b/bgp/bgpio/src/main/java/org/onosproject/bgpio/types/MpUnReachNlri.java
@@ -24,6 +24,7 @@
 import org.onosproject.bgpio.protocol.BGPLSNlri;
 import org.onosproject.bgpio.protocol.linkstate.BGPNodeLSNlriVer4;
 import org.onosproject.bgpio.protocol.linkstate.BGPPrefixIPv4LSNlriVer4;
+import org.onosproject.bgpio.protocol.linkstate.BgpLinkLsNlriVer4;
 import org.onosproject.bgpio.util.Constants;
 import org.onosproject.bgpio.util.Validation;
 import org.slf4j.Logger;
@@ -36,10 +37,10 @@
  */
 public class MpUnReachNlri implements BGPValueType {
 
-    protected static final Logger log = LoggerFactory.getLogger(MpUnReachNlri.class);
-
+    private static final Logger log = LoggerFactory.getLogger(MpUnReachNlri.class);
     public static final byte MPUNREACHNLRI_TYPE = 15;
     public static final byte LINK_NLRITYPE = 2;
+
     private boolean isMpUnReachNlri = false;
     private final short afi;
     private final byte safi;
@@ -113,8 +114,8 @@
                     case BGPNodeLSNlriVer4.NODE_NLRITYPE:
                         bgpLSNlri = BGPNodeLSNlriVer4.read(tempBuf, afi, safi);
                         break;
-                    case LINK_NLRITYPE:
-                        //TODO: to be merged later
+                    case BgpLinkLsNlriVer4.LINK_NLRITYPE:
+                        bgpLSNlri = BgpLinkLsNlriVer4.read(tempBuf, afi, safi);
                         break;
                     case BGPPrefixIPv4LSNlriVer4.PREFIX_IPV4_NLRITYPE:
                         bgpLSNlri = BGPPrefixIPv4LSNlriVer4.read(tempBuf, afi,