diff --git a/generator/generator.yml b/generator/generator.yml
index 3607146c..a3fdd2c8 100644
--- a/generator/generator.yml
+++ b/generator/generator.yml
@@ -569,7 +569,12 @@ modules:
         lookup: mtxrGaugeName
         drop_source_indexes: true
       - source_indexes: [mtxrNeighborIndex]
-        lookup: mtxrNeighborIpAddress
+        lookup: mtxrNeighborMacAddress
+        drop_source_indexes: true
+      - source_indexes: [mtxrNeighborIndex]
+        lookup: mtxrNeighborInterfaceID
+      - source_indexes: [mtxrNeighborInterfaceID]
+        lookup: ifName
         drop_source_indexes: true
       - source_indexes: [mtxrOpticalIndex]
         lookup: mtxrOpticalName
diff --git a/snmp.yml b/snmp.yml
index 3d6e175a..a22816ba 100644
--- a/snmp.yml
+++ b/snmp.yml
@@ -14735,14 +14735,28 @@ modules:
       indexes:
       - labelname: mtxrNeighborIndex
         type: gauge
+      - labelname: mtxrNeighborInterfaceID
+        type: gauge
       lookups:
       - labels:
         - mtxrNeighborIndex
-        labelname: mtxrNeighborIpAddress
-        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
-        type: InetAddressIPv4
+        labelname: mtxrNeighborMacAddress
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
+        type: PhysAddress48
+      - labels:
+        - mtxrNeighborIndex
+        labelname: mtxrNeighborInterfaceID
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
+        type: gauge
+      - labels:
+        - mtxrNeighborInterfaceID
+        labelname: ifName
+        oid: 1.3.6.1.2.1.31.1.1.1.1
+        type: DisplayString
       - labels: []
         labelname: mtxrNeighborIndex
+      - labels: []
+        labelname: mtxrNeighborInterfaceID
     - name: mtxrNeighborIpAddress
       oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
       type: InetAddressIPv4
@@ -14750,14 +14764,28 @@ modules:
       indexes:
       - labelname: mtxrNeighborIndex
         type: gauge
+      - labelname: mtxrNeighborInterfaceID
+        type: gauge
       lookups:
       - labels:
         - mtxrNeighborIndex
-        labelname: mtxrNeighborIpAddress
-        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
-        type: InetAddressIPv4
+        labelname: mtxrNeighborMacAddress
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
+        type: PhysAddress48
+      - labels:
+        - mtxrNeighborIndex
+        labelname: mtxrNeighborInterfaceID
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
+        type: gauge
+      - labels:
+        - mtxrNeighborInterfaceID
+        labelname: ifName
+        oid: 1.3.6.1.2.1.31.1.1.1.1
+        type: DisplayString
       - labels: []
         labelname: mtxrNeighborIndex
+      - labels: []
+        labelname: mtxrNeighborInterfaceID
     - name: mtxrNeighborMacAddress
       oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
       type: PhysAddress48
@@ -14765,14 +14793,28 @@ modules:
       indexes:
       - labelname: mtxrNeighborIndex
         type: gauge
+      - labelname: mtxrNeighborInterfaceID
+        type: gauge
       lookups:
       - labels:
         - mtxrNeighborIndex
-        labelname: mtxrNeighborIpAddress
-        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
-        type: InetAddressIPv4
+        labelname: mtxrNeighborMacAddress
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
+        type: PhysAddress48
+      - labels:
+        - mtxrNeighborIndex
+        labelname: mtxrNeighborInterfaceID
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
+        type: gauge
+      - labels:
+        - mtxrNeighborInterfaceID
+        labelname: ifName
+        oid: 1.3.6.1.2.1.31.1.1.1.1
+        type: DisplayString
       - labels: []
         labelname: mtxrNeighborIndex
+      - labels: []
+        labelname: mtxrNeighborInterfaceID
     - name: mtxrNeighborVersion
       oid: 1.3.6.1.4.1.14988.1.1.11.1.1.4
       type: DisplayString
@@ -14780,14 +14822,28 @@ modules:
       indexes:
       - labelname: mtxrNeighborIndex
         type: gauge
+      - labelname: mtxrNeighborInterfaceID
+        type: gauge
       lookups:
       - labels:
         - mtxrNeighborIndex
-        labelname: mtxrNeighborIpAddress
-        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
-        type: InetAddressIPv4
+        labelname: mtxrNeighborMacAddress
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
+        type: PhysAddress48
+      - labels:
+        - mtxrNeighborIndex
+        labelname: mtxrNeighborInterfaceID
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
+        type: gauge
+      - labels:
+        - mtxrNeighborInterfaceID
+        labelname: ifName
+        oid: 1.3.6.1.2.1.31.1.1.1.1
+        type: DisplayString
       - labels: []
         labelname: mtxrNeighborIndex
+      - labels: []
+        labelname: mtxrNeighborInterfaceID
     - name: mtxrNeighborPlatform
       oid: 1.3.6.1.4.1.14988.1.1.11.1.1.5
       type: DisplayString
@@ -14795,14 +14851,28 @@ modules:
       indexes:
       - labelname: mtxrNeighborIndex
         type: gauge
+      - labelname: mtxrNeighborInterfaceID
+        type: gauge
       lookups:
       - labels:
         - mtxrNeighborIndex
-        labelname: mtxrNeighborIpAddress
-        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
-        type: InetAddressIPv4
+        labelname: mtxrNeighborMacAddress
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
+        type: PhysAddress48
+      - labels:
+        - mtxrNeighborIndex
+        labelname: mtxrNeighborInterfaceID
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
+        type: gauge
+      - labels:
+        - mtxrNeighborInterfaceID
+        labelname: ifName
+        oid: 1.3.6.1.2.1.31.1.1.1.1
+        type: DisplayString
       - labels: []
         labelname: mtxrNeighborIndex
+      - labels: []
+        labelname: mtxrNeighborInterfaceID
     - name: mtxrNeighborIdentity
       oid: 1.3.6.1.4.1.14988.1.1.11.1.1.6
       type: DisplayString
@@ -14810,14 +14880,28 @@ modules:
       indexes:
       - labelname: mtxrNeighborIndex
         type: gauge
+      - labelname: mtxrNeighborInterfaceID
+        type: gauge
       lookups:
       - labels:
         - mtxrNeighborIndex
-        labelname: mtxrNeighborIpAddress
-        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
-        type: InetAddressIPv4
+        labelname: mtxrNeighborMacAddress
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
+        type: PhysAddress48
+      - labels:
+        - mtxrNeighborIndex
+        labelname: mtxrNeighborInterfaceID
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
+        type: gauge
+      - labels:
+        - mtxrNeighborInterfaceID
+        labelname: ifName
+        oid: 1.3.6.1.2.1.31.1.1.1.1
+        type: DisplayString
       - labels: []
         labelname: mtxrNeighborIndex
+      - labels: []
+        labelname: mtxrNeighborInterfaceID
     - name: mtxrNeighborSoftwareID
       oid: 1.3.6.1.4.1.14988.1.1.11.1.1.7
       type: DisplayString
@@ -14825,14 +14909,28 @@ modules:
       indexes:
       - labelname: mtxrNeighborIndex
         type: gauge
+      - labelname: mtxrNeighborInterfaceID
+        type: gauge
       lookups:
       - labels:
         - mtxrNeighborIndex
-        labelname: mtxrNeighborIpAddress
-        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
-        type: InetAddressIPv4
+        labelname: mtxrNeighborMacAddress
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
+        type: PhysAddress48
+      - labels:
+        - mtxrNeighborIndex
+        labelname: mtxrNeighborInterfaceID
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
+        type: gauge
+      - labels:
+        - mtxrNeighborInterfaceID
+        labelname: ifName
+        oid: 1.3.6.1.2.1.31.1.1.1.1
+        type: DisplayString
       - labels: []
         labelname: mtxrNeighborIndex
+      - labels: []
+        labelname: mtxrNeighborInterfaceID
     - name: mtxrNeighborInterfaceID
       oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
       type: gauge
@@ -14840,14 +14938,28 @@ modules:
       indexes:
       - labelname: mtxrNeighborIndex
         type: gauge
+      - labelname: mtxrNeighborInterfaceID
+        type: gauge
       lookups:
       - labels:
         - mtxrNeighborIndex
-        labelname: mtxrNeighborIpAddress
-        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.2
-        type: InetAddressIPv4
+        labelname: mtxrNeighborMacAddress
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.3
+        type: PhysAddress48
+      - labels:
+        - mtxrNeighborIndex
+        labelname: mtxrNeighborInterfaceID
+        oid: 1.3.6.1.4.1.14988.1.1.11.1.1.8
+        type: gauge
+      - labels:
+        - mtxrNeighborInterfaceID
+        labelname: ifName
+        oid: 1.3.6.1.2.1.31.1.1.1.1
+        type: DisplayString
       - labels: []
         labelname: mtxrNeighborIndex
+      - labels: []
+        labelname: mtxrNeighborInterfaceID
     - name: mtxrDate
       oid: 1.3.6.1.4.1.14988.1.1.12.1
       type: gauge