diff --git a/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator/FILES b/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator/FILES
index be8f43b72f15e9d43510b5fa60ebd25e0872a090..850cbed46d8e4ac07390cf5d14736db4d0d18d56 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator/FILES
+++ b/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator/FILES
@@ -34,6 +34,7 @@ capif_routing_info/models/ipv6_address_range1.py
 capif_routing_info/models/local2d_point_uncertainty_ellipse.py
 capif_routing_info/models/local3d_point_uncertainty_ellipsoid.py
 capif_routing_info/models/local_origin.py
+capif_routing_info/models/o_auth_grant_type.py
 capif_routing_info/models/operation.py
 capif_routing_info/models/point.py
 capif_routing_info/models/point_altitude.py
diff --git a/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator/VERSION
index 18bb4182dd01428f1d4c3c2145501ee5d40455a3..b23eb27529e2bacf6c8c06f725c323d9fb87f042 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator/VERSION
+++ b/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator/VERSION
@@ -1 +1 @@
-7.5.0
+7.11.0
diff --git a/services/TS29222_CAPIF_Routing_Info_API/README.md b/services/TS29222_CAPIF_Routing_Info_API/README.md
index edacb4a6f8839ed6e00ca6b7250bd7aca3d9df43..b239418e6ca48afcab32df49aeb265a57a253a3c 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/README.md
+++ b/services/TS29222_CAPIF_Routing_Info_API/README.md
@@ -15,7 +15,7 @@ To run the server, please execute the following from the root directory:
 
 ```
 pip3 install -r requirements.txt
-python3 -m openapi_server
+python3 -m capif_routing_info
 ```
 
 and open your browser to here:
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/__init__.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/__init__.py
index d036df693ea41dfaa3debffffad0462c1fcd8e4a..04378bc93f83ca03bf715d445eb96fd99e7ffcfb 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/__init__.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/__init__.py
@@ -1,2 +1,43 @@
 # flake8: noqa
 # import models into model package
+from capif_routing_info.models.aef_location import AefLocation
+from capif_routing_info.models.aef_profile import AefProfile
+from capif_routing_info.models.civic_address import CivicAddress
+from capif_routing_info.models.communication_type import CommunicationType
+from capif_routing_info.models.custom_operation import CustomOperation
+from capif_routing_info.models.data_format import DataFormat
+from capif_routing_info.models.ellipsoid_arc import EllipsoidArc
+from capif_routing_info.models.gad_shape import GADShape
+from capif_routing_info.models.geographic_area import GeographicArea
+from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates
+from capif_routing_info.models.interface_description import InterfaceDescription
+from capif_routing_info.models.invalid_param import InvalidParam
+from capif_routing_info.models.ip_addr_range import IpAddrRange
+from capif_routing_info.models.ipv4_address_range import Ipv4AddressRange
+from capif_routing_info.models.ipv4_address_range1 import Ipv4AddressRange1
+from capif_routing_info.models.ipv6_addr1 import Ipv6Addr1
+from capif_routing_info.models.ipv6_address_range import Ipv6AddressRange
+from capif_routing_info.models.ipv6_address_range1 import Ipv6AddressRange1
+from capif_routing_info.models.local2d_point_uncertainty_ellipse import Local2dPointUncertaintyEllipse
+from capif_routing_info.models.local3d_point_uncertainty_ellipsoid import Local3dPointUncertaintyEllipsoid
+from capif_routing_info.models.local_origin import LocalOrigin
+from capif_routing_info.models.o_auth_grant_type import OAuthGrantType
+from capif_routing_info.models.operation import Operation
+from capif_routing_info.models.point import Point
+from capif_routing_info.models.point_altitude import PointAltitude
+from capif_routing_info.models.point_altitude_uncertainty import PointAltitudeUncertainty
+from capif_routing_info.models.point_uncertainty_circle import PointUncertaintyCircle
+from capif_routing_info.models.point_uncertainty_ellipse import PointUncertaintyEllipse
+from capif_routing_info.models.polygon import Polygon
+from capif_routing_info.models.problem_details import ProblemDetails
+from capif_routing_info.models.protocol import Protocol
+from capif_routing_info.models.relative_cartesian_location import RelativeCartesianLocation
+from capif_routing_info.models.resource import Resource
+from capif_routing_info.models.routing_info import RoutingInfo
+from capif_routing_info.models.routing_rule import RoutingRule
+from capif_routing_info.models.security_method import SecurityMethod
+from capif_routing_info.models.service_kpis import ServiceKpis
+from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes
+from capif_routing_info.models.uncertainty_ellipse import UncertaintyEllipse
+from capif_routing_info.models.uncertainty_ellipsoid import UncertaintyEllipsoid
+from capif_routing_info.models.version import Version
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_location.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_location.py
index f0e756be690433fcf944def5f64229fd20e75748..e60b523e09791c335c1b8eb2280e9b02edb024e3 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_location.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_location.py
@@ -1,12 +1,15 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info.models.civic_address import CivicAddress
+from capif_routing_info.models.geographic_area import GeographicArea
+from capif_routing_info import util
+
 from capif_routing_info.models.civic_address import CivicAddress  # noqa: E501
 from capif_routing_info.models.geographic_area import GeographicArea  # noqa: E501
 
-
 class AefLocation(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_profile.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_profile.py
index ccf24ad69e698692adb1f873fa673cd204a7b6fe..2cb26e132ed92bbff478e0e6ccfb8ebabaa5dfa6 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_profile.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_profile.py
@@ -1,25 +1,36 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
+from capif_routing_info.models.base_model import Model
+from capif_routing_info.models.aef_location import AefLocation
+from capif_routing_info.models.data_format import DataFormat
+from capif_routing_info.models.interface_description import InterfaceDescription
+from capif_routing_info.models.ip_addr_range import IpAddrRange
+from capif_routing_info.models.o_auth_grant_type import OAuthGrantType
+from capif_routing_info.models.protocol import Protocol
+from capif_routing_info.models.security_method import SecurityMethod
+from capif_routing_info.models.service_kpis import ServiceKpis
+from capif_routing_info.models.version import Version
 from capif_routing_info import util
+
 from capif_routing_info.models.aef_location import AefLocation  # noqa: E501
-from capif_routing_info.models.base_model import Model
 from capif_routing_info.models.data_format import DataFormat  # noqa: E501
 from capif_routing_info.models.interface_description import InterfaceDescription  # noqa: E501
 from capif_routing_info.models.ip_addr_range import IpAddrRange  # noqa: E501
+from capif_routing_info.models.o_auth_grant_type import OAuthGrantType  # noqa: E501
 from capif_routing_info.models.protocol import Protocol  # noqa: E501
 from capif_routing_info.models.security_method import SecurityMethod  # noqa: E501
 from capif_routing_info.models.service_kpis import ServiceKpis  # noqa: E501
 from capif_routing_info.models.version import Version  # noqa: E501
 
-
 class AefProfile(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
     Do not edit the class manually.
     """
 
-    def __init__(self, aef_id=None, versions=None, protocol=None, data_format=None, security_methods=None, domain_name=None, interface_descriptions=None, aef_location=None, service_kpis=None, ue_ip_range=None):  # noqa: E501
+    def __init__(self, aef_id=None, versions=None, protocol=None, data_format=None, security_methods=None, grant_types=None, domain_name=None, interface_descriptions=None, aef_location=None, service_kpis=None, ue_ip_range=None):  # noqa: E501
         """AefProfile - a model defined in OpenAPI
 
         :param aef_id: The aef_id of this AefProfile.  # noqa: E501
@@ -32,6 +43,8 @@ class AefProfile(Model):
         :type data_format: DataFormat
         :param security_methods: The security_methods of this AefProfile.  # noqa: E501
         :type security_methods: List[SecurityMethod]
+        :param grant_types: The grant_types of this AefProfile.  # noqa: E501
+        :type grant_types: List[OAuthGrantType]
         :param domain_name: The domain_name of this AefProfile.  # noqa: E501
         :type domain_name: str
         :param interface_descriptions: The interface_descriptions of this AefProfile.  # noqa: E501
@@ -49,6 +62,7 @@ class AefProfile(Model):
             'protocol': Protocol,
             'data_format': DataFormat,
             'security_methods': List[SecurityMethod],
+            'grant_types': List[OAuthGrantType],
             'domain_name': str,
             'interface_descriptions': List[InterfaceDescription],
             'aef_location': AefLocation,
@@ -62,6 +76,7 @@ class AefProfile(Model):
             'protocol': 'protocol',
             'data_format': 'dataFormat',
             'security_methods': 'securityMethods',
+            'grant_types': 'grantTypes',
             'domain_name': 'domainName',
             'interface_descriptions': 'interfaceDescriptions',
             'aef_location': 'aefLocation',
@@ -74,6 +89,7 @@ class AefProfile(Model):
         self._protocol = protocol
         self._data_format = data_format
         self._security_methods = security_methods
+        self._grant_types = grant_types
         self._domain_name = domain_name
         self._interface_descriptions = interface_descriptions
         self._aef_location = aef_location
@@ -210,6 +226,29 @@ class AefProfile(Model):
 
         self._security_methods = security_methods
 
+    @property
+    def grant_types(self) -> List[OAuthGrantType]:
+        """Gets the grant_types of this AefProfile.
+
+
+        :return: The grant_types of this AefProfile.
+        :rtype: List[OAuthGrantType]
+        """
+        return self._grant_types
+
+    @grant_types.setter
+    def grant_types(self, grant_types: List[OAuthGrantType]):
+        """Sets the grant_types of this AefProfile.
+
+
+        :param grant_types: The grant_types of this AefProfile.
+        :type grant_types: List[OAuthGrantType]
+        """
+        if grant_types is not None and len(grant_types) < 1:
+            raise ValueError("Invalid value for `grant_types`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._grant_types = grant_types
+
     @property
     def domain_name(self) -> str:
         """Gets the domain_name of this AefProfile.
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/base_model.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/base_model.py
index 57cac681050dbb58f484665598a3791402122dad..4849636261a29a950cfe1f65820ab2bce95f0922 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/base_model.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/base_model.py
@@ -1,4 +1,5 @@
 import pprint
+
 import typing
 
 from capif_routing_info import util
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/civic_address.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/civic_address.py
index e12616c961824a301b1af41fe3dbf471ec6ba956..fd306ef3914d94985cea135f41eeed9ad2d5014c 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/civic_address.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/civic_address.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info import util
 
 
 class CivicAddress(Model):
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/communication_type.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/communication_type.py
index 02f3063dda850439667db3d3ee6a07c28d7be1e9..c355c6de27af7a8277f30fe17982fed29043b5d1 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/communication_type.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/communication_type.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info import util
 
 
 class CommunicationType(Model):
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/custom_operation.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/custom_operation.py
index 6ea6b7059ce6f8d02a9b784008d62a95731d4e2f..0e0995b243953f733235a2741ff86b952b33e82a 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/custom_operation.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/custom_operation.py
@@ -1,12 +1,15 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info.models.communication_type import CommunicationType
+from capif_routing_info.models.operation import Operation
+from capif_routing_info import util
+
 from capif_routing_info.models.communication_type import CommunicationType  # noqa: E501
 from capif_routing_info.models.operation import Operation  # noqa: E501
 
-
 class CustomOperation(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/data_format.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/data_format.py
index 3b453d17bc4f39e447f89c96913113c721558905..83f31a21083b763e8971ea217f4c06772c3c75cd 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/data_format.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/data_format.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info import util
 
 
 class DataFormat(Model):
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ellipsoid_arc.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ellipsoid_arc.py
index 790d70a094bdf1a4de495c033be74595d004de61..345698c2efdd0f7c1bd39c8f71dcd8417ea5a2a2 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ellipsoid_arc.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ellipsoid_arc.py
@@ -1,12 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info.models.gad_shape import GADShape
+from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates
+from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes
+from capif_routing_info import util
+
+from capif_routing_info.models.gad_shape import GADShape  # noqa: E501
 from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 
-
 class EllipsoidArc(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/gad_shape.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/gad_shape.py
index de28747699d8840f565a4408119912eee256510f..d956d8d23a90fa23a5cbad5e91234388b39d7dc2 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/gad_shape.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/gad_shape.py
@@ -1,10 +1,12 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
-from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
+from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes
+from capif_routing_info import util
 
+from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 
 class GADShape(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/geographic_area.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/geographic_area.py
index f0fd6607f0701b96db86c9be546b1f1cb823114b..5c1598253924c2e6f32af2520a6b30ca19b89d33 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/geographic_area.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/geographic_area.py
@@ -1,13 +1,31 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info.models.ellipsoid_arc import EllipsoidArc
+from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates
+from capif_routing_info.models.point import Point
+from capif_routing_info.models.point_altitude import PointAltitude
+from capif_routing_info.models.point_altitude_uncertainty import PointAltitudeUncertainty
+from capif_routing_info.models.point_uncertainty_circle import PointUncertaintyCircle
+from capif_routing_info.models.point_uncertainty_ellipse import PointUncertaintyEllipse
+from capif_routing_info.models.polygon import Polygon
+from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes
+from capif_routing_info.models.uncertainty_ellipse import UncertaintyEllipse
+from capif_routing_info import util
+
+from capif_routing_info.models.ellipsoid_arc import EllipsoidArc  # noqa: E501
 from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
+from capif_routing_info.models.point import Point  # noqa: E501
+from capif_routing_info.models.point_altitude import PointAltitude  # noqa: E501
+from capif_routing_info.models.point_altitude_uncertainty import PointAltitudeUncertainty  # noqa: E501
+from capif_routing_info.models.point_uncertainty_circle import PointUncertaintyCircle  # noqa: E501
+from capif_routing_info.models.point_uncertainty_ellipse import PointUncertaintyEllipse  # noqa: E501
+from capif_routing_info.models.polygon import Polygon  # noqa: E501
 from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 from capif_routing_info.models.uncertainty_ellipse import UncertaintyEllipse  # noqa: E501
 
-
 class GeographicArea(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/interface_description.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/interface_description.py
index 6d0075be6c8732003d5184a3993e5df6e3183dd0..f9b79570a9806bd10ce59432e2a8e3f0caca3875 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/interface_description.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/interface_description.py
@@ -1,11 +1,16 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
-from capif_routing_info.models.security_method import SecurityMethod  # noqa: E501
+from capif_routing_info.models.o_auth_grant_type import OAuthGrantType
+from capif_routing_info.models.security_method import SecurityMethod
+import re
+from capif_routing_info import util
 
+from capif_routing_info.models.o_auth_grant_type import OAuthGrantType  # noqa: E501
+from capif_routing_info.models.security_method import SecurityMethod  # noqa: E501
+import re  # noqa: E501
 
 class InterfaceDescription(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -13,7 +18,7 @@ class InterfaceDescription(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, ipv4_addr=None, ipv6_addr=None, fqdn=None, port=None, api_prefix=None, security_methods=None):  # noqa: E501
+    def __init__(self, ipv4_addr=None, ipv6_addr=None, fqdn=None, port=None, api_prefix=None, security_methods=None, grant_types=None):  # noqa: E501
         """InterfaceDescription - a model defined in OpenAPI
 
         :param ipv4_addr: The ipv4_addr of this InterfaceDescription.  # noqa: E501
@@ -28,6 +33,8 @@ class InterfaceDescription(Model):
         :type api_prefix: str
         :param security_methods: The security_methods of this InterfaceDescription.  # noqa: E501
         :type security_methods: List[SecurityMethod]
+        :param grant_types: The grant_types of this InterfaceDescription.  # noqa: E501
+        :type grant_types: List[OAuthGrantType]
         """
         self.openapi_types = {
             'ipv4_addr': str,
@@ -35,7 +42,8 @@ class InterfaceDescription(Model):
             'fqdn': str,
             'port': int,
             'api_prefix': str,
-            'security_methods': List[SecurityMethod]
+            'security_methods': List[SecurityMethod],
+            'grant_types': List[OAuthGrantType]
         }
 
         self.attribute_map = {
@@ -44,7 +52,8 @@ class InterfaceDescription(Model):
             'fqdn': 'fqdn',
             'port': 'port',
             'api_prefix': 'apiPrefix',
-            'security_methods': 'securityMethods'
+            'security_methods': 'securityMethods',
+            'grant_types': 'grantTypes'
         }
 
         self._ipv4_addr = ipv4_addr
@@ -53,6 +62,7 @@ class InterfaceDescription(Model):
         self._port = port
         self._api_prefix = api_prefix
         self._security_methods = security_methods
+        self._grant_types = grant_types
 
     @classmethod
     def from_dict(cls, dikt) -> 'InterfaceDescription':
@@ -136,7 +146,7 @@ class InterfaceDescription(Model):
         if fqdn is not None and len(fqdn) < 4:
             raise ValueError("Invalid value for `fqdn`, length must be greater than or equal to `4`")  # noqa: E501
         if fqdn is not None and not re.search(r'^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$', fqdn):  # noqa: E501
-            raise ValueError("Invalid value for `fqdn`, must be a follow pattern or equal to `/^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `fqdn`, must be a follow pattern or equal to `/^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$/`")  # noqa: E501
 
         self._fqdn = fqdn
 
@@ -214,3 +224,26 @@ class InterfaceDescription(Model):
             raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
 
         self._security_methods = security_methods
+
+    @property
+    def grant_types(self) -> List[OAuthGrantType]:
+        """Gets the grant_types of this InterfaceDescription.
+
+
+        :return: The grant_types of this InterfaceDescription.
+        :rtype: List[OAuthGrantType]
+        """
+        return self._grant_types
+
+    @grant_types.setter
+    def grant_types(self, grant_types: List[OAuthGrantType]):
+        """Sets the grant_types of this InterfaceDescription.
+
+
+        :param grant_types: The grant_types of this InterfaceDescription.
+        :type grant_types: List[OAuthGrantType]
+        """
+        if grant_types is not None and len(grant_types) < 1:
+            raise ValueError("Invalid value for `grant_types`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._grant_types = grant_types
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/invalid_param.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/invalid_param.py
index 3014346fa88dc43513de02189977734f0fc0fcd2..e6d4edec0a6d97fc50177b101776b3dd6a745926 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/invalid_param.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/invalid_param.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info import util
 
 
 class InvalidParam(Model):
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ip_addr_range.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ip_addr_range.py
index 6fa0acf3a648c993cc37968a0925723c3406d460..d470760f018aaaedc550c17ed9c7e64637dc329d 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ip_addr_range.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ip_addr_range.py
@@ -1,12 +1,15 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info.models.ipv4_address_range1 import Ipv4AddressRange1
+from capif_routing_info.models.ipv6_address_range1 import Ipv6AddressRange1
+from capif_routing_info import util
+
 from capif_routing_info.models.ipv4_address_range1 import Ipv4AddressRange1  # noqa: E501
 from capif_routing_info.models.ipv6_address_range1 import Ipv6AddressRange1  # noqa: E501
 
-
 class IpAddrRange(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py
index a8025b6cb70da8555be363e1ac5ef1a59026ff85..e4a0b763f4605998f41ac846510c6002832b0202 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py
@@ -1,10 +1,12 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+import re
+from capif_routing_info import util
 
+import re  # noqa: E501
 
 class Ipv4AddressRange(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -65,7 +67,7 @@ class Ipv4AddressRange(Model):
         :type start: str
         """
         if start is not None and not re.search(r'^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$', start):  # noqa: E501
-            raise ValueError("Invalid value for `start`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `start`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
 
         self._start = start
 
@@ -90,6 +92,6 @@ class Ipv4AddressRange(Model):
         :type end: str
         """
         if end is not None and not re.search(r'^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$', end):  # noqa: E501
-            raise ValueError("Invalid value for `end`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `end`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
 
         self._end = end
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range1.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range1.py
index ebb34a4abaf993a285dc769286c65b7f9db34367..ca5d5f4a21907a09deee4b1e8967433833c3d785 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range1.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range1.py
@@ -1,10 +1,12 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+import re
+from capif_routing_info import util
 
+import re  # noqa: E501
 
 class Ipv4AddressRange1(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -67,7 +69,7 @@ class Ipv4AddressRange1(Model):
         if start is None:
             raise ValueError("Invalid value for `start`, must not be `None`")  # noqa: E501
         if start is not None and not re.search(r'^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$', start):  # noqa: E501
-            raise ValueError("Invalid value for `start`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `start`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
 
         self._start = start
 
@@ -94,6 +96,6 @@ class Ipv4AddressRange1(Model):
         if end is None:
             raise ValueError("Invalid value for `end`, must not be `None`")  # noqa: E501
         if end is not None and not re.search(r'^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$', end):  # noqa: E501
-            raise ValueError("Invalid value for `end`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `end`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
 
         self._end = end
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_addr1.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_addr1.py
index a08058027ebdc12cff398ed5b394e83bc9791fb0..f4248ba8cde7f3f4846934c46d5152099d1428ce 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_addr1.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_addr1.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info import util
 
 
 class Ipv6Addr1(Model):
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range.py
index 2067eb2d4600f322d0bce17c8676ce28733ede39..aeaff9c170cf40efd06f6007fccbf9de8a81bf57 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info import util
 
 
 class Ipv6AddressRange(Model):
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range1.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range1.py
index 270b9ac93a0ccf3bc6f4586f262595b80880f9ff..a1060d8a6f20d7a7925a0a7c70c63d9e4718e05e 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range1.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range1.py
@@ -1,10 +1,12 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
-from capif_routing_info.models.ipv6_addr1 import Ipv6Addr1  # noqa: E501
+from capif_routing_info.models.ipv6_addr1 import Ipv6Addr1
+from capif_routing_info import util
 
+from capif_routing_info.models.ipv6_addr1 import Ipv6Addr1  # noqa: E501
 
 class Ipv6AddressRange1(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local3d_point_uncertainty_ellipsoid.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local3d_point_uncertainty_ellipsoid.py
index 2539de2ce701974bc68b9d0873ef30d0eb853fa0..076c7f4941292d3d1f351b365b68915a8c7390b1 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local3d_point_uncertainty_ellipsoid.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local3d_point_uncertainty_ellipsoid.py
@@ -22,7 +22,7 @@ class Local3dPointUncertaintyEllipsoid(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, shape=None, local_origin=None, point=None, uncertainty_ellipsoid=None, confidence=None):  # noqa: E501
+    def __init__(self, shape=None, local_origin=None, point=None, uncertainty_ellipsoid=None, confidence=None, v_confidence=None):  # noqa: E501
         """Local3dPointUncertaintyEllipsoid - a model defined in OpenAPI
 
         :param shape: The shape of this Local3dPointUncertaintyEllipsoid.  # noqa: E501
@@ -35,13 +35,16 @@ class Local3dPointUncertaintyEllipsoid(Model):
         :type uncertainty_ellipsoid: UncertaintyEllipsoid
         :param confidence: The confidence of this Local3dPointUncertaintyEllipsoid.  # noqa: E501
         :type confidence: int
+        :param v_confidence: The v_confidence of this Local3dPointUncertaintyEllipsoid.  # noqa: E501
+        :type v_confidence: int
         """
         self.openapi_types = {
             'shape': SupportedGADShapes,
             'local_origin': LocalOrigin,
             'point': RelativeCartesianLocation,
             'uncertainty_ellipsoid': UncertaintyEllipsoid,
-            'confidence': int
+            'confidence': int,
+            'v_confidence': int
         }
 
         self.attribute_map = {
@@ -49,7 +52,8 @@ class Local3dPointUncertaintyEllipsoid(Model):
             'local_origin': 'localOrigin',
             'point': 'point',
             'uncertainty_ellipsoid': 'uncertaintyEllipsoid',
-            'confidence': 'confidence'
+            'confidence': 'confidence',
+            'v_confidence': 'vConfidence'
         }
 
         self._shape = shape
@@ -57,6 +61,7 @@ class Local3dPointUncertaintyEllipsoid(Model):
         self._point = point
         self._uncertainty_ellipsoid = uncertainty_ellipsoid
         self._confidence = confidence
+        self._v_confidence = v_confidence
 
     @classmethod
     def from_dict(cls, dikt) -> 'Local3dPointUncertaintyEllipsoid':
@@ -189,3 +194,30 @@ class Local3dPointUncertaintyEllipsoid(Model):
             raise ValueError("Invalid value for `confidence`, must be a value greater than or equal to `0`")  # noqa: E501
 
         self._confidence = confidence
+
+    @property
+    def v_confidence(self) -> int:
+        """Gets the v_confidence of this Local3dPointUncertaintyEllipsoid.
+
+        Indicates value of confidence.  # noqa: E501
+
+        :return: The v_confidence of this Local3dPointUncertaintyEllipsoid.
+        :rtype: int
+        """
+        return self._v_confidence
+
+    @v_confidence.setter
+    def v_confidence(self, v_confidence: int):
+        """Sets the v_confidence of this Local3dPointUncertaintyEllipsoid.
+
+        Indicates value of confidence.  # noqa: E501
+
+        :param v_confidence: The v_confidence of this Local3dPointUncertaintyEllipsoid.
+        :type v_confidence: int
+        """
+        if v_confidence is not None and v_confidence > 100:  # noqa: E501
+            raise ValueError("Invalid value for `v_confidence`, must be a value less than or equal to `100`")  # noqa: E501
+        if v_confidence is not None and v_confidence < 0:  # noqa: E501
+            raise ValueError("Invalid value for `v_confidence`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._v_confidence = v_confidence
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local_origin.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local_origin.py
index 8eb4a75aa3736a6a1c1c3ed99035c8ace4ed5441..0b89a0dca37c94d7735c612a675ae8873bab4775 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local_origin.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local_origin.py
@@ -1,10 +1,14 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
-from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
+from capif_routing_info.models.geographic_area import GeographicArea
+from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates
+from capif_routing_info import util
 
+from capif_routing_info.models.geographic_area import GeographicArea  # noqa: E501
+from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 
 class LocalOrigin(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -12,26 +16,36 @@ class LocalOrigin(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, coordinate_id=None, point=None):  # noqa: E501
+    def __init__(self, coordinate_id=None, point=None, area=None, horiz_axes_orientation=None):  # noqa: E501
         """LocalOrigin - a model defined in OpenAPI
 
         :param coordinate_id: The coordinate_id of this LocalOrigin.  # noqa: E501
         :type coordinate_id: str
         :param point: The point of this LocalOrigin.  # noqa: E501
         :type point: GeographicalCoordinates
+        :param area: The area of this LocalOrigin.  # noqa: E501
+        :type area: GeographicArea
+        :param horiz_axes_orientation: The horiz_axes_orientation of this LocalOrigin.  # noqa: E501
+        :type horiz_axes_orientation: int
         """
         self.openapi_types = {
             'coordinate_id': str,
-            'point': GeographicalCoordinates
+            'point': GeographicalCoordinates,
+            'area': GeographicArea,
+            'horiz_axes_orientation': int
         }
 
         self.attribute_map = {
             'coordinate_id': 'coordinateId',
-            'point': 'point'
+            'point': 'point',
+            'area': 'area',
+            'horiz_axes_orientation': 'horizAxesOrientation'
         }
 
         self._coordinate_id = coordinate_id
         self._point = point
+        self._area = area
+        self._horiz_axes_orientation = horiz_axes_orientation
 
     @classmethod
     def from_dict(cls, dikt) -> 'LocalOrigin':
@@ -62,6 +76,8 @@ class LocalOrigin(Model):
         :param coordinate_id: The coordinate_id of this LocalOrigin.
         :type coordinate_id: str
         """
+        if coordinate_id is None:
+            raise ValueError("Invalid value for `coordinate_id`, must not be `None`")  # noqa: E501
 
         self._coordinate_id = coordinate_id
 
@@ -85,3 +101,51 @@ class LocalOrigin(Model):
         """
 
         self._point = point
+
+    @property
+    def area(self) -> GeographicArea:
+        """Gets the area of this LocalOrigin.
+
+
+        :return: The area of this LocalOrigin.
+        :rtype: GeographicArea
+        """
+        return self._area
+
+    @area.setter
+    def area(self, area: GeographicArea):
+        """Sets the area of this LocalOrigin.
+
+
+        :param area: The area of this LocalOrigin.
+        :type area: GeographicArea
+        """
+
+        self._area = area
+
+    @property
+    def horiz_axes_orientation(self) -> int:
+        """Gets the horiz_axes_orientation of this LocalOrigin.
+
+        Horizontal axes orientation angle clockwise from northing in 0.1 degrees.  # noqa: E501
+
+        :return: The horiz_axes_orientation of this LocalOrigin.
+        :rtype: int
+        """
+        return self._horiz_axes_orientation
+
+    @horiz_axes_orientation.setter
+    def horiz_axes_orientation(self, horiz_axes_orientation: int):
+        """Sets the horiz_axes_orientation of this LocalOrigin.
+
+        Horizontal axes orientation angle clockwise from northing in 0.1 degrees.  # noqa: E501
+
+        :param horiz_axes_orientation: The horiz_axes_orientation of this LocalOrigin.
+        :type horiz_axes_orientation: int
+        """
+        if horiz_axes_orientation is not None and horiz_axes_orientation > 3600:  # noqa: E501
+            raise ValueError("Invalid value for `horiz_axes_orientation`, must be a value less than or equal to `3600`")  # noqa: E501
+        if horiz_axes_orientation is not None and horiz_axes_orientation < 0:  # noqa: E501
+            raise ValueError("Invalid value for `horiz_axes_orientation`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._horiz_axes_orientation = horiz_axes_orientation
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/o_auth_grant_type.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/o_auth_grant_type.py
new file mode 100644
index 0000000000000000000000000000000000000000..420b4513460530d4d5e4e5c2fc588235bfbab778
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/o_auth_grant_type.py
@@ -0,0 +1,34 @@
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model import Model
+from capif_routing_info import util
+
+
+class OAuthGrantType(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """OAuthGrantType - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'OAuthGrantType':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The OAuthGrantType of this OAuthGrantType.  # noqa: E501
+        :rtype: OAuthGrantType
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation.py
index 3e0511a1860ec3f6d451cf77f5e7655c10d6fd75..856dc775600412378a64bb9ef2749bb417b45fe2 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info import util
 
 
 class Operation(Model):
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point.py
index 471c405c488739b2ea9b8bed187d30e82391a532..88b0a922e2d4b075966d95b45b4d1b9d968056f3 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point.py
@@ -1,12 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info.models.gad_shape import GADShape
+from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates
+from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes
+from capif_routing_info import util
+
+from capif_routing_info.models.gad_shape import GADShape  # noqa: E501
 from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 
-
 class Point(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_altitude.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_altitude.py
index 8524f90298135d054c687cc304afb06753a32624..ff5cab9ef5b6b8b426e07c4922613fbcc872a1a4 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_altitude.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_altitude.py
@@ -1,12 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info.models.gad_shape import GADShape
+from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates
+from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes
+from capif_routing_info import util
+
+from capif_routing_info.models.gad_shape import GADShape  # noqa: E501
 from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 
-
 class PointAltitude(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/polygon.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/polygon.py
index 977b02264d6e0f1988660ce5423fd4f96b9ffaf8..3af36a1ed09e465095af4304009c5bd4eecdd744 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/polygon.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/polygon.py
@@ -1,12 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info.models.gad_shape import GADShape
+from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates
+from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes
+from capif_routing_info import util
+
+from capif_routing_info.models.gad_shape import GADShape  # noqa: E501
 from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 
-
 class Polygon(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/problem_details.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/problem_details.py
index e2a91365ae14fe297d8c12b6a2b54a31b07566c7..096c04eb628676278803cf3ed90d2827b7c72ac0 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/problem_details.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/problem_details.py
@@ -1,11 +1,14 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
-from capif_routing_info.models.invalid_param import InvalidParam  # noqa: E501
+from capif_routing_info.models.invalid_param import InvalidParam
+import re
+from capif_routing_info import util
 
+from capif_routing_info.models.invalid_param import InvalidParam  # noqa: E501
+import re  # noqa: E501
 
 class ProblemDetails(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -259,6 +262,6 @@ class ProblemDetails(Model):
         :type supported_features: str
         """
         if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
-            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
 
         self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/protocol.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/protocol.py
index 48cda2a8fbf79ffff6fde64dc11a85029db46d18..fe4b2bf32cf9b7e7490ca402f592714da7b880df 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/protocol.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/protocol.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info import util
 
 
 class Protocol(Model):
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/resource.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/resource.py
index 11872f4956b1bf735f272764f90a9c4bf52b2f8b..c6540878a4bbc9a91ed4c938a4bd0bf16c25cdd6 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/resource.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/resource.py
@@ -1,13 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info.models.communication_type import CommunicationType
+from capif_routing_info.models.custom_operation import CustomOperation
+from capif_routing_info.models.operation import Operation
+from capif_routing_info import util
+
 from capif_routing_info.models.communication_type import CommunicationType  # noqa: E501
 from capif_routing_info.models.custom_operation import CustomOperation  # noqa: E501
 from capif_routing_info.models.operation import Operation  # noqa: E501
 
-
 class Resource(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_info.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_info.py
index e81e9048a76c696da9a358140882987a246a76eb..8d086045c4a9f4ffa662b9ed437b228e2c25fb9c 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_info.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_info.py
@@ -1,10 +1,12 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
-from capif_routing_info.models.routing_rule import RoutingRule  # noqa: E501
+from capif_routing_info.models.routing_rule import RoutingRule
+from capif_routing_info import util
 
+from capif_routing_info.models.routing_rule import RoutingRule  # noqa: E501
 
 class RoutingInfo(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py
index 14216c31d50518bcb63cd014e1406b0257c35527..88cb2c7a08f4f10e818afc8b940909c42be196a4 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py
@@ -1,13 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
+from capif_routing_info.models.base_model import Model
+from capif_routing_info.models.aef_profile import AefProfile
+from capif_routing_info.models.ipv4_address_range import Ipv4AddressRange
+from capif_routing_info.models.ipv6_address_range import Ipv6AddressRange
 from capif_routing_info import util
+
 from capif_routing_info.models.aef_profile import AefProfile  # noqa: E501
-from capif_routing_info.models.base_model import Model
 from capif_routing_info.models.ipv4_address_range import Ipv4AddressRange  # noqa: E501
 from capif_routing_info.models.ipv6_address_range import Ipv6AddressRange  # noqa: E501
 
-
 class RoutingRule(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/security_method.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/security_method.py
index dc073f400e54197b4644303edcd593ddca912869..0ef293df07c56f8f0654aff42aa69481f5333326 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/security_method.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/security_method.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info import util
 
 
 class SecurityMethod(Model):
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/service_kpis.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/service_kpis.py
index 05926a00f7016ce60d930cfc065969673c500fda..869dc5a315dfeb99280f1e823f8eec747cec68f9 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/service_kpis.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/service_kpis.py
@@ -1,10 +1,12 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+import re
+from capif_routing_info import util
 
+import re  # noqa: E501
 
 class ServiceKpis(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -170,7 +172,7 @@ class ServiceKpis(Model):
         :type aval_comp: str
         """
         if aval_comp is not None and not re.search(r'^\d+(\.\d+)? (kFLOPS|MFLOPS|GFLOPS|TFLOPS|PFLOPS|EFLOPS|ZFLOPS)$', aval_comp):  # noqa: E501
-            raise ValueError("Invalid value for `aval_comp`, must be a follow pattern or equal to `/^\d+(\.\d+)? (kFLOPS|MFLOPS|GFLOPS|TFLOPS|PFLOPS|EFLOPS|ZFLOPS)$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `aval_comp`, must be a follow pattern or equal to `/^\d+(\.\d+)? (kFLOPS|MFLOPS|GFLOPS|TFLOPS|PFLOPS|EFLOPS|ZFLOPS)$/`")  # noqa: E501
 
         self._aval_comp = aval_comp
 
@@ -195,7 +197,7 @@ class ServiceKpis(Model):
         :type aval_gra_comp: str
         """
         if aval_gra_comp is not None and not re.search(r'^\d+(\.\d+)? (kFLOPS|MFLOPS|GFLOPS|TFLOPS|PFLOPS|EFLOPS|ZFLOPS)$', aval_gra_comp):  # noqa: E501
-            raise ValueError("Invalid value for `aval_gra_comp`, must be a follow pattern or equal to `/^\d+(\.\d+)? (kFLOPS|MFLOPS|GFLOPS|TFLOPS|PFLOPS|EFLOPS|ZFLOPS)$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `aval_gra_comp`, must be a follow pattern or equal to `/^\d+(\.\d+)? (kFLOPS|MFLOPS|GFLOPS|TFLOPS|PFLOPS|EFLOPS|ZFLOPS)$/`")  # noqa: E501
 
         self._aval_gra_comp = aval_gra_comp
 
@@ -220,7 +222,7 @@ class ServiceKpis(Model):
         :type aval_mem: str
         """
         if aval_mem is not None and not re.search(r'^\d+(\.\d+)? (KB|MB|GB|TB|PB|EB|ZB|YB)$', aval_mem):  # noqa: E501
-            raise ValueError("Invalid value for `aval_mem`, must be a follow pattern or equal to `/^\d+(\.\d+)? (KB|MB|GB|TB|PB|EB|ZB|YB)$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `aval_mem`, must be a follow pattern or equal to `/^\d+(\.\d+)? (KB|MB|GB|TB|PB|EB|ZB|YB)$/`")  # noqa: E501
 
         self._aval_mem = aval_mem
 
@@ -245,7 +247,7 @@ class ServiceKpis(Model):
         :type aval_stor: str
         """
         if aval_stor is not None and not re.search(r'^\d+(\.\d+)? (KB|MB|GB|TB|PB|EB|ZB|YB)$', aval_stor):  # noqa: E501
-            raise ValueError("Invalid value for `aval_stor`, must be a follow pattern or equal to `/^\d+(\.\d+)? (KB|MB|GB|TB|PB|EB|ZB|YB)$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `aval_stor`, must be a follow pattern or equal to `/^\d+(\.\d+)? (KB|MB|GB|TB|PB|EB|ZB|YB)$/`")  # noqa: E501
 
         self._aval_stor = aval_stor
 
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/supported_gad_shapes.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/supported_gad_shapes.py
index 98407a0e203a26f5b3650c7f16429b97af3f4dfa..e238c97b70f1623e56d8017a310e3477487a7bb0 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/supported_gad_shapes.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/supported_gad_shapes.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info import util
 
 
 class SupportedGADShapes(Model):
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/uncertainty_ellipse.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/uncertainty_ellipse.py
index 9d802dd4c13e7dc4e6c47054f367119fe8edd1c1..27a6acd188aa7563f467edda45d7e247fa18cf12 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/uncertainty_ellipse.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/uncertainty_ellipse.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info import util
 
 
 class UncertaintyEllipse(Model):
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/version.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/version.py
index 6e7df34151ca1fa86ec73bc191ffab1332456376..1be123dc7cb8818724f0d6d24501cdab4de01cd4 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/version.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/version.py
@@ -1,12 +1,15 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_routing_info import util
 from capif_routing_info.models.base_model import Model
+from capif_routing_info.models.custom_operation import CustomOperation
+from capif_routing_info.models.resource import Resource
+from capif_routing_info import util
+
 from capif_routing_info.models.custom_operation import CustomOperation  # noqa: E501
 from capif_routing_info.models.resource import Resource  # noqa: E501
 
-
 class Version(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/openapi/openapi.yaml b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/openapi/openapi.yaml
index 5e93c85aac7ab73a113427949cca3bac11566a58..7b775eadfb8d0b6faee2522f87dbb15cb790cd1f 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/openapi/openapi.yaml
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/openapi/openapi.yaml
@@ -1,11 +1,11 @@
 openapi: 3.0.0
 info:
-  description: "API for Routing information.  \n© 2022, 3GPP Organizational Partners\
+  description: "API for Routing information.  \n© 2024, 3GPP Organizational Partners\
     \ (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).  \nAll rights reserved.\n"
   title: CAPIF_Routing_Info_API
-  version: 1.2.0-alpha.1
+  version: 1.2.0
 externalDocs:
-  description: 3GPP TS 29.222 V18.0.0 Common API Framework for 3GPP Northbound APIs
+  description: 3GPP TS 29.222 V18.6.0 Common API Framework for 3GPP Northbound APIs
   url: https://www.3gpp.org/ftp/Specs/archive/29_series/29.222/
 servers:
 - url: "{apiRoot}/capif-routing-info/v1"
@@ -209,6 +209,9 @@ components:
             end: end
           aefProfile:
             protocol: HTTP_1_1
+            grantTypes:
+            - CLIENT_CREDENTIALS
+            - CLIENT_CREDENTIALS
             ueIpRange:
               ueIpv4AddrRanges:
               - start: 198.51.100.1
@@ -387,6 +390,9 @@ components:
             aefId: aefId
             interfaceDescriptions:
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -395,6 +401,9 @@ components:
               apiPrefix: apiPrefix
               ipv4Addr: ipv4Addr
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -423,6 +432,9 @@ components:
             end: end
           aefProfile:
             protocol: HTTP_1_1
+            grantTypes:
+            - CLIENT_CREDENTIALS
+            - CLIENT_CREDENTIALS
             ueIpRange:
               ueIpv4AddrRanges:
               - start: 198.51.100.1
@@ -601,6 +613,9 @@ components:
             aefId: aefId
             interfaceDescriptions:
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -609,6 +624,9 @@ components:
               apiPrefix: apiPrefix
               ipv4Addr: ipv4Addr
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -651,6 +669,9 @@ components:
           end: end
         aefProfile:
           protocol: HTTP_1_1
+          grantTypes:
+          - CLIENT_CREDENTIALS
+          - CLIENT_CREDENTIALS
           ueIpRange:
             ueIpv4AddrRanges:
             - start: 198.51.100.1
@@ -829,6 +850,9 @@ components:
           aefId: aefId
           interfaceDescriptions:
           - ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -837,6 +861,9 @@ components:
             apiPrefix: apiPrefix
             ipv4Addr: ipv4Addr
           - ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -997,6 +1024,9 @@ components:
       description: Represents the AEF profile data.
       example:
         protocol: HTTP_1_1
+        grantTypes:
+        - CLIENT_CREDENTIALS
+        - CLIENT_CREDENTIALS
         ueIpRange:
           ueIpv4AddrRanges:
           - start: 198.51.100.1
@@ -1175,6 +1205,9 @@ components:
         aefId: aefId
         interfaceDescriptions:
         - ipv6Addr: ipv6Addr
+          grantTypes:
+          - null
+          - null
           securityMethods:
           - null
           - null
@@ -1183,6 +1216,9 @@ components:
           apiPrefix: apiPrefix
           ipv4Addr: ipv4Addr
         - ipv6Addr: ipv6Addr
+          grantTypes:
+          - null
+          - null
           securityMethods:
           - null
           - null
@@ -1200,11 +1236,9 @@ components:
           maxReqRate: 0
           avalGraComp: avalGraComp
       nullable: true
-      oneOf:
-      - required:
-        - domainName
-      - required:
-        - interfaceDescriptions
+      oneOf: 
+        - required: ["domainName"]
+        - required: ["interfaceDescriptions"]
       properties:
         aefId:
           description: Identifier of the API exposing function
@@ -1228,6 +1262,12 @@ components:
           minItems: 1
           title: securityMethods
           type: array
+        grantTypes:
+          items:
+            $ref: '#/components/schemas/OAuthGrantType'
+          minItems: 1
+          title: grantTypes
+          type: array
         domainName:
           description: Domain to which API belongs to
           title: domainName
@@ -1521,6 +1561,9 @@ components:
       description: Represents the description of an API's interface.
       example:
         ipv6Addr: ipv6Addr
+        grantTypes:
+        - null
+        - null
         securityMethods:
         - null
         - null
@@ -1529,13 +1572,10 @@ components:
         apiPrefix: apiPrefix
         ipv4Addr: ipv4Addr
       nullable: true
-      oneOf:
-      - required:
-        - ipv4Addr
-      - required:
-        - ipv6Addr
-      - required:
-        - fqdn
+      oneOf: 
+        - required: ["fqdn"]
+        - required: ["ipv4Addr"]
+        - required: ["ipv6Addr"]
       properties:
         ipv4Addr:
           description: |
@@ -1574,6 +1614,12 @@ components:
           minItems: 1
           title: securityMethods
           type: array
+        grantTypes:
+          items:
+            $ref: '#/components/schemas/OAuthGrantType'
+          minItems: 1
+          title: grantTypes
+          type: array
       title: InterfaceDescription
       type: object
     AefLocation:
@@ -1696,7 +1742,9 @@ components:
       title: ServiceKpis
       type: object
     IpAddrRange:
-      anyOf: []
+      anyOf: 
+        - required: ["ueIpv4AddrRanges"]
+        - required: ["ueIpv6AddrRanges"]
       description: Represents the list of public IP ranges
       example:
         ueIpv4AddrRanges:
@@ -1739,6 +1787,23 @@ components:
       pattern: "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$"
       title: Ipv4Addr
       type: string
+    OAuthGrantType:
+      anyOf:
+      - enum:
+        - CLIENT_CREDENTIALS
+        - AUTHORIZATION_CODE
+        - AUTHORIZATION_CODE_WITH_PKCE
+        type: string
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration and is not used to encode content defined in the present version of this API.
+        type: string
+      description: "Indicates the supported authorization flow (e.g. client credentials\
+        \ flow, authorization code         flow, etc.) to the API invoker.  \nPossible\
+        \ values are:\n- CLIENT_CREDENTIALS: Indicate that the grant type is is client\
+        \ credentials flow.\n- AUTHORIZATION_CODE: Indicate that the grant type is\
+        \ authorization code.\n- AUTHORIZATION_CODE_WITH_PKCE: Indicate that the grant\
+        \ type is authorization code with PKCE.\n"
+      title: OAuthGrantType
     DateTime:
       description: string with format "date-time" as defined in OpenAPI.
       format: date-time
@@ -2197,8 +2262,26 @@ components:
           type: string
         point:
           $ref: '#/components/schemas/GeographicalCoordinates'
+        area:
+          $ref: '#/components/schemas/GeographicArea'
+        horizAxesOrientation:
+          description: Horizontal axes orientation angle clockwise from northing in
+            0.1 degrees.
+          maximum: 3600
+          minimum: 0
+          title: HorizAxesOrientation
+          type: integer
+      required:
+      - coordinateId
       title: LocalOrigin
       type: object
+    HorizAxesOrientation:
+      description: Horizontal axes orientation angle clockwise from northing in 0.1
+        degrees.
+      maximum: 3600
+      minimum: 0
+      title: HorizAxesOrientation
+      type: integer
     RelativeCartesianLocation:
       description: Relative Cartesian Location
       properties:
@@ -2234,6 +2317,8 @@ components:
             $ref: '#/components/schemas/UncertaintyEllipsoid'
           confidence:
             $ref: '#/components/schemas/Confidence'
+          vConfidence:
+            $ref: '#/components/schemas/Confidence'
         required:
         - confidence
         - localOrigin
@@ -2326,9 +2411,6 @@ components:
       title: Ipv6AddressRange_1
       type: object
     Ipv6Addr_1:
-      allOf:
-      - pattern: "^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$"
-      - pattern: "^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$"
       description: |
         String identifying an IPv6 address formatted according to clause 4 of RFC5952. The mixed IPv4 IPv6 notation according to clause 5 of RFC5952 shall not be used.
       example: 2001:db8:85a3::8a2e:370:7334
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/__init__.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/__init__.py
index fe016ad6fbe0f457e2f40c5f049a797d1b5e0a24..e95f59cf4b47c3789207ccf04683ef89e3a4ff3f 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/__init__.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/__init__.py
@@ -1,9 +1,10 @@
 import logging
 
 import connexion
-from capif_routing_info.encoder import JSONEncoder
 from flask_testing import TestCase
 
+from capif_routing_info.encoder import JSONEncoder
+
 
 class BaseTestCase(TestCase):
 
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/test_default_controller.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/test_default_controller.py
index e90ce9235112e14d0517a5508215f5dae8c2c4c6..7241b494a85ddfab5cca2eb3347865fc723c6a8b 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/test_default_controller.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/test_default_controller.py
@@ -1,5 +1,9 @@
 import unittest
 
+from flask import json
+
+from capif_routing_info.models.problem_details import ProblemDetails  # noqa: E501
+from capif_routing_info.models.routing_info import RoutingInfo  # noqa: E501
 from capif_routing_info.test import BaseTestCase
 
 
diff --git a/services/TS29222_CAPIF_Routing_Info_API/setup.py b/services/TS29222_CAPIF_Routing_Info_API/setup.py
index 6d66c72675bb2bd84baebd370e98e511f3312eba..f3e2e6adddc4755c06c2ef52c30dbb0251076f6f 100644
--- a/services/TS29222_CAPIF_Routing_Info_API/setup.py
+++ b/services/TS29222_CAPIF_Routing_Info_API/setup.py
@@ -1,3 +1,4 @@
+import sys
 from setuptools import setup, find_packages
 
 NAME = "capif_routing_info"
@@ -30,7 +31,7 @@ setup(
     entry_points={
         'console_scripts': ['capif_routing_info=capif_routing_info.__main__:main']},
     long_description="""\
-    API for Routing information.   © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).   All rights reserved. 
+    API for Routing information.   © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).   All rights reserved. 
     """
 )