diff --git a/src/Api/ApigeeX/Denormalizer/AcceptedRatePlanDenormalizer.php b/src/Api/ApigeeX/Denormalizer/AcceptedRatePlanDenormalizer.php
index c2131b708..ebc4e9101 100755
--- a/src/Api/ApigeeX/Denormalizer/AcceptedRatePlanDenormalizer.php
+++ b/src/Api/ApigeeX/Denormalizer/AcceptedRatePlanDenormalizer.php
@@ -32,7 +32,7 @@ abstract class AcceptedRatePlanDenormalizer extends ObjectDenormalizer
      * @psalm-suppress PossiblyNullReference - getPackage() can only return
      * null when a rate plan is created. It does not return null here.
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         /** @var AcceptedRatePlanInterface $denormalized */
         $denormalized = parent::denormalize($data, $type, $format, $context);
@@ -43,7 +43,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/ApigeeX/Denormalizer/ApiProductDenormalizer.php b/src/Api/ApigeeX/Denormalizer/ApiProductDenormalizer.php
index 6b086aa15..17b950fb8 100755
--- a/src/Api/ApigeeX/Denormalizer/ApiProductDenormalizer.php
+++ b/src/Api/ApigeeX/Denormalizer/ApiProductDenormalizer.php
@@ -45,7 +45,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/ApigeeX/Denormalizer/AppDenormalizer.php b/src/Api/ApigeeX/Denormalizer/AppDenormalizer.php
index dc4270531..63be5b096 100644
--- a/src/Api/ApigeeX/Denormalizer/AppDenormalizer.php
+++ b/src/Api/ApigeeX/Denormalizer/AppDenormalizer.php
@@ -46,7 +46,7 @@ class AppDenormalizer extends ObjectDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         if (isset($data->developerId)) {
             return parent::denormalize($data, $this->developerAppClass, $format, $context);
@@ -61,7 +61,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/ApigeeX/Denormalizer/AppGroupMembershipDenormalizer.php b/src/Api/ApigeeX/Denormalizer/AppGroupMembershipDenormalizer.php
index d6f23fe46..47117e15d 100644
--- a/src/Api/ApigeeX/Denormalizer/AppGroupMembershipDenormalizer.php
+++ b/src/Api/ApigeeX/Denormalizer/AppGroupMembershipDenormalizer.php
@@ -29,7 +29,7 @@ class AppGroupMembershipDenormalizer implements DenormalizerInterface
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         $denormalized = [];
         if (!empty($data['attributes'])) {
@@ -52,7 +52,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/ApigeeX/Denormalizer/BillingTypeDenormalizer.php b/src/Api/ApigeeX/Denormalizer/BillingTypeDenormalizer.php
index fbf3c232f..f5e73ca1d 100644
--- a/src/Api/ApigeeX/Denormalizer/BillingTypeDenormalizer.php
+++ b/src/Api/ApigeeX/Denormalizer/BillingTypeDenormalizer.php
@@ -26,7 +26,7 @@ abstract class BillingTypeDenormalizer extends ObjectDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         /** @var BillingTypeInterface $denormalized */
         $denormalized = parent::denormalize($data, $type, $format, $context);
@@ -37,7 +37,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/ApigeeX/Denormalizer/DeveloperAcceptedRatePlanDenormalizer.php b/src/Api/ApigeeX/Denormalizer/DeveloperAcceptedRatePlanDenormalizer.php
index ceb6b4347..9f356a179 100755
--- a/src/Api/ApigeeX/Denormalizer/DeveloperAcceptedRatePlanDenormalizer.php
+++ b/src/Api/ApigeeX/Denormalizer/DeveloperAcceptedRatePlanDenormalizer.php
@@ -32,7 +32,7 @@ class DeveloperAcceptedRatePlanDenormalizer extends AcceptedRatePlanDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         return parent::denormalize($data, $this->developerAcceptedRatePlanClass, $format, $context);
     }
@@ -40,9 +40,9 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
-        if (parent::supportsDenormalization($data, $type, $format)) {
+        if (parent::supportsDenormalization($data, $type, $format, $context)) {
             return true;
         }
 
diff --git a/src/Api/ApigeeX/Denormalizer/DeveloperBillingTypeDenormalizer.php b/src/Api/ApigeeX/Denormalizer/DeveloperBillingTypeDenormalizer.php
index d84134685..4c3278f31 100644
--- a/src/Api/ApigeeX/Denormalizer/DeveloperBillingTypeDenormalizer.php
+++ b/src/Api/ApigeeX/Denormalizer/DeveloperBillingTypeDenormalizer.php
@@ -32,7 +32,7 @@ class DeveloperBillingTypeDenormalizer extends BillingTypeDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         return parent::denormalize($data, $this->developerBillinTypeClass, $format, $context);
     }
@@ -40,9 +40,9 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
-        if (parent::supportsDenormalization($data, $type, $format)) {
+        if (parent::supportsDenormalization($data, $type, $format, $context)) {
             return true;
         }
 
diff --git a/src/Api/ApigeeX/Denormalizer/PrepaidBalanceDenormalizer.php b/src/Api/ApigeeX/Denormalizer/PrepaidBalanceDenormalizer.php
index c0c0970bb..51f6d1f7c 100755
--- a/src/Api/ApigeeX/Denormalizer/PrepaidBalanceDenormalizer.php
+++ b/src/Api/ApigeeX/Denormalizer/PrepaidBalanceDenormalizer.php
@@ -45,7 +45,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/ApigeeX/Denormalizer/RatePlanDenormalizer.php b/src/Api/ApigeeX/Denormalizer/RatePlanDenormalizer.php
index 92b04d04e..c28410602 100755
--- a/src/Api/ApigeeX/Denormalizer/RatePlanDenormalizer.php
+++ b/src/Api/ApigeeX/Denormalizer/RatePlanDenormalizer.php
@@ -54,7 +54,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
      * @psalm-suppress PossiblyNullReference - Organization should not be null
      * here.
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         /** @var RatePlanInterface $entity */
         $entity = parent::denormalize($data, $type, $format, $context);
@@ -65,7 +65,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/ApigeeX/Denormalizer/RatePlanDenormalizerFactory.php b/src/Api/ApigeeX/Denormalizer/RatePlanDenormalizerFactory.php
index 8a07a7f35..d04aff8f2 100755
--- a/src/Api/ApigeeX/Denormalizer/RatePlanDenormalizerFactory.php
+++ b/src/Api/ApigeeX/Denormalizer/RatePlanDenormalizerFactory.php
@@ -56,12 +56,12 @@ public function __construct(array $denormalizers = [])
      * @psalm-suppress InvalidNullableReturnType - There are going to be at
      * least one denormalizer always that can denormalize data here.
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         foreach ($this->denormalizers as $denormalizer) {
             // Return the result from the first denormalizer that can
             // denormalize this.
-            if ($denormalizer->supportsDenormalization($data, $type, $format)) {
+            if ($denormalizer->supportsDenormalization($data, $type, $format, $context)) {
                 return $denormalizer->denormalize($data, $type, $format, $context);
             }
         }
@@ -70,10 +70,10 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         foreach ($this->denormalizers as $denormalizer) {
-            if ($denormalizer->supportsDenormalization($data, $type, $format)) {
+            if ($denormalizer->supportsDenormalization($data, $type, $format, $context)) {
                 return true;
             }
         }
diff --git a/src/Api/ApigeeX/Denormalizer/RatePlanRateDenormalizer.php b/src/Api/ApigeeX/Denormalizer/RatePlanRateDenormalizer.php
index f69a268f3..9c7fc655b 100755
--- a/src/Api/ApigeeX/Denormalizer/RatePlanRateDenormalizer.php
+++ b/src/Api/ApigeeX/Denormalizer/RatePlanRateDenormalizer.php
@@ -33,7 +33,7 @@ class RatePlanRateDenormalizer extends ObjectDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         $denormalized = (array) $data;
         if (RatePlanRate::TYPE_REVSHARE === $data->type) {
@@ -48,7 +48,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/ApigeeX/Denormalizer/StandardRatePlanDenormalizer.php b/src/Api/ApigeeX/Denormalizer/StandardRatePlanDenormalizer.php
index 6fbf0e3b0..b5dd1475f 100755
--- a/src/Api/ApigeeX/Denormalizer/StandardRatePlanDenormalizer.php
+++ b/src/Api/ApigeeX/Denormalizer/StandardRatePlanDenormalizer.php
@@ -41,7 +41,7 @@ class StandardRatePlanDenormalizer extends RatePlanDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         if (isset($data->parentRatePlan)) {
             return parent::denormalize($data, $this->standardRatePlanRevisionClass, $format, $context);
@@ -53,14 +53,14 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
             return false;
         }
 
-        if (parent::supportsDenormalization($data, $type, $format)) {
+        if (parent::supportsDenormalization($data, $type, $format, $context)) {
             // return RatePlanInterface::TYPE_STANDARD == $data->type;
             return RatePlanInterface::TYPE_STANDARD == 'STANDARD';
         }
diff --git a/src/Api/ApigeeX/Normalizer/AcceptedRatePlanNormalizer.php b/src/Api/ApigeeX/Normalizer/AcceptedRatePlanNormalizer.php
index abe097912..724d6df9f 100755
--- a/src/Api/ApigeeX/Normalizer/AcceptedRatePlanNormalizer.php
+++ b/src/Api/ApigeeX/Normalizer/AcceptedRatePlanNormalizer.php
@@ -44,7 +44,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof AcceptedRatePlanInterface;
     }
diff --git a/src/Api/ApigeeX/Normalizer/ApiProductNormalizer.php b/src/Api/ApigeeX/Normalizer/ApiProductNormalizer.php
index 4ab87a1d8..3d8c28b50 100755
--- a/src/Api/ApigeeX/Normalizer/ApiProductNormalizer.php
+++ b/src/Api/ApigeeX/Normalizer/ApiProductNormalizer.php
@@ -58,7 +58,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof ApiProductInterface;
     }
diff --git a/src/Api/ApigeeX/Normalizer/AppGroupMembershipNormalizer.php b/src/Api/ApigeeX/Normalizer/AppGroupMembershipNormalizer.php
index 280a358a5..c4f6a6656 100644
--- a/src/Api/ApigeeX/Normalizer/AppGroupMembershipNormalizer.php
+++ b/src/Api/ApigeeX/Normalizer/AppGroupMembershipNormalizer.php
@@ -44,7 +44,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof AppGroupMembership;
     }
diff --git a/src/Api/ApigeeX/Normalizer/AppNormalizer.php b/src/Api/ApigeeX/Normalizer/AppNormalizer.php
index 8eb0b9e14..f4304e9ec 100644
--- a/src/Api/ApigeeX/Normalizer/AppNormalizer.php
+++ b/src/Api/ApigeeX/Normalizer/AppNormalizer.php
@@ -30,7 +30,7 @@ class AppNormalizer extends ObjectNormalizer implements NormalizerInterface
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof AppInterface;
     }
diff --git a/src/Api/ApigeeX/Normalizer/BillingTypeNormalizer.php b/src/Api/ApigeeX/Normalizer/BillingTypeNormalizer.php
index 25a35d4fc..469a9a622 100644
--- a/src/Api/ApigeeX/Normalizer/BillingTypeNormalizer.php
+++ b/src/Api/ApigeeX/Normalizer/BillingTypeNormalizer.php
@@ -41,7 +41,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof BillingTypeInterface;
     }
diff --git a/src/Api/ApigeeX/Normalizer/PrepaidBalanceNormalizer.php b/src/Api/ApigeeX/Normalizer/PrepaidBalanceNormalizer.php
index 6a9ee05ee..090bae1ba 100755
--- a/src/Api/ApigeeX/Normalizer/PrepaidBalanceNormalizer.php
+++ b/src/Api/ApigeeX/Normalizer/PrepaidBalanceNormalizer.php
@@ -45,7 +45,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritDoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof PrepaidBalanceInterface;
     }
diff --git a/src/Api/ApigeeX/Normalizer/RatePlanNormalizer.php b/src/Api/ApigeeX/Normalizer/RatePlanNormalizer.php
index b78d8268a..1c5e40b93 100755
--- a/src/Api/ApigeeX/Normalizer/RatePlanNormalizer.php
+++ b/src/Api/ApigeeX/Normalizer/RatePlanNormalizer.php
@@ -70,7 +70,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof RatePlanInterface;
     }
diff --git a/src/Api/ApigeeX/Normalizer/RatePlanNormalizerFactory.php b/src/Api/ApigeeX/Normalizer/RatePlanNormalizerFactory.php
index 70730221e..0d0b0a9e5 100755
--- a/src/Api/ApigeeX/Normalizer/RatePlanNormalizerFactory.php
+++ b/src/Api/ApigeeX/Normalizer/RatePlanNormalizerFactory.php
@@ -70,10 +70,10 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         foreach ($this->normalizers as $denormalizer) {
-            if ($denormalizer->supportsNormalization($data, $format)) {
+            if ($denormalizer->supportsNormalization($data, $format, $context)) {
                 return true;
             }
         }
diff --git a/src/Api/ApigeeX/Normalizer/RatePlanRateNormalizer.php b/src/Api/ApigeeX/Normalizer/RatePlanRateNormalizer.php
index d1214aa64..d5acc4fdd 100755
--- a/src/Api/ApigeeX/Normalizer/RatePlanRateNormalizer.php
+++ b/src/Api/ApigeeX/Normalizer/RatePlanRateNormalizer.php
@@ -46,7 +46,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof RatePlanRate;
     }
diff --git a/src/Api/ApigeeX/Normalizer/StandardRatePlanNormalizer.php b/src/Api/ApigeeX/Normalizer/StandardRatePlanNormalizer.php
index b0874e41b..236f5d41d 100755
--- a/src/Api/ApigeeX/Normalizer/StandardRatePlanNormalizer.php
+++ b/src/Api/ApigeeX/Normalizer/StandardRatePlanNormalizer.php
@@ -41,7 +41,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof StandardRatePlanInterface;
     }
diff --git a/src/Api/Management/Denormalizer/AppDenormalizer.php b/src/Api/Management/Denormalizer/AppDenormalizer.php
index 8f7bd2dc2..c57c77f0e 100644
--- a/src/Api/Management/Denormalizer/AppDenormalizer.php
+++ b/src/Api/Management/Denormalizer/AppDenormalizer.php
@@ -46,7 +46,7 @@ class AppDenormalizer extends ObjectDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         if (isset($data->developerId)) {
             return parent::denormalize($data, $this->developerAppClass, $format, $context);
@@ -61,7 +61,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Management/Denormalizer/CompanyMembershipDenormalizer.php b/src/Api/Management/Denormalizer/CompanyMembershipDenormalizer.php
index bcd725baf..337d3d72a 100755
--- a/src/Api/Management/Denormalizer/CompanyMembershipDenormalizer.php
+++ b/src/Api/Management/Denormalizer/CompanyMembershipDenormalizer.php
@@ -29,7 +29,7 @@ class CompanyMembershipDenormalizer implements DenormalizerInterface
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         $denormalized = [];
         // Ignore parent "developer" key.
@@ -44,7 +44,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Management/Normalizer/AppCredentialNormalizer.php b/src/Api/Management/Normalizer/AppCredentialNormalizer.php
index 21d88a4d8..6d623ea43 100644
--- a/src/Api/Management/Normalizer/AppCredentialNormalizer.php
+++ b/src/Api/Management/Normalizer/AppCredentialNormalizer.php
@@ -30,7 +30,7 @@ class AppCredentialNormalizer extends ObjectNormalizer implements NormalizerInte
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof AppCredentialInterface;
     }
diff --git a/src/Api/Management/Normalizer/AppNormalizer.php b/src/Api/Management/Normalizer/AppNormalizer.php
index e94276cb9..9f49cb570 100644
--- a/src/Api/Management/Normalizer/AppNormalizer.php
+++ b/src/Api/Management/Normalizer/AppNormalizer.php
@@ -30,7 +30,7 @@ class AppNormalizer extends ObjectNormalizer implements NormalizerInterface
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof AppInterface;
     }
diff --git a/src/Api/Management/Normalizer/CompanyMembershipNormalizer.php b/src/Api/Management/Normalizer/CompanyMembershipNormalizer.php
index 8e36875d9..1bf689372 100644
--- a/src/Api/Management/Normalizer/CompanyMembershipNormalizer.php
+++ b/src/Api/Management/Normalizer/CompanyMembershipNormalizer.php
@@ -47,7 +47,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof CompanyMembership;
     }
diff --git a/src/Api/Management/Query/StatsQueryNormalizer.php b/src/Api/Management/Query/StatsQueryNormalizer.php
index dc50bcd67..d1d1709cf 100644
--- a/src/Api/Management/Query/StatsQueryNormalizer.php
+++ b/src/Api/Management/Query/StatsQueryNormalizer.php
@@ -92,7 +92,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof StatsQuery;
     }
diff --git a/src/Api/Monetization/Denormalizer/AcceptedRatePlanDenormalizer.php b/src/Api/Monetization/Denormalizer/AcceptedRatePlanDenormalizer.php
index 41bba56cc..f20502a68 100644
--- a/src/Api/Monetization/Denormalizer/AcceptedRatePlanDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/AcceptedRatePlanDenormalizer.php
@@ -32,7 +32,7 @@ abstract class AcceptedRatePlanDenormalizer extends ObjectDenormalizer
      * @psalm-suppress PossiblyNullReference - getPackage() can only return
      * null when a rate plan is created. It does not return null here.
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         /** @var AcceptedRatePlanInterface $denormalized */
         $denormalized = parent::denormalize($data, $type, $format, $context);
@@ -45,7 +45,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Denormalizer/AddressDenormalizer.php b/src/Api/Monetization/Denormalizer/AddressDenormalizer.php
index 16e37ebd2..ff01ca43d 100644
--- a/src/Api/Monetization/Denormalizer/AddressDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/AddressDenormalizer.php
@@ -45,7 +45,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Denormalizer/ApiPackageDenormalizer.php b/src/Api/Monetization/Denormalizer/ApiPackageDenormalizer.php
index 204a5f276..2eaa8ec66 100644
--- a/src/Api/Monetization/Denormalizer/ApiPackageDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/ApiPackageDenormalizer.php
@@ -45,7 +45,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Denormalizer/BalanceDenormalizer.php b/src/Api/Monetization/Denormalizer/BalanceDenormalizer.php
index e2d705eec..c3dbae56d 100644
--- a/src/Api/Monetization/Denormalizer/BalanceDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/BalanceDenormalizer.php
@@ -45,7 +45,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Denormalizer/CompanyAcceptedRatePlanDenormalizer.php b/src/Api/Monetization/Denormalizer/CompanyAcceptedRatePlanDenormalizer.php
index 2b68ae3ef..2516f237b 100644
--- a/src/Api/Monetization/Denormalizer/CompanyAcceptedRatePlanDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/CompanyAcceptedRatePlanDenormalizer.php
@@ -51,7 +51,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         return parent::denormalize($data, $this->companyAcceptedRatePlanClass, $format, $context);
     }
@@ -59,9 +59,9 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
-        if (parent::supportsDenormalization($data, $type, $format)) {
+        if (parent::supportsDenormalization($data, $type, $format, $context)) {
             return $data->developer->isCompany;
         }
 
diff --git a/src/Api/Monetization/Denormalizer/CompanyPaymentTransactionDenormalizer.php b/src/Api/Monetization/Denormalizer/CompanyPaymentTransactionDenormalizer.php
index 8bc914eae..829b600ba 100644
--- a/src/Api/Monetization/Denormalizer/CompanyPaymentTransactionDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/CompanyPaymentTransactionDenormalizer.php
@@ -51,7 +51,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         return parent::denormalize($data, $this->companyPaymentTransactionClass, $format, $context);
     }
@@ -59,9 +59,9 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
-        if (parent::supportsDenormalization($data, $type, $format)) {
+        if (parent::supportsDenormalization($data, $type, $format, $context)) {
             return $data->developer->isCompany;
         }
 
diff --git a/src/Api/Monetization/Denormalizer/CompanyRatePlanDenormalizer.php b/src/Api/Monetization/Denormalizer/CompanyRatePlanDenormalizer.php
index 55c1ea4cb..bfb46031f 100644
--- a/src/Api/Monetization/Denormalizer/CompanyRatePlanDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/CompanyRatePlanDenormalizer.php
@@ -56,7 +56,7 @@ public function __construct(?\Symfony\Component\Serializer\Mapping\Factory\Class
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         if (isset($data->parentRatePlan)) {
             return parent::denormalize($data, $this->companyRatePlanRevisionClass, $format, $context);
@@ -68,14 +68,14 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
             return false;
         }
 
-        if (parent::supportsDenormalization($data, $type, $format)) {
+        if (parent::supportsDenormalization($data, $type, $format, $context)) {
             return RatePlanInterface::TYPE_DEVELOPER == $data->type && $data->developer->isCompany;
         }
 
diff --git a/src/Api/Monetization/Denormalizer/CompanyReportDefinitionDenormalizer.php b/src/Api/Monetization/Denormalizer/CompanyReportDefinitionDenormalizer.php
index 000e75275..459053a47 100644
--- a/src/Api/Monetization/Denormalizer/CompanyReportDefinitionDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/CompanyReportDefinitionDenormalizer.php
@@ -51,7 +51,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         return parent::denormalize($data, $this->companyReportDefinitionClass, $format, $context);
     }
@@ -59,9 +59,9 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
-        if (parent::supportsDenormalization($data, $type, $format)) {
+        if (parent::supportsDenormalization($data, $type, $format, $context)) {
             // Non-developer specific reports API also returns the developer
             // property, but it is always NULL.
             return is_object($data->developer) && $data->developer->isCompany;
diff --git a/src/Api/Monetization/Denormalizer/DateTimeZoneDenormalizer.php b/src/Api/Monetization/Denormalizer/DateTimeZoneDenormalizer.php
index dd82d672e..800845ff5 100644
--- a/src/Api/Monetization/Denormalizer/DateTimeZoneDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/DateTimeZoneDenormalizer.php
@@ -28,7 +28,7 @@ class DateTimeZoneDenormalizer implements DenormalizerInterface
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         try {
             return new DateTimeZone($data);
@@ -40,7 +40,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Denormalizer/DeveloperAcceptedRatePlanDenormalizer.php b/src/Api/Monetization/Denormalizer/DeveloperAcceptedRatePlanDenormalizer.php
index 5c3098ce6..861b568f0 100644
--- a/src/Api/Monetization/Denormalizer/DeveloperAcceptedRatePlanDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/DeveloperAcceptedRatePlanDenormalizer.php
@@ -32,7 +32,7 @@ class DeveloperAcceptedRatePlanDenormalizer extends AcceptedRatePlanDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         return parent::denormalize($data, $this->developerAcceptedRatePlanClass, $format, $context);
     }
@@ -40,9 +40,9 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
-        if (parent::supportsDenormalization($data, $type, $format)) {
+        if (parent::supportsDenormalization($data, $type, $format, $context)) {
             return !$data->developer->isCompany;
         }
 
diff --git a/src/Api/Monetization/Denormalizer/DeveloperCategoryRatePlanDenormalizer.php b/src/Api/Monetization/Denormalizer/DeveloperCategoryRatePlanDenormalizer.php
index 9606cc2a2..aae2de996 100644
--- a/src/Api/Monetization/Denormalizer/DeveloperCategoryRatePlanDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/DeveloperCategoryRatePlanDenormalizer.php
@@ -41,7 +41,7 @@ class DeveloperCategoryRatePlanDenormalizer extends RatePlanDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         if (isset($data->parentRatePlan)) {
             return parent::denormalize($data, $this->developerCategoryRatePlanRevisionClass, $format, $context);
@@ -53,14 +53,14 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
             return false;
         }
 
-        if (parent::supportsDenormalization($data, $type, $format)) {
+        if (parent::supportsDenormalization($data, $type, $format, $context)) {
             return RatePlanInterface::TYPE_DEVELOPER_CATEGORY == $data->type;
         }
 
diff --git a/src/Api/Monetization/Denormalizer/DeveloperPaymentTransactionDenormalizer.php b/src/Api/Monetization/Denormalizer/DeveloperPaymentTransactionDenormalizer.php
index d351ab06e..005ca2fdd 100644
--- a/src/Api/Monetization/Denormalizer/DeveloperPaymentTransactionDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/DeveloperPaymentTransactionDenormalizer.php
@@ -32,7 +32,7 @@ class DeveloperPaymentTransactionDenormalizer extends PaymentTransactionDenormal
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         return parent::denormalize($data, $this->developerPaymentTransactionClass, $format, $context);
     }
@@ -40,9 +40,9 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
-        if (parent::supportsDenormalization($data, $type, $format)) {
+        if (parent::supportsDenormalization($data, $type, $format, $context)) {
             return !$data->developer->isCompany;
         }
 
diff --git a/src/Api/Monetization/Denormalizer/DeveloperRatePlanDenormalizer.php b/src/Api/Monetization/Denormalizer/DeveloperRatePlanDenormalizer.php
index b7fd92dd8..035aa3949 100644
--- a/src/Api/Monetization/Denormalizer/DeveloperRatePlanDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/DeveloperRatePlanDenormalizer.php
@@ -41,7 +41,7 @@ class DeveloperRatePlanDenormalizer extends RatePlanDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         if (isset($data->parentRatePlan)) {
             return parent::denormalize($data, $this->developerRatePlanRevisionClass, $format, $context);
@@ -53,14 +53,14 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
             return false;
         }
 
-        if (parent::supportsDenormalization($data, $type, $format)) {
+        if (parent::supportsDenormalization($data, $type, $format, $context)) {
             return RatePlanInterface::TYPE_DEVELOPER == $data->type && empty($data->developer->isCompany);
         }
 
diff --git a/src/Api/Monetization/Denormalizer/DeveloperReportDefinitionDenormalizer.php b/src/Api/Monetization/Denormalizer/DeveloperReportDefinitionDenormalizer.php
index f003149fc..26d4d687c 100644
--- a/src/Api/Monetization/Denormalizer/DeveloperReportDefinitionDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/DeveloperReportDefinitionDenormalizer.php
@@ -32,7 +32,7 @@ class DeveloperReportDefinitionDenormalizer extends ReportDefinitionDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         return parent::denormalize($data, $this->developerReportDefinitionClass, $format, $context);
     }
@@ -40,9 +40,9 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
-        if (parent::supportsDenormalization($data, $type, $format)) {
+        if (parent::supportsDenormalization($data, $type, $format, $context)) {
             // Non-developer specific reports API also returns the developer
             // property, but it is always NULL.
             return is_object($data->developer) && !$data->developer->isCompany;
diff --git a/src/Api/Monetization/Denormalizer/LegalEntityDenormalizer.php b/src/Api/Monetization/Denormalizer/LegalEntityDenormalizer.php
index 294f4c447..b60682b84 100644
--- a/src/Api/Monetization/Denormalizer/LegalEntityDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/LegalEntityDenormalizer.php
@@ -64,7 +64,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         if ($data->isCompany) {
             return parent::denormalize($data, $this->companyClass, $format, $context);
@@ -76,7 +76,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Denormalizer/OrganizationProfileDenormalizer.php b/src/Api/Monetization/Denormalizer/OrganizationProfileDenormalizer.php
index de1da2f6e..49ff8e46c 100644
--- a/src/Api/Monetization/Denormalizer/OrganizationProfileDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/OrganizationProfileDenormalizer.php
@@ -45,7 +45,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Denormalizer/PaymentTransactionDenormalizer.php b/src/Api/Monetization/Denormalizer/PaymentTransactionDenormalizer.php
index 65fb8b580..83ff6f377 100644
--- a/src/Api/Monetization/Denormalizer/PaymentTransactionDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/PaymentTransactionDenormalizer.php
@@ -45,7 +45,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Denormalizer/PrepaidBalanceDenormalizer.php b/src/Api/Monetization/Denormalizer/PrepaidBalanceDenormalizer.php
index 26ac32196..17a5a0de8 100644
--- a/src/Api/Monetization/Denormalizer/PrepaidBalanceDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/PrepaidBalanceDenormalizer.php
@@ -45,7 +45,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Denormalizer/RatePlanDenormalizer.php b/src/Api/Monetization/Denormalizer/RatePlanDenormalizer.php
index 5dd46192a..ac4041eb2 100644
--- a/src/Api/Monetization/Denormalizer/RatePlanDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/RatePlanDenormalizer.php
@@ -54,7 +54,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
      * @psalm-suppress PossiblyNullReference - Organization should not be null
      * here.
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         /** @var RatePlanInterface $entity */
         $entity = parent::denormalize($data, $type, $format, $context);
@@ -67,7 +67,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Denormalizer/RatePlanDenormalizerFactory.php b/src/Api/Monetization/Denormalizer/RatePlanDenormalizerFactory.php
index d3450368d..8acec0c29 100644
--- a/src/Api/Monetization/Denormalizer/RatePlanDenormalizerFactory.php
+++ b/src/Api/Monetization/Denormalizer/RatePlanDenormalizerFactory.php
@@ -53,12 +53,12 @@ public function __construct(array $denormalizers = [])
      * @psalm-suppress InvalidNullableReturnType - There are going to be at
      * least one denormalizer always that can denormalize data here.
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         foreach ($this->denormalizers as $denormalizer) {
             // Return the result from the first denormalizer that can
             // denormalize this.
-            if ($denormalizer->supportsDenormalization($data, $type, $format)) {
+            if ($denormalizer->supportsDenormalization($data, $type, $format, $context)) {
                 return $denormalizer->denormalize($data, $type, $format, $context);
             }
         }
@@ -67,10 +67,10 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         foreach ($this->denormalizers as $denormalizer) {
-            if ($denormalizer->supportsDenormalization($data, $type, $format)) {
+            if ($denormalizer->supportsDenormalization($data, $type, $format, $context)) {
                 return true;
             }
         }
diff --git a/src/Api/Monetization/Denormalizer/RatePlanRateDenormalizer.php b/src/Api/Monetization/Denormalizer/RatePlanRateDenormalizer.php
index 6642040fa..fd41c674b 100644
--- a/src/Api/Monetization/Denormalizer/RatePlanRateDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/RatePlanRateDenormalizer.php
@@ -33,7 +33,7 @@ class RatePlanRateDenormalizer extends ObjectDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         $denormalized = (array) $data;
         if (RatePlanRate::TYPE_REVSHARE === $data->type) {
@@ -48,7 +48,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Denormalizer/ReportCriteriaDenormalizer.php b/src/Api/Monetization/Denormalizer/ReportCriteriaDenormalizer.php
index 13d6e9cec..c2a7e822a 100644
--- a/src/Api/Monetization/Denormalizer/ReportCriteriaDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/ReportCriteriaDenormalizer.php
@@ -61,7 +61,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
      *
      * @psalm-suppress PossiblyInvalidArgument We are sure of the return type of denormalize().
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         // This is what is in the type-hint on the $criteria property of the
         // ReportDefinition object.
@@ -128,7 +128,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Denormalizer/ReportDefinitionDenormalizer.php b/src/Api/Monetization/Denormalizer/ReportDefinitionDenormalizer.php
index 59a40c6d9..d7f40bd95 100644
--- a/src/Api/Monetization/Denormalizer/ReportDefinitionDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/ReportDefinitionDenormalizer.php
@@ -45,7 +45,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Denormalizer/StandardRatePlanDenormalizer.php b/src/Api/Monetization/Denormalizer/StandardRatePlanDenormalizer.php
index dbd1da96b..7ca38279d 100644
--- a/src/Api/Monetization/Denormalizer/StandardRatePlanDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/StandardRatePlanDenormalizer.php
@@ -41,7 +41,7 @@ class StandardRatePlanDenormalizer extends RatePlanDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         if (isset($data->parentRatePlan)) {
             return parent::denormalize($data, $this->standardRatePlanRevisionClass, $format, $context);
@@ -53,14 +53,14 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
             return false;
         }
 
-        if (parent::supportsDenormalization($data, $type, $format)) {
+        if (parent::supportsDenormalization($data, $type, $format, $context)) {
             return RatePlanInterface::TYPE_STANDARD == $data->type;
         }
 
diff --git a/src/Api/Monetization/Denormalizer/SupportedCurrencyDenormalizer.php b/src/Api/Monetization/Denormalizer/SupportedCurrencyDenormalizer.php
index 0540a2c2d..66d1510e6 100644
--- a/src/Api/Monetization/Denormalizer/SupportedCurrencyDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/SupportedCurrencyDenormalizer.php
@@ -45,7 +45,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Denormalizer/TermsAndConditionsDenormalizer.php b/src/Api/Monetization/Denormalizer/TermsAndConditionsDenormalizer.php
index 0963f4647..df9318853 100644
--- a/src/Api/Monetization/Denormalizer/TermsAndConditionsDenormalizer.php
+++ b/src/Api/Monetization/Denormalizer/TermsAndConditionsDenormalizer.php
@@ -51,7 +51,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
      * @psalm-suppress PossiblyNullReference - Organization should not be null
      * here.
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         /** @var TermsAndConditionsInterface $entity */
         $entity = parent::denormalize($data, $type, $format, $context);
@@ -64,7 +64,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Api/Monetization/Normalizer/AcceptedRatePlanNormalizer.php b/src/Api/Monetization/Normalizer/AcceptedRatePlanNormalizer.php
index 170a79e42..67e7bc9bf 100644
--- a/src/Api/Monetization/Normalizer/AcceptedRatePlanNormalizer.php
+++ b/src/Api/Monetization/Normalizer/AcceptedRatePlanNormalizer.php
@@ -44,7 +44,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof AcceptedRatePlanInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/AddressNormalizer.php b/src/Api/Monetization/Normalizer/AddressNormalizer.php
index b2f941297..d72aa2cbe 100644
--- a/src/Api/Monetization/Normalizer/AddressNormalizer.php
+++ b/src/Api/Monetization/Normalizer/AddressNormalizer.php
@@ -45,7 +45,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof Address;
     }
diff --git a/src/Api/Monetization/Normalizer/ApiPackageNormalizer.php b/src/Api/Monetization/Normalizer/ApiPackageNormalizer.php
index 022922eed..5f4e9d88e 100644
--- a/src/Api/Monetization/Normalizer/ApiPackageNormalizer.php
+++ b/src/Api/Monetization/Normalizer/ApiPackageNormalizer.php
@@ -63,7 +63,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof ApiPackageInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/BalanceNormalizer.php b/src/Api/Monetization/Normalizer/BalanceNormalizer.php
index e467b88bb..58b91b9fe 100644
--- a/src/Api/Monetization/Normalizer/BalanceNormalizer.php
+++ b/src/Api/Monetization/Normalizer/BalanceNormalizer.php
@@ -44,7 +44,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof BalanceInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/CompanyAcceptedRatePlanNormalizer.php b/src/Api/Monetization/Normalizer/CompanyAcceptedRatePlanNormalizer.php
index 98341571f..81a5044a7 100644
--- a/src/Api/Monetization/Normalizer/CompanyAcceptedRatePlanNormalizer.php
+++ b/src/Api/Monetization/Normalizer/CompanyAcceptedRatePlanNormalizer.php
@@ -44,7 +44,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof CompanyAcceptedRatePlanInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/CompanyPaymentTransactionNormalizer.php b/src/Api/Monetization/Normalizer/CompanyPaymentTransactionNormalizer.php
index 1a3f95779..84d8d0d4f 100644
--- a/src/Api/Monetization/Normalizer/CompanyPaymentTransactionNormalizer.php
+++ b/src/Api/Monetization/Normalizer/CompanyPaymentTransactionNormalizer.php
@@ -59,7 +59,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof CompanyPaymentTransaction;
     }
diff --git a/src/Api/Monetization/Normalizer/CompanyRatePlanNormalizer.php b/src/Api/Monetization/Normalizer/CompanyRatePlanNormalizer.php
index 2851b6327..84cf04c4e 100644
--- a/src/Api/Monetization/Normalizer/CompanyRatePlanNormalizer.php
+++ b/src/Api/Monetization/Normalizer/CompanyRatePlanNormalizer.php
@@ -44,7 +44,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof CompanyRatePlanInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/CompanyReportDefinitionNormalizer.php b/src/Api/Monetization/Normalizer/CompanyReportDefinitionNormalizer.php
index 22974aead..172fb5dc6 100644
--- a/src/Api/Monetization/Normalizer/CompanyReportDefinitionNormalizer.php
+++ b/src/Api/Monetization/Normalizer/CompanyReportDefinitionNormalizer.php
@@ -44,7 +44,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof CompanyReportDefinitionInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/DateTimeZoneNormalizer.php b/src/Api/Monetization/Normalizer/DateTimeZoneNormalizer.php
index 38cef829f..c32d078b1 100644
--- a/src/Api/Monetization/Normalizer/DateTimeZoneNormalizer.php
+++ b/src/Api/Monetization/Normalizer/DateTimeZoneNormalizer.php
@@ -34,7 +34,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof DateTimeZone;
     }
diff --git a/src/Api/Monetization/Normalizer/DeveloperCategoryRatePlanNormalizer.php b/src/Api/Monetization/Normalizer/DeveloperCategoryRatePlanNormalizer.php
index 9f8788a69..6d6c39194 100644
--- a/src/Api/Monetization/Normalizer/DeveloperCategoryRatePlanNormalizer.php
+++ b/src/Api/Monetization/Normalizer/DeveloperCategoryRatePlanNormalizer.php
@@ -41,7 +41,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof DeveloperCategoryRatePlanInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/DeveloperPaymentTransactionNormalizer.php b/src/Api/Monetization/Normalizer/DeveloperPaymentTransactionNormalizer.php
index 139c6e38e..935911a55 100644
--- a/src/Api/Monetization/Normalizer/DeveloperPaymentTransactionNormalizer.php
+++ b/src/Api/Monetization/Normalizer/DeveloperPaymentTransactionNormalizer.php
@@ -40,7 +40,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof DeveloperPaymentTransaction;
     }
diff --git a/src/Api/Monetization/Normalizer/DeveloperRatePlanNormalizer.php b/src/Api/Monetization/Normalizer/DeveloperRatePlanNormalizer.php
index 1b9a3f858..49b9fa1d4 100644
--- a/src/Api/Monetization/Normalizer/DeveloperRatePlanNormalizer.php
+++ b/src/Api/Monetization/Normalizer/DeveloperRatePlanNormalizer.php
@@ -25,7 +25,7 @@ class DeveloperRatePlanNormalizer extends LegalEntityRatePlanNormalizer
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof DeveloperRatePlanInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/DeveloperReportDefinitionNormalizer.php b/src/Api/Monetization/Normalizer/DeveloperReportDefinitionNormalizer.php
index 9e804d595..6b12fb437 100644
--- a/src/Api/Monetization/Normalizer/DeveloperReportDefinitionNormalizer.php
+++ b/src/Api/Monetization/Normalizer/DeveloperReportDefinitionNormalizer.php
@@ -25,7 +25,7 @@ class DeveloperReportDefinitionNormalizer extends LegalEntityReportDefinitionNor
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof DeveloperReportDefinitionInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/LegalEntityNormalizer.php b/src/Api/Monetization/Normalizer/LegalEntityNormalizer.php
index 70fb383c1..74729097b 100644
--- a/src/Api/Monetization/Normalizer/LegalEntityNormalizer.php
+++ b/src/Api/Monetization/Normalizer/LegalEntityNormalizer.php
@@ -66,7 +66,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof LegalEntityInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/OrganizationProfileNormalizer.php b/src/Api/Monetization/Normalizer/OrganizationProfileNormalizer.php
index fc4d9448b..e836fe331 100644
--- a/src/Api/Monetization/Normalizer/OrganizationProfileNormalizer.php
+++ b/src/Api/Monetization/Normalizer/OrganizationProfileNormalizer.php
@@ -44,7 +44,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof OrganizationProfileInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/PaymentTransactionNormalizer.php b/src/Api/Monetization/Normalizer/PaymentTransactionNormalizer.php
index 0c0e9826c..22bd6bed2 100644
--- a/src/Api/Monetization/Normalizer/PaymentTransactionNormalizer.php
+++ b/src/Api/Monetization/Normalizer/PaymentTransactionNormalizer.php
@@ -45,7 +45,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof PaymentTransaction;
     }
diff --git a/src/Api/Monetization/Normalizer/PrepaidBalanceNormalizer.php b/src/Api/Monetization/Normalizer/PrepaidBalanceNormalizer.php
index 7cb321e9b..ca951e84e 100644
--- a/src/Api/Monetization/Normalizer/PrepaidBalanceNormalizer.php
+++ b/src/Api/Monetization/Normalizer/PrepaidBalanceNormalizer.php
@@ -44,7 +44,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof PrepaidBalanceInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/RatePlanNormalizer.php b/src/Api/Monetization/Normalizer/RatePlanNormalizer.php
index e4d8a78c4..322f9171b 100644
--- a/src/Api/Monetization/Normalizer/RatePlanNormalizer.php
+++ b/src/Api/Monetization/Normalizer/RatePlanNormalizer.php
@@ -75,7 +75,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof RatePlanInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/RatePlanNormalizerFactory.php b/src/Api/Monetization/Normalizer/RatePlanNormalizerFactory.php
index b62fc8bbd..91f73c4bb 100644
--- a/src/Api/Monetization/Normalizer/RatePlanNormalizerFactory.php
+++ b/src/Api/Monetization/Normalizer/RatePlanNormalizerFactory.php
@@ -67,10 +67,10 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         foreach ($this->normalizers as $denormalizer) {
-            if ($denormalizer->supportsNormalization($data, $format)) {
+            if ($denormalizer->supportsNormalization($data, $format, $context)) {
                 return true;
             }
         }
diff --git a/src/Api/Monetization/Normalizer/RatePlanRateNormalizer.php b/src/Api/Monetization/Normalizer/RatePlanRateNormalizer.php
index ced20de38..6a7bad087 100644
--- a/src/Api/Monetization/Normalizer/RatePlanRateNormalizer.php
+++ b/src/Api/Monetization/Normalizer/RatePlanRateNormalizer.php
@@ -46,7 +46,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof RatePlanRate;
     }
diff --git a/src/Api/Monetization/Normalizer/ReportCriteriaNormalizer.php b/src/Api/Monetization/Normalizer/ReportCriteriaNormalizer.php
index 7776ce092..1c48622da 100644
--- a/src/Api/Monetization/Normalizer/ReportCriteriaNormalizer.php
+++ b/src/Api/Monetization/Normalizer/ReportCriteriaNormalizer.php
@@ -95,7 +95,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof AbstractCriteria;
     }
diff --git a/src/Api/Monetization/Normalizer/ReportDefinitionNormalizer.php b/src/Api/Monetization/Normalizer/ReportDefinitionNormalizer.php
index f49affe1d..a25996150 100644
--- a/src/Api/Monetization/Normalizer/ReportDefinitionNormalizer.php
+++ b/src/Api/Monetization/Normalizer/ReportDefinitionNormalizer.php
@@ -67,7 +67,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof ReportDefinitionInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/StandardRatePlanNormalizer.php b/src/Api/Monetization/Normalizer/StandardRatePlanNormalizer.php
index a6f17a584..2c089829b 100644
--- a/src/Api/Monetization/Normalizer/StandardRatePlanNormalizer.php
+++ b/src/Api/Monetization/Normalizer/StandardRatePlanNormalizer.php
@@ -41,7 +41,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof StandardRatePlanInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/SupportedCurrencyNormalizer.php b/src/Api/Monetization/Normalizer/SupportedCurrencyNormalizer.php
index d2239970f..f4de7b0fc 100644
--- a/src/Api/Monetization/Normalizer/SupportedCurrencyNormalizer.php
+++ b/src/Api/Monetization/Normalizer/SupportedCurrencyNormalizer.php
@@ -44,7 +44,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof SupportedCurrencyInterface;
     }
diff --git a/src/Api/Monetization/Normalizer/TermsAndConditionsNormalizer.php b/src/Api/Monetization/Normalizer/TermsAndConditionsNormalizer.php
index 70117e1fe..4d9b05170 100644
--- a/src/Api/Monetization/Normalizer/TermsAndConditionsNormalizer.php
+++ b/src/Api/Monetization/Normalizer/TermsAndConditionsNormalizer.php
@@ -72,7 +72,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof TermsAndConditionsInterface;
     }
diff --git a/src/Api/Monetization/Serializer/ReportDefinitionSerializer.php b/src/Api/Monetization/Serializer/ReportDefinitionSerializer.php
index 6826ade04..4f3270de4 100644
--- a/src/Api/Monetization/Serializer/ReportDefinitionSerializer.php
+++ b/src/Api/Monetization/Serializer/ReportDefinitionSerializer.php
@@ -85,7 +85,7 @@ public function deserialize($data, $type, $format, array $context = []): mixed
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         $this->addReportDefinitionTypeToContext($data, $context);
 
diff --git a/src/Denormalizer/AttributesPropertyDenormalizer.php b/src/Denormalizer/AttributesPropertyDenormalizer.php
index 58f25fac3..22e8dd055 100644
--- a/src/Denormalizer/AttributesPropertyDenormalizer.php
+++ b/src/Denormalizer/AttributesPropertyDenormalizer.php
@@ -28,7 +28,7 @@ class AttributesPropertyDenormalizer extends KeyValueMapDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
@@ -48,7 +48,7 @@ public function supportsDenormalization($data, $type, $format = null): bool
      *
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         $flatten = [];
         foreach ($data as $key => $item) {
diff --git a/src/Denormalizer/CredentialProductDenormalizer.php b/src/Denormalizer/CredentialProductDenormalizer.php
index 9feb5177e..98dde4695 100644
--- a/src/Denormalizer/CredentialProductDenormalizer.php
+++ b/src/Denormalizer/CredentialProductDenormalizer.php
@@ -30,7 +30,7 @@ class CredentialProductDenormalizer implements DenormalizerInterface
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
@@ -43,7 +43,7 @@ public function supportsDenormalization($data, $type, $format = null): bool
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         return new CredentialProduct($data->apiproduct, $data->status);
     }
diff --git a/src/Denormalizer/EdgeDateDenormalizer.php b/src/Denormalizer/EdgeDateDenormalizer.php
index 0fdd0af7c..23719461f 100644
--- a/src/Denormalizer/EdgeDateDenormalizer.php
+++ b/src/Denormalizer/EdgeDateDenormalizer.php
@@ -55,7 +55,7 @@ public function __construct()
      * @psalm-suppress ImplementedReturnTypeMismatch - We have to return null,
      * even if it not officially supported by the overridden class.
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         // Handle -1 in expiresAt property of AppCredential.
         if ($data < 0) {
@@ -73,7 +73,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         return isset(self::$supportedTypes[$type]);
     }
diff --git a/src/Denormalizer/KeyValueMapDenormalizer.php b/src/Denormalizer/KeyValueMapDenormalizer.php
index 411135eac..5ea9c20a7 100644
--- a/src/Denormalizer/KeyValueMapDenormalizer.php
+++ b/src/Denormalizer/KeyValueMapDenormalizer.php
@@ -29,7 +29,7 @@ class KeyValueMapDenormalizer implements DenormalizerInterface
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         return new $type($data);
     }
@@ -37,7 +37,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
diff --git a/src/Denormalizer/ObjectDenormalizer.php b/src/Denormalizer/ObjectDenormalizer.php
index 2ba8ebe93..3c6c8c425 100644
--- a/src/Denormalizer/ObjectDenormalizer.php
+++ b/src/Denormalizer/ObjectDenormalizer.php
@@ -89,7 +89,7 @@ public function __construct(?ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         // The original input should not be altered.
         if (is_object($data)) {
@@ -113,7 +113,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         if ('[]' === substr($type, -2)) {
             return false;
@@ -122,7 +122,7 @@ public function supportsDenormalization($data, $type, $format = null): bool
         // Enforce the only supported format if format is null.
         $format = $format ?? $this->format;
 
-        return $format === $this->format && $this->objectNormalizer->supportsDenormalization($data, $type, $format);
+        return $format === $this->format && $this->objectNormalizer->supportsDenormalization($data, $type, $format, $context);
     }
 
     /**
diff --git a/src/Denormalizer/PropertiesPropertyDenormalizer.php b/src/Denormalizer/PropertiesPropertyDenormalizer.php
index 9682d2697..fd13d21bc 100644
--- a/src/Denormalizer/PropertiesPropertyDenormalizer.php
+++ b/src/Denormalizer/PropertiesPropertyDenormalizer.php
@@ -28,7 +28,7 @@ class PropertiesPropertyDenormalizer extends KeyValueMapDenormalizer
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         // Do not apply this on array objects. ArrayDenormalizer takes care of them.
         if ('[]' === substr($type, -2)) {
@@ -41,7 +41,7 @@ public function supportsDenormalization($data, $type, $format = null): bool
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         if (is_object($data) && property_exists($data, 'property') && is_array($data->property)) {
             $flatten = [];
diff --git a/src/Normalizer/CredentialProductNormalizer.php b/src/Normalizer/CredentialProductNormalizer.php
index 3e43bf231..d8e5599dd 100644
--- a/src/Normalizer/CredentialProductNormalizer.php
+++ b/src/Normalizer/CredentialProductNormalizer.php
@@ -48,7 +48,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof CredentialProductInterface;
     }
diff --git a/src/Normalizer/EdgeDateNormalizer.php b/src/Normalizer/EdgeDateNormalizer.php
index f63d7af60..fe21719bd 100644
--- a/src/Normalizer/EdgeDateNormalizer.php
+++ b/src/Normalizer/EdgeDateNormalizer.php
@@ -26,7 +26,7 @@ class EdgeDateNormalizer implements NormalizerInterface
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof DateTimeInterface;
     }
diff --git a/src/Normalizer/KeyValueMapNormalizer.php b/src/Normalizer/KeyValueMapNormalizer.php
index 1f7e0e5bc..41f37c9e1 100644
--- a/src/Normalizer/KeyValueMapNormalizer.php
+++ b/src/Normalizer/KeyValueMapNormalizer.php
@@ -42,7 +42,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof KeyValueMapInterface;
     }
diff --git a/src/Normalizer/ObjectNormalizer.php b/src/Normalizer/ObjectNormalizer.php
index 666690f6d..fa729d514 100644
--- a/src/Normalizer/ObjectNormalizer.php
+++ b/src/Normalizer/ObjectNormalizer.php
@@ -109,12 +109,12 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         // Enforce the only supported format if format is null.
         $format = $format ?? $this->format;
 
-        return $format === $this->format && $this->objectNormalizer->supportsNormalization($data, $format);
+        return $format === $this->format && $this->objectNormalizer->supportsNormalization($data, $format, $context);
     }
 
     /**
diff --git a/src/Normalizer/PropertiesPropertyNormalizer.php b/src/Normalizer/PropertiesPropertyNormalizer.php
index eb66bbd9d..12d7247b6 100644
--- a/src/Normalizer/PropertiesPropertyNormalizer.php
+++ b/src/Normalizer/PropertiesPropertyNormalizer.php
@@ -47,7 +47,7 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof PropertiesProperty;
     }
diff --git a/src/Serializer/EntitySerializer.php b/src/Serializer/EntitySerializer.php
index 2345386b1..53405fffc 100755
--- a/src/Serializer/EntitySerializer.php
+++ b/src/Serializer/EntitySerializer.php
@@ -25,6 +25,7 @@
 use Apigee\Edge\Normalizer\EdgeDateNormalizer;
 use Apigee\Edge\Normalizer\KeyValueMapNormalizer;
 use Apigee\Edge\Normalizer\ObjectNormalizer;
+use Apigee\Edge\Serializer\JsonDecode;
 use Psr\Http\Message\ResponseInterface;
 use ReflectionMethod;
 use ReflectionObject;
@@ -74,7 +75,7 @@ public function __construct(array $normalizers = [])
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): mixed
     {
         return $this->serializer->denormalize($data, $type, $format, $context);
     }
@@ -82,9 +83,9 @@ public function denormalize($data, $type, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
-        return $this->format === $format && $this->serializer->supportsDenormalization($data, $type, $format);
+        return $this->format === $format && $this->serializer->supportsDenormalization($data, $type, $format, $context);
     }
 
     /**
@@ -98,9 +99,9 @@ public function normalize($object, $format = null, array $context = []): array|s
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
-        return $this->format === $format && $this->serializer->supportsNormalization($data, $format);
+        return $this->format === $format && $this->serializer->supportsNormalization($data, $format, $context);
     }
 
     /**
@@ -191,7 +192,7 @@ public function setPropertiesFromResponse(ResponseInterface $response, EntityInt
     /**
      * {@inheritdoc}
      */
-    public function decode($data, $format, array $context = [])
+    public function decode($data, $format, array $context = []): mixed
     {
         return $this->serializer->decode($data, $format, $context);
     }