diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml
index f9f405cde1ffc0c7de3008bc649b79764c845aa1..7803c3d6db6aae90cddd42cc15d3eea8c2037bfb 100644
--- a/OpenAPI/TS28104_MdaNrm.yaml
+++ b/OpenAPI/TS28104_MdaNrm.yaml
@@ -14,11 +14,29 @@ components:
   schemas:
 
 #-------- Definition of types-----------------------------------------------------
-
+    MDAType:
+      type: string
+      enum:
+        - COVERAGEANALYTICS_COVERAGEPROBLEMANALYSIS
+        - COVERAGEANALYTICS_PAGINGOPTIMIZATION
+        - SLSANALYSIS_SERVICEEXPERIENCEANALYSIS
+        - SLSANALYSIS_NETWORKSLICETHROUGHPUTANALYSIS
+        - SLSANALYSIS_NETWORKSLICETRAFFICANALYSIS
+        - SLSANALYSIS_E2ELATENCYANALYSIS
+        - SLSANALYSIS_NETWORKSLICELOADANALYSIS
+        - MDAASSISTEDFAULTMANAGEMENT_FAILUREPREDICTION
+        - MDAASSISTEDENERGYSAVING_ENERGYSAVINGANALYSIS
+        - MOBILITYMANAGEMENTANALYTICS_MOBILITYPERFORMANCEANALYSIS
+        - MOBILITYMANAGEMENTANALYTICS_HANDOVEROPTIMIZATION
+        - MAINTENANCE_MAINTENANCEANALYTICS
+        - RESOURCEANALYTICS_VIRTUALIZEDRESOURCEUTILIZATIONANALYSISNF
+        - RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF
+        - RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS
+        - PREDICTIONS_PMDATA
     MDATypes:
       type: array
       items:
-        type: string
+        $ref: '#/components/schemas/MDAType'
 
     MDAOutputs:
       type: array
diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index 47d3a1f84550ef74400dec67b516d743c81195d4..abe9fd0e224d8e466c5a60ce0e9b55025a629421 100644
--- a/OpenAPI/TS28105_AiMlNrm.yaml
+++ b/OpenAPI/TS28105_AiMlNrm.yaml
@@ -110,7 +110,7 @@ components:
       type: object
       properties:
         aIMLInferenceName:
-          type: string
+          $ref: '#/components/schemas/AIMLInferenceName'
         capabilityName:
           type: string
         mLCapabilityParameters:
@@ -141,7 +141,7 @@ components:
           items:
             type: string
         aIMLInferenceName:
-          type: string
+          $ref: '#/components/schemas/AIMLInferenceName'
         inferenceOutputTime:
           type: array
           items:
@@ -152,7 +152,22 @@ components:
         outputResult:
           description: A map (list of key-value pairs) for Inference result name and it's value
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet'
-          
+    AIMLInferenceName:
+      oneOf:
+        - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType'
+        - $ref: '#/components/schemas/NwdafAnalyticsType'
+        - $ref: '#/components/schemas/NgRanInferenceType'
+        - $ref: '#/components/schemas/VSExtensionType' 
+    NwdafAnalyticsType:
+      $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent'
+    NgRanInferenceType:
+      type: string
+      enum:
+        - NG_RAN_NETWORK_ENERGY_SAVING
+        - NG_RAN_LOAD_BALANCING 
+        - NG_RAN_ MOBILITY_OPTIMIZATION
+    VSExtensionType:
+      type: string
 #-------- Definition of types for name-containments ------
     SubNetwork-ncO-AiMlNrm:
       type: object
@@ -226,7 +241,7 @@ components:
                 - type: object
                   properties:
                     aIMLInferenceName:
-                      type: string  
+                      $ref: '#/components/schemas/AIMLInferenceName'  
                     candidateTrainingDataSource:
                       type: array
                       items:
@@ -406,7 +421,7 @@ components:
                 - type: object
                   properties:
                     aIMLInferenceName:
-                      type: string
+                      $ref: '#/components/schemas/AIMLInferenceName'
                     policyForLoading:
                       $ref: '#/components/schemas/AIMLManagementPolicy'
                     mLModelRef:
@@ -445,7 +460,7 @@ components:
                 mLModelId:
                   type: string
                 aIMLInferenceName:
-                  type: string
+                  $ref: '#/components/schemas/AIMLInferenceName'
                 mLModelVersion:
                   type: string
                 expectedRunTimeContext: