diff --git a/lib/Manager.php b/lib/Manager.php
index 8dd86fb..23f33d3 100644
--- a/lib/Manager.php
+++ b/lib/Manager.php
@@ -177,11 +177,8 @@ class Manager {
             throw new InvalidArgumentException("Provider '$providerId' does not support service creation");
         }
         
-        // Create a fresh service instance
-        $service = $provider->serviceFresh();
-        
-        // Deserialize the data into the service
-        $service->jsonDeserialize($data);
+        // Create a service instance with provided data
+        $service = $provider->serviceFresh()->jsonDeserialize($data);
         
         // Create the service
         $serviceId = $provider->serviceCreate($tenantId, $userId, $service);
@@ -218,8 +215,8 @@ class Manager {
             throw new InvalidArgumentException("Service '$serviceId' not found");
         }
         
-        // Update with new data
-        $service->jsonDeserialize($data);
+        // Create a service instance with updated data
+        $service = $provider->serviceFresh()->jsonDeserialize($data);
         
         // Modify the service
         $provider->serviceModify($tenantId, $userId, $service);