diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 3a8530a5d1ba30e15dd982ee725df4d52c3fd5cf..00e46b5eac24828fae3d05aea13a866881387b66 100644
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -633,9 +633,6 @@ components:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc'
         mnc:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc'
-      required:
-        - mcc
-        - mnc
 
     traceDepth-Type:
       description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details.
@@ -658,10 +655,6 @@ components:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc'
         traceId:
           type: string
-      required:
-        - mcc
-        - mnc
-        - traceId
 
     traceReportingFormat-Type:
       type: string
@@ -690,13 +683,10 @@ components:
             - SUPI
         TargetIdValue:
           type: string
-      required:
-        - TargetIdType
-        - TargetIdValue
     
     triggeringEvents-Type:
       type: object
-      description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional detials.
+      description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional details.
       properties:
         MSC_SERVER:
           type: array
@@ -945,7 +935,7 @@ components:
         - A2_EVENT
 
     eventThreshold-Type:
-      description: See details in 3GPP TS 32.422 clause 5.10.7, 5.10.7a, 5.10.13 and 5.10.14.
+      description: See details in 3GPP TS 32.422 clause 5.10.7 (LTE/NR Event A2 RSRP, RSRQ, SINR), 5.10.13 (UMTS Event 1f) and 5.10.14 (UMTS Event 1i).
       type: object
       properties:
         EventThresholdRSRP:
@@ -964,6 +954,10 @@ components:
           - type: integer
             minimum: 0
             maximum: 127
+        EventThresholdSINR:
+          type: integer
+          minimum: 0
+          maximum: 127
         EventThreshold1F:
           type: object
           properties:
@@ -1092,7 +1086,7 @@ components:
               - INFINITY
 
     eventThresholdL1-Type:
-      description: See details in 3GPP TS 32.422 clause 5.10.X.
+      description: See details in 3GPP TS 32.422 clause 5.10.36.
       type: object
       properties:
             RSRP:
@@ -1105,13 +1099,13 @@ components:
               maximum: 127
     
     hysteresisL1-Type:
-      description: See details in 3GPP TS 32.422 clause 5.10.Y.
+      description: See details in 3GPP TS 32.422 clause 5.10.37.
       type: integer
       minimum: 0
       maximum: 30
     
     timeToTriggerL1-Type:
-      description: See details in 3GPP TS 32.422 clause 5.10.Z.
+      description: See details in 3GPP TS 32.422 clause 5.10.38.
       type: string
       enum:
         - 0ms
@@ -1168,7 +1162,7 @@ components:
         - PathLoss
 
     eventThresholdUphUMTS-Type:
-      description: See details in 3GPP TS 32.422 clause 5.10.A.
+      description: See details in 3GPP TS 32.422 clause 5.10.39.
       type: integer
       minimum: 0
       maximum: 31
@@ -1183,9 +1177,6 @@ components:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc'
           mnc:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc'
-        required:
-          - mcc
-          - mnc
       maxItems: 16
 
     positioningMethod-Type: