diff --git a/artifacts/open-traffic-generator-dhcpv6client.txt b/artifacts/open-traffic-generator-dhcpv6client.txt
index 977e55c..e901c53 100644
--- a/artifacts/open-traffic-generator-dhcpv6client.txt
+++ b/artifacts/open-traffic-generator-dhcpv6client.txt
@@ -19,10 +19,14 @@ module: open-traffic-generator-dhcpv6client
            |  +--ro rapid-commit-solicits-sent?      otg-types:counter64
            |  +--ro rapid-commit-replies-received?   otg-types:counter64
            +--ro interface
-              +--ro iapd-address?         otg-types:ipv6-address
-              +--ro iapd-prefix-length?   uint32
-              +--ro address?              otg-types:ipv6-address
-              +--ro gateway-address?      otg-types:ipv6-address
-              +--ro lease-time?           uint32
-              +--ro renew-time?           uint32
-              +--ro rebind-time?          uint32
+              +--ro iapd-addresses
+              |  +--ro iapd-address* []
+              |     +--ro address?         otg-types:ipv6-address
+              |     +--ro prefix-length?   uint32
+              +--ro ia-addresses
+              |  +--ro ia-address* []
+              |     +--ro address?   otg-types:ipv6-address
+              |     +--ro gateway?   otg-types:ipv6-address
+              +--ro lease-time?       uint32
+              +--ro renew-time?       uint32
+              +--ro rebind-time?      uint32
diff --git a/models/dhcp/v6client/open-traffic-generator-dhcpv6client.yang b/models/dhcp/v6client/open-traffic-generator-dhcpv6client.yang
index df8a547..708ff8a 100644
--- a/models/dhcp/v6client/open-traffic-generator-dhcpv6client.yang
+++ b/models/dhcp/v6client/open-traffic-generator-dhcpv6client.yang
@@ -162,26 +162,51 @@ module open-traffic-generator-dhcpv6client {
   grouping dhcp6-interface {
     description
       "This grouping defines learning of IPv6 address information.";
-    leaf iapd-address {
-      type otg-types:ipv6-address;
-      description
-        "The IPv6 IAPD address associated with this DHCP Client session.";
-    }
-    leaf iapd-prefix-length {
-      type uint32;
-      description
-        "The prefix length of the IPv6 IAPD address";
-    }
-    leaf address {
-      type otg-types:ipv6-address;
+
+    container iapd-addresses {
       description
-        "The IPv6 address associated with this DHCP Client session.";
+        "Discovered IPv6 IAPD addresses associated with this DHCP Client session";
+
+      list iapd-address  {
+
+        description
+          "A list of IPv6 IAPD addresses and prefix lengths.";
+
+        leaf address {
+          type otg-types:ipv6-address;
+          description
+            "The IPv6 IAPD address associated with this DHCP Client session.";
+        }
+        leaf prefix-length {
+          type uint32;
+          description
+            "The prefix length of the IPv6 IAPD address";
+        }
+      }
     }
-    leaf gateway-address {
-      type otg-types:ipv6-address;
+
+    container ia-addresses {
       description
-        "The Gateway address associated with the DHCP Client session.";
+        "Discovered IPv6 addresses and gateways associated with this DHCP Client session";
+
+      list ia-address  {
+
+        description
+          "A list of IPv6 addresses and gateways.";
+
+        leaf address {
+          type otg-types:ipv6-address;
+          description
+            "The IPv6 address associated with this DHCP Client session.";
+        }
+        leaf gateway {
+          type otg-types:ipv6-address;
+          description
+            "The Gateway address associated with the DHCP Client session.";
+        }
+      }
     }
+
     leaf lease-time {
       type uint32;
       description