diff --git a/config-models/aether-3.x/files/yang/aether-types.yang b/config-models/aether-3.x/files/yang/aether-types.yang
index fedbdc6..b8de573 100755
--- a/config-models/aether-3.x/files/yang/aether-types.yang
+++ b/config-models/aether-3.x/files/yang/aether-types.yang
@@ -21,12 +21,14 @@
       type string {
         pattern '[0-9]{3}';
       }
+    description "The typedef for mcc";
   }
 
   typedef mnc {
       type string {
         pattern '[0-9]{2,3}';
       }
+    description "The typedef for mnc";
   }
 
   typedef tac {
@@ -34,49 +36,57 @@
         length 4..8;
         pattern '[0-9A-F\.]*';
       }
+    description "The typedef for tac";
   }
 
   typedef ent {
       type uint32 {
         range 0..999;
       }
-  }  
+    description "The typedef for ent";
+  }
 
   typedef dnn {
       type string {
         length 1..32;
       }
-  }  
+    description "The typedef for dnn";
+  }
 
   typedef sst {
       type uint8 {
         range 1..255;
       }
+    description "The typedef for sst";
   }
 
   typedef sd {
       type uint32 {
         range 0..16777215;
       }
+    description "The typedef for sd";
   }
 
   typedef qci {
       type uint8 {
         range 1..32;
       }
+    description "The typedef for qci";
   }
 
   typedef pelr {
       type int8 {
         range 0..10;
       }
+    description "The typedef for pelr";
   }
 
   typedef pdb {
       type uint16 {
         range 0..1000;
       }
-  }  
+    description "The typedef for pdb";
+  }
 
   // "TCP" or "UDP"
   typedef protocol {
@@ -85,6 +95,7 @@
         pattern "TCP|UDP";
       }
       default "TCP";
+    description "The typedef for protocol";
   }
 
   // "ENABLE" | "MAINTENTANCE" | "DISABLE"
@@ -94,16 +105,19 @@
         pattern "ENABLE|MAINTENANCE|DISABLE";
       }
       default "ENABLE";
-  }  
+    description "The typedef for admin-status";
+  }
 
   typedef mtu {
       type inet:port-number;
       default 1492;
+    description "The typedef for mtu";
   }
 
   typedef description {
     type string {
       length 1..1024;
     }
+    description "The typedef for description";
   }
 }
diff --git a/config-models/aether-3.x/files/yang/ap-list.yang b/config-models/aether-3.x/files/yang/ap-list.yang
index 3c1a759..cb0ecde 100755
--- a/config-models/aether-3.x/files/yang/ap-list.yang
+++ b/config-models/aether-3.x/files/yang/ap-list.yang
@@ -13,7 +13,7 @@
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
-  description 
+  description
     "An Aether AP List is a named list of access points.";
 
   revision "2021-06-02" {
@@ -25,6 +25,7 @@
         type yg:yang-identifier {
             length 1..32;
         }
+    description "The typedef ap-list-id";
   }
 
   container ap-list {
@@ -52,7 +53,7 @@
           mandatory true;
           description
               "Type Allocation Code";
-        }        
+        }
         leaf enable {
           type boolean;
           default true;
@@ -61,14 +62,14 @@
         }
         description
           "List of access point addresses";
-      }        
+      }
 
       leaf display-name {
         type string {
             length 1..80;
         }
         description "display name to use in GUI or CLI";
-      }     
+      }
 
       leaf description {
         type at:description;
@@ -85,7 +86,7 @@
         mandatory true;
         description
           "Link to enterprise that owns this Access Point List";
-      }       
+      }
     }
-  } 
+  }
 }
diff --git a/config-models/aether-3.x/files/yang/application.yang b/config-models/aether-3.x/files/yang/application.yang
index 2f1a4fc..fcc05e3 100755
--- a/config-models/aether-3.x/files/yang/application.yang
+++ b/config-models/aether-3.x/files/yang/application.yang
@@ -13,7 +13,7 @@
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
-  description 
+  description
     "An Aether Application is an application that UE devices may
      connect to. Includes a set of endpoints where services are
      provided.";
@@ -27,6 +27,7 @@
         type yg:yang-identifier {
             length 1..32;
         }
+    description "The typedef for application-id";
   }
 
   container application {
@@ -83,7 +84,8 @@
           type at:protocol;
           description
               "Name of this endpoint";
-        }                   
+        }
+        description "The list for endpoints";
       }
 
       leaf enterprise {
@@ -95,5 +97,5 @@
           "Link to enterprise that owns this Application. May be set to None if the application is global to all Enterprises.";
       }
     }
-  } 
+  }
 }
diff --git a/config-models/aether-3.x/files/yang/connectivity-service.yang b/config-models/aether-3.x/files/yang/connectivity-service.yang
index f3cc3fc..aa97da3 100755
--- a/config-models/aether-3.x/files/yang/connectivity-service.yang
+++ b/config-models/aether-3.x/files/yang/connectivity-service.yang
@@ -12,7 +12,7 @@
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
-  description 
+  description
     "An Aether Connectivity service is the linkage between the
      ROC and a core that provides connectivity.";
 
@@ -25,6 +25,7 @@
         type yg:yang-identifier {
             length 1..32;
         }
+    description "The typedef for connectivity-service-id";
   }
 
   container connectivity-service {
@@ -45,7 +46,7 @@
             length 1..80;
         }
         description "display name to use in GUI or CLI";
-      }     
+      }
 
       leaf description {
         type at:description;
@@ -70,7 +71,7 @@
       leaf core-5g-endpoint {
         type inet:uri;
         description "url of the 5g core";
-      }      
+      }
     }
-  } 
+  }
 }
diff --git a/config-models/aether-3.x/files/yang/device-group.yang b/config-models/aether-3.x/files/yang/device-group.yang
index e9c1590..feb0337 100755
--- a/config-models/aether-3.x/files/yang/device-group.yang
+++ b/config-models/aether-3.x/files/yang/device-group.yang
@@ -13,7 +13,7 @@
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
-  description 
+  description
     "An aether device group represents a list of device IMSIS.
      This list is expressed as a set of ranges,
          [(from_imsi, to_imsi),
@@ -33,7 +33,8 @@
         type yg:yang-identifier {
             length 1..32;
         }
-  }  
+    description "The typedef for device-group-id";
+  }
 
   container device-group {
     description "The top level container";
@@ -58,19 +59,22 @@
             length 1..80;
         }
         description "display name to use in GUI or CLI";
-      }      
-      
+      }
+
       list imsis {
         // TODO: imsi-range-from cannot be used as a list index
         key "name";
         leaf name {
           type string;
+          description "The leaf for imsi name";
         }
         leaf imsi-range-from {
           type uint64;
+	  description "The leaf for imsi-range-from";
         }
         leaf imsi-range-to {
           type uint64;
+          description "The leaf for imsi-range-to";
         }
         description
           "List of imsi ranges that comprise this group. It's acceptable for
@@ -80,7 +84,7 @@
       leaf ip-domain {
         type leafref {
           path "/ipd:ip-domain/ipd:ip-domain/ipd:id";
-        }          
+        }
         description
           "Link to ip-domain settings that determine the pool of IP addresses,
            as well as the domain resolver settings to use";
@@ -95,5 +99,5 @@
           "Link to site";
       }
     }
-  } 
+  }
 }
diff --git a/config-models/aether-3.x/files/yang/enterprise.yang b/config-models/aether-3.x/files/yang/enterprise.yang
index 4d91f47..8128e6d 100755
--- a/config-models/aether-3.x/files/yang/enterprise.yang
+++ b/config-models/aether-3.x/files/yang/enterprise.yang
@@ -12,7 +12,7 @@
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
-  description 
+  description
     "An Aether Enterprise is an administration entity that
      has ownership of resrouces.";
 
@@ -25,6 +25,7 @@
         type yg:yang-identifier {
             length 1..32;
         }
+    description "The typedef for enterprise-id";
   }
 
   container enterprise {
@@ -45,7 +46,7 @@
             length 1..80;
         }
         description "display name to use in GUI or CLI";
-      }     
+      }
 
       leaf description {
         type at:description;
@@ -57,7 +58,7 @@
         leaf connectivity-service {
           type leafref {
             path "/cs:connectivity-service/cs:connectivity-service/cs:id";
-          }            
+          }
           description
             "Link to connectivity services where configuration should be pushed for this enterprise's devices";
         }
@@ -67,7 +68,8 @@
           description
             "Allow or disallow pushes to this connectivity service";
         }
-      }              
+        description "The list for connectivity-service";
+      }
     }
-  } 
+  }
 }
