diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 49f37c53deafc59441198c666e62cf3835b23361..3d54d84acfa5353f5dc84d46bc5131d6fd2dc2d6 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -751,9 +751,6 @@ components:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc'
         mnc:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc'
-      required:
-        - mcc
-        - mnc
 
     listOfTraceMetrics:
       description: The trace metrics to be reported. See 3GPP TS 32.422 clause 10 for additional details.
@@ -782,10 +779,6 @@ components:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc'
         traceId:
           type: string
-      required:
-        - mcc
-        - mnc
-        - traceId
 
     traceReportingFormat-Type:
       type: string
@@ -814,13 +807,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
@@ -1073,7 +1063,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:
@@ -1092,6 +1082,10 @@ components:
           - type: integer
             minimum: 0
             maximum: 127
+        EventThresholdSINR:
+          type: integer
+          minimum: 0
+          maximum: 127
         EventThreshold1F:
           type: object
           properties:
@@ -1220,7 +1214,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:
@@ -1233,13 +1227,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
@@ -1296,7 +1290,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
@@ -1311,9 +1305,6 @@ components:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc'
           mnc:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc'
-        required:
-          - mcc
-          - mnc
       maxItems: 16
 
     positioningMethod-Type: