diff --git a/TS29122_AsSessionWithQoS.yaml b/TS29122_AsSessionWithQoS.yaml
index 8228e6dd..f55d1c10 100644
--- a/TS29122_AsSessionWithQoS.yaml
+++ b/TS29122_AsSessionWithQoS.yaml
@@ -7,7 +7,8 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials: 
+    - unspecified
 servers:
   - url: '{apiRoot}/3gpp-as-session-with-qos/v1'
     variables:
@@ -338,7 +339,8 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes:
+            unspecified: unspecified scope
   schemas: 
     AsSessionWithQoSSubscription:
       type: object
diff --git a/TS29122_ChargeableParty.yaml b/TS29122_ChargeableParty.yaml
index 930daaaf..51ade452 100644
--- a/TS29122_ChargeableParty.yaml
+++ b/TS29122_ChargeableParty.yaml
@@ -7,7 +7,8 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials:
+    - unspecified
 servers:
   - url: '{apiRoot}/3gpp-chargeable-party/v1'
     variables:
@@ -287,7 +288,8 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes:
+            unspecified: unspecified scope
   schemas: 
     ChargeableParty:
       type: object
diff --git a/TS29122_CpProvisioning.yaml b/TS29122_CpProvisioning.yaml
index 0c1f9adb..919bee81 100644
--- a/TS29122_CpProvisioning.yaml
+++ b/TS29122_CpProvisioning.yaml
@@ -7,7 +7,8 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials:
+    - unspecified
 servers:
   - url: '{apiRoot}/3gpp-cp-parameter-provisioning/v1'
     variables:
@@ -409,7 +410,8 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes:
+            unspecified: unspecified scope
   schemas: 
     CpInfo:
       type: object
diff --git a/TS29122_DeviceTriggering.yaml b/TS29122_DeviceTriggering.yaml
index 58a6c4fc..68e4be4f 100644
--- a/TS29122_DeviceTriggering.yaml
+++ b/TS29122_DeviceTriggering.yaml
@@ -7,7 +7,8 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials:
+    - unspecified
 servers:
   - url: '{apiRoot}/3gpp-device-triggering/v1'
     variables:
@@ -293,7 +294,8 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes:
+            unspecified: unspecified scope
   schemas: 
     DeviceTriggering:
       type: object
diff --git a/TS29122_ECRControl.yaml b/TS29122_ECRControl.yaml
index 1b39f7c7..3cb61857 100644
--- a/TS29122_ECRControl.yaml
+++ b/TS29122_ECRControl.yaml
@@ -7,7 +7,8 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials:
+    - unspecified
 servers:
   - url: '{apiRoot}/3gpp-ecr-control/v1'
     variables:
@@ -99,7 +100,8 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes:
+            unspecified: unspecified scope
   schemas: 
     ECRControl:
       type: object
diff --git a/TS29122_GMDviaMBMSbyMB2.yaml b/TS29122_GMDviaMBMSbyMB2.yaml
index f0c282de..bee4eaa4 100644
--- a/TS29122_GMDviaMBMSbyMB2.yaml
+++ b/TS29122_GMDviaMBMSbyMB2.yaml
@@ -8,7 +8,8 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials: 
+    - unspecified
 servers:
   - url: '{apiRoot}/3gpp-group-message-delivery-mb2/v1'
     variables:
@@ -661,7 +662,8 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes: 
+            unspecified: unspecified scope
   schemas: 
     TMGIAllocation:
       type: object
diff --git a/TS29122_GMDviaMBMSbyxMB.yaml b/TS29122_GMDviaMBMSbyxMB.yaml
index 9579c806..2b1cb50b 100644
--- a/TS29122_GMDviaMBMSbyxMB.yaml
+++ b/TS29122_GMDviaMBMSbyxMB.yaml
@@ -8,7 +8,8 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials:
+    - unspecified
 servers:
   - url: '{apiRoot}/3gpp-group-message-delivery-xmb/v1'
     variables:
@@ -561,7 +562,9 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes:
+            unspecified: unspecified scope
+
   schemas: 
     ServiceCreation:
       type: object
diff --git a/TS29122_MonitoringEvent.yaml b/TS29122_MonitoringEvent.yaml
index e376b837..4ee88ef3 100644
--- a/TS29122_MonitoringEvent.yaml
+++ b/TS29122_MonitoringEvent.yaml
@@ -7,7 +7,8 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials:
+    - unspecified
 servers:
   - url: '{apiRoot}/3gpp-monitoring-event/v1'
     variables:
@@ -297,7 +298,9 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes:
+            unspecified: unspecified scope
+
   schemas: 
     MonitoringEventSubscription:
       type: object
diff --git a/TS29122_MsisdnLessMoSms.yaml b/TS29122_MsisdnLessMoSms.yaml
index 4bab45fe..43b8e130 100644
--- a/TS29122_MsisdnLessMoSms.yaml
+++ b/TS29122_MsisdnLessMoSms.yaml
@@ -7,7 +7,8 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials: 
+    - unspecified
 servers:
   - url: '{apiRoot}'
     variables:
@@ -60,7 +61,9 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes:
+            unspecified: unspecified scope
+
   schemas: 
     MsisdnLessMoSmsNotification:
       type: object
diff --git a/TS29122_NIDD.yaml b/TS29122_NIDD.yaml
index 1ea71827..678127f8 100644
--- a/TS29122_NIDD.yaml
+++ b/TS29122_NIDD.yaml
@@ -7,7 +7,8 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials: 
+    - unspecified
 servers:
   - url: '{apiRoot}/3gpp-nidd/v1'
     variables:
@@ -460,7 +461,9 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes:
+            unspecified: unspecified scope
+
   schemas: 
     NiddConfiguration:
       type: object
diff --git a/TS29122_NpConfiguration.yaml b/TS29122_NpConfiguration.yaml
index 5a7eab85..2e9fe6f7 100644
--- a/TS29122_NpConfiguration.yaml
+++ b/TS29122_NpConfiguration.yaml
@@ -7,7 +7,8 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials: 
+    - unspecified
 servers:
   - url: '{apiRoot}/3gpp-network-parameter-configuration/v1'
     variables:
@@ -350,7 +351,8 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes:
+            unspecified: unspecified scope
   schemas: 
     NpConfiguration:
       type: object
diff --git a/TS29122_PfdManagement.yaml b/TS29122_PfdManagement.yaml
index d1b6b035..cb115cea 100644
--- a/TS29122_PfdManagement.yaml
+++ b/TS29122_PfdManagement.yaml
@@ -7,7 +7,8 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials:
+    - unspecified
 servers:
   - url: '{apiRoot}/3gpp-pfd-management/v1'
     variables:
@@ -404,7 +405,8 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes:
+            unspecified: unspecified scope
   schemas: 
     PfdManagement:
       type: object
diff --git a/TS29122_ReportingNetworkStatus.yaml b/TS29122_ReportingNetworkStatus.yaml
index d0492baa..716d11aa 100644
--- a/TS29122_ReportingNetworkStatus.yaml
+++ b/TS29122_ReportingNetworkStatus.yaml
@@ -7,7 +7,8 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials:
+    - unspecified
 servers:
   - url: '{apiRoot}/3gpp-net-stat-report/v1'
     variables:
@@ -239,7 +240,9 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes: 
+            unspecified: unspecified scope
+
   schemas: 
     NetworkStatusReportingSubscription:
       type: object
diff --git a/TS29122_ResourceManagementOfBdt.yaml b/TS29122_ResourceManagementOfBdt.yaml
index 38195aba..4ca3f3e4 100644
--- a/TS29122_ResourceManagementOfBdt.yaml
+++ b/TS29122_ResourceManagementOfBdt.yaml
@@ -7,7 +7,8 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.122/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials:
+    - unspecified
 servers:
   - url: '{apiRoot}/3gpp-bdt/v1'
     variables:
@@ -204,7 +205,8 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes:
+            unspecified: unspecified scope
   schemas: 
     Bdt:
       type: object
diff --git a/TS29522_TrafficInfluence.yaml b/TS29522_TrafficInfluence.yaml
index 7ab9c37e..6e33c774 100644
--- a/TS29522_TrafficInfluence.yaml
+++ b/TS29522_TrafficInfluence.yaml
@@ -7,7 +7,7 @@ externalDocs:
   url: 'http://www.3gpp.org/ftp/Specs/archive/29_series/29.522/'
 security:
   - {}
-  - oAuth2ClientCredentials: []
+  - oAuth2ClientCredentials: [unspecified]
 servers:
   - url: '{apiRoot}/3gpp-traffic-influence/v1'
     variables:
@@ -294,7 +294,8 @@ components:
       flows:
         clientCredentials:
           tokenUrl: '{tokenUrl}'
-          scopes: {}
+          scopes: 
+            unspecified: unspecified scope
   schemas: 
     TrafficInfluSub:
       type: object