diff --git a/MEC029_FAI.yaml b/MEC029_FAI.yaml
index bf560131029b837f264877350b5d372a69be21a6..e8edaf41e3933e99e65c8c21979f1d36d029d8b2 100644
--- a/MEC029_FAI.yaml
+++ b/MEC029_FAI.yaml
@@ -16,16 +16,14 @@ openapi: 3.0.0
 servers:
   - url: 'https://localhost/fai/v1'
 tags:
-  - name: queries
-    description: Queries
-  - name: subscription
-    description: Subscription    
+  - name: Queries
+  - name: Subscription  
 
 paths:
  /queries/fa_info:
   get:
    tags:
-    - 'queries'
+    - 'Queries'
    summary: 'Retrieve information on the available fixed access networks.'
    description: 'Retrieve information on the available fixed access networks.'
    operationId: fa_infoGET  
@@ -100,7 +98,7 @@ paths:
  /queries/device_info:
   get:
    tags:
-    - 'queries'
+    - 'Queries'
    summary: 'retrieve information on the devices that are connected to a fixed access network.'
    description: 'retrieve information on the devices that are connected to a fixed access network.'
    operationId: device_infoGET  
@@ -149,19 +147,296 @@ paths:
           $ref: '#/components/responses/406'
         '429':
           $ref: '#/components/responses/429'          
- #/queries/cable_line_info:
-  #get: 
- #/queries/optical_network_info: 
-  #get: 
- #/subscriptions: 
-  #get:
-  #post:
- #/subscriptions/{subscriptionId}: 
-  #get:
-  #put: 
-  #delete: 
-# /notifitication_end_point_provided_by_client
- #post:
+          
+ /queries/cable_line_info:
+  get:
+   tags:
+    - 'Cable line info'
+   summary: 'It Queries information about the cable line of a fixed access network.'
+   description: 'It Queries information about the cable line of a fixed access network.'
+   operationId: cable_line_infoGET  
+   parameters:
+        - in: query
+          name: customerPremisesInfo
+          schema:
+           type: array
+           items:
+            $ref: '#/components/schemas/CpInfo'
+          required: false
+          description: 'Comma separated list of customer premises information'
+        - in: query
+          name: cmId
+          schema:
+            type: array
+            items:
+             type: string
+          required: false
+          description: 'Comma separated list of Cable Modem identifiers.'
+    
+ 
+   responses:
+        '200':
+          description: 'A response body containing the cable line information is returned.'
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/CableLineInfo'        
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+        '406':
+          $ref: '#/components/responses/406'
+        '429':
+          $ref: '#/components/responses/429'  
+ /queries/optical_network_info: 
+  get:
+   tags:
+    - 'Optical network info'
+   summary: 'used to query information about the optical network.'
+   description: 'used to query information about the optical network.'
+   operationId: optical_network_infoGET  
+   parameters:
+        - in: query
+          name: customerPremisesInfo
+          schema:
+           type: array
+           items:
+            $ref: '#/components/schemas/CpInfo'
+          required: false
+          description: 'Comma separated list of customer premises information'
+        - in: query
+          name: ponYS_ID
+          schema:
+            type: array
+            items:
+             type: string
+          required: false
+          description: 'Comma separated list of optical system identifiers.'
+        - in: query
+          name: onuId
+          schema:
+            type: array
+            items:
+             type: string
+          required: false
+          description: 'Comma separated list of optical network unit identifiers.'   
+ 
+   responses:
+        '200':
+          description: 'A response body containing the optical network information is returned.'
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                 $ref: '#/components/schemas/PonInfo'        
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+        '406':
+          $ref: '#/components/responses/406'
+        '429':
+          $ref: '#/components/responses/429' 
+          
+          
+ /subscriptions: 
+  get:
+   tags:
+    - 'Subscription'
+   summary: 'request information about the subscriptions for this requestor.'
+   description: 'request information about the subscriptions for this requestor.'
+   operationId: subGET  
+   parameters:
+        - in: query
+          name: subscription_type
+          schema:
+           type: string
+          required: false
+        
+          description: 'Query parameter to filter on a specific subscription type. Permitted values: ONU_ALARM. DEVICE_ABNORMAL_ALERT. CM_CONNECTIVITY_STATE.  ANI_ALARM.'
+   responses:
+        '200':
+          description: 'A response body containing the list of links to requestor subscriptions is returned.'
+          content:
+            application/json:
+              schema:
+                 $ref: '#/components/schemas/SubscriptionLinkList'        
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+        '406':
+          $ref: '#/components/responses/406'
+        '429':
+          $ref: '#/components/responses/429' 
+  post:
+   tags:
+    - 'Subscription'
+   summary: ' create a new subscription to FAI notifications.'
+   description: ' create a new subscription to FAI notifications.'
+   operationId: subPOST  
+   requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              oneOf:
+               - $ref: '#/components/schemas/OnuAlarmSubscription'
+               - $ref: '#/components/schemas/DevInfoSubscription'
+               - $ref: '#/components/schemas/CmConnSubscription'
+               - $ref: '#/components/schemas/AniAlarmSubscription'
+
+   responses:
+        '201':
+          description: 'In the returned NotificationSubscription structure, the created subscription is described using the appropriate data type.'
+          content:
+            application/json:
+              schema:
+               oneOf:
+               - $ref: '#/components/schemas/OnuAlarmSubscription'
+               - $ref: '#/components/schemas/DevInfoSubscription'
+               - $ref: '#/components/schemas/CmConnSubscription'
+               - $ref: '#/components/schemas/AniAlarmSubscription'      
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+        '406':
+          $ref: '#/components/responses/406'
+        '415':
+          $ref: '#/components/responses/415'
+        '422':
+          $ref: '#/components/responses/422'  
+        '429':
+          $ref: '#/components/responses/429' 
+          
+ /subscriptions/{subscriptionId}: 
+    parameters:
+    - in: path
+      name: subscriptionId
+      description: 'Refers to created subscription, where the FAI API allocates a unique resource name for this subscription'
+      schema:
+        type: string
+      required: true  
+
+  
+
+    get:
+      tags:
+      - 'Subscription'
+      summary: 'Retrieve information about this subscription.'
+      description: 'Retrieve information about this subscription.'
+      operationId: individualSubscriptionGET
+      
+      responses:
+        '200':
+          description: 'A response body containing data type describing the specific FAI event subscription is returned' 
+          content:
+            application/json:
+              schema:
+               oneOf:
+               - $ref: '#/components/schemas/OnuAlarmSubscription'
+               - $ref: '#/components/schemas/DevInfoSubscription'
+               - $ref: '#/components/schemas/CmConnSubscription'
+               - $ref: '#/components/schemas/AniAlarmSubscription'  
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+        '406':
+          $ref: '#/components/responses/406'
+        '429':
+          $ref: '#/components/responses/429'   
+
+    put:
+      tags:
+      - 'Subscription'
+      summary: 'Used to update the existing subscription.'
+      description: 'Used to update the existing subscription.'
+      operationId: individualSubscriptionPUT
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              oneOf:
+               - $ref: '#/components/schemas/OnuAlarmSubscription'
+               - $ref: '#/components/schemas/DevInfoSubscription'
+               - $ref: '#/components/schemas/CmConnSubscription'
+               - $ref: '#/components/schemas/AniAlarmSubscription'
+      responses:
+        '200':
+          description: 'A response body containing data type describing the updated subscription is returned' 
+          content:
+            application/json:
+              schema:
+               oneOf:
+               - $ref: '#/components/schemas/OnuAlarmSubscription'
+               - $ref: '#/components/schemas/DevInfoSubscription'
+               - $ref: '#/components/schemas/CmConnSubscription'
+               - $ref: '#/components/schemas/AniAlarmSubscription'  
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+          
+        '403':
+          $ref: '#/components/responses/403'
+          
+        '404':
+          $ref: '#/components/responses/404'
+          
+        '406':
+          $ref: '#/components/responses/406'
+          
+        '412':
+          $ref: '#/components/responses/412' 
+          
+        '422':
+          $ref: '#/components/responses/422'
+          
+        '429':
+          $ref: '#/components/responses/429'
+    delete:
+      tags:
+      - 'Subscription'
+      summary: 'Used to cancel the existing subscription.'
+      description: 'Used to cancel the existing subscription.'
+      operationId: individualSubscriptionDELETE
+      responses:
+        '204':
+          $ref: '#/components/responses/204'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+        '429':
+          $ref: '#/components/responses/429'
+          
  
 components:
   schemas:
@@ -225,7 +500,6 @@ components:
           $ref: '#/components/schemas/TimeStamp'
       required:
       - notificationType
-      - onuId
       - aniIndex
       - alarm
       type: object
@@ -336,10 +610,10 @@ components:
       x-etsi-ref: 6.3.6
       
     CableLineInfo.cmInfo.serviceFlowStats:
-                  description: It describes statistics associated with the Service Flows in a managed device.
+                  description: 'It describes statistics associated with the Service Flows in a managed device.'
                   properties:
                       ifIndex:
-                        description: It represents the interface index of the MAC Domain of the Service Flow.
+                        description: 'It represents the interface index of the MAC Domain of the Service Flow'
                         type: string
                         x-etsi-mec-cardinality: '1'
                         x-etsi-mec-origin-type: String
@@ -565,7 +839,7 @@ components:
   
   
   
-    cmRegState:
+    CmConnNotification.cmIf.cmRegState:
        description: 'It indicates the CM connectivity state. Enumeration of:  1 = notReady. 2 = notSynchronized. 3 = phySynchronized. 4 = dsTopologyResolutionInProgress.5 = usParametersAcquired. 6 = rangingInProgress.7 = rangingComplete. 8 = eaeInProgress.9 = dhcpv4InProgress. 10 = dhcpv6InProgress.11 = dhcpV4Complete.12 = dhcpV6Complete.13 = todEstablished.14 = securityEstablished.15 = configFileDownloadComplete.16 = registrationInProgress.17 = registrationComplete. 18 = accessDenied. 19 =operational. 20 = bpiInit.21 =forwardingDisabled.'
        enum:
         - 1
@@ -589,8 +863,8 @@ components:
         - 19
         - 20
         - 21
-       type: integer    
-      
+       type: integer
+       
     CmConnNotification.cmIf:
             description: ''
             items:
@@ -603,7 +877,7 @@ components:
                 x-etsi-mec-origin-type: String
               cmRegState:
                 items:
-                  $ref: '#/components/schemas/cmRegState'
+                  $ref: '#/components/schemas/CmConnNotification.cmIf.cmRegState'
                 minItems: 1
                 type: array
                 x-etsi-mec-cardinality: 1..N
@@ -661,7 +935,33 @@ components:
           - self
           type: object
           x-etsi-mec-cardinality: 0..1
-          
+
+    CmConnSubscription.filterCriteriaCmConn.cmIf.cmRegState:
+       description: 'It indicates the CM connectivity state. Enumeration of:  1 = notReady. 2 = notSynchronized. 3 = phySynchronized. 4 = dsTopologyResolutionInProgress.5 = usParametersAcquired. 6 = rangingInProgress.7 = rangingComplete. 8 = eaeInProgress.9 = dhcpv4InProgress. 10 = dhcpv6InProgress.11 = dhcpV4Complete.12 = dhcpV6Complete.13 = todEstablished.14 = securityEstablished.15 = configFileDownloadComplete.16 = registrationInProgress.17 = registrationComplete. 18 = accessDenied. 19 =operational. 20 = bpiInit.21 =forwardingDisabled.'
+       enum:
+        - 1
+        - 2
+        - 3
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
+        - 14
+        - 15
+        - 16
+        - 17
+        - 18
+        - 19
+        - 20
+        - 21
+       type: integer
+       
     CmConnSubscription.filterCriteriaCmConn.cmIf:
                 description: ''
                 properties:
@@ -672,7 +972,7 @@ components:
                     x-etsi-mec-origin-type: String
                   cmRegState:
                     items:
-                      $ref: '#/components/schemas/cmRegState'
+                      $ref: '#/components/schemas/CmConnSubscription.filterCriteriaCmConn.cmIf.cmRegState'
                     minItems: 1
                     type: array
                     x-etsi-mec-cardinality: 1..N
@@ -692,7 +992,10 @@ components:
     CmConnSubscription.filterCriteriaCmConn:  
           description: List of filtering criteria for the subscription. Any filtering criteria from below, which is included in the request, shall also be included in the response.
           properties:
+             
               cmIf:
+               type: array
+               items:
                 $ref: '#/components/schemas/CmConnSubscription.filterCriteriaCmConn.cmIf'  
               customerPremisesInfo:
                 # description': The physical location of a customer site.
@@ -882,11 +1185,8 @@ components:
 
 
             This value shall remain fixed over the lifetime of the device, including across firmware updates.'
-          items:
-            type: string
-          minItems: 0
-          type: array
-          x-etsi-mec-cardinality: 0..N
+          type: string
+          x-etsi-mec-cardinality: 0..1
           x-etsi-mec-origin-type: String
         deviceStatus:
           $ref: '#/components/schemas/DeviceInfo.deviceStatus'
@@ -1228,12 +1528,11 @@ components:
       - diagnosticsState
       type: object
       x-etsi-ref: 6.5.4
-    LocalityTypes:
-      type: string
       
     OnuAlarmNotification.alarm:
           description: 'Indicates the alarm of the ONU:0  = EquipmentAlarm.1  = PoweringAlarm.2  = BatteryMissing.3  = BatteryFailure.4  = BatteryLow.5  = PhysicalIntrusion. 6  = OnuSelfTestFailure. 7  = DyingGasp. 8  = TemperatureYellow.9  = TemperatureRed.10 = VoltageYellow.11 = VoltageRed.12 = OnuManualPowerOff. 13 = InvImage.14 = PseOverloadYellow.15 = PseOverloadRed.'
           enum:
+          - 0
           - 1
           - 2
           - 3
@@ -1472,9 +1771,7 @@ components:
        - opticalNetworkInfo
        type: object
        x-etsi-ref: 6.2.5
-    SerializerTypes:
-      type: string
-    
+
     SubscriptionLinkList.links.subscription.subscriptionType:
                     description: 'Numeric value (0 - 255) corresponding to specified type of subscription as following: 0 = RESERVED. 1 = ONU_ALARM. 2 = DEVICE_ABNORMAL_ALERT. 3 = CM_CONNECTIVITY_STATE.4 = ANI_ALARM.'
                     enum:
@@ -1597,12 +1894,7 @@ components:
       - diagnosticsState
       type: object
       x-etsi-ref: 6.5.5
-    TransportTypes:
-      type: string
-    Uint32:
-      type: number
-    UnsignedInt:
-      type: number
+
     
     UploadDiagnostics.diagnosticsState:
           description: 'The state of the HTTP and FTP download test. Enumeration of: 1 = None. 2 = Requested. 3 = Completed. 4 = Error_InitConnectionFailed. 5 = Error_NoResponse.  6 = Error_PasswordRequestFailed. 7 = Error_LoginFailed. 8 = Error_NoTransferMode. 9 = Error_NoPASV.  10 = Error_NoCWD. 11 = Error_NoSTOR.12 = Error_NoTransferComplete.'
@@ -1673,9 +1965,7 @@ components:
       - diagnosticsState
       type: object
       x-etsi-ref: 6.5.7
-    VirtualNetworkInterfaceRequirements:
-      type: string
-      
+
     LinkType:
       description: >-
         'This data type represents a type of link'
@@ -1785,4 +2075,4 @@ components:
       content:
         application/json:
           schema:
-            $ref: '#/components/schemas/ProblemDetails' 
\ No newline at end of file
+            $ref: '#/components/schemas/ProblemDetails' 
diff --git a/proto3/models/ani_alarm_notification.proto b/proto3/models/ani_alarm_notification.proto
index 6189445779f358c90c648e6365d1c7858b6f8651..d2ddceaefdecfee76ad9c23a8de759f14870a6cb 100644
--- a/proto3/models/ani_alarm_notification.proto
+++ b/proto3/models/ani_alarm_notification.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -21,16 +21,16 @@ message AniAlarmNotification {
 
   AniAlarmNotificationAlarm alarm = 1;
 
-  AniAlarmNotificationAniId aniId = 2;
+  AniAlarmNotificationAniId ani_id = 2;
 
   // The physical location of the related customer sites.
-  repeated CpInfo customerPremisesInfo = 3;
+  repeated CpInfo customer_premises_info = 3;
 
   // Shall be set to \"AniAlarmNotification\".
-  string notificationType = 4;
+  string notification_type = 4;
 
-  string onuId = 5;
+  string onu_id = 5;
 
-  TimeStamp timeStamp = 6;
+  TimeStamp time_stamp = 6;
 
 }
diff --git a/proto3/models/ani_alarm_notification_alarm.proto b/proto3/models/ani_alarm_notification_alarm.proto
index 54e65695695487931bcdc44a106509215126962a..7d21168dbba4956f967cffa92453fe707c1dd56d 100644
--- a/proto3/models/ani_alarm_notification_alarm.proto
+++ b/proto3/models/ani_alarm_notification_alarm.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,13 @@ package mec029;
 
 
 message AniAlarmNotificationAlarm {
-
+enum TypeEnum {
+		ANI_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_0 = 0;
+		ANI_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_1 = 1;
+		ANI_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_2 = 2;
+		ANI_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_3 = 3;
+		ANI_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_4 = 4;
+		ANI_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_5 = 5;
+		ANI_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_6 = 6;
+	}
 }
diff --git a/proto3/models/ani_alarm_notification_ani_id.proto b/proto3/models/ani_alarm_notification_ani_id.proto
index c92abbcdd329c5539117f26cc4ed04df476ae384..43e12f83b58a3bfd59981fe8e87d56ae48d76f36 100644
--- a/proto3/models/ani_alarm_notification_ani_id.proto
+++ b/proto3/models/ani_alarm_notification_ani_id.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -16,9 +16,9 @@ package mec029;
 message AniAlarmNotificationAniId {
 
   // The unique identifiers for the optical network unit.
-  string onuId = 1;
+  string onu_id = 1;
 
   // The index of an access network interface supported by the optical network unit.
-  string aniIndex = 2;
+  string ani_index = 2;
 
 }
diff --git a/proto3/models/ani_alarm_subscription.proto b/proto3/models/ani_alarm_subscription.proto
index b9076ebb13e63b604dac927c2b6cc23d753cd781..0557f5aeac793523ab90c3eb20ef15025b0a08fe 100644
--- a/proto3/models/ani_alarm_subscription.proto
+++ b/proto3/models/ani_alarm_subscription.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -19,18 +19,18 @@ import public "models/time_stamp.proto";
 message AniAlarmSubscription {
 
   // Shall be set to \\\"AniAlarmSubscription\\\"
-  string subscriptionType = 1;
+  string subscription_type = 1;
 
-  AniAlarmSubscriptionLinks Underscorelinks = 2;
+  AniAlarmSubscriptionLinks links = 2;
 
   // The index of an access network interface supported by the optical network unit.
-  string aniIndex = 3;
+  string ani_index = 3;
 
   // URI selected by the service consumer to receive notifications on the subscribed FAIS information. This shall be included both in the request and in response.
-  string callbackReference = 4;
+  string callback_reference = 4;
 
-  TimeStamp expiryDeadline = 5;
+  TimeStamp expiry_deadline = 5;
 
-  AniAlarmSubscriptionFilterCriteriaAniAlarm filterCriteriaAniAlarm = 6;
+  AniAlarmSubscriptionFilterCriteriaAniAlarm filter_criteria_ani_alarm = 6;
 
 }
diff --git a/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm.proto b/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm.proto
index 547556f878a73a7413fc9292389c8d1151a04a7e..776e8f8b8780e85bece794846d6f69ff6c31470e 100644
--- a/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm.proto
+++ b/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -19,12 +19,12 @@ import public "models/cp_info.proto";
 message AniAlarmSubscriptionFilterCriteriaAniAlarm {
 
   // 0 to N physical locations of the customer sites.
-  repeated CpInfo customerPremisesInfo = 1;
+  repeated CpInfo customer_premises_info = 1;
 
   // 1 to N unique identifiers for the optical network units.  Typical it is the unique serial number for each ONU, which contains the vendor ID and version number. The first four bytes are an ASCII-encoded four-letter vendor ID. The second four bytes are a binary encoded serial number, under the control of the ONU vendor.
-  repeated string onuId = 2;
+  repeated string onu_id = 2;
 
-  AniAlarmSubscriptionFilterCriteriaAniAlarmAniId aniId = 3;
+  AniAlarmSubscriptionFilterCriteriaAniAlarmAniId ani_id = 3;
 
   repeated AniAlarmSubscriptionFilterCriteriaAniAlarmAlarms alarms = 4;
 
diff --git a/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_alarms.proto b/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_alarms.proto
index 1fa63ac439b2b8aef50470f58d1300e1048483a4..ec654b3b901bce117fb9fd8c8ba8464e07631509 100644
--- a/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_alarms.proto
+++ b/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_alarms.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,14 @@ package mec029;
 
 
 message AniAlarmSubscriptionFilterCriteriaAniAlarmAlarms {
-
+enum TypeEnum {
+		ANI_ALARM_SUBSCRIPTION_FILTER_CRITERIA_ANI_ALARM_ALARMS_TYPE_ENUM_0 = 0;
+		ANI_ALARM_SUBSCRIPTION_FILTER_CRITERIA_ANI_ALARM_ALARMS_TYPE_ENUM_1 = 1;
+		ANI_ALARM_SUBSCRIPTION_FILTER_CRITERIA_ANI_ALARM_ALARMS_TYPE_ENUM_2 = 2;
+		ANI_ALARM_SUBSCRIPTION_FILTER_CRITERIA_ANI_ALARM_ALARMS_TYPE_ENUM_3 = 3;
+		ANI_ALARM_SUBSCRIPTION_FILTER_CRITERIA_ANI_ALARM_ALARMS_TYPE_ENUM_4 = 4;
+		ANI_ALARM_SUBSCRIPTION_FILTER_CRITERIA_ANI_ALARM_ALARMS_TYPE_ENUM_5 = 5;
+		ANI_ALARM_SUBSCRIPTION_FILTER_CRITERIA_ANI_ALARM_ALARMS_TYPE_ENUM_6 = 6;
+		ANI_ALARM_SUBSCRIPTION_FILTER_CRITERIA_ANI_ALARM_ALARMS_TYPE_ENUM_MINUS_1 = 7;
+	}
 }
diff --git a/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_ani_id.proto b/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_ani_id.proto
index 7b84262146716b44db70d268f1d5f2a79b2841d7..706b79954e117ed2c8f86e30fee61b06e7cdd510 100644
--- a/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_ani_id.proto
+++ b/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_ani_id.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -16,9 +16,9 @@ package mec029;
 message AniAlarmSubscriptionFilterCriteriaAniAlarmAniId {
 
   // The unique identifiers for the optical network unit
-  string onuId = 1;
+  string onu_id = 1;
 
   // The index of an access network interface supported by the optical network unit
-  string aniIndex = 2;
+  string ani_index = 2;
 
 }
diff --git a/proto3/models/ani_alarm_subscription_links.proto b/proto3/models/ani_alarm_subscription_links.proto
index bd2501a08ee5a18f28ad82c0feb03159dc00d3bf..e843e580612aaf8253d017c10bc72a56a10a7b9a 100644
--- a/proto3/models/ani_alarm_subscription_links.proto
+++ b/proto3/models/ani_alarm_subscription_links.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
diff --git a/proto3/models/cable_line_info.proto b/proto3/models/cable_line_info.proto
index 066526aafd3dbcd6064a35ebaeae4f8ce8c2ad7a..8eb5c005c077637c6ac07ff9a5a721a9ef5cdade 100644
--- a/proto3/models/cable_line_info.proto
+++ b/proto3/models/cable_line_info.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -18,10 +18,10 @@ import public "models/time_stamp.proto";
 
 message CableLineInfo {
 
-  CableLineInfoCmInfo cmInfo = 1;
+  CableLineInfoCmInfo cm_info = 1;
 
-  CpInfo customerPremisesInfo = 2;
+  CpInfo customer_premises_info = 2;
 
-  TimeStamp timeStamp = 3;
+  TimeStamp time_stamp = 3;
 
 }
diff --git a/proto3/models/cable_line_info_cm_info.proto b/proto3/models/cable_line_info_cm_info.proto
index 028073e7b5033d193e94b844ed91bd833f53f43d..20d4323e4935f3420610fc27f4651414e2d7917e 100644
--- a/proto3/models/cable_line_info_cm_info.proto
+++ b/proto3/models/cable_line_info_cm_info.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -18,13 +18,13 @@ import public "models/cable_line_info_cm_info_service_flow_stats.proto";
 
 message CableLineInfoCmInfo {
 
-  repeated CableLineInfoCmInfoCmDpvStats cmDpvStats = 1;
+  repeated CableLineInfoCmInfoCmDpvStats cm_dpv_stats = 1;
 
   // Information (typically the serial number) to identify a Cable Modem at subscriber locations intended for use in conveying data communications on a cable data system.This value SHALL remain fixed over the lifetime of thedevice, including across firmware updates.
-  string cmId = 2;
+  string cm_id = 2;
 
-  CableLineInfoCmInfoCmStatus cmStatus = 3;
+  CableLineInfoCmInfoCmStatus cm_status = 3;
 
-  repeated CableLineInfoCmInfoServiceFlowStats serviceFlowStats = 4;
+  repeated CableLineInfoCmInfoServiceFlowStats service_flow_stats = 4;
 
 }
diff --git a/proto3/models/cable_line_info_cm_info_cm_dpv_stats.proto b/proto3/models/cable_line_info_cm_info_cm_dpv_stats.proto
index ca15fda2c1a94299365fe73faf83b902ada76a68..211290cc6c54ebffaba5898a55f0adf1bab37593 100644
--- a/proto3/models/cable_line_info_cm_info_cm_dpv_stats.proto
+++ b/proto3/models/cable_line_info_cm_info_cm_dpv_stats.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -17,23 +17,23 @@ import public "models/time_stamp.proto";
 message CableLineInfoCmInfoCmDpvStats {
 
   // The average latency measurement.
-  int32 avgLatency = 1;
+  int32 avg_latency = 1;
 
   // It represents the interface Index of the Downstream Interface where the measurements are taken.
-  string ifIndex = 2;
+  string if_index = 2;
 
   // The last latency measurement.
-  int32 lastMeasLatency = 3;
+  int32 last_meas_latency = 3;
 
-  TimeStamp lastMeasTime = 4;
+  TimeStamp last_meas_time = 4;
 
   // The maximum latency measurement.
-  int32 maxLatency = 5;
+  int32 max_latency = 5;
 
   // The minimum latency measurement.
-  int32 minLatency = 6;
+  int32 min_latency = 6;
 
   // The number of latency measurements made.
-  int32 numMeas = 7;
+  int32 num_meas = 7;
 
 }
diff --git a/proto3/models/cable_line_info_cm_info_cm_status.proto b/proto3/models/cable_line_info_cm_info_cm_status.proto
index c108bd9706ad3734e6b2d929e461d04bcb940d43..207a0bf18c71844df4223941915050021fba43a0 100644
--- a/proto3/models/cable_line_info_cm_info_cm_status.proto
+++ b/proto3/models/cable_line_info_cm_info_cm_status.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -16,22 +16,22 @@ import public "models/cable_line_info_cm_info_cm_status_cm_reg_state.proto";
 
 message CableLineInfoCmInfoCmStatus {
 
-  CableLineInfoCmInfoCmStatusCmRegState cmRegState = 1;
+  CableLineInfoCmInfoCmStatusCmRegState cm_reg_state = 1;
 
   // It indicates whether the CM is currently operating in Energy Management DLS Mode.
-  bool emDlsOperStatus = 2;
+  bool em_dls_oper_status = 2;
 
   // It indicates whether the CM is currently operating in Energy Management 1x1 Mode.
-  bool energyMgt1x1OperStatus = 3;
+  bool energy_mgt1x1_oper_status = 3;
 
   // It denotes the MAC Domain interface index of the CM.
-  string ifIndex = 4;
+  string if_index = 4;
 
   // It denotes the number of times the CM received invalid registration response messages.
-  int32 invalidRegRsps = 5;
+  int32 invalid_reg_rsps = 5;
 
   // It denotes the number of times the CM lost synchronization with the downstream channel.
-  int32 lostSyncs = 6;
+  int32 lost_syncs = 6;
 
   // It denotes the number of times the CM reset or initialized this interface.
   int32 resets = 7;
diff --git a/proto3/models/cable_line_info_cm_info_cm_status_cm_reg_state.proto b/proto3/models/cable_line_info_cm_info_cm_status_cm_reg_state.proto
index 35c8c7324be9e9cab964a97a318956a19be1ed4b..9441a19fe0c0ef17eacf6e2ad74dbd2ccd7248ba 100644
--- a/proto3/models/cable_line_info_cm_info_cm_status_cm_reg_state.proto
+++ b/proto3/models/cable_line_info_cm_info_cm_status_cm_reg_state.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,29 @@ package mec029;
 
 
 message CableLineInfoCmInfoCmStatusCmRegState {
-
+enum TypeEnum {
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_1 = 0;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_2 = 1;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_3 = 2;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_4 = 3;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_5 = 4;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_6 = 5;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_7 = 6;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_8 = 7;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_9 = 8;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_10 = 9;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_11 = 10;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_12 = 11;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_13 = 12;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_14 = 13;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_15 = 14;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_16 = 15;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_17 = 16;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_18 = 17;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_19 = 18;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_20 = 19;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_21 = 20;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_22 = 21;
+		CABLE_LINE_INFO_CM_INFO_CM_STATUS_CM_REG_STATE_TYPE_ENUM_23 = 22;
+	}
 }
diff --git a/proto3/models/cable_line_info_cm_info_service_flow_stats.proto b/proto3/models/cable_line_info_cm_info_service_flow_stats.proto
index 32335254552ab3b8122754705da1899dde28730f..333cb207cdcacc00785729f196869fbba9d3b81a 100644
--- a/proto3/models/cable_line_info_cm_info_service_flow_stats.proto
+++ b/proto3/models/cable_line_info_cm_info_service_flow_stats.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -16,9 +16,9 @@ import public "models/cable_line_info_cm_info_service_flow_stats_service_flow_in
 
 message CableLineInfoCmInfoServiceFlowStats {
 
-  // It represents the interface index of the MAC Domain of the Service Flow.
-  string ifIndex = 1;
+  // It represents the interface index of the MAC Domain of the Service Flow
+  string if_index = 1;
 
-  repeated CableLineInfoCmInfoServiceFlowStatsServiceFlowInfo serviceFlowInfo = 2;
+  repeated CableLineInfoCmInfoServiceFlowStatsServiceFlowInfo service_flow_info = 2;
 
 }
diff --git a/proto3/models/cable_line_info_cm_info_service_flow_stats_service_flow_info.proto b/proto3/models/cable_line_info_cm_info_service_flow_stats_service_flow_info.proto
index 5218db8b98bcd6ed3ffb58fad7a3d55d48ff64df..ee1f1b4c561eb4160dac2dbd663153146652bda6 100644
--- a/proto3/models/cable_line_info_cm_info_service_flow_stats_service_flow_info.proto
+++ b/proto3/models/cable_line_info_cm_info_service_flow_stats_service_flow_info.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -17,23 +17,23 @@ import public "models/time_stamp.proto";
 message CableLineInfoCmInfoServiceFlowStatsServiceFlowInfo {
 
   // For upstream service flows on which AQM is enabled, this attribute counts the number of Packet Data PDUs classified to this service flow dropped due to Active Queue Management drop decisions.
-  int32 aqmDroppedPkts = 1;
+  int32 aqm_dropped_pkts = 1;
 
   // For outgoing Service Flows, this attribute counts the number of Packet Data PDUs forwarded to this Service Flow. For incoming upstream CMTS service flows, this attribute counts the number of Packet Data PDUs actually received on the Service Flow identified by the SID for which the packet was scheduled.
   int32 pkts = 2;
 
   // It counts only outgoing packets delayed in order to maintain the Maximum Sustained Traffic Rate.
-  int32 policedDelayPkts = 3;
+  int32 policed_delay_pkts = 3;
 
   // For upstream service flows, this attribute counts the number of Packet Data PDUs classified to this service flow dropped due to: 1) exceeding the selected Buffer Size for the service flow; or 2) UGS packets dropped due to exceeding the Unsolicited Grant Size with a Request/Transmission policy that requires such packets to be dropped.
-  int32 policedDropPkts = 4;
+  int32 policed_drop_pkts = 4;
 
   // It represents an identifier assigned to a Service Flow by CMTS within a MAC Domain.
-  int32 serviceFlowId = 5;
+  int32 service_flow_id = 5;
 
   // It indicates the number of seconds that the service flow has been active.
-  int32 timeActive = 6;
+  int32 time_active = 6;
 
-  TimeStamp timeCreated = 7;
+  TimeStamp time_created = 7;
 
 }
diff --git a/proto3/models/cm_conn_notification.proto b/proto3/models/cm_conn_notification.proto
index d875b1cfafccc38786867200490eb7798378a839..023f00ba2efecbcd6f696b88eb5edf71af343f74 100644
--- a/proto3/models/cm_conn_notification.proto
+++ b/proto3/models/cm_conn_notification.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -12,19 +12,19 @@ syntax = "proto3";
 
 package mec029;
 
+import public "models/cm_conn_notification_cm_if.proto";
 import public "models/cp_info.proto";
 import public "models/time_stamp.proto";
-import public "models/todo_object_mapping.proto";
 
 message CmConnNotification {
 
-  repeated array[TODO_OBJECT_MAPPING] cmIf = 1;
+  repeated CmConnNotificationCmIf cm_if = 1;
 
-  CpInfo customerPremisesInfo = 2;
+  CpInfo customer_premises_info = 2;
 
   // Shall be set to \\\"CmconnNotification\\\".
-  string notificationType = 3;
+  string notification_type = 3;
 
-  TimeStamp timeStamp = 4;
+  TimeStamp time_stamp = 4;
 
 }
diff --git a/proto3/models/cm_conn_notification_cm_if.proto b/proto3/models/cm_conn_notification_cm_if.proto
index c9f1d7baec984919ac51df025b8187654dc3c2b5..00f865c7c908a4cb9e23d0b698da6bbb8c1055cd 100644
--- a/proto3/models/cm_conn_notification_cm_if.proto
+++ b/proto3/models/cm_conn_notification_cm_if.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -12,9 +12,16 @@ syntax = "proto3";
 
 package mec029;
 
-import public "models/repeat.proto";
-import public "models/todo_object_mapping.proto";
+import public "models/cm_conn_notification_cm_if_cm_reg_state.proto";
 
 message CmConnNotificationCmIf {
 
+  // The Cable Modem identifier.
+  string cm_id = 1;
+
+  repeated CmConnNotificationCmIfCmRegState cm_conn_notification_if_cm_reg_state = 2;
+
+  // The MAC Domain interface index of the CM.
+  repeated string if_index = 3;
+
 }
diff --git a/proto3/models/cm_conn_notification_cm_if_cm_reg_state.proto b/proto3/models/cm_conn_notification_cm_if_cm_reg_state.proto
new file mode 100644
index 0000000000000000000000000000000000000000..a2b1eb9303654e04912e5e007d2f895224a06854
--- /dev/null
+++ b/proto3/models/cm_conn_notification_cm_if_cm_reg_state.proto
@@ -0,0 +1,40 @@
+/*
+  ETSI GS MEC 029 Fixed Access Information API
+ 
+  ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
+ 
+  The version of the OpenAPI document: 2.1.1
+  Contact: cti_support@etsi.org
+  Generated by OpenAPI Generator: https://openapi-generator.tech
+*/
+
+syntax = "proto3";
+
+package mec029;
+
+
+message CmConnNotificationCmIfCmRegState {
+enum TypeEnum {
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_1 = 0;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_2 = 1;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_3 = 2;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_4 = 3;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_5 = 4;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_6 = 5;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_7 = 6;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_8 = 7;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_9 = 8;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_10 = 9;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_11 = 10;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_12 = 11;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_13 = 12;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_14 = 13;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_15 = 14;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_16 = 15;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_17 = 16;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_18 = 17;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_19 = 18;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_20 = 19;
+		CM_CONN_NOTIFICATION_CM_IF_CM_REG_STATE_TYPE_ENUM_21 = 20;
+	}
+}
diff --git a/proto3/models/cm_conn_subscription.proto b/proto3/models/cm_conn_subscription.proto
index 2bf0029c281a36e551464eb4c991eda346706a8c..7e6de19368613f49d06b20567e12e92e0a997686 100644
--- a/proto3/models/cm_conn_subscription.proto
+++ b/proto3/models/cm_conn_subscription.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -18,16 +18,16 @@ import public "models/time_stamp.proto";
 
 message CmConnSubscription {
 
-  CmConnSubscriptionLinks Underscorelinks = 1;
+  CmConnSubscriptionLinks links = 1;
 
   // URI selected by the service consumer to receive notifications on the subscribed FAIS information. This shall be included both in the request and in response.
-  string callbackReference = 2;
+  string callback_reference = 2;
 
-  TimeStamp expiryDeadline = 3;
+  TimeStamp expiry_deadline = 3;
 
-  CmConnSubscriptionFilterCriteriaCmConn filterCriteriaCmConn = 4;
+  CmConnSubscriptionFilterCriteriaCmConn filter_criteria_cm_conn = 4;
 
   // Shall be set to \"CmConnSubscription\".
-  string subscriptionType = 5;
+  string subscription_type = 5;
 
 }
diff --git a/proto3/models/cm_conn_subscription_filter_criteria_cm_conn.proto b/proto3/models/cm_conn_subscription_filter_criteria_cm_conn.proto
index 302aea748ef6975f2ff6efa8517feac3a06c3387..5ffda1083d4aac2962fc5610b900c87054ed4bbd 100644
--- a/proto3/models/cm_conn_subscription_filter_criteria_cm_conn.proto
+++ b/proto3/models/cm_conn_subscription_filter_criteria_cm_conn.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -17,8 +17,8 @@ import public "models/cp_info.proto";
 
 message CmConnSubscriptionFilterCriteriaCmConn {
 
-  CmConnSubscriptionFilterCriteriaCmConnCmIf cmIf = 1;
+  repeated CmConnSubscriptionFilterCriteriaCmConnCmIf cm_if = 1;
 
-  CpInfo customerPremisesInfo = 2;
+  CpInfo customer_premises_info = 2;
 
 }
diff --git a/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if.proto b/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if.proto
index 9b390ffd472772c1f5aa5ebc1301435e6bd02139..f62615c106bd683400ce7246a434a6ce7480de3c 100644
--- a/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if.proto
+++ b/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -12,16 +12,16 @@ syntax = "proto3";
 
 package mec029;
 
-import public "models/cm_reg_state.proto";
+import public "models/cm_conn_subscription_filter_criteria_cm_conn_cm_if_cm_reg_state.proto";
 
 message CmConnSubscriptionFilterCriteriaCmConnCmIf {
 
   // The identifier of a Cable Modem at subscriber locations intended for use in conveying data communications on a cable data system.
-  string cmId = 1;
+  string cm_id = 1;
 
-  repeated CmRegState cmRegState = 2;
+  repeated CmConnSubscriptionFilterCriteriaCmConnCmIfCmRegState cm_reg_state = 2;
 
   // The MAC Domain interface index of the CM.
-  repeated string ifIndex = 3;
+  repeated string if_index = 3;
 
 }
diff --git a/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if_cm_reg_state.proto b/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if_cm_reg_state.proto
new file mode 100644
index 0000000000000000000000000000000000000000..69e39e8e354aeaa7128d0d7d829890ca32a73093
--- /dev/null
+++ b/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if_cm_reg_state.proto
@@ -0,0 +1,40 @@
+/*
+  ETSI GS MEC 029 Fixed Access Information API
+ 
+  ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
+ 
+  The version of the OpenAPI document: 2.1.1
+  Contact: cti_support@etsi.org
+  Generated by OpenAPI Generator: https://openapi-generator.tech
+*/
+
+syntax = "proto3";
+
+package mec029;
+
+
+message CmConnSubscriptionFilterCriteriaCmConnCmIfCmRegState {
+enum TypeEnum {
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_1 = 0;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_2 = 1;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_3 = 2;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_4 = 3;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_5 = 4;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_6 = 5;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_7 = 6;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_8 = 7;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_9 = 8;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_10 = 9;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_11 = 10;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_12 = 11;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_13 = 12;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_14 = 13;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_15 = 14;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_16 = 15;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_17 = 16;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_18 = 17;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_19 = 18;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_20 = 19;
+		CM_CONN_SUBSCRIPTION_FILTER_CRITERIA_CM_CONN_CM_IF_CM_REG_STATE_TYPE_ENUM_21 = 20;
+	}
+}
diff --git a/proto3/models/cm_conn_subscription_links.proto b/proto3/models/cm_conn_subscription_links.proto
index 5dd1edfbd046b782c338a299dca46af1f1919e7a..66e3e30e062ea8f3d9b497b981a2a483ac4a7493 100644
--- a/proto3/models/cm_conn_subscription_links.proto
+++ b/proto3/models/cm_conn_subscription_links.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
diff --git a/proto3/models/cm_reg_state.proto b/proto3/models/cm_reg_state.proto
deleted file mode 100644
index 801d65e500ef8d4b47944dddb07f9422cbb23566..0000000000000000000000000000000000000000
--- a/proto3/models/cm_reg_state.proto
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-  ETSI GS MEC 029 Fixed Access Information API
- 
-  ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
- 
-  The version of the OpenAPI document: 2.1.1
-  
-  Generated by OpenAPI Generator: https://openapi-generator.tech
-*/
-
-syntax = "proto3";
-
-package mec029;
-
-
-message CmRegState {
-
-}
diff --git a/proto3/models/cp_info.proto b/proto3/models/cp_info.proto
index 1f402e341bbcf722845e3ab43efd9ea275c573b4..a24054533547a61502081ffb1a7a5eb1a0f9efd7 100644
--- a/proto3/models/cp_info.proto
+++ b/proto3/models/cp_info.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -22,6 +22,6 @@ message CpInfo {
   float longitude = 2;
 
   // Postal code for the location
-  string postalCode = 3;
+  string postal_code = 3;
 
 }
diff --git a/proto3/models/dev_info_notification.proto b/proto3/models/dev_info_notification.proto
index 33125fbea148aae2f6d03b712fe8ddaebf33b88c..0731442e30e9e2597a0d05261f713552dc2c5faa 100644
--- a/proto3/models/dev_info_notification.proto
+++ b/proto3/models/dev_info_notification.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -17,14 +17,14 @@ import public "models/time_stamp.proto";
 
 message DevInfoNotification {
 
-  DeviceErrStatus deviceErrStatus = 1;
+  DeviceErrStatus device_err_status = 1;
 
   // The identifier for a device.
-  string deviceId = 2;
+  string device_id = 2;
 
   // Shall be set to \"DevInfoNotification\".
-  string notificationType = 3;
+  string notification_type = 3;
 
-  TimeStamp timeStamp = 4;
+  TimeStamp time_stamp = 4;
 
 }
diff --git a/proto3/models/dev_info_subscription.proto b/proto3/models/dev_info_subscription.proto
index aa2be28275d3e9d40c12603bedff85148a3182e7..950da03c5fac26bf7ae2528dfeb31232c3600493 100644
--- a/proto3/models/dev_info_subscription.proto
+++ b/proto3/models/dev_info_subscription.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -18,16 +18,16 @@ import public "models/time_stamp.proto";
 
 message DevInfoSubscription {
 
-  DevInfoSubscriptionLinks Underscorelinks = 1;
+  DevInfoSubscriptionLinks links = 1;
 
   // URI selected by the service consumer to receive notifications on the subscribed FAIS information. This shall be included both in the request and in response.
-  string callbackReference = 2;
+  string callback_reference = 2;
 
-  TimeStamp expiryDeadline = 3;
+  TimeStamp expiry_deadline = 3;
 
-  DevInfoSubscriptionFilterCriteriaDevInfo filterCriteriaDevInfo = 4;
+  DevInfoSubscriptionFilterCriteriaDevInfo filter_criteria_dev_info = 4;
 
   // Shall be set to \"DevInfoSubscription\".
-  string subscriptionType = 5;
+  string subscription_type = 5;
 
 }
diff --git a/proto3/models/dev_info_subscription_filter_criteria_dev_info.proto b/proto3/models/dev_info_subscription_filter_criteria_dev_info.proto
index 1d335b1d0b4925c523ccd2c391a2f2694138146e..babdeaa9b944b918a4a0c1fd8614b8fdc0af9020 100644
--- a/proto3/models/dev_info_subscription_filter_criteria_dev_info.proto
+++ b/proto3/models/dev_info_subscription_filter_criteria_dev_info.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -16,12 +16,12 @@ import public "models/device_err_status.proto";
 
 message DevInfoSubscriptionFilterCriteriaDevInfo {
 
-  repeated DeviceErrStatus deviceErrStatus = 1;
+  repeated DeviceErrStatus device_err_status = 1;
 
   // The device identifier.
-  repeated string deviceId = 2;
+  repeated string device_id = 2;
 
   // The identifier of an Internet Gateway Device through which the customer premises device is connected.
-  repeated string gwId = 3;
+  repeated string gw_id = 3;
 
 }
diff --git a/proto3/models/dev_info_subscription_links.proto b/proto3/models/dev_info_subscription_links.proto
index ee56d1ec283d71dab86c0fb03d2d59f0a6768acc..77b2e57a8e9881ed971f5b71e0628b8b91aa6da8 100644
--- a/proto3/models/dev_info_subscription_links.proto
+++ b/proto3/models/dev_info_subscription_links.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
diff --git a/proto3/models/device_err_status.proto b/proto3/models/device_err_status.proto
index 65b93763ed01dd4741be892c04cc2858dc3628e6..45f9f34d954b31126dacde48b074841344ceb4a1 100644
--- a/proto3/models/device_err_status.proto
+++ b/proto3/models/device_err_status.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,8 @@ package mec029;
 
 
 message DeviceErrStatus {
-
+enum TypeEnum {
+		DEVICE_ERR_STATUS_TYPE_ENUM_1 = 0;
+		DEVICE_ERR_STATUS_TYPE_ENUM_2 = 1;
+	}
 }
diff --git a/proto3/models/device_info.proto b/proto3/models/device_info.proto
index 76d726d0a9b3daa1cae2486e8ab45ce7e51e62d0..df9e61eeb0ed9fa6082f55b05074f258ca47dccc 100644
--- a/proto3/models/device_info.proto
+++ b/proto3/models/device_info.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -22,39 +22,39 @@ import public "models/upload_diagnostics.proto";
 message DeviceInfo {
 
   // Typically, the serial number of the device.  This value shall remain fixed over the lifetime of the device, including across firmware updates.
-  repeated string deviceId = 1;
+  string device_id = 1;
 
-  DeviceInfoDeviceStatus deviceStatus = 2;
+  DeviceInfoDeviceStatus device_status = 2;
 
-  DownloadDiagnostics downloadDiagnostics = 3;
+  DownloadDiagnostics download_diagnostics = 3;
 
   // Information (typically the serial number) to identify an Internet Gateway Device through which the customer premises device is connected.  This value shall remain fixed over the lifetime of the device, including across firmware updates.
-  repeated string gwId = 4;
+  repeated string gw_id = 4;
 
   // The time in seconds that the IP interface has been connected.
-  int32 iPConnectionUpTime = 5;
+  int32 ip_connection_up_time = 5;
 
-  IPPingDiagnostics iPPingDiagnostics = 6;
+  IPPingDiagnostics ip_ping_diagnostics = 6;
 
-  TimeStamp timeStamp = 7;
+  TimeStamp time_stamp = 7;
 
   // Total number of IP payload bytes received since the device was last restarted.
-  int32 totalBytesReceived = 8;
+  int32 total_bytes_received = 8;
 
   // Total number of IP payload bytes sent since the device was last restarted.
-  int32 totalBytesSent = 9;
+  int32 total_bytes_sent = 9;
 
   // Total number of packets received since the device was last restarted.
-  int32 totalPacketsReceived = 10;
+  int32 total_packets_received = 10;
 
   // Total number of packets sent since the device was last restarted.
-  int32 totalPacketsSent = 11;
+  int32 total_packets_sent = 11;
 
-  TraceRouteDiagnostics traceRouteDiagnostics = 12;
+  TraceRouteDiagnostics trace_route_diagnostics = 12;
 
   // Time in seconds since the device was last restarted.
-  int32 upTime = 13;
+  int32 up_time = 13;
 
-  UploadDiagnostics uploadDiagnostics = 14;
+  UploadDiagnostics upload_diagnostics = 14;
 
 }
diff --git a/proto3/models/device_info_device_status.proto b/proto3/models/device_info_device_status.proto
index 39fa2e7417f17ee99bb263a69cd954c15d86b627..53f1836cc8b78e6de79da20a44a24aac2dd9b881 100644
--- a/proto3/models/device_info_device_status.proto
+++ b/proto3/models/device_info_device_status.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,10 @@ package mec029;
 
 
 message DeviceInfoDeviceStatus {
-
+enum TypeEnum {
+		DEVICE_INFO_DEVICE_STATUS_TYPE_ENUM_1 = 0;
+		DEVICE_INFO_DEVICE_STATUS_TYPE_ENUM_2 = 1;
+		DEVICE_INFO_DEVICE_STATUS_TYPE_ENUM_3 = 2;
+		DEVICE_INFO_DEVICE_STATUS_TYPE_ENUM_4 = 3;
+	}
 }
diff --git a/proto3/models/download_diagnostics.proto b/proto3/models/download_diagnostics.proto
index cdedcbd6605ad42010876fb2303e5619193593e3..d5a601573e663d0a09f085cd067699792cbc5046 100644
--- a/proto3/models/download_diagnostics.proto
+++ b/proto3/models/download_diagnostics.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -17,25 +17,25 @@ import public "models/time_stamp.proto";
 
 message DownloadDiagnostics {
 
-  TimeStamp bOMTime = 1;
+  TimeStamp b_om_time = 1;
 
-  DownloadDiagnosticsDiagnosticsState diagnosticsState = 2;
+  DownloadDiagnosticsDiagnosticsState diagnostics_state = 2;
 
   // The URI for the device to perform the download on.
-  string downloadURI = 3;
+  string download_uri = 3;
 
-  TimeStamp eOMTime = 4;
+  TimeStamp e_om_time = 4;
 
-  TimeStamp rOMTime = 5;
+  TimeStamp r_om_time = 5;
 
-  TimeStamp tCPOpenReponseTime = 6;
+  TimeStamp tcp_open_reponse_time = 6;
 
-  TimeStamp tCPOpenRequestTime = 7;
+  TimeStamp tcp_open_request_time = 7;
 
-  // The test traffic received in bytes during the FTP/HTTP transaction including FTP/HTTP headers, between bOMTime and eOMTime.
-  int32 testBytesReceived = 8;
+  // The test traffic received in bytes during the FTP/HTTP transaction including FTP/HTTP headers, between b_oMTime and e_oMTime.
+  int32 test_bytes_received = 8;
 
-  // The total number of bytes received on the Interface between bOMTime and eOMTime.
-  int32 totalBytesReceived = 9;
+  // The total number of bytes received on the Interface between b_om_time and e_om_time.
+  int32 total_bytes_received = 9;
 
 }
diff --git a/proto3/models/download_diagnostics_diagnostics_state.proto b/proto3/models/download_diagnostics_diagnostics_state.proto
index 39aeb198bb8375d0319e52727656a750b8ffc3d6..117177fac12340f93110bc42491cb75af298ffde 100644
--- a/proto3/models/download_diagnostics_diagnostics_state.proto
+++ b/proto3/models/download_diagnostics_diagnostics_state.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,19 @@ package mec029;
 
 
 message DownloadDiagnosticsDiagnosticsState {
+enum TypeEnum {
+		DOWNLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_1 = 0;
+		DOWNLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_2 = 1;
+		DOWNLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_3 = 2;
+		DOWNLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_4 = 3;
+		DOWNLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_5 = 4;
+		DOWNLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_6 = 5;
+		DOWNLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_7 = 6;
+		DOWNLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_8 = 7;
+		DOWNLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_9 = 8;
+		DOWNLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_10 = 9;
+		DOWNLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_11 = 10;
+		DOWNLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_12 = 11;
+	}
 
 }
diff --git a/proto3/models/expiry_notification.proto b/proto3/models/expiry_notification.proto
index c6a447d0cda58f831c79a70db665563966c3cf89..dac7c61e0e493362482f0057ffca04a2b03c6e4c 100644
--- a/proto3/models/expiry_notification.proto
+++ b/proto3/models/expiry_notification.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -17,10 +17,10 @@ import public "models/time_stamp.proto";
 
 message ExpiryNotification {
 
-  ExpiryNotificationLinks Underscorelinks = 1;
+  ExpiryNotificationLinks links = 1;
 
-  TimeStamp expiryDeadline = 2;
+  TimeStamp expiry_deadline = 2;
 
-  TimeStamp timeStamp = 3;
+  TimeStamp time_stamp = 3;
 
 }
diff --git a/proto3/models/expiry_notification_links.proto b/proto3/models/expiry_notification_links.proto
index 239cc39dfd04a50ee61c80f4bd27e238d3bff8bf..3ca39036026c3d2c6418a06549e94e9490304634 100644
--- a/proto3/models/expiry_notification_links.proto
+++ b/proto3/models/expiry_notification_links.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
diff --git a/proto3/models/fa_info.proto b/proto3/models/fa_info.proto
index 649a9b8d77e06474e706e4f9c4f9a87855425e4c..c95697d6d856103de637e8856cf9a9c07d463305 100644
--- a/proto3/models/fa_info.proto
+++ b/proto3/models/fa_info.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -18,11 +18,11 @@ import public "models/time_stamp.proto";
 
 message FaInfo {
 
-  repeated FaInfoConnectivityInfo connectivityInfo = 1;
+  repeated FaInfoConnectivityInfo connectivity_info = 1;
 
   // The physical location of a customer site.
-  repeated CpInfo customerPremisesInfo = 2;
+  repeated CpInfo customer_premises_info = 2;
 
-  TimeStamp timeStamp = 3;
+  TimeStamp time_stamp = 3;
 
 }
diff --git a/proto3/models/fa_info_connectivity_info.proto b/proto3/models/fa_info_connectivity_info.proto
index 4094bc615fb41f1aa2667046d9fec3c3c5471148..371c66de344afbe029f3ceda5106e1204c0ca69e 100644
--- a/proto3/models/fa_info_connectivity_info.proto
+++ b/proto3/models/fa_info_connectivity_info.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -20,9 +20,9 @@ message FaInfoConnectivityInfo {
   // The bandwidth (in Mbps) from the network towards the customer site.
   int32 dsbw = 1;
 
-  FaInfoConnectivityInfoInterfaceType interfaceType = 2;
+  FaInfoConnectivityInfoInterfaceType interface_type = 2;
 
-  FaInfoConnectivityInfoLastMileTech lastMileTech = 3;
+  FaInfoConnectivityInfoLastMileTech last_mile_tech = 3;
 
   // Maximum baseline latency (in ms) between customer site and service edge node.
   int32 latency = 4;
diff --git a/proto3/models/fa_info_connectivity_info_interface_type.proto b/proto3/models/fa_info_connectivity_info_interface_type.proto
index 8c2804155e89ac24a1a59dd10be4142d03aea6be..6655c79e5ed9c63b4f75fdc493802ae68d0b6718 100644
--- a/proto3/models/fa_info_connectivity_info_interface_type.proto
+++ b/proto3/models/fa_info_connectivity_info_interface_type.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -15,4 +15,16 @@ package mec029;
 
 message FaInfoConnectivityInfoInterfaceType {
 
+enum TypeEnum {
+		FA_INFO_CONNECTIVITY_INFO_INTERFACE_TYPE_TYPE_ENUM_1 = 0;
+		FA_INFO_CONNECTIVITY_INFO_INTERFACE_TYPE_TYPE_ENUM_2 = 1;
+		FA_INFO_CONNECTIVITY_INFO_INTERFACE_TYPE_TYPE_ENUM_3 = 2;
+		FA_INFO_CONNECTIVITY_INFO_INTERFACE_TYPE_TYPE_ENUM_4 = 3;
+		FA_INFO_CONNECTIVITY_INFO_INTERFACE_TYPE_TYPE_ENUM_5 = 4;
+		FA_INFO_CONNECTIVITY_INFO_INTERFACE_TYPE_TYPE_ENUM_6 = 5;
+		FA_INFO_CONNECTIVITY_INFO_INTERFACE_TYPE_TYPE_ENUM_7 = 6;
+		FA_INFO_CONNECTIVITY_INFO_INTERFACE_TYPE_TYPE_ENUM_8 = 7;
+		FA_INFO_CONNECTIVITY_INFO_INTERFACE_TYPE_TYPE_ENUM_9 = 8;
+		FA_INFO_CONNECTIVITY_INFO_INTERFACE_TYPE_TYPE_ENUM_10 = 9;
+	}
 }
diff --git a/proto3/models/fa_info_connectivity_info_last_mile_tech.proto b/proto3/models/fa_info_connectivity_info_last_mile_tech.proto
index 43e66d47d9d145c02f62e634f029c4da2ebf2bae..812d5648c8aa6e0d85a30d7dce4acf439520d3e4 100644
--- a/proto3/models/fa_info_connectivity_info_last_mile_tech.proto
+++ b/proto3/models/fa_info_connectivity_info_last_mile_tech.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,14 @@ package mec029;
 
 
 message FaInfoConnectivityInfoLastMileTech {
-
+enum TypeEnum {
+		FA_INFO_CONNECTIVITY_INFO_LAST_MILE_TECH_TYPE_ENUM_1 = 0;
+		FA_INFO_CONNECTIVITY_INFO_LAST_MILE_TECH_TYPE_ENUM_2 = 1;
+		FA_INFO_CONNECTIVITY_INFO_LAST_MILE_TECH_TYPE_ENUM_3 = 2;
+		FA_INFO_CONNECTIVITY_INFO_LAST_MILE_TECH_TYPE_ENUM_4 = 3;
+		FA_INFO_CONNECTIVITY_INFO_LAST_MILE_TECH_TYPE_ENUM_5 = 4;
+		FA_INFO_CONNECTIVITY_INFO_LAST_MILE_TECH_TYPE_ENUM_6 = 5;
+		FA_INFO_CONNECTIVITY_INFO_LAST_MILE_TECH_TYPE_ENUM_7 = 6;
+		FA_INFO_CONNECTIVITY_INFO_LAST_MILE_TECH_TYPE_ENUM_8 = 7;
+	}
 }
diff --git a/proto3/models/ip_ping_diagnostics.proto b/proto3/models/ip_ping_diagnostics.proto
index b8f414a3207974b5af3eca13d6d8208dff55c563..df5d3e511f72f828de15adf2c1cb1ef2f5a918ce 100644
--- a/proto3/models/ip_ping_diagnostics.proto
+++ b/proto3/models/ip_ping_diagnostics.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -13,34 +13,35 @@ syntax = "proto3";
 package mec029;
 
 import public "models/ip_ping_diagnostics_diagnostics_state.proto";
+option java_outer_classname = "IpPingDiagnosticsProto";
 
 message IPPingDiagnostics {
 
   // Result parameter indicating the average response time in milliseconds over all repetitions with successful responses of the most recent ping test.  If there were no successful responses, this value shall be zero.
-  int32 averageResponseTime = 1;
+  int32 average_response_time = 1;
 
   // Size of the data block in bytes to be sent for each ping.
-  int32 dataBlockSize = 2;
+  int32 data_block_size = 2;
 
-  IPPingDiagnosticsDiagnosticsState diagnosticsState = 3;
+  IPPingDiagnosticsDiagnosticsState diagnostics_state = 3;
 
   // Result parameter indicating the number of failed pings in the most recent ping test.
-  int32 failureCount = 4;
+  int32 failure_count = 4;
 
   // Host name or address of the host to ping.
   string host = 5;
 
   // Result parameter indicating the maximum response time in milliseconds over all repetitions with successful responses of the most recent ping test.  If there were no successful responses, this value shall be zero.
-  int32 maximumResponseTime = 6;
+  int32 maximum_response_time = 6;
 
   // Result parameter indicating the minimum response time in milliseconds over all repetitions with successful responses of the most recent ping test.  If there were no successful responses, this value shall be zero.
-  int32 minimumResponseTime = 7;
+  int32 minimum_response_time = 7;
 
   // Number of repetitions of the ping test to perform before reporting the results.
-  int32 numberOfRepetitions = 8;
+  int32 number_of_repetitions = 8;
 
   // Result parameter indicating the number of successful pings (those in which a successful response was received prior to the timeout) in the most recent ping test.
-  int32 successCount = 9;
+  int32 success_count = 9;
 
   // Timeout in milliseconds for the ping test.
   int32 timeout = 10;
diff --git a/proto3/models/ip_ping_diagnostics_diagnostics_state.proto b/proto3/models/ip_ping_diagnostics_diagnostics_state.proto
index 628d49978df06aa61a487dcf89626eba79d54308..890c312ebc3279614cbe0114c255cccf3b2548b6 100644
--- a/proto3/models/ip_ping_diagnostics_diagnostics_state.proto
+++ b/proto3/models/ip_ping_diagnostics_diagnostics_state.proto
@@ -4,15 +4,23 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
 syntax = "proto3";
 
 package mec029;
-
+option java_outer_classname = "IpPingDiagnosticsDiagnosticsStateProto";
 
 message IPPingDiagnosticsDiagnosticsState {
 
+enum TypeEnum {
+		IP_PING_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_1 = 0;
+		IP_PING_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_2 = 1;
+		IP_PING_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_3 = 2;
+		IP_PING_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_4 = 3;
+		IP_PING_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_5 = 4;
+		IP_PING_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_6 = 5;
+	}
 }
diff --git a/proto3/models/link_type.proto b/proto3/models/link_type.proto
index d92a5807380a18ccd3c1770202f3153c7b3d68ed..17e71e2c2f0edbc364e7d5963164b56a12d92e67 100644
--- a/proto3/models/link_type.proto
+++ b/proto3/models/link_type.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
diff --git a/proto3/models/onu_alarm_notification.proto b/proto3/models/onu_alarm_notification.proto
index a4d705fe2bdc5084d2a3dd5d17a102d902ccc0a1..b6894b020f9a69050c8a5695a5bbb53b67188337 100644
--- a/proto3/models/onu_alarm_notification.proto
+++ b/proto3/models/onu_alarm_notification.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -21,14 +21,14 @@ message OnuAlarmNotification {
   OnuAlarmNotificationAlarm alarm = 1;
 
   // The physical location of the related customer sites.
-  repeated CpInfo customerPremisesInfo = 2;
+  repeated CpInfo customer_premises_info = 2;
 
   // Shall be set to \"OnuAlarmNotification\".
-  string notificationType = 3;
+  string notification_type = 3;
 
   // The unique identifier for an optical network unit.
-  string onuId = 4;
+  string onu_id = 4;
 
-  TimeStamp timeStamp = 5;
+  TimeStamp time_stamp = 5;
 
 }
diff --git a/proto3/models/onu_alarm_notification_alarm.proto b/proto3/models/onu_alarm_notification_alarm.proto
index 18431ea792e0d8fbfb3f43e6bfe7370ce92989d1..a378dcb4b188138c477ddb4eadfc64a2a04a1d1a 100644
--- a/proto3/models/onu_alarm_notification_alarm.proto
+++ b/proto3/models/onu_alarm_notification_alarm.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,22 @@ package mec029;
 
 
 message OnuAlarmNotificationAlarm {
-
+enum TypeEnum {
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_0 = 0;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_1 = 1;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_2 = 2;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_3 = 3;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_4 = 4;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_5 = 5;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_6 = 6;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_7 = 7;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_8 = 8;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_9 = 9;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_10 = 10;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_11 = 11;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_12 = 12;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_13 = 13;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_14 = 14;
+		ONU_ALARM_NOTIFICATION_ALARM_TYPE_ENUM_15 = 15;
+	}
 }
diff --git a/proto3/models/onu_alarm_subscription.proto b/proto3/models/onu_alarm_subscription.proto
index ffeb1fccec757001d7f661eddd0093675fad39cf..f19c2d1a2e01820be497eaf5742ab62c04cc6d1b 100644
--- a/proto3/models/onu_alarm_subscription.proto
+++ b/proto3/models/onu_alarm_subscription.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -18,16 +18,16 @@ import public "models/time_stamp.proto";
 
 message OnuAlarmSubscription {
 
-  OnuAlarmSubscriptionLinks Underscorelinks = 1;
+  OnuAlarmSubscriptionLinks links = 1;
 
   // URI selected by the service consumer to receive notifications on the subscribed FAIS information. This shall be included both in the request and in response.
-  string callbackReference = 2;
+  string callback_reference = 2;
 
-  TimeStamp expiryDeadline = 3;
+  TimeStamp expiry_deadline = 3;
 
-  OnuAlarmSubscriptionFilterCriteriaOnuAlarm filterCriteriaOnuAlarm = 4;
+  OnuAlarmSubscriptionFilterCriteriaOnuAlarm filter_criteria_onu_alarm = 4;
 
   // Shall be set to \\\"OnuAlarmSubscription\\\".
-  string subscriptionType = 5;
+  string subscription_type = 5;
 
 }
diff --git a/proto3/models/onu_alarm_subscription_alarms.proto b/proto3/models/onu_alarm_subscription_alarms.proto
index 77e466f7faee9d9e57f48d544f6302af4e2e4638..2d2f1026be9eb029dc3f126fd32b9160ed7f77c5 100644
--- a/proto3/models/onu_alarm_subscription_alarms.proto
+++ b/proto3/models/onu_alarm_subscription_alarms.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,23 @@ package mec029;
 
 
 message OnuAlarmSubscriptionAlarms {
-
+enum TypeEnum {
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_0 = 0;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_1 = 1;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_2 = 2;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_3 = 3;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_4 = 4;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_5 = 5;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_6 = 6;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_7 = 7;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_8 = 8;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_9 = 9;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_10 = 10;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_11 = 11;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_12 = 12;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_13 = 13;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_14 = 14;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_15 = 15;
+		ONU_ALARM_SUBSCRIPTION_ALARMS_TYPE_ENUM_MINUS_1 = 16;
+	}
 }
diff --git a/proto3/models/onu_alarm_subscription_filter_criteria_onu_alarm.proto b/proto3/models/onu_alarm_subscription_filter_criteria_onu_alarm.proto
index 759f6b770b3c06002fe0d450c958d998631db46b..16f46b2c4923f69f161f68b8a623c4e7ba3404ae 100644
--- a/proto3/models/onu_alarm_subscription_filter_criteria_onu_alarm.proto
+++ b/proto3/models/onu_alarm_subscription_filter_criteria_onu_alarm.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -20,9 +20,9 @@ message OnuAlarmSubscriptionFilterCriteriaOnuAlarm {
   repeated OnuAlarmSubscriptionAlarms alarms = 1;
 
   // 0 to N physical locations of the customer sites.
-  repeated CpInfo customerPremisesInfo = 2;
+  repeated CpInfo customer_premises_info = 2;
 
   // 1 to N unique identifiers for the optical network units. Typical it is the unique serial number for each ONU, which contains the vendor ID and version number. The first four bytes are an ASCII-encoded four-letter vendor ID. The second four bytes are a binary encoded serial number, under the control of the ONU vendor.
-  repeated string onuId = 3;
+  repeated string onu_id = 3;
 
 }
diff --git a/proto3/models/onu_alarm_subscription_links.proto b/proto3/models/onu_alarm_subscription_links.proto
index 4b72f6f75b989d53bf92d3220eadffc75aea09d6..d7440f66187968a9480e18118b90e750e5fd1a77 100644
--- a/proto3/models/onu_alarm_subscription_links.proto
+++ b/proto3/models/onu_alarm_subscription_links.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
diff --git a/proto3/models/pon_info.proto b/proto3/models/pon_info.proto
index e289586bf6dd29a985b265a17a721fc7dda1d24a..d032b4cd77b1c9b32cc8b71d96cd7c627b9df295 100644
--- a/proto3/models/pon_info.proto
+++ b/proto3/models/pon_info.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -13,19 +13,19 @@ syntax = "proto3";
 package mec029;
 
 import public "models/cp_info.proto";
+import public "models/pon_info_optical_network_info.proto";
 import public "models/time_stamp.proto";
-import public "models/todo_object_mapping.proto";
 
 message PonInfo {
 
   // The physical location of a customer site.
-  repeated CpInfo customerPremisesInfo = 1;
+  repeated CpInfo customer_premises_info = 1;
 
-  repeated array[TODO_OBJECT_MAPPING] opticalNetworkInfo = 2;
+  repeated PonInfoOpticalNetworkInfo optical_network_info = 2;
 
   // The 20-bit identity of the optical system within a certain domain.This is a reference value set by the OSS.
-  string ponSYSUnderscoreID = 3;
+  string pon_sys_id = 3;
 
-  TimeStamp timeStamp = 4;
+  TimeStamp time_stamp = 4;
 
 }
diff --git a/proto3/models/pon_info_optical_network_info.proto b/proto3/models/pon_info_optical_network_info.proto
index babdae0956fb82534d4fabf84c639c027675c761..2f638ae6d6a8a990ec7565bfd556248a118116e8 100644
--- a/proto3/models/pon_info_optical_network_info.proto
+++ b/proto3/models/pon_info_optical_network_info.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -12,9 +12,22 @@ syntax = "proto3";
 
 package mec029;
 
-import public "models/repeat.proto";
-import public "models/todo_object_mapping.proto";
+import public "models/pon_info_optical_network_info_ds_rate.proto";
+import public "models/pon_info_optical_network_info_operational_state.proto";
+import public "models/pon_info_optical_network_info_pon_tech.proto";
+import public "models/pon_info_optical_network_info_us_rate.proto";
 
 message PonInfoOpticalNetworkInfo {
 
+  PonInfoOpticalNetworkInfoDsRate ds_rate = 1;
+
+  // Information to identify an Optical Network Unit.
+  string onu_id = 2;
+
+  PonInfoOpticalNetworkInfoOperationalState operational_state = 3;
+
+  PonInfoOpticalNetworkInfoPonTech pon_tech = 4;
+
+  PonInfoOpticalNetworkInfoUsRate us_rate = 5;
+
 }
diff --git a/proto3/models/pon_info_optical_network_info_ds_rate.proto b/proto3/models/pon_info_optical_network_info_ds_rate.proto
index 5916ed9b666eab4bd8cb037e41b37ce8cec59d1b..8402c16f343d1b23157a953f5799f9b4b9a9555c 100644
--- a/proto3/models/pon_info_optical_network_info_ds_rate.proto
+++ b/proto3/models/pon_info_optical_network_info_ds_rate.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,8 @@ package mec029;
 
 
 message PonInfoOpticalNetworkInfoDsRate {
-
+enum TypeEnum {
+		PON_INFO_OPTICAL_NETWORK_INFO_DS_RATE_TYPE_ENUM_1 = 0;
+		PON_INFO_OPTICAL_NETWORK_INFO_DS_RATE_TYPE_ENUM_2 = 1;
+	}
 }
diff --git a/proto3/models/pon_info_optical_network_info_operational_state.proto b/proto3/models/pon_info_optical_network_info_operational_state.proto
index a1b2e8e8aad2efcad31f2677f6c9263b68fdfef6..a3f49f8b493af610ea7be783988a6ca08acd9bd0 100644
--- a/proto3/models/pon_info_optical_network_info_operational_state.proto
+++ b/proto3/models/pon_info_optical_network_info_operational_state.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,8 @@ package mec029;
 
 
 message PonInfoOpticalNetworkInfoOperationalState {
-
+enum TypeEnum {
+		PON_INFO_OPTICAL_NETWORK_INFO_OPERATIONAL_STATE_TYPE_ENUM_0 = 0;
+		PON_INFO_OPTICAL_NETWORK_INFO_OPERATIONAL_STATE_TYPE_ENUM_1 = 1;
+	}
 }
diff --git a/proto3/models/pon_info_optical_network_info_pon_tech.proto b/proto3/models/pon_info_optical_network_info_pon_tech.proto
index e84e6cdc76948a11f6f2768d4d35ca6a84dcc32c..c6ba507e9a7b7667f17b6f025eb7a5fc3bd4e988 100644
--- a/proto3/models/pon_info_optical_network_info_pon_tech.proto
+++ b/proto3/models/pon_info_optical_network_info_pon_tech.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,10 @@ package mec029;
 
 
 message PonInfoOpticalNetworkInfoPonTech {
-
+enum TypeEnum {
+		PON_INFO_OPTICAL_NETWORK_INFO_PON_TECH_TYPE_ENUM_1 = 0;
+		PON_INFO_OPTICAL_NETWORK_INFO_PON_TECH_TYPE_ENUM_2 = 1;
+		PON_INFO_OPTICAL_NETWORK_INFO_PON_TECH_TYPE_ENUM_3 = 2;
+		PON_INFO_OPTICAL_NETWORK_INFO_PON_TECH_TYPE_ENUM_4 = 3;
+	}
 }
diff --git a/proto3/models/pon_info_optical_network_info_us_rate.proto b/proto3/models/pon_info_optical_network_info_us_rate.proto
index 2bf1e67f88793de1d46a9d56c2d709097f52d9a8..f139b2acc8370b6894c5a94c61331a5b80070cea 100644
--- a/proto3/models/pon_info_optical_network_info_us_rate.proto
+++ b/proto3/models/pon_info_optical_network_info_us_rate.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,9 @@ package mec029;
 
 
 message PonInfoOpticalNetworkInfoUsRate {
-
+enum TypeEnum {
+		PON_INFO_OPTICAL_NETWORK_INFO_US_RATE_TYPE_ENUM_1 = 0;
+		PON_INFO_OPTICAL_NETWORK_INFO_US_RATE_TYPE_ENUM_2 = 1;
+		PON_INFO_OPTICAL_NETWORK_INFO_US_RATE_TYPE_ENUM_3 = 2;
+	}
 }
diff --git a/proto3/models/problem_details.proto b/proto3/models/problem_details.proto
index bc57af8e871def8464555f109bd97e493b48349d..96f4fc439d0734d8ae68d38dcfdfbc1e6917abb5 100644
--- a/proto3/models/problem_details.proto
+++ b/proto3/models/problem_details.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
diff --git a/proto3/models/subscription.proto b/proto3/models/subscription.proto
new file mode 100644
index 0000000000000000000000000000000000000000..e2b8272fa111848cdabd0f5a621e2c6964491b4e
--- /dev/null
+++ b/proto3/models/subscription.proto
@@ -0,0 +1,29 @@
+/*
+  ETSI GS MEC 029 Fixed Access Information API
+ 
+  ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
+ 
+  The version of the OpenAPI document: 2.1.1
+  Contact: cti_support@etsi.org
+  Generated by OpenAPI Generator: https://openapi-generator.tech
+*/
+
+syntax = "proto3";
+
+package mec029;
+
+
+import public "models/onu_alarm_subscription.proto";
+import public "models/dev_info_subscription.proto";
+import public "models/cm_conn_subscription.proto";
+import public "models/ani_alarm_subscription.proto";
+
+
+message Subscription {
+  oneof subscription {
+    OnuAlarmSubscription onu_alarm_subscription = 1;
+    DevInfoSubscription dev_info_subscription = 2;
+    CmConnSubscription cm_conn_subscription = 3;
+    AniAlarmSubscription ani_alarm_subscription = 4;	
+  }
+}
diff --git a/proto3/models/subscription_link_list.proto b/proto3/models/subscription_link_list.proto
index 2c98d54eff8f4297a38d739ae0a2dafccf2c4535..5e777ab831a16f42a0f2b6c4f053076310bab74d 100644
--- a/proto3/models/subscription_link_list.proto
+++ b/proto3/models/subscription_link_list.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -16,6 +16,6 @@ import public "models/subscription_link_list_links.proto";
 
 message SubscriptionLinkList {
 
-  SubscriptionLinkListLinks Underscorelinks = 1;
+  SubscriptionLinkListLinks links = 1;
 
 }
diff --git a/proto3/models/subscription_link_list_links.proto b/proto3/models/subscription_link_list_links.proto
index 6fda5cf49cc807dad3724dae2cb4870e73ebfb23..66a91240191eef18bee14ef44e27a09bd22e93e4 100644
--- a/proto3/models/subscription_link_list_links.proto
+++ b/proto3/models/subscription_link_list_links.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
diff --git a/proto3/models/subscription_link_list_links_subscription.proto b/proto3/models/subscription_link_list_links_subscription.proto
index 5092ab71d3086e2e373beec105730b4e95b3018b..0d4b18be5f49fb437572166ab71ac1c893d743af 100644
--- a/proto3/models/subscription_link_list_links_subscription.proto
+++ b/proto3/models/subscription_link_list_links_subscription.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -19,6 +19,6 @@ message SubscriptionLinkListLinksSubscription {
   // The URI referring to the subscription.
   string href = 1;
 
-  SubscriptionLinkListLinksSubscriptionSubscriptionType subscriptionType = 2;
+  SubscriptionLinkListLinksSubscriptionSubscriptionType subscription_type = 2;
 
 }
diff --git a/proto3/models/subscription_link_list_links_subscription_subscription_type.proto b/proto3/models/subscription_link_list_links_subscription_subscription_type.proto
index 94f0d521d1335af4b206fc5a6f849acdbe631a57..f1fde352013a2f830c71269c4e3d88b1e8bb84eb 100644
--- a/proto3/models/subscription_link_list_links_subscription_subscription_type.proto
+++ b/proto3/models/subscription_link_list_links_subscription_subscription_type.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,11 @@ package mec029;
 
 
 message SubscriptionLinkListLinksSubscriptionSubscriptionType {
-
+enum TypeEnum {
+		SUBSCRIPTION_LINK_LIST_LINKS_SUBSCRIPTION_SUBSCRIPTION_TYPE_TYPE_ENUM_0 = 0;
+		SUBSCRIPTION_LINK_LIST_LINKS_SUBSCRIPTION_SUBSCRIPTION_TYPE_TYPE_ENUM_1 = 1;
+		SUBSCRIPTION_LINK_LIST_LINKS_SUBSCRIPTION_SUBSCRIPTION_TYPE_TYPE_ENUM_2 = 2;
+		SUBSCRIPTION_LINK_LIST_LINKS_SUBSCRIPTION_SUBSCRIPTION_TYPE_TYPE_ENUM_3 = 3;
+		SUBSCRIPTION_LINK_LIST_LINKS_SUBSCRIPTION_SUBSCRIPTION_TYPE_TYPE_ENUM_4 = 4;
+	}
 }
diff --git a/proto3/models/time_stamp.proto b/proto3/models/time_stamp.proto
index f9ef73ca46a1b298a27de41cc80a524eb6a823a5..e2a537b417dc93af8782ce5a5143ff2d2a283d2d 100644
--- a/proto3/models/time_stamp.proto
+++ b/proto3/models/time_stamp.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -16,7 +16,7 @@ package mec029;
 message TimeStamp {
 
   // The nanoseconds part of the time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.
-  int32 nanoSeconds = 1;
+  int32 nano_seconds = 1;
 
   // The seconds part of the time. Time is defined as Unixtime since January 1, 1970, 00:00:00 UTC.
   int32 seconds = 2;
diff --git a/proto3/models/trace_route_diagnostics.proto b/proto3/models/trace_route_diagnostics.proto
index 0aef8539285b7ff862d9badce26ded8a9112ba4d..dbd80cf2a165695ea9236711a6ea2eb2638b755b 100644
--- a/proto3/models/trace_route_diagnostics.proto
+++ b/proto3/models/trace_route_diagnostics.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -17,21 +17,21 @@ import public "models/trace_route_diagnostics_diagnostics_state.proto";
 message TraceRouteDiagnostics {
 
   // Size of the data block in bytes to be sent for each trace route.
-  int32 dataBlockSize = 1;
+  int32 data_block_size = 1;
 
-  TraceRouteDiagnosticsDiagnosticsState diagnosticsState = 2;
+  TraceRouteDiagnosticsDiagnosticsState diagnostics_state = 2;
 
   // Host name or address of the host to find a route to.
   string host = 3;
 
   // The maximum number of hop used in outgoing probe packets. The default is 30 hops.
-  int32 maxHopCount = 4;
+  int32 max_hop_count = 4;
 
   // Result parameter indicating the number of hops within the discovered route.  If a route could not be determined, this value shall be zero.
-  int32 numberOfRouteHops = 5;
+  int32 number_of_route_hops = 5;
 
   // Result parameter indicating the response time in milliseconds the most recent trace route test.  If a route could not be determined, this value shall be zero.
-  int32 responseTime = 6;
+  int32 response_time = 6;
 
   // Timeout in milliseconds for the trace route test.
   int32 timeout = 7;
diff --git a/proto3/models/trace_route_diagnostics_diagnostics_state.proto b/proto3/models/trace_route_diagnostics_diagnostics_state.proto
index 3d1e1bd7f53e83476ec80f92bfdaa229216d8cb3..5331b7d2e76130500605e52be01d6dc39f382308 100644
--- a/proto3/models/trace_route_diagnostics_diagnostics_state.proto
+++ b/proto3/models/trace_route_diagnostics_diagnostics_state.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,14 @@ package mec029;
 
 
 message TraceRouteDiagnosticsDiagnosticsState {
+enum TypeEnum {
+		TRACE_ROUTE_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_1 = 0;
+		TRACE_ROUTE_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_2 = 1;
+		TRACE_ROUTE_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_3 = 2;
+		TRACE_ROUTE_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_4 = 3;
+		TRACE_ROUTE_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_5 = 4;
+		TRACE_ROUTE_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_6 = 5;
+		TRACE_ROUTE_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_7 = 6;
+	}
 
 }
diff --git a/proto3/models/upload_diagnostics.proto b/proto3/models/upload_diagnostics.proto
index 7ad5dcee0239b541fd7e15f7e2e935309ac7b3c6..ff3856141e5146b008591f55faebbd9afaf9a9b0 100644
--- a/proto3/models/upload_diagnostics.proto
+++ b/proto3/models/upload_diagnostics.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -17,25 +17,25 @@ import public "models/upload_diagnostics_diagnostics_state.proto";
 
 message UploadDiagnostics {
 
-  TimeStamp bOMTime = 1;
+  TimeStamp b_om_time = 1;
 
-  UploadDiagnosticsDiagnosticsState diagnosticsState = 2;
+  UploadDiagnosticsDiagnosticsState diagnostics_state = 2;
 
-  TimeStamp eOMTime = 3;
+  TimeStamp e_om_time = 3;
 
-  TimeStamp rOMTime = 4;
+  TimeStamp r_om_time = 4;
 
-  TimeStamp tCPOpenReponseTime = 5;
+  TimeStamp tcp_ppen_reponse_time = 5;
 
-  TimeStamp tCPOpenRequestTime = 6;
+  TimeStamp tcp_open_request_time = 6;
 
-  // The test traffic sent in bytes during the FTP/HTTP transaction including FTP/HTTP headers, between bOMTime and eOMTime.
-  int32 testBytesSent = 7;
+  // The test traffic sent in bytes during the FTP/HTTP transaction including FTP/HTTP headers, between b_oMTime and e_oMTime.
+  int32 test_bytes_sent = 7;
 
   // The size of the file (in bytes) to be uploaded to the server.
-  int32 testFileLength = 8;
+  int32 test_file_length = 8;
 
   // The URI for the device to perform the upload to.
-  string uploadURI = 9;
+  string upload_uri = 9;
 
 }
diff --git a/proto3/models/upload_diagnostics_diagnostics_state.proto b/proto3/models/upload_diagnostics_diagnostics_state.proto
index c054939f29d602ff86f3f23313e21d0c7ab517ca..edefc5b705ceff84756ff64d9b04fcd02506d5a4 100644
--- a/proto3/models/upload_diagnostics_diagnostics_state.proto
+++ b/proto3/models/upload_diagnostics_diagnostics_state.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -14,5 +14,18 @@ package mec029;
 
 
 message UploadDiagnosticsDiagnosticsState {
-
+enum TypeEnum {
+		UPLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_1 = 0;
+		UPLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_2 = 1;
+		UPLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_3 = 2;
+		UPLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_4 = 3;
+		UPLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_5 = 4;
+		UPLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_6 = 5;
+		UPLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_7 = 6;
+		UPLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_8 = 7;
+		UPLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_9 = 8;
+		UPLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_10 = 9;
+		UPLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_11 = 10;
+		UPLOAD_DIAGNOSTICS_DIAGNOSTICS_STATE_TYPE_ENUM_12 = 11;
+	}
 }
diff --git a/proto3/services/cable_line_info_service.proto b/proto3/services/cable_line_info_service.proto
new file mode 100644
index 0000000000000000000000000000000000000000..5e66622908ed727be7daed541bcb3243e37408a8
--- /dev/null
+++ b/proto3/services/cable_line_info_service.proto
@@ -0,0 +1,31 @@
+/*
+  ETSI GS MEC 029 Fixed Access Information API
+ 
+  ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
+ 
+  The version of the OpenAPI document: 2.1.1
+  Contact: cti_support@etsi.org
+  Generated by OpenAPI Generator: https://openapi-generator.tech
+*/
+
+syntax = "proto3";
+
+package mec029;
+
+import public "models/cable_line_info.proto";
+import public "models/cp_info.proto";
+import public "models/problem_details.proto";
+
+service CableLineInfoService {
+  rpc CableLineInfoGET (CableLineInfoGETRequest) returns (CableLineInfo);
+
+}
+
+message CableLineInfoGETRequest {
+  // Comma separated list of customer premises information
+  repeated CpInfo customer_premises_info = 1;
+  // Comma separated list of Cable Modem identifiers.
+  repeated string cm_id = 2;
+
+}
+
diff --git a/proto3/services/optical_network_info_service.proto b/proto3/services/optical_network_info_service.proto
new file mode 100644
index 0000000000000000000000000000000000000000..1213078348c310a0eae086e1575d3cc1ffdb6559
--- /dev/null
+++ b/proto3/services/optical_network_info_service.proto
@@ -0,0 +1,37 @@
+/*
+  ETSI GS MEC 029 Fixed Access Information API
+ 
+  ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
+ 
+  The version of the OpenAPI document: 2.1.1
+  Contact: cti_support@etsi.org
+  Generated by OpenAPI Generator: https://openapi-generator.tech
+*/
+
+syntax = "proto3";
+
+package mec029;
+
+import public "models/cp_info.proto";
+import public "models/pon_info.proto";
+import public "models/problem_details.proto";
+
+service OpticalNetworkInfoService {
+  rpc OpticalNetworkInfoGET (OpticalNetworkInfoGETRequest) returns (OpticalNetworkInfoGETResponse);
+
+}
+
+message OpticalNetworkInfoGETRequest {
+  // Comma separated list of customer premises information
+  repeated CpInfo customer_premises_info = 1;
+  // Comma separated list of optical system identifiers.
+  repeated string pon_ysid = 2;
+  // Comma separated list of optical network unit identifiers.
+  repeated string onu_id = 3;
+
+}
+
+message OpticalNetworkInfoGETResponse {
+  repeated PonInfo data = 1;
+}
+
diff --git a/proto3/services/queries_service.proto b/proto3/services/queries_service.proto
index 70099b149c6a9d036cba2a697238538140bc9172..d3b2337bdb8bd9b14a32c612ed8aa9811da5ee98 100644
--- a/proto3/services/queries_service.proto
+++ b/proto3/services/queries_service.proto
@@ -4,7 +4,7 @@
   ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
  
   The version of the OpenAPI document: 2.1.1
-  
+  Contact: cti_support@etsi.org
   Generated by OpenAPI Generator: https://openapi-generator.tech
 */
 
@@ -12,7 +12,6 @@ syntax = "proto3";
 
 package mec029;
 
-import "google/protobuf/empty.proto";
 import public "models/cp_info.proto";
 import public "models/device_info.proto";
 import public "models/fa_info.proto";
@@ -27,21 +26,21 @@ service QueriesService {
 
 message DeviceInfoGETRequest {
   // Comma separated list of gateway identifier
-  repeated string gwId = 1;
+  repeated string gw_id = 1;
   // Comma separated list of device identifier.
-  repeated string deviceId = 2;
+  repeated string device_id = 2;
   // Comma separated list of device status.
-  repeated int32 deviceStatus = 3;
+  repeated int32 device_status = 3;
 
 }
 
 message FaInfoGETRequest {
   // Comma separated list of customer premises information
-  repeated CpInfo customerPremisesInfo = 1;
+  repeated CpInfo customer_premises_info = 1;
   // Comma separated list of last mile technologies.
-  repeated int32 lastMileTech = 2;
+  repeated int32 last_mile_tech = 2;
   // Comma separated list of interface types.
-  repeated int32 interfaceType = 3;
+  repeated int32 interface_type = 3;
   // Comma separated list of the bandwidth (in Mbps) from the network towards the customer site.
   repeated int32 dsbw = 4;
   // Comma separated list of the bandwidth (in Mbps) from the customer site towards the network.
diff --git a/proto3/services/subscription_service.proto b/proto3/services/subscription_service.proto
new file mode 100644
index 0000000000000000000000000000000000000000..6a59d4306a4987f0a5d1a1722d3ee955d74dd6f5
--- /dev/null
+++ b/proto3/services/subscription_service.proto
@@ -0,0 +1,62 @@
+/*
+  ETSI GS MEC 029 Fixed Access Information API
+ 
+  ETSI GS MEC 029 Fixed Access Information API described using OpenAPI.
+ 
+  The version of the OpenAPI document: 2.1.1
+  Contact: cti_support@etsi.org
+  Generated by OpenAPI Generator: https://openapi-generator.tech
+*/
+
+syntax = "proto3";
+
+package mec029;
+
+import "google/protobuf/empty.proto";	
+import public "models/subscription.proto";
+import public "models/problem_details.proto";
+import public "models/subscription_link_list.proto";
+
+service SubscriptionService {
+  rpc IndividualSubscriptionDELETE (IndividualSubscriptionDELETERequest) returns (google.protobuf.Empty);
+
+  rpc IndividualSubscriptionGET (IndividualSubscriptionGETRequest) returns (Subscription);
+
+  rpc IndividualSubscriptionPUT (IndividualSubscriptionPUTRequest) returns (Subscription);
+
+  rpc SubGET (SubGETRequest) returns (SubscriptionLinkList);
+
+  rpc SubPOST (SubPOSTRequest) returns (Subscription);
+
+}
+
+message IndividualSubscriptionDELETERequest {
+  // Refers to created subscription, where the FAI API allocates a unique resource name for this subscription
+  string subscription_id = 1;
+
+}
+
+message IndividualSubscriptionGETRequest {
+  // Refers to created subscription, where the FAI API allocates a unique resource name for this subscription
+  string subscription_id = 1;
+
+}
+
+message IndividualSubscriptionPUTRequest {
+  // Refers to created subscription, where the FAI API allocates a unique resource name for this subscription
+  string subscription_id = 1;
+  Subscription subscription = 2;
+
+}
+
+message SubGETRequest {
+  // Query parameter to filter on a specific subscription type. Permitted values: ONU_ALARM. DEVICE_ABNORMAL_ALERT. CM_CONNECTIVITY_STATE.  ANI_ALARM.
+  string subscription_type = 1;
+
+}
+
+message SubPOSTRequest {
+  Subscription subscription = 1;
+
+}
+