diff --git a/src/App/Users/Resources/UserResource.php b/src/App/Users/Resources/UserResource.php
index efd0b446..4ee8b077 100644
--- a/src/App/Users/Resources/UserResource.php
+++ b/src/App/Users/Resources/UserResource.php
@@ -3,7 +3,6 @@
 namespace App\Users\Resources;
 
 use App\Users\Actions\FormatUsageEstimatesAction;
-use ByteUnits\Metric;
 use Domain\Folders\Resources\FolderCollection;
 use VueFileManager\Subscription\Domain\Usage\Actions\SumUsageForCurrentPeriodAction;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/src/Support/Listeners/SubscriptionEventSubscriber.php b/src/Support/Listeners/SubscriptionEventSubscriber.php
index e859dacf..b1f5da27 100644
--- a/src/Support/Listeners/SubscriptionEventSubscriber.php
+++ b/src/Support/Listeners/SubscriptionEventSubscriber.php
@@ -11,16 +11,16 @@ class SubscriptionEventSubscriber
     public function handleSubscriptionWasCreated($event)
     {
         $event->subscription->user->limitations()->update([
-            'max_storage_amount' => $event->subscription->feature('max_storage_amount'),
-            'max_team_members'   => $event->subscription->feature('max_team_members'),
+            'max_storage_amount' => $event->subscription->fixedFeature('max_storage_amount'),
+            'max_team_members'   => $event->subscription->fixedFeature('max_team_members'),
         ]);
     }
 
     public function handleSubscriptionWasUpdated($event)
     {
         $event->subscription->user->limitations()->update([
-            'max_storage_amount' => $event->subscription->feature('max_storage_amount'),
-            'max_team_members'   => $event->subscription->feature('max_team_members'),
+            'max_storage_amount' => $event->subscription->fixedFeature('max_storage_amount'),
+            'max_team_members'   => $event->subscription->fixedFeature('max_team_members'),
         ]);
     }
 
diff --git a/tests/App/Users/UserSubscriptionTest.php b/tests/App/Users/UserSubscriptionTest.php
index 0d2e3a0a..587d5767 100644
--- a/tests/App/Users/UserSubscriptionTest.php
+++ b/tests/App/Users/UserSubscriptionTest.php
@@ -6,9 +6,7 @@ use App\Users\Actions\FormatUsageEstimatesAction;
 use Tests\TestCase;
 use App\Users\Models\User;
 use VueFileManager\Subscription\Domain\Plans\Models\Plan;
-use VueFileManager\Subscription\Domain\Plans\Models\PlanFeature;
-use VueFileManager\Subscription\Domain\Plans\Models\PlanMeteredFeature;
-use VueFileManager\Subscription\Domain\Subscriptions\Models\Subscription;
+use VueFileManager\Subscription\Domain\Plans\Models\PlanFixedFeature;
 use VueFileManager\Subscription\Support\Events\SubscriptionWasCreated;
 use VueFileManager\Subscription\Support\Events\SubscriptionWasExpired;
 use VueFileManager\Subscription\Support\Events\SubscriptionWasUpdated;
@@ -21,7 +19,7 @@ class UserSubscriptionTest extends TestCase
     public function it_set_user_limitations_for_new_subscription()
     {
         $plan = Plan::factory()
-            ->has(PlanFeature::factory()
+            ->has(PlanFixedFeature::factory()
                 ->count(2)
                 ->sequence(
                     [
@@ -32,7 +30,7 @@ class UserSubscriptionTest extends TestCase
                         'key'   => 'max_team_members',
                         'value' => 20,
                     ],
-                ), 'features')
+                ), 'fixedFeatures')
             ->create();
 
         $user = User::factory()
@@ -55,7 +53,7 @@ class UserSubscriptionTest extends TestCase
     public function it_set_user_limitations_for_updated_subscription()
     {
         $plan = Plan::factory()
-            ->has(PlanFeature::factory()
+            ->has(PlanFixedFeature::factory()
                 ->count(2)
                 ->sequence(
                     [
@@ -66,7 +64,7 @@ class UserSubscriptionTest extends TestCase
                         'key'   => 'max_team_members',
                         'value' => 20,
                     ],
-                ), 'features')
+                ), 'fixedFeatures')
             ->create();
 
         $user = User::factory()