diff --git a/services/TS29222_CAPIF_Events_API/.openapi-generator/FILES b/services/TS29222_CAPIF_Events_API/.openapi-generator/FILES
index 54c709f66c81094be746c23eac6df18d20638d18..2bcc916b8c380d71db69b02312855cd91383d4f2 100644
--- a/services/TS29222_CAPIF_Events_API/.openapi-generator/FILES
+++ b/services/TS29222_CAPIF_Events_API/.openapi-generator/FILES
@@ -1,5 +1,6 @@
 .dockerignore
 .gitignore
+.openapi-generator-ignore
 .travis.yml
 Dockerfile
 README.md
@@ -50,6 +51,7 @@ capif_events/models/muting_exception_instructions.py
 capif_events/models/muting_notifications_settings.py
 capif_events/models/notification_flag.py
 capif_events/models/notification_method.py
+capif_events/models/o_auth_grant_type.py
 capif_events/models/operation.py
 capif_events/models/partitioning_criteria.py
 capif_events/models/point.py
@@ -79,6 +81,7 @@ capif_events/models/version.py
 capif_events/models/websock_notif_config.py
 capif_events/openapi/openapi.yaml
 capif_events/test/__init__.py
+capif_events/test/test_default_controller.py
 capif_events/typing_utils.py
 capif_events/util.py
 requirements.txt
diff --git a/services/TS29222_CAPIF_Events_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_Events_API/.openapi-generator/VERSION
index 18bb4182dd01428f1d4c3c2145501ee5d40455a3..b23eb27529e2bacf6c8c06f725c323d9fb87f042 100644
--- a/services/TS29222_CAPIF_Events_API/.openapi-generator/VERSION
+++ b/services/TS29222_CAPIF_Events_API/.openapi-generator/VERSION
@@ -1 +1 @@
-7.5.0
+7.11.0
diff --git a/services/TS29222_CAPIF_Events_API/README.md b/services/TS29222_CAPIF_Events_API/README.md
index e6189d5346f7d95bbab11277ddcd18acbc6dfbbe..9f89fecda371a76b63bfccae48159dc22eb216da 100644
--- a/services/TS29222_CAPIF_Events_API/README.md
+++ b/services/TS29222_CAPIF_Events_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_events
 ```
 
 and open your browser to here:
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/__init__.py b/services/TS29222_CAPIF_Events_API/capif_events/models/__init__.py
index d036df693ea41dfaa3debffffad0462c1fcd8e4a..537f79935f266f815c6aee11ae94f595218dc5dc 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/__init__.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/__init__.py
@@ -1,2 +1,68 @@
 # flake8: noqa
 # import models into model package
+from capif_events.models.access_control_policy_list import AccessControlPolicyList
+from capif_events.models.access_control_policy_list_ext import AccessControlPolicyListExt
+from capif_events.models.aef_location import AefLocation
+from capif_events.models.aef_profile import AefProfile
+from capif_events.models.api_invoker_policy import ApiInvokerPolicy
+from capif_events.models.api_status import ApiStatus
+from capif_events.models.buffered_notifications_action import BufferedNotificationsAction
+from capif_events.models.capif_event import CAPIFEvent
+from capif_events.models.capif_event_detail import CAPIFEventDetail
+from capif_events.models.capif_event_filter import CAPIFEventFilter
+from capif_events.models.civic_address import CivicAddress
+from capif_events.models.communication_type import CommunicationType
+from capif_events.models.custom_operation import CustomOperation
+from capif_events.models.data_format import DataFormat
+from capif_events.models.ellipsoid_arc import EllipsoidArc
+from capif_events.models.event_notification import EventNotification
+from capif_events.models.event_subscription import EventSubscription
+from capif_events.models.event_subscription_patch import EventSubscriptionPatch
+from capif_events.models.gad_shape import GADShape
+from capif_events.models.geographic_area import GeographicArea
+from capif_events.models.geographical_coordinates import GeographicalCoordinates
+from capif_events.models.interface_description import InterfaceDescription
+from capif_events.models.invalid_param import InvalidParam
+from capif_events.models.invocation_log import InvocationLog
+from capif_events.models.ip_addr_range import IpAddrRange
+from capif_events.models.ipv4_address_range import Ipv4AddressRange
+from capif_events.models.ipv4_address_range1 import Ipv4AddressRange1
+from capif_events.models.ipv6_addr1 import Ipv6Addr1
+from capif_events.models.ipv6_address_range import Ipv6AddressRange
+from capif_events.models.ipv6_address_range1 import Ipv6AddressRange1
+from capif_events.models.local2d_point_uncertainty_ellipse import Local2dPointUncertaintyEllipse
+from capif_events.models.local3d_point_uncertainty_ellipsoid import Local3dPointUncertaintyEllipsoid
+from capif_events.models.local_origin import LocalOrigin
+from capif_events.models.log import Log
+from capif_events.models.muting_exception_instructions import MutingExceptionInstructions
+from capif_events.models.muting_notifications_settings import MutingNotificationsSettings
+from capif_events.models.notification_flag import NotificationFlag
+from capif_events.models.notification_method import NotificationMethod
+from capif_events.models.o_auth_grant_type import OAuthGrantType
+from capif_events.models.operation import Operation
+from capif_events.models.partitioning_criteria import PartitioningCriteria
+from capif_events.models.point import Point
+from capif_events.models.point_altitude import PointAltitude
+from capif_events.models.point_altitude_uncertainty import PointAltitudeUncertainty
+from capif_events.models.point_uncertainty_circle import PointUncertaintyCircle
+from capif_events.models.point_uncertainty_ellipse import PointUncertaintyEllipse
+from capif_events.models.polygon import Polygon
+from capif_events.models.problem_details import ProblemDetails
+from capif_events.models.protocol import Protocol
+from capif_events.models.published_api_path import PublishedApiPath
+from capif_events.models.relative_cartesian_location import RelativeCartesianLocation
+from capif_events.models.reporting_information import ReportingInformation
+from capif_events.models.resource import Resource
+from capif_events.models.routing_rule import RoutingRule
+from capif_events.models.security_method import SecurityMethod
+from capif_events.models.service_api_description import ServiceAPIDescription
+from capif_events.models.service_kpis import ServiceKpis
+from capif_events.models.shareable_information import ShareableInformation
+from capif_events.models.subscription_action import SubscriptionAction
+from capif_events.models.supported_gad_shapes import SupportedGADShapes
+from capif_events.models.time_range_list import TimeRangeList
+from capif_events.models.topology_hiding import TopologyHiding
+from capif_events.models.uncertainty_ellipse import UncertaintyEllipse
+from capif_events.models.uncertainty_ellipsoid import UncertaintyEllipsoid
+from capif_events.models.version import Version
+from capif_events.models.websock_notif_config import WebsockNotifConfig
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list.py b/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list.py
index 95e986c1f31988d0b6ce011546d89d7180cb4ffe..a64c38411b05bf8ecd26bf3201930e35c82af363 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list.py
@@ -1,10 +1,12 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
-from capif_events.models.api_invoker_policy import ApiInvokerPolicy  # noqa: E501
 from capif_events.models.base_model import Model
+from capif_events.models.api_invoker_policy import ApiInvokerPolicy
+from capif_events import util
 
+from capif_events.models.api_invoker_policy import ApiInvokerPolicy  # noqa: E501
 
 class AccessControlPolicyList(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list_ext.py b/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list_ext.py
index 2492b928ec63192f90df8c7f56943bcc69846c23..e99c495cc71913079048f1d133857017086920a2 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list_ext.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list_ext.py
@@ -1,10 +1,12 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
-from capif_events.models.api_invoker_policy import ApiInvokerPolicy  # noqa: E501
 from capif_events.models.base_model import Model
+from capif_events.models.api_invoker_policy import ApiInvokerPolicy
+from capif_events import util
 
+from capif_events.models.api_invoker_policy import ApiInvokerPolicy  # noqa: E501
 
 class AccessControlPolicyListExt(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/aef_location.py b/services/TS29222_CAPIF_Events_API/capif_events/models/aef_location.py
index 3487b6f38820c2c3312f02c86538bc0a30a868f3..1f85dba5f386aa180f1b3a1655413f38c2487565 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/aef_location.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/aef_location.py
@@ -1,12 +1,15 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.civic_address import CivicAddress
+from capif_events.models.geographic_area import GeographicArea
+from capif_events import util
+
 from capif_events.models.civic_address import CivicAddress  # noqa: E501
 from capif_events.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_Events_API/capif_events/models/aef_profile.py b/services/TS29222_CAPIF_Events_API/capif_events/models/aef_profile.py
index c59fc51faeed458a548864e126eebede10fd7e57..02ae4b489862207cafde4b214f6b8b1ed7db36f5 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/aef_profile.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/aef_profile.py
@@ -1,25 +1,36 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
+from capif_events.models.base_model import Model
+from capif_events.models.aef_location import AefLocation
+from capif_events.models.data_format import DataFormat
+from capif_events.models.interface_description import InterfaceDescription
+from capif_events.models.ip_addr_range import IpAddrRange
+from capif_events.models.o_auth_grant_type import OAuthGrantType
+from capif_events.models.protocol import Protocol
+from capif_events.models.security_method import SecurityMethod
+from capif_events.models.service_kpis import ServiceKpis
+from capif_events.models.version import Version
 from capif_events import util
+
 from capif_events.models.aef_location import AefLocation  # noqa: E501
-from capif_events.models.base_model import Model
 from capif_events.models.data_format import DataFormat  # noqa: E501
 from capif_events.models.interface_description import InterfaceDescription  # noqa: E501
 from capif_events.models.ip_addr_range import IpAddrRange  # noqa: E501
+from capif_events.models.o_auth_grant_type import OAuthGrantType  # noqa: E501
 from capif_events.models.protocol import Protocol  # noqa: E501
 from capif_events.models.security_method import SecurityMethod  # noqa: E501
 from capif_events.models.service_kpis import ServiceKpis  # noqa: E501
 from capif_events.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_Events_API/capif_events/models/api_invoker_policy.py b/services/TS29222_CAPIF_Events_API/capif_events/models/api_invoker_policy.py
index 30c021c2c6c067dc6e9f8ccbf3d1428b36816c19..4d2075bc3f61e5e17bdf9e20179d8d066362d42b 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/api_invoker_policy.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/api_invoker_policy.py
@@ -1,10 +1,12 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
-from capif_events.models.time_range_list import TimeRangeList  # noqa: E501
+from capif_events.models.time_range_list import TimeRangeList
+from capif_events import util
 
+from capif_events.models.time_range_list import TimeRangeList  # noqa: E501
 
 class ApiInvokerPolicy(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/api_status.py b/services/TS29222_CAPIF_Events_API/capif_events/models/api_status.py
index c088f5bd2f98e04e0f69e2073adbb6f163b4bc11..3ea72ce90ed879bac58e4c6a969d3f335b6c6196 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/api_status.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/api_status.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class ApiStatus(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/base_model.py b/services/TS29222_CAPIF_Events_API/capif_events/models/base_model.py
index 336bc44c7987e97e113531749fda0a9f61c3b60e..417972649e5961125c7dd8e694cb7e9aea0cd1fb 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/base_model.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/base_model.py
@@ -1,4 +1,5 @@
 import pprint
+
 import typing
 
 from capif_events import util
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/buffered_notifications_action.py b/services/TS29222_CAPIF_Events_API/capif_events/models/buffered_notifications_action.py
index 4275f2907b2720077cbf443e4cbe385ec679dbcf..eca654779bb92504e3ca3a2003b67bd0ce752d38 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/buffered_notifications_action.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/buffered_notifications_action.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class BufferedNotificationsAction(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event.py b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event.py
index 381df838bb3d53c3eef4a68bc14ed3c23b2aee76..fa3a98288ec4c499c3afe8dd5ca996c603d27e39 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class CAPIFEvent(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_detail.py b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_detail.py
index ebc44655810f491d8b54322167fa858b8a657107..c15ad4c88b8826d16871a015138e267e85c27c27 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_detail.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_detail.py
@@ -1,14 +1,19 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
+from capif_events.models.base_model import Model
+from capif_events.models.access_control_policy_list_ext import AccessControlPolicyListExt
+from capif_events.models.invocation_log import InvocationLog
+from capif_events.models.service_api_description import ServiceAPIDescription
+from capif_events.models.topology_hiding import TopologyHiding
 from capif_events import util
+
 from capif_events.models.access_control_policy_list_ext import AccessControlPolicyListExt  # noqa: E501
-from capif_events.models.base_model import Model
 from capif_events.models.invocation_log import InvocationLog  # noqa: E501
 from capif_events.models.service_api_description import ServiceAPIDescription  # noqa: E501
 from capif_events.models.topology_hiding import TopologyHiding  # noqa: E501
 
-
 class CAPIFEventDetail(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_filter.py b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_filter.py
index 6db6dce0dff50e6415c2e8a12ee4a05781648827..e9c1638da56d444147de66da43635eae9dd0bb5f 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_filter.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_filter.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class CAPIFEventFilter(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/civic_address.py b/services/TS29222_CAPIF_Events_API/capif_events/models/civic_address.py
index 34b6e912a343a93ee359914305261e68d8e3158f..5819d5f219f368200c8ba7551c32d294abe816fb 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/civic_address.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/civic_address.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class CivicAddress(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/communication_type.py b/services/TS29222_CAPIF_Events_API/capif_events/models/communication_type.py
index 93fb327500a8881a97fe944506217bd744ce836f..e5203eb6c23c0dff53314bcf78276c438b5f4fcd 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/communication_type.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/communication_type.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class CommunicationType(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/custom_operation.py b/services/TS29222_CAPIF_Events_API/capif_events/models/custom_operation.py
index 57deea3beed891b9805a84b82d303cfeec05ee90..5676f21613b28ee2b1e4e8e90b118cec2d59439d 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/custom_operation.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/custom_operation.py
@@ -1,12 +1,15 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.communication_type import CommunicationType
+from capif_events.models.operation import Operation
+from capif_events import util
+
 from capif_events.models.communication_type import CommunicationType  # noqa: E501
 from capif_events.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_Events_API/capif_events/models/data_format.py b/services/TS29222_CAPIF_Events_API/capif_events/models/data_format.py
index 751627ee5b61091654f48a6e4a65113f6b7a03b4..adec690a5f595137abfa56f65beed511bff613c8 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/data_format.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/data_format.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class DataFormat(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/ellipsoid_arc.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ellipsoid_arc.py
index 05a4ea3eb8267b5f83d8bdeb71476385e58de204..b5be85b2b1f26ce22121c060013ad63d91364575 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/ellipsoid_arc.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/ellipsoid_arc.py
@@ -1,12 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.gad_shape import GADShape
+from capif_events.models.geographical_coordinates import GeographicalCoordinates
+from capif_events.models.supported_gad_shapes import SupportedGADShapes
+from capif_events import util
+
+from capif_events.models.gad_shape import GADShape  # noqa: E501
 from capif_events.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from capif_events.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_Events_API/capif_events/models/event_notification.py b/services/TS29222_CAPIF_Events_API/capif_events/models/event_notification.py
index e59efbbc35e41ed537930e1ae20b9a133dd83dba..9200e1bce298ba06b79f4b9dfa08e6e37452589d 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/event_notification.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/event_notification.py
@@ -1,12 +1,15 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.capif_event import CAPIFEvent
+from capif_events.models.capif_event_detail import CAPIFEventDetail
+from capif_events import util
+
 from capif_events.models.capif_event import CAPIFEvent  # noqa: E501
 from capif_events.models.capif_event_detail import CAPIFEventDetail  # noqa: E501
 
-
 class EventNotification(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription.py b/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription.py
index fef528652c2bfef2c4b7ee1bc00af5129a1eadf1..aed779ab577d94e0de87e1f8901f3eb32ae80d24 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription.py
@@ -1,14 +1,20 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.capif_event import CAPIFEvent
+from capif_events.models.capif_event_filter import CAPIFEventFilter
+from capif_events.models.reporting_information import ReportingInformation
+from capif_events.models.websock_notif_config import WebsockNotifConfig
+import re
+from capif_events import util
+
 from capif_events.models.capif_event import CAPIFEvent  # noqa: E501
 from capif_events.models.capif_event_filter import CAPIFEventFilter  # noqa: E501
 from capif_events.models.reporting_information import ReportingInformation  # noqa: E501
 from capif_events.models.websock_notif_config import WebsockNotifConfig  # noqa: E501
-
+import re  # noqa: E501
 
 class EventSubscription(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -61,7 +67,7 @@ class EventSubscription(Model):
         self._request_test_notification = request_test_notification
         self._websock_notif_config = websock_notif_config
         self._supported_features = supported_features
-
+        
     @classmethod
     def return_supp_feat_dict(cls, supp_feat):
         TOTAL_FEATURES=4
@@ -74,7 +80,7 @@ class EventSubscription(Model):
             "EnhancedEventReport": True if supp_feat_in_bin[2] == "1" else False,
             "ApiStatusMonitoring": True if supp_feat_in_bin[3] == "1" else False
         }
-    
+
     @classmethod
     def from_dict(cls, dikt) -> 'EventSubscription':
         """Returns the dict as a model
@@ -249,6 +255,6 @@ class EventSubscription(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_Events_API/capif_events/models/event_subscription_patch.py b/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription_patch.py
index 401b92e577156034ea63bca357c5f536485da7b3..51be7cd3ac4b4b761e61621e6d82c10a8d6e33df 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription_patch.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription_patch.py
@@ -1,13 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.capif_event import CAPIFEvent
+from capif_events.models.capif_event_filter import CAPIFEventFilter
+from capif_events.models.reporting_information import ReportingInformation
+from capif_events import util
+
 from capif_events.models.capif_event import CAPIFEvent  # noqa: E501
 from capif_events.models.capif_event_filter import CAPIFEventFilter  # noqa: E501
 from capif_events.models.reporting_information import ReportingInformation  # noqa: E501
 
-
 class EventSubscriptionPatch(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/gad_shape.py b/services/TS29222_CAPIF_Events_API/capif_events/models/gad_shape.py
index 568a10bf718e11d663b2ab6792734cdde7612f4f..f669a853f74abe537016e04a1bb97fd3bdc866b8 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/gad_shape.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/gad_shape.py
@@ -1,10 +1,12 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
-from capif_events.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
+from capif_events.models.supported_gad_shapes import SupportedGADShapes
+from capif_events import util
 
+from capif_events.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_Events_API/capif_events/models/geographic_area.py b/services/TS29222_CAPIF_Events_API/capif_events/models/geographic_area.py
index 69ee22dac20e1a6fdb3d9d79477097f2df6eec2b..45c7018d807a66888349b19265a702ff5d8b2d96 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/geographic_area.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/geographic_area.py
@@ -1,13 +1,31 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.ellipsoid_arc import EllipsoidArc
+from capif_events.models.geographical_coordinates import GeographicalCoordinates
+from capif_events.models.point import Point
+from capif_events.models.point_altitude import PointAltitude
+from capif_events.models.point_altitude_uncertainty import PointAltitudeUncertainty
+from capif_events.models.point_uncertainty_circle import PointUncertaintyCircle
+from capif_events.models.point_uncertainty_ellipse import PointUncertaintyEllipse
+from capif_events.models.polygon import Polygon
+from capif_events.models.supported_gad_shapes import SupportedGADShapes
+from capif_events.models.uncertainty_ellipse import UncertaintyEllipse
+from capif_events import util
+
+from capif_events.models.ellipsoid_arc import EllipsoidArc  # noqa: E501
 from capif_events.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
+from capif_events.models.point import Point  # noqa: E501
+from capif_events.models.point_altitude import PointAltitude  # noqa: E501
+from capif_events.models.point_altitude_uncertainty import PointAltitudeUncertainty  # noqa: E501
+from capif_events.models.point_uncertainty_circle import PointUncertaintyCircle  # noqa: E501
+from capif_events.models.point_uncertainty_ellipse import PointUncertaintyEllipse  # noqa: E501
+from capif_events.models.polygon import Polygon  # noqa: E501
 from capif_events.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 from capif_events.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_Events_API/capif_events/models/geographical_coordinates.py b/services/TS29222_CAPIF_Events_API/capif_events/models/geographical_coordinates.py
index 8337fc1bba7149a56bbaf39aed2c969142065ec3..382105069791c075b5ba62413d274dea8b92b9fb 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/geographical_coordinates.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/geographical_coordinates.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class GeographicalCoordinates(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/interface_description.py b/services/TS29222_CAPIF_Events_API/capif_events/models/interface_description.py
index 42ddd5f046ded87bbda36eabbd63c046e342c58b..e31b30d2726f63aff2f516d3fe90602426830ffd 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/interface_description.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/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_events import util
 from capif_events.models.base_model import Model
-from capif_events.models.security_method import SecurityMethod  # noqa: E501
+from capif_events.models.o_auth_grant_type import OAuthGrantType
+from capif_events.models.security_method import SecurityMethod
+import re
+from capif_events import util
 
+from capif_events.models.o_auth_grant_type import OAuthGrantType  # noqa: E501
+from capif_events.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_Events_API/capif_events/models/invalid_param.py b/services/TS29222_CAPIF_Events_API/capif_events/models/invalid_param.py
index 795b8890bcbf7a77e9f4105bdf965e959a0eb672..9f3557f5311fd85a47ceb2855cfeb427a1e18aab 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/invalid_param.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/invalid_param.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class InvalidParam(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/invocation_log.py b/services/TS29222_CAPIF_Events_API/capif_events/models/invocation_log.py
index 1762fbc704b1604c3219ba6759004e1eeb00df50..b67a39782fedf3486650930fcf92368e9306de46 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/invocation_log.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/invocation_log.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_events import util
 from capif_events.models.base_model import Model
-from capif_events.models.log import Log  # noqa: E501
+from capif_events.models.log import Log
+import re
+from capif_events import util
 
+from capif_events.models.log import Log  # noqa: E501
+import re  # noqa: E501
 
 class InvocationLog(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -153,6 +156,6 @@ class InvocationLog(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_Events_API/capif_events/models/ip_addr_range.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ip_addr_range.py
index f2b3d3b0712234587ab1ea6b576156b3cd03c776..f633723b71250ec6552a0bf739031f44e5b4f88f 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/ip_addr_range.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/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_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.ipv4_address_range import Ipv4AddressRange
+from capif_events.models.ipv6_address_range1 import Ipv6AddressRange1
+from capif_events import util
+
 from capif_events.models.ipv4_address_range import Ipv4AddressRange  # noqa: E501
 from capif_events.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_Events_API/capif_events/models/ipv4_address_range.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv4_address_range.py
index a76dee2138581594b9b50b2e1213f97c4e5caf94..10e517736183eeb8d0d36e81f9cdc29d8a91c1f7 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv4_address_range.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/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_events import util
 from capif_events.models.base_model import Model
+import re
+from capif_events import util
 
+import re  # noqa: E501
 
 class Ipv4AddressRange(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -67,7 +69,7 @@ class Ipv4AddressRange(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 Ipv4AddressRange(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_Events_API/capif_events/models/ipv4_address_range1.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv4_address_range1.py
index 6773c80c93f75858879e198bfaaaf732d700b1b0..c02910537b94d60e70a95f91763e9261334d9103 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv4_address_range1.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/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_events import util
 from capif_events.models.base_model import Model
+import re
+from capif_events import util
 
+import re  # noqa: E501
 
 class Ipv4AddressRange1(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -65,7 +67,7 @@ class Ipv4AddressRange1(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 Ipv4AddressRange1(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_Events_API/capif_events/models/ipv6_addr1.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_addr1.py
index 01cf6762ff9df505614f9fa8478a669f46760918..d07d4876244521da48cb117e399a9c70c191cfa1 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_addr1.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_addr1.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class Ipv6Addr1(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range.py
index 3d7e5c83f6413e3fd7dd181682785e8744b7d069..17f20cdd4d2762f9ebf52395d838bb2e223d2346 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/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_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class Ipv6AddressRange(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range1.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range1.py
index 4eff20b6fc392738fe7383b0de538eb7b80a5307..4d678058b87ca15f66af414fd0d96873d9e7310b 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range1.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/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_events import util
 from capif_events.models.base_model import Model
-from capif_events.models.ipv6_addr1 import Ipv6Addr1  # noqa: E501
+from capif_events.models.ipv6_addr1 import Ipv6Addr1
+from capif_events import util
 
+from capif_events.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_Events_API/capif_events/models/local2d_point_uncertainty_ellipse.py b/services/TS29222_CAPIF_Events_API/capif_events/models/local2d_point_uncertainty_ellipse.py
index 588ecb63c229e45a6f39a0970598a8160699df9d..694b07d0da22d92daed1c1cd4df576fb2ffaea57 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/local2d_point_uncertainty_ellipse.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/local2d_point_uncertainty_ellipse.py
@@ -1,14 +1,21 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.gad_shape import GADShape
+from capif_events.models.local_origin import LocalOrigin
+from capif_events.models.relative_cartesian_location import RelativeCartesianLocation
+from capif_events.models.supported_gad_shapes import SupportedGADShapes
+from capif_events.models.uncertainty_ellipse import UncertaintyEllipse
+from capif_events import util
+
+from capif_events.models.gad_shape import GADShape  # noqa: E501
 from capif_events.models.local_origin import LocalOrigin  # noqa: E501
 from capif_events.models.relative_cartesian_location import RelativeCartesianLocation  # noqa: E501
 from capif_events.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 from capif_events.models.uncertainty_ellipse import UncertaintyEllipse  # noqa: E501
 
-
 class Local2dPointUncertaintyEllipse(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/local3d_point_uncertainty_ellipsoid.py b/services/TS29222_CAPIF_Events_API/capif_events/models/local3d_point_uncertainty_ellipsoid.py
index a70f1a00f53bbeb181d38273e49d029427a51e23..7f164c4d53753f483bc652dc1b643bc0a0cc16cc 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/local3d_point_uncertainty_ellipsoid.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/local3d_point_uncertainty_ellipsoid.py
@@ -1,21 +1,28 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.gad_shape import GADShape
+from capif_events.models.local_origin import LocalOrigin
+from capif_events.models.relative_cartesian_location import RelativeCartesianLocation
+from capif_events.models.supported_gad_shapes import SupportedGADShapes
+from capif_events.models.uncertainty_ellipsoid import UncertaintyEllipsoid
+from capif_events import util
+
+from capif_events.models.gad_shape import GADShape  # noqa: E501
 from capif_events.models.local_origin import LocalOrigin  # noqa: E501
 from capif_events.models.relative_cartesian_location import RelativeCartesianLocation  # noqa: E501
 from capif_events.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 from capif_events.models.uncertainty_ellipsoid import UncertaintyEllipsoid  # noqa: E501
 
-
 class Local3dPointUncertaintyEllipsoid(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
     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
@@ -28,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 = {
@@ -42,7 +52,8 @@ class Local3dPointUncertaintyEllipsoid(Model):
             'local_origin': 'localOrigin',
             'point': 'point',
             'uncertainty_ellipsoid': 'uncertaintyEllipsoid',
-            'confidence': 'confidence'
+            'confidence': 'confidence',
+            'v_confidence': 'vConfidence'
         }
 
         self._shape = shape
@@ -50,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':
@@ -182,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_Events_API/capif_events/models/local_origin.py b/services/TS29222_CAPIF_Events_API/capif_events/models/local_origin.py
index 4cb83ca670e926e5391a3583e5a52b539ff7f029..f5b69773b0ee8169bbcdfa485cee4222f2a6b049 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/local_origin.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/local_origin.py
@@ -1,10 +1,14 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
-from capif_events.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
+from capif_events.models.geographic_area import GeographicArea
+from capif_events.models.geographical_coordinates import GeographicalCoordinates
+from capif_events import util
 
+from capif_events.models.geographic_area import GeographicArea  # noqa: E501
+from capif_events.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_Events_API/capif_events/models/log.py b/services/TS29222_CAPIF_Events_API/capif_events/models/log.py
index 5b9f5bb7b6df2d174ec3f7d3334c97fa9b901cd5..bfb21f7326dfea0ff8678d1113b84ee612b8fc0a 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/log.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/log.py
@@ -1,13 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.interface_description import InterfaceDescription
+from capif_events.models.operation import Operation
+from capif_events.models.protocol import Protocol
+from capif_events import util
+
 from capif_events.models.interface_description import InterfaceDescription  # noqa: E501
 from capif_events.models.operation import Operation  # noqa: E501
 from capif_events.models.protocol import Protocol  # noqa: E501
 
-
 class Log(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/muting_exception_instructions.py b/services/TS29222_CAPIF_Events_API/capif_events/models/muting_exception_instructions.py
index d8882bfbbbcda2a01fabe7b827cfb91dd2743def..008392447efd02ec24438c50a5df10ba4987bda1 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/muting_exception_instructions.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/muting_exception_instructions.py
@@ -1,12 +1,15 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.buffered_notifications_action import BufferedNotificationsAction
+from capif_events.models.subscription_action import SubscriptionAction
+from capif_events import util
+
 from capif_events.models.buffered_notifications_action import BufferedNotificationsAction  # noqa: E501
 from capif_events.models.subscription_action import SubscriptionAction  # noqa: E501
 
-
 class MutingExceptionInstructions(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/muting_notifications_settings.py b/services/TS29222_CAPIF_Events_API/capif_events/models/muting_notifications_settings.py
index 902cf1933feccfd4e1dfa2b293a6598afb903d38..ac4ea3d63a4ee1fb82865900faf48ce78ab427e8 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/muting_notifications_settings.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/muting_notifications_settings.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class MutingNotificationsSettings(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/notification_flag.py b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_flag.py
index 17eff44ae2171e0ac5304e39a20abc2aa583d5c1..fa4d5259fe1422248afbfb8ebc70df2536542a33 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/notification_flag.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_flag.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class NotificationFlag(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/notification_method.py b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_method.py
index f8676038ea967eb7e4720c1a5a4f26db9fd3bb35..b87ce0b50622fb9a1bbe66d4f2af88186b852b0d 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/notification_method.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_method.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class NotificationMethod(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/o_auth_grant_type.py b/services/TS29222_CAPIF_Events_API/capif_events/models/o_auth_grant_type.py
new file mode 100644
index 0000000000000000000000000000000000000000..5d4c4ba6c3b572cc1c2e7ca7c40f36021f91322e
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/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_events.models.base_model import Model
+from capif_events 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_Events_API/capif_events/models/operation.py b/services/TS29222_CAPIF_Events_API/capif_events/models/operation.py
index 1a8a1f97a4ba1a0e927975d9c63f76db7b095c16..01c0842820c030a96cfa4c933c447ae1b28d7d80 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/operation.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/operation.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class Operation(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/partitioning_criteria.py b/services/TS29222_CAPIF_Events_API/capif_events/models/partitioning_criteria.py
index 40a8bf7bbec0b9b1ccc6a1e7e20d27698eab840d..1fed743c56b1377499ec9a2d83951d5174673415 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/partitioning_criteria.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/partitioning_criteria.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class PartitioningCriteria(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/point.py b/services/TS29222_CAPIF_Events_API/capif_events/models/point.py
index 3f9f2e2376f97455575e1663e1328cc01997dbb1..25e5dcef3349266b5871655bb2f99e01bb2b4c89 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/point.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/point.py
@@ -1,12 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.gad_shape import GADShape
+from capif_events.models.geographical_coordinates import GeographicalCoordinates
+from capif_events.models.supported_gad_shapes import SupportedGADShapes
+from capif_events import util
+
+from capif_events.models.gad_shape import GADShape  # noqa: E501
 from capif_events.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from capif_events.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_Events_API/capif_events/models/point_altitude.py b/services/TS29222_CAPIF_Events_API/capif_events/models/point_altitude.py
index 64134eca71ac18bedea9675a7dbc58592ab09c68..e1fbee8dc9bf33a0d65e8ae19ae31c6b02dfa136 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/point_altitude.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/point_altitude.py
@@ -1,12 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.gad_shape import GADShape
+from capif_events.models.geographical_coordinates import GeographicalCoordinates
+from capif_events.models.supported_gad_shapes import SupportedGADShapes
+from capif_events import util
+
+from capif_events.models.gad_shape import GADShape  # noqa: E501
 from capif_events.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from capif_events.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_Events_API/capif_events/models/point_altitude_uncertainty.py b/services/TS29222_CAPIF_Events_API/capif_events/models/point_altitude_uncertainty.py
index f45227d1d0f258105f1071b21ccbd44a092c6f0b..965fd43118b69e4d5cad0a270fb015c9397df35e 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/point_altitude_uncertainty.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/point_altitude_uncertainty.py
@@ -1,13 +1,19 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.gad_shape import GADShape
+from capif_events.models.geographical_coordinates import GeographicalCoordinates
+from capif_events.models.supported_gad_shapes import SupportedGADShapes
+from capif_events.models.uncertainty_ellipse import UncertaintyEllipse
+from capif_events import util
+
+from capif_events.models.gad_shape import GADShape  # noqa: E501
 from capif_events.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from capif_events.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 from capif_events.models.uncertainty_ellipse import UncertaintyEllipse  # noqa: E501
 
-
 class PointAltitudeUncertainty(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/point_uncertainty_circle.py b/services/TS29222_CAPIF_Events_API/capif_events/models/point_uncertainty_circle.py
index a62a475cec8f7161a6d6bd48ffcefe41c33846a8..8ea7284cfea2c647814c5355fa33050c25e4af83 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/point_uncertainty_circle.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/point_uncertainty_circle.py
@@ -1,12 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.gad_shape import GADShape
+from capif_events.models.geographical_coordinates import GeographicalCoordinates
+from capif_events.models.supported_gad_shapes import SupportedGADShapes
+from capif_events import util
+
+from capif_events.models.gad_shape import GADShape  # noqa: E501
 from capif_events.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from capif_events.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 
-
 class PointUncertaintyCircle(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/point_uncertainty_ellipse.py b/services/TS29222_CAPIF_Events_API/capif_events/models/point_uncertainty_ellipse.py
index 618bb46d93e05119f0b4292c2dfeb6a2b4f586d9..07f77277ef47ad23c87e28249bd99cef308d3ade 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/point_uncertainty_ellipse.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/point_uncertainty_ellipse.py
@@ -1,13 +1,19 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.gad_shape import GADShape
+from capif_events.models.geographical_coordinates import GeographicalCoordinates
+from capif_events.models.supported_gad_shapes import SupportedGADShapes
+from capif_events.models.uncertainty_ellipse import UncertaintyEllipse
+from capif_events import util
+
+from capif_events.models.gad_shape import GADShape  # noqa: E501
 from capif_events.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from capif_events.models.supported_gad_shapes import SupportedGADShapes  # noqa: E501
 from capif_events.models.uncertainty_ellipse import UncertaintyEllipse  # noqa: E501
 
-
 class PointUncertaintyEllipse(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/polygon.py b/services/TS29222_CAPIF_Events_API/capif_events/models/polygon.py
index 7d89244dfd0f6a0390c8878eefda89988cc17cb5..8804de2c1e416dd108ba8923c872733f37fdbd4b 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/polygon.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/polygon.py
@@ -1,12 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.gad_shape import GADShape
+from capif_events.models.geographical_coordinates import GeographicalCoordinates
+from capif_events.models.supported_gad_shapes import SupportedGADShapes
+from capif_events import util
+
+from capif_events.models.gad_shape import GADShape  # noqa: E501
 from capif_events.models.geographical_coordinates import GeographicalCoordinates  # noqa: E501
 from capif_events.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_Events_API/capif_events/models/problem_details.py b/services/TS29222_CAPIF_Events_API/capif_events/models/problem_details.py
index bbf924527ac4e21018e437e264614f8e1175bd84..4cd85b688a743df0fb11c267682e42c0aa86404c 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/problem_details.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/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_events import util
 from capif_events.models.base_model import Model
-from capif_events.models.invalid_param import InvalidParam  # noqa: E501
+from capif_events.models.invalid_param import InvalidParam
+import re
+from capif_events import util
 
+from capif_events.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_Events_API/capif_events/models/protocol.py b/services/TS29222_CAPIF_Events_API/capif_events/models/protocol.py
index a92a428aa51087ffc42b7bce764e117e877d2c4a..437f5b2a7680223f329b0b3112767e3c42e63aef 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/protocol.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/protocol.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class Protocol(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/published_api_path.py b/services/TS29222_CAPIF_Events_API/capif_events/models/published_api_path.py
index 6f2ae66268e0b014b12f50e956c568313a500944..f341f1c94b218c3a090a60c8065a404ac23ca02b 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/published_api_path.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/published_api_path.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class PublishedApiPath(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/relative_cartesian_location.py b/services/TS29222_CAPIF_Events_API/capif_events/models/relative_cartesian_location.py
index e6c06126627a42f13a61c59cac93a5dca5e4c061..5a99492891921845f05be5fd89c2f4c80f8d2480 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/relative_cartesian_location.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/relative_cartesian_location.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class RelativeCartesianLocation(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/reporting_information.py b/services/TS29222_CAPIF_Events_API/capif_events/models/reporting_information.py
index cb2fcfe99585407811692e031c81b8d73f2ae570..08e387b0eae711bb123320886e35e2859fd7229c 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/reporting_information.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/reporting_information.py
@@ -1,15 +1,21 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.muting_exception_instructions import MutingExceptionInstructions
+from capif_events.models.muting_notifications_settings import MutingNotificationsSettings
+from capif_events.models.notification_flag import NotificationFlag
+from capif_events.models.notification_method import NotificationMethod
+from capif_events.models.partitioning_criteria import PartitioningCriteria
+from capif_events import util
+
 from capif_events.models.muting_exception_instructions import MutingExceptionInstructions  # noqa: E501
 from capif_events.models.muting_notifications_settings import MutingNotificationsSettings  # noqa: E501
 from capif_events.models.notification_flag import NotificationFlag  # noqa: E501
 from capif_events.models.notification_method import NotificationMethod  # noqa: E501
 from capif_events.models.partitioning_criteria import PartitioningCriteria  # noqa: E501
 
-
 class ReportingInformation(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/resource.py b/services/TS29222_CAPIF_Events_API/capif_events/models/resource.py
index 9ab8c7718399c694a099c25489f47cadc81fda95..8493f59d1cfda104b44b7b89e23bcae40767f69f 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/resource.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/resource.py
@@ -1,13 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.communication_type import CommunicationType
+from capif_events.models.custom_operation import CustomOperation
+from capif_events.models.operation import Operation
+from capif_events import util
+
 from capif_events.models.communication_type import CommunicationType  # noqa: E501
 from capif_events.models.custom_operation import CustomOperation  # noqa: E501
 from capif_events.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_Events_API/capif_events/models/routing_rule.py b/services/TS29222_CAPIF_Events_API/capif_events/models/routing_rule.py
index 0560f90fd1e414b9da2cde14f59d179c61d4df5d..b59d1dd7046c7bd6ad01e24f2112079e7c87959a 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/routing_rule.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/routing_rule.py
@@ -1,13 +1,17 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
+from capif_events.models.base_model import Model
+from capif_events.models.aef_profile import AefProfile
+from capif_events.models.ipv4_address_range1 import Ipv4AddressRange1
+from capif_events.models.ipv6_address_range import Ipv6AddressRange
 from capif_events import util
+
 from capif_events.models.aef_profile import AefProfile  # noqa: E501
-from capif_events.models.base_model import Model
 from capif_events.models.ipv4_address_range1 import Ipv4AddressRange1  # noqa: E501
 from capif_events.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_Events_API/capif_events/models/security_method.py b/services/TS29222_CAPIF_Events_API/capif_events/models/security_method.py
index fa70435cf343f93ef8fb6d1243d908a3a93730de..ff87e785326717c82237cccb4102c3b7ff861698 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/security_method.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/security_method.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class SecurityMethod(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/service_api_description.py b/services/TS29222_CAPIF_Events_API/capif_events/models/service_api_description.py
index ac3bb24275fe24527cd8377294fd3228c767f25e..6616b8f4f612d673e6ddf194cd88caffbdd9a299 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/service_api_description.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/service_api_description.py
@@ -1,14 +1,20 @@
-import re  # noqa: E501
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
+from capif_events.models.base_model import Model
+from capif_events.models.aef_profile import AefProfile
+from capif_events.models.api_status import ApiStatus
+from capif_events.models.published_api_path import PublishedApiPath
+from capif_events.models.shareable_information import ShareableInformation
+import re
 from capif_events import util
+
 from capif_events.models.aef_profile import AefProfile  # noqa: E501
 from capif_events.models.api_status import ApiStatus  # noqa: E501
-from capif_events.models.base_model import Model
 from capif_events.models.published_api_path import PublishedApiPath  # noqa: E501
 from capif_events.models.shareable_information import ShareableInformation  # noqa: E501
-
+import re  # noqa: E501
 
 class ServiceAPIDescription(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -236,7 +242,7 @@ class ServiceAPIDescription(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
 
@@ -305,7 +311,7 @@ class ServiceAPIDescription(Model):
         :type api_supp_feats: str
         """
         if api_supp_feats is not None and not re.search(r'^[A-Fa-f0-9]*$', api_supp_feats):  # noqa: E501
-            raise ValueError("Invalid value for `api_supp_feats`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+            raise ValueError(r"Invalid value for `api_supp_feats`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
 
         self._api_supp_feats = api_supp_feats
 
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/service_kpis.py b/services/TS29222_CAPIF_Events_API/capif_events/models/service_kpis.py
index 1bbabf845871d651475e7da75d0763bde4c45490..7a4789dd12d29c1522616ac26a7839f94e3a02e5 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/service_kpis.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/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_events import util
 from capif_events.models.base_model import Model
+import re
+from capif_events 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_Events_API/capif_events/models/shareable_information.py b/services/TS29222_CAPIF_Events_API/capif_events/models/shareable_information.py
index 0521026981694ad6bda7f3a7810f3fea1dd47c0b..7b16c081ff3fb059d5cc540edd71c1c409203cb9 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/shareable_information.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/shareable_information.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class ShareableInformation(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/subscription_action.py b/services/TS29222_CAPIF_Events_API/capif_events/models/subscription_action.py
index 99f4aab2780db0706387659caa861045cb198cc1..99ae834de457421324b10b0c2d9fb282e7c3695c 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/subscription_action.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/subscription_action.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class SubscriptionAction(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/supported_gad_shapes.py b/services/TS29222_CAPIF_Events_API/capif_events/models/supported_gad_shapes.py
index e78e057a3ca56201e0cdb0ae9ac5a4265dc8270d..38ff4d53caa82d396e66c7d07de48095fa4d3948 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/supported_gad_shapes.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/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_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class SupportedGADShapes(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/time_range_list.py b/services/TS29222_CAPIF_Events_API/capif_events/models/time_range_list.py
index ad689a1382d2d0b9f89fa89eec8343f9976385d3..9a6b62671d8e1990cd3346fc8c36b3e507849277 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/time_range_list.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/time_range_list.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class TimeRangeList(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/topology_hiding.py b/services/TS29222_CAPIF_Events_API/capif_events/models/topology_hiding.py
index 7f56cc9f9d114209df1dc5f7553362ad8a89d76f..0a028785000e975723936a0f42bc67869be808f6 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/topology_hiding.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/topology_hiding.py
@@ -1,10 +1,12 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
-from capif_events.models.routing_rule import RoutingRule  # noqa: E501
+from capif_events.models.routing_rule import RoutingRule
+from capif_events import util
 
+from capif_events.models.routing_rule import RoutingRule  # noqa: E501
 
 class TopologyHiding(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipse.py b/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipse.py
index c10203df5d243e4d1113d46889a179cec6a2cbf5..627eb52b271d3a0b32e7006b1b24707ccac4a473 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipse.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipse.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class UncertaintyEllipse(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipsoid.py b/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipsoid.py
index e1a4a1f24c6a5f648737d9c402914cd3af050049..f10fac8fcba65a1d742ad13a9fa4250eff924d84 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipsoid.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/uncertainty_ellipsoid.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class UncertaintyEllipsoid(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/version.py b/services/TS29222_CAPIF_Events_API/capif_events/models/version.py
index 5777e684360941e7db1f5413d3abd0594c458009..709e34cea199b306a00705e45987d618cdfec3ba 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/version.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/version.py
@@ -1,12 +1,15 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events.models.custom_operation import CustomOperation
+from capif_events.models.resource import Resource
+from capif_events import util
+
 from capif_events.models.custom_operation import CustomOperation  # noqa: E501
 from capif_events.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_Events_API/capif_events/models/websock_notif_config.py b/services/TS29222_CAPIF_Events_API/capif_events/models/websock_notif_config.py
index f1ceeb001a04c47189d64f7f3cd379e533f1769f..0077354dec83d45767653535faa1c1d55cc5c6e7 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/models/websock_notif_config.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/websock_notif_config.py
@@ -1,8 +1,9 @@
 from datetime import date, datetime  # noqa: F401
+
 from typing import List, Dict  # noqa: F401
 
-from capif_events import util
 from capif_events.models.base_model import Model
+from capif_events import util
 
 
 class WebsockNotifConfig(Model):
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/openapi/openapi.yaml b/services/TS29222_CAPIF_Events_API/capif_events/openapi/openapi.yaml
index 892a7a2b13e51a0105dd6e7edb43a2a22a0481af..cc8ed018254bd3c66ec524fb64ccc044ba3debd9 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/openapi/openapi.yaml
+++ b/services/TS29222_CAPIF_Events_API/capif_events/openapi/openapi.yaml
@@ -1,11 +1,11 @@
 openapi: 3.0.0
 info:
-  description: "API for event subscription management.  \n© 2023, 3GPP Organizational\
+  description: "API for event subscription management.  \n© 2024, 3GPP Organizational\
     \ Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).  \nAll rights reserved.\n"
   title: CAPIF_Events_API
-  version: 1.3.0-alpha.4
+  version: 1.3.0
 externalDocs:
-  description: 3GPP TS 29.222 V18.4.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-events/v1"
@@ -18,9 +18,9 @@ paths:
     post:
       callbacks:
         notificationDestination:
-          '{request.body#/notificationDestination}':
+          '{$request.body#/notificationDestination}':
             post:
-              operationId: notificationDestination_request_bodyNotificationDestinationPost
+              operationId: notification_destination_post
               requestBody:
                 content:
                   application/json:
@@ -673,6 +673,9 @@ components:
               invocationTime: 2000-01-23T04:56:07.000+00:00
               srcInterface:
                 ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -690,6 +693,9 @@ components:
               apiVersion: apiVersion
               destInterface:
                 ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -704,6 +710,9 @@ components:
               invocationTime: 2000-01-23T04:56:07.000+00:00
               srcInterface:
                 ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -721,6 +730,9 @@ components:
               apiVersion: apiVersion
               destInterface:
                 ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -739,6 +751,9 @@ components:
               invocationTime: 2000-01-23T04:56:07.000+00:00
               srcInterface:
                 ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -756,6 +771,9 @@ components:
               apiVersion: apiVersion
               destInterface:
                 ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -770,6 +788,9 @@ components:
               invocationTime: 2000-01-23T04:56:07.000+00:00
               srcInterface:
                 ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -787,6 +808,9 @@ components:
               apiVersion: apiVersion
               destInterface:
                 ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -807,6 +831,9 @@ components:
                 end: end
               aefProfile:
                 protocol: HTTP_1_1
+                grantTypes:
+                - CLIENT_CREDENTIALS
+                - CLIENT_CREDENTIALS
                 ueIpRange:
                   ueIpv4AddrRanges:
                   - start: 198.51.100.1
@@ -985,6 +1012,9 @@ components:
                 aefId: aefId
                 interfaceDescriptions:
                 - ipv6Addr: ipv6Addr
+                  grantTypes:
+                  - null
+                  - null
                   securityMethods:
                   - null
                   - null
@@ -993,6 +1023,9 @@ components:
                   apiPrefix: apiPrefix
                   ipv4Addr: ipv4Addr
                 - ipv6Addr: ipv6Addr
+                  grantTypes:
+                  - null
+                  - null
                   securityMethods:
                   - null
                   - null
@@ -1021,6 +1054,9 @@ components:
                 end: end
               aefProfile:
                 protocol: HTTP_1_1
+                grantTypes:
+                - CLIENT_CREDENTIALS
+                - CLIENT_CREDENTIALS
                 ueIpRange:
                   ueIpv4AddrRanges:
                   - start: 198.51.100.1
@@ -1199,6 +1235,9 @@ components:
                 aefId: aefId
                 interfaceDescriptions:
                 - ipv6Addr: ipv6Addr
+                  grantTypes:
+                  - null
+                  - null
                   securityMethods:
                   - null
                   - null
@@ -1207,6 +1246,9 @@ components:
                   apiPrefix: apiPrefix
                   ipv4Addr: ipv4Addr
                 - ipv6Addr: ipv6Addr
+                  grantTypes:
+                  - null
+                  - null
                   securityMethods:
                   - null
                   - null
@@ -1267,6 +1309,9 @@ components:
               - aefIds
             aefProfiles:
             - protocol: HTTP_1_1
+              grantTypes:
+              - CLIENT_CREDENTIALS
+              - CLIENT_CREDENTIALS
               ueIpRange:
                 ueIpv4AddrRanges:
                 - start: 198.51.100.1
@@ -1445,6 +1490,9 @@ components:
               aefId: aefId
               interfaceDescriptions:
               - ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -1453,6 +1501,9 @@ components:
                 apiPrefix: apiPrefix
                 ipv4Addr: ipv4Addr
               - ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -1470,6 +1521,9 @@ components:
                 maxReqRate: 0
                 avalGraComp: avalGraComp
             - protocol: HTTP_1_1
+              grantTypes:
+              - CLIENT_CREDENTIALS
+              - CLIENT_CREDENTIALS
               ueIpRange:
                 ueIpv4AddrRanges:
                 - start: 198.51.100.1
@@ -1648,6 +1702,9 @@ components:
               aefId: aefId
               interfaceDescriptions:
               - ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -1656,6 +1713,9 @@ components:
                 apiPrefix: apiPrefix
                 ipv4Addr: ipv4Addr
               - ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -1695,6 +1755,9 @@ components:
               - aefIds
             aefProfiles:
             - protocol: HTTP_1_1
+              grantTypes:
+              - CLIENT_CREDENTIALS
+              - CLIENT_CREDENTIALS
               ueIpRange:
                 ueIpv4AddrRanges:
                 - start: 198.51.100.1
@@ -1873,6 +1936,9 @@ components:
               aefId: aefId
               interfaceDescriptions:
               - ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -1881,6 +1947,9 @@ components:
                 apiPrefix: apiPrefix
                 ipv4Addr: ipv4Addr
               - ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -1898,6 +1967,9 @@ components:
                 maxReqRate: 0
                 avalGraComp: avalGraComp
             - protocol: HTTP_1_1
+              grantTypes:
+              - CLIENT_CREDENTIALS
+              - CLIENT_CREDENTIALS
               ueIpRange:
                 ueIpv4AddrRanges:
                 - start: 198.51.100.1
@@ -2076,6 +2148,9 @@ components:
               aefId: aefId
               interfaceDescriptions:
               - ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -2084,6 +2159,9 @@ components:
                 apiPrefix: apiPrefix
                 ipv4Addr: ipv4Addr
               - ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -2174,6 +2252,9 @@ components:
             invocationTime: 2000-01-23T04:56:07.000+00:00
             srcInterface:
               ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -2191,6 +2272,9 @@ components:
             apiVersion: apiVersion
             destInterface:
               ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -2205,6 +2289,9 @@ components:
             invocationTime: 2000-01-23T04:56:07.000+00:00
             srcInterface:
               ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -2222,6 +2309,9 @@ components:
             apiVersion: apiVersion
             destInterface:
               ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -2240,6 +2330,9 @@ components:
             invocationTime: 2000-01-23T04:56:07.000+00:00
             srcInterface:
               ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -2257,6 +2350,9 @@ components:
             apiVersion: apiVersion
             destInterface:
               ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -2271,6 +2367,9 @@ components:
             invocationTime: 2000-01-23T04:56:07.000+00:00
             srcInterface:
               ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -2288,6 +2387,9 @@ components:
             apiVersion: apiVersion
             destInterface:
               ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -2308,6 +2410,9 @@ components:
               end: end
             aefProfile:
               protocol: HTTP_1_1
+              grantTypes:
+              - CLIENT_CREDENTIALS
+              - CLIENT_CREDENTIALS
               ueIpRange:
                 ueIpv4AddrRanges:
                 - start: 198.51.100.1
@@ -2486,6 +2591,9 @@ components:
               aefId: aefId
               interfaceDescriptions:
               - ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -2494,6 +2602,9 @@ components:
                 apiPrefix: apiPrefix
                 ipv4Addr: ipv4Addr
               - ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -2522,6 +2633,9 @@ components:
               end: end
             aefProfile:
               protocol: HTTP_1_1
+              grantTypes:
+              - CLIENT_CREDENTIALS
+              - CLIENT_CREDENTIALS
               ueIpRange:
                 ueIpv4AddrRanges:
                 - start: 198.51.100.1
@@ -2700,6 +2814,9 @@ components:
               aefId: aefId
               interfaceDescriptions:
               - ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -2708,6 +2825,9 @@ components:
                 apiPrefix: apiPrefix
                 ipv4Addr: ipv4Addr
               - ipv6Addr: ipv6Addr
+                grantTypes:
+                - null
+                - null
                 securityMethods:
                 - null
                 - null
@@ -2768,6 +2888,9 @@ components:
             - aefIds
           aefProfiles:
           - protocol: HTTP_1_1
+            grantTypes:
+            - CLIENT_CREDENTIALS
+            - CLIENT_CREDENTIALS
             ueIpRange:
               ueIpv4AddrRanges:
               - start: 198.51.100.1
@@ -2946,6 +3069,9 @@ components:
             aefId: aefId
             interfaceDescriptions:
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -2954,6 +3080,9 @@ components:
               apiPrefix: apiPrefix
               ipv4Addr: ipv4Addr
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -2971,6 +3100,9 @@ components:
               maxReqRate: 0
               avalGraComp: avalGraComp
           - protocol: HTTP_1_1
+            grantTypes:
+            - CLIENT_CREDENTIALS
+            - CLIENT_CREDENTIALS
             ueIpRange:
               ueIpv4AddrRanges:
               - start: 198.51.100.1
@@ -3149,6 +3281,9 @@ components:
             aefId: aefId
             interfaceDescriptions:
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -3157,6 +3292,9 @@ components:
               apiPrefix: apiPrefix
               ipv4Addr: ipv4Addr
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -3196,6 +3334,9 @@ components:
             - aefIds
           aefProfiles:
           - protocol: HTTP_1_1
+            grantTypes:
+            - CLIENT_CREDENTIALS
+            - CLIENT_CREDENTIALS
             ueIpRange:
               ueIpv4AddrRanges:
               - start: 198.51.100.1
@@ -3374,6 +3515,9 @@ components:
             aefId: aefId
             interfaceDescriptions:
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -3382,6 +3526,9 @@ components:
               apiPrefix: apiPrefix
               ipv4Addr: ipv4Addr
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -3399,6 +3546,9 @@ components:
               maxReqRate: 0
               avalGraComp: avalGraComp
           - protocol: HTTP_1_1
+            grantTypes:
+            - CLIENT_CREDENTIALS
+            - CLIENT_CREDENTIALS
             ueIpRange:
               ueIpv4AddrRanges:
               - start: 198.51.100.1
@@ -3577,6 +3727,9 @@ components:
             aefId: aefId
             interfaceDescriptions:
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -3585,6 +3738,9 @@ components:
               apiPrefix: apiPrefix
               ipv4Addr: ipv4Addr
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -3685,6 +3841,9 @@ components:
             end: end
           aefProfile:
             protocol: HTTP_1_1
+            grantTypes:
+            - CLIENT_CREDENTIALS
+            - CLIENT_CREDENTIALS
             ueIpRange:
               ueIpv4AddrRanges:
               - start: 198.51.100.1
@@ -3863,6 +4022,9 @@ components:
             aefId: aefId
             interfaceDescriptions:
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -3871,6 +4033,9 @@ components:
               apiPrefix: apiPrefix
               ipv4Addr: ipv4Addr
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -3899,6 +4064,9 @@ components:
             end: end
           aefProfile:
             protocol: HTTP_1_1
+            grantTypes:
+            - CLIENT_CREDENTIALS
+            - CLIENT_CREDENTIALS
             ueIpRange:
               ueIpv4AddrRanges:
               - start: 198.51.100.1
@@ -4077,6 +4245,9 @@ components:
             aefId: aefId
             interfaceDescriptions:
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -4085,6 +4256,9 @@ components:
               apiPrefix: apiPrefix
               ipv4Addr: ipv4Addr
             - ipv6Addr: ipv6Addr
+              grantTypes:
+              - null
+              - null
               securityMethods:
               - null
               - null
@@ -4376,6 +4550,9 @@ components:
           - aefIds
         aefProfiles:
         - protocol: HTTP_1_1
+          grantTypes:
+          - CLIENT_CREDENTIALS
+          - CLIENT_CREDENTIALS
           ueIpRange:
             ueIpv4AddrRanges:
             - start: 198.51.100.1
@@ -4554,6 +4731,9 @@ components:
           aefId: aefId
           interfaceDescriptions:
           - ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -4562,6 +4742,9 @@ components:
             apiPrefix: apiPrefix
             ipv4Addr: ipv4Addr
           - ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -4579,6 +4762,9 @@ components:
             maxReqRate: 0
             avalGraComp: avalGraComp
         - protocol: HTTP_1_1
+          grantTypes:
+          - CLIENT_CREDENTIALS
+          - CLIENT_CREDENTIALS
           ueIpRange:
             ueIpv4AddrRanges:
             - start: 198.51.100.1
@@ -4757,6 +4943,9 @@ components:
           aefId: aefId
           interfaceDescriptions:
           - ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -4765,6 +4954,9 @@ components:
             apiPrefix: apiPrefix
             ipv4Addr: ipv4Addr
           - ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -4865,6 +5057,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
@@ -5043,6 +5238,9 @@ components:
         aefId: aefId
         interfaceDescriptions:
         - ipv6Addr: ipv6Addr
+          grantTypes:
+          - null
+          - null
           securityMethods:
           - null
           - null
@@ -5051,6 +5249,9 @@ components:
           apiPrefix: apiPrefix
           ipv4Addr: ipv4Addr
         - ipv6Addr: ipv6Addr
+          grantTypes:
+          - null
+          - null
           securityMethods:
           - null
           - null
@@ -5068,13 +5269,10 @@ components:
           maxReqRate: 0
           avalGraComp: avalGraComp
       nullable: true
-      oneOf: 
-      - required:
-        - ipv4Addr
-      - required:
-        - ipv6Addr
-      - required:
-        - fqdn
+      oneOf:
+        - required: ["domainName"]
+        - required: ["interfaceDescriptions"]
+        - {} 
       properties:
         aefId:
           description: Identifier of the API exposing function
@@ -5098,6 +5296,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
@@ -5391,6 +5595,9 @@ components:
       description: Represents the description of an API's interface.
       example:
         ipv6Addr: ipv6Addr
+        grantTypes:
+        - null
+        - null
         securityMethods:
         - null
         - null
@@ -5399,11 +5606,10 @@ components:
         apiPrefix: apiPrefix
         ipv4Addr: ipv4Addr
       nullable: true
-      oneOf:
-      - required:
-        - domainName
-      - required:
-        - interfaceDescriptions
+      oneOf: 
+        - required: ["fqdn"]
+        - required: ["ipv4Addr"]
+        - required: ["ipv6Addr"]
       properties:
         ipv4Addr:
           description: |
@@ -5442,6 +5648,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:
@@ -5564,7 +5776,9 @@ components:
       title: ServiceKpis
       type: object
     IpAddrRange:
-      anyOf: []
+      anyOf: 
+        - required: ["ueIpv4AddrRanges"]
+        - required: ["ueIpv6AddrRanges"]
       description: Represents the list of public IP ranges
       example:
         ueIpv4AddrRanges:
@@ -5651,6 +5865,9 @@ components:
           invocationTime: 2000-01-23T04:56:07.000+00:00
           srcInterface:
             ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -5668,6 +5885,9 @@ components:
           apiVersion: apiVersion
           destInterface:
             ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -5682,6 +5902,9 @@ components:
           invocationTime: 2000-01-23T04:56:07.000+00:00
           srcInterface:
             ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -5699,6 +5922,9 @@ components:
           apiVersion: apiVersion
           destInterface:
             ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -5745,6 +5971,9 @@ components:
         invocationTime: 2000-01-23T04:56:07.000+00:00
         srcInterface:
           ipv6Addr: ipv6Addr
+          grantTypes:
+          - null
+          - null
           securityMethods:
           - null
           - null
@@ -5762,6 +5991,9 @@ components:
         apiVersion: apiVersion
         destInterface:
           ipv6Addr: ipv6Addr
+          grantTypes:
+          - null
+          - null
           securityMethods:
           - null
           - null
@@ -5923,6 +6155,9 @@ components:
           end: end
         aefProfile:
           protocol: HTTP_1_1
+          grantTypes:
+          - CLIENT_CREDENTIALS
+          - CLIENT_CREDENTIALS
           ueIpRange:
             ueIpv4AddrRanges:
             - start: 198.51.100.1
@@ -6101,6 +6336,9 @@ components:
           aefId: aefId
           interfaceDescriptions:
           - ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -6109,6 +6347,9 @@ components:
             apiPrefix: apiPrefix
             ipv4Addr: ipv4Addr
           - ipv6Addr: ipv6Addr
+            grantTypes:
+            - null
+            - null
             securityMethods:
             - null
             - null
@@ -6292,6 +6533,23 @@ components:
           type: integer
       title: MutingNotificationsSettings
       type: object
+    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_1:
       description: string with format "date-time" as defined in OpenAPI.
       format: date-time
@@ -6755,8 +7013,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:
@@ -6792,6 +7068,8 @@ components:
             $ref: '#/components/schemas/UncertaintyEllipsoid'
           confidence:
             $ref: '#/components/schemas/Confidence'
+          vConfidence:
+            $ref: '#/components/schemas/Confidence'
         required:
         - confidence
         - localOrigin
@@ -6886,9 +7164,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_Events_API/capif_events/test/__init__.py b/services/TS29222_CAPIF_Events_API/capif_events/test/__init__.py
index 8da9951b2baa6ecbba37bb2ce6f00d944854faf8..c55e721a5dd1d0ecd2ff0cba98a557ea4492b460 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/test/__init__.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/test/__init__.py
@@ -1,9 +1,10 @@
 import logging
 
 import connexion
-from capif_events.encoder import JSONEncoder
 from flask_testing import TestCase
 
+from capif_events.encoder import JSONEncoder
+
 
 class BaseTestCase(TestCase):
 
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/test/test_default_controller.py b/services/TS29222_CAPIF_Events_API/capif_events/test/test_default_controller.py
index b724d9aef5f5a791e47b4e381d347ee72d743b58..7e06036bbe989f82740969b149da6ca5a66c1988 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/test/test_default_controller.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/test/test_default_controller.py
@@ -1,8 +1,12 @@
 import unittest
 
-from capif_events.test import BaseTestCase
 from flask import json
 
+from capif_events.models.event_subscription import EventSubscription  # noqa: E501
+from capif_events.models.event_subscription_patch import EventSubscriptionPatch  # noqa: E501
+from capif_events.models.problem_details import ProblemDetails  # noqa: E501
+from capif_events.test import BaseTestCase
+
 
 class TestDefaultController(BaseTestCase):
     """DefaultController integration test stubs"""
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/typing_utils.py b/services/TS29222_CAPIF_Events_API/capif_events/typing_utils.py
index d21c4f633653a0eae75d04b2f6eff684ff9d200d..74e3c913a7db6246bc765f147ca872996112c6bb 100644
--- a/services/TS29222_CAPIF_Events_API/capif_events/typing_utils.py
+++ b/services/TS29222_CAPIF_Events_API/capif_events/typing_utils.py
@@ -1,6 +1,7 @@
 import sys
 
 if sys.version_info < (3, 7):
+    import typing
 
     def is_generic(klass):
         """ Determine whether klass is a generic class """
diff --git a/services/TS29222_CAPIF_Events_API/setup.py b/services/TS29222_CAPIF_Events_API/setup.py
index defed2ccdf4811792f1c8e90ff70d50eec1d89f6..f6e3cc23e790daa09c9ff6dd9aa8fbf4fe396e98 100644
--- a/services/TS29222_CAPIF_Events_API/setup.py
+++ b/services/TS29222_CAPIF_Events_API/setup.py
@@ -1,3 +1,4 @@
+import sys
 from setuptools import setup, find_packages
 
 NAME = "capif_events"
@@ -30,7 +31,7 @@ setup(
     entry_points={
         'console_scripts': ['capif_events=capif_events.__main__:main']},
     long_description="""\
-    API for event subscription management.   © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).   All rights reserved. 
+    API for event subscription management.   © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).   All rights reserved. 
     """
 )
 
diff --git a/services/TS29222_CAPIF_Events_API/test-requirements.txt b/services/TS29222_CAPIF_Events_API/test-requirements.txt
index 202a684feef71ff540d6aa528d348febf0b37d1e..58f51d6a00272d7515a20e3618f345b73c68afa0 100644
--- a/services/TS29222_CAPIF_Events_API/test-requirements.txt
+++ b/services/TS29222_CAPIF_Events_API/test-requirements.txt
@@ -1,4 +1,4 @@
-pytest~=4.6.7 # needed for python 2.7+3.4
+pytest~=7.1.0
 pytest-cov>=2.8.1
-pytest-randomly == 1.2.3 # needed for python 2.7+3.4
-Flask-Testing == 0.8.0
+pytest-randomly>=1.2.3
+Flask-Testing==0.8.1