diff --git a/config-models/aether-3.x/files/yang/ietf-inet-types.yang b/config-models/aether-3.x/files/yang/ietf-inet-types.yang
index eacefb6..fa57f75 100644
--- a/config-models/aether-3.x/files/yang/ietf-inet-types.yang
+++ b/config-models/aether-3.x/files/yang/ietf-inet-types.yang
@@ -354,11 +354,11 @@
 
   typedef domain-name {
     type string {
+      length "1..253";
       pattern
         '((([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.)*'
       + '([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.?)'
       + '|\.';
-      length "1..253";
     }
     description
      "The domain-name type represents a DNS domain name.  The
diff --git a/config-models/aether-3.x/files/yang/ip-domain.yang b/config-models/aether-3.x/files/yang/ip-domain.yang
index 7f2bf73..9efd41d 100755
--- a/config-models/aether-3.x/files/yang/ip-domain.yang
+++ b/config-models/aether-3.x/files/yang/ip-domain.yang
@@ -27,6 +27,7 @@
         type yg:yang-identifier {
             length 1..32;
         }
+    description "The typedef for ip-domain-id";
   }
 
   container ip-domain {
@@ -52,7 +53,7 @@
       leaf dnn {
         type at:dnn;
         description "DNN/APN";
-      }      
+      }
 
       leaf dns-primary {
         type inet:ip-address;
@@ -80,7 +81,7 @@
       leaf mtu {
         type at:mtu;
         description "maximum transmission unit";
-      }           
+      }
 
       leaf description {
         type at:description;
@@ -96,7 +97,7 @@
         mandatory true;
         description
           "Link to enterprise that owns this IP-Domain";
-      }         
+      }
     }
-  } 
+  }
 }
diff --git a/config-models/aether-3.x/files/yang/site.yang b/config-models/aether-3.x/files/yang/site.yang
index 89f8fc7..5c4a31c 100755
--- a/config-models/aether-3.x/files/yang/site.yang
+++ b/config-models/aether-3.x/files/yang/site.yang
@@ -12,7 +12,7 @@
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
-  description 
+  description
     "An Aether site is a location where resources are deployed.";
 
   revision "2021-06-02" {
@@ -24,6 +24,7 @@
         type yg:yang-identifier {
             length 1..32;
         }
+    description "The typedef for site-id";
   }
 
   container site {
@@ -49,27 +50,27 @@
       leaf enterprise {
         type leafref {
           path "/ent:enterprise/ent:enterprise/ent:id";
-        }              
+        }
+        mandatory true;
         description
           "Link to enterprise that owns this site";
-        mandatory true;          
       }
 
       container imsi-definition {
         leaf mcc {
           type at:mcc;
+	  mandatory true;
           description "mobile country code";
-          mandatory true;
         }
         leaf mnc {
           type at:mnc;
+	  mandatory true;
           description "mobile network code";
-          mandatory true;
         }
         leaf enterprise {
           type at:ent;
+	  mandatory true;
           description "enterprise-specific identifier";
-          mandatory true;
         }
         leaf format {
           type string {
@@ -89,12 +90,13 @@
           //   3 digit enterprise ID
           //   5 digit subscriber ID
         }
+        description "The container for imsi-definition";
       }
 
       leaf description {
         type at:description;
         description "description of this site";
-      }         
+      }
     }
-  } 
+  }
 }
diff --git a/config-models/aether-3.x/files/yang/template.yang b/config-models/aether-3.x/files/yang/template.yang
index ea040e7..95bda57 100755
--- a/config-models/aether-3.x/files/yang/template.yang
+++ b/config-models/aether-3.x/files/yang/template.yang
@@ -12,7 +12,7 @@
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
-  description 
+  description
     "The aether vcs-template holds common parameters used
      by a virtual connectivity service. Templates are used to
      populate a VCS.";
@@ -26,6 +26,7 @@
         type yg:yang-identifier {
             length 1..32;
         }
+    description "The typedef for template-id";
   }
 
   container template {
@@ -71,15 +72,15 @@
       leaf traffic-class {
         type leafref {
           path "/tc:traffic-class/tc:traffic-class/tc:id";
-        }          
+        }
         description
           "Link to traffic class";
-      } 
+      }
 
       leaf description {
         type at:description;
         description "description of this vcs template";
       }
     }
-  } 
+  }
 }
diff --git a/config-models/aether-3.x/files/yang/traffic-class.yang b/config-models/aether-3.x/files/yang/traffic-class.yang
index 636c816..ce9aeb5 100755
--- a/config-models/aether-3.x/files/yang/traffic-class.yang
+++ b/config-models/aether-3.x/files/yang/traffic-class.yang
@@ -11,7 +11,7 @@
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
-  description 
+  description
     "The aether traffic class associates qos constants
      with a named class of service";
 
@@ -24,6 +24,7 @@
         type yg:yang-identifier {
             length 1..32;
         }
+    description "The typedef for traffic-class-id";
   }
 
   container traffic-class {
@@ -54,17 +55,17 @@
       leaf pdb {
         type at:pdb;
         description "PDB";
-      }        
+      }
 
       leaf qci {
         type at:qci;
         description "QCI";
-      }      
+      }
 
       leaf description {
         type at:description;
         description "description of this traffic class";
       }
     }
-  } 
+  }
 }
diff --git a/config-models/aether-3.x/files/yang/upf.yang b/config-models/aether-3.x/files/yang/upf.yang
index 1c92214..3c56722 100755
--- a/config-models/aether-3.x/files/yang/upf.yang
+++ b/config-models/aether-3.x/files/yang/upf.yang
@@ -24,6 +24,7 @@
         type yg:yang-identifier {
             length 1..32;
         }
+    description "The typedef for upf-id";
   }
 
   container upf {
@@ -75,7 +76,7 @@
         mandatory true;
         description
           "Link to enterprise that owns this Access Point List";
-      }      
+      }
     }
-  } 
+  }
 }
diff --git a/config-models/aether-3.x/files/yang/vcs.yang b/config-models/aether-3.x/files/yang/vcs.yang
index ab4e370..5799143 100755
--- a/config-models/aether-3.x/files/yang/vcs.yang
+++ b/config-models/aether-3.x/files/yang/vcs.yang
@@ -8,7 +8,7 @@
 
   import template{ prefix vt; }
   import upf { prefix upf; }
-  import ap-list{ prefix apl; }    
+  import ap-list{ prefix apl; }
   import application{ prefix app; }
   import aether-types{ prefix at; }
   import device-group{ prefix dg; }
@@ -18,7 +18,7 @@
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
-  description 
+  description
     "An Aether Virtual Cellular Service (VCS) is
      used to connect UE devices with applications";
 
@@ -31,6 +31,7 @@
         type yg:yang-identifier {
             length 1..32;
         }
+    description "The typedef for vcs-id";
   }
 
   container vcs {
@@ -54,13 +55,13 @@
       }
 
       list device-group {
-        key "device-group";   
+        key "device-group";
         leaf device-group {
           type leafref {
             path "/dg:device-group/dg:device-group/dg:id";
-          }          
+          }
           description
-            "Link to device group";          
+            "Link to device group";
         }
         leaf enable {
           type boolean;
@@ -71,19 +72,19 @@
         description
           "A list of device groups. Groups will only participate in
            the VCS if the enable field is set to True";
-      }         
+      }
 
       leaf template {
         type leafref {
           path "/vt:template/vt:template/vt:id";
-        }          
+        }
         description
           "Link to user vcs template that was used to initialize
            this VCS";
       }
 
       list application {
-        key "application";   
+        key "application";
         leaf application {
           type leafref {
             path "/app:application/app:application/app:id";
@@ -102,12 +103,12 @@
           "An ordered list of applications to allow and deny. The deny rules
            will be executed first, followed by the allow rules. The first rule
            to match is returned. An implicit DENY ALL lies at the end.";
-      }      
+      }
 
       leaf upf {
         type leafref {
           path "/upf:upf/upf:upf/upf:id";
-        }          
+        }
         description
           "Link to user plane that implements this vcf";
       }
@@ -115,7 +116,7 @@
       leaf ap {
         type leafref {
           path "/apl:ap-list/apl:ap-list/apl:id";
-        }          
+        }
         description
           "Link to access-point list";
       }
@@ -132,7 +133,7 @@
         mandatory true;
         description
           "Link to enterprise that owns this VCS";
-      }      
+      }
 
       // the following are populated from the template
       leaf sst {
@@ -140,7 +141,7 @@
         mandatory true;
         description "Slice/Service type. Immutable.";
       }
-      
+
       leaf sd {
         type at:sd;
         mandatory true;
@@ -167,5 +168,5 @@
       }
       // end of items populated from the template
     }
-  } 
+  }
 }