diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 69afa0a..38c065e 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -6,24 +6,6 @@ parameters:
 			count: 1
 			path: app/Actions/CreateBucketAction.php
 
-		-
-			message: '#^Access to undefined constant App\\Models\\Bucket\:\:TYPE_FIXED_LIMIT\.$#'
-			identifier: classConstant.notFound
-			count: 2
-			path: app/Http/Controllers/BucketController.php
-
-		-
-			message: '#^Access to undefined constant App\\Models\\Bucket\:\:TYPE_PERCENTAGE\.$#'
-			identifier: classConstant.notFound
-			count: 2
-			path: app/Http/Controllers/BucketController.php
-
-		-
-			message: '#^Access to undefined constant App\\Models\\Bucket\:\:TYPE_UNLIMITED\.$#'
-			identifier: classConstant.notFound
-			count: 3
-			path: app/Http/Controllers/BucketController.php
-
 		-
 			message: '#^Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany\:\:orderedBySortOrder\(\)\.$#'
 			identifier: method.notFound
@@ -145,7 +127,13 @@ parameters:
 			path: app/Http/Resources/BucketResource.php
 
 		-
-			message: '#^Access to an undefined property App\\Http\\Resources\\BucketResource\:\:\$id\.$#'
+			message: '#^Access to an undefined property App\\Http\\Resources\\BucketResource\:\:\$type\.$#'
+			identifier: property.notFound
+			count: 2
+			path: app/Http/Resources/BucketResource.php
+
+		-
+			message: '#^Access to an undefined property App\\Http\\Resources\\BucketResource\:\:\$uuid\.$#'
 			identifier: property.notFound
 			count: 1
 			path: app/Http/Resources/BucketResource.php
@@ -205,7 +193,7 @@ parameters:
 			path: app/Http/Resources/DrawResource.php
 
 		-
-			message: '#^Access to an undefined property App\\Http\\Resources\\DrawResource\:\:\$bucket_id\.$#'
+			message: '#^Access to an undefined property App\\Http\\Resources\\DrawResource\:\:\$bucket\.$#'
 			identifier: property.notFound
 			count: 1
 			path: app/Http/Resources/DrawResource.php
@@ -229,7 +217,7 @@ parameters:
 			path: app/Http/Resources/DrawResource.php
 
 		-
-			message: '#^Access to an undefined property App\\Http\\Resources\\DrawResource\:\:\$id\.$#'
+			message: '#^Access to an undefined property App\\Http\\Resources\\DrawResource\:\:\$uuid\.$#'
 			identifier: property.notFound
 			count: 1
 			path: app/Http/Resources/DrawResource.php
@@ -265,7 +253,7 @@ parameters:
 			path: app/Http/Resources/InflowResource.php
 
 		-
-			message: '#^Access to an undefined property App\\Http\\Resources\\InflowResource\:\:\$id\.$#'
+			message: '#^Access to an undefined property App\\Http\\Resources\\InflowResource\:\:\$uuid\.$#'
 			identifier: property.notFound
 			count: 1
 			path: app/Http/Resources/InflowResource.php
@@ -277,7 +265,7 @@ parameters:
 			path: app/Http/Resources/InflowResource.php
 
 		-
-			message: '#^Access to an undefined property App\\Http\\Resources\\InflowResource\:\:\$stream_id\.$#'
+			message: '#^Access to an undefined property App\\Http\\Resources\\InflowResource\:\:\$stream\.$#'
 			identifier: property.notFound
 			count: 1
 			path: app/Http/Resources/InflowResource.php
@@ -289,7 +277,7 @@ parameters:
 			path: app/Http/Resources/OutflowResource.php
 
 		-
-			message: '#^Access to an undefined property App\\Http\\Resources\\OutflowResource\:\:\$bucket_id\.$#'
+			message: '#^Access to an undefined property App\\Http\\Resources\\OutflowResource\:\:\$bucket\.$#'
 			identifier: property.notFound
 			count: 1
 			path: app/Http/Resources/OutflowResource.php
@@ -313,7 +301,7 @@ parameters:
 			path: app/Http/Resources/OutflowResource.php
 
 		-
-			message: '#^Access to an undefined property App\\Http\\Resources\\OutflowResource\:\:\$id\.$#'
+			message: '#^Access to an undefined property App\\Http\\Resources\\OutflowResource\:\:\$uuid\.$#'
 			identifier: property.notFound
 			count: 1
 			path: app/Http/Resources/OutflowResource.php
@@ -325,7 +313,7 @@ parameters:
 			path: app/Http/Resources/OutflowResource.php
 
 		-
-			message: '#^Access to an undefined property App\\Http\\Resources\\OutflowResource\:\:\$stream_id\.$#'
+			message: '#^Access to an undefined property App\\Http\\Resources\\OutflowResource\:\:\$stream\.$#'
 			identifier: property.notFound
 			count: 1
 			path: app/Http/Resources/OutflowResource.php
@@ -343,7 +331,7 @@ parameters:
 			path: app/Http/Resources/ScenarioResource.php
 
 		-
-			message: '#^Access to an undefined property App\\Http\\Resources\\ScenarioResource\:\:\$id\.$#'
+			message: '#^Access to an undefined property App\\Http\\Resources\\ScenarioResource\:\:\$uuid\.$#'
 			identifier: property.notFound
 			count: 1
 			path: app/Http/Resources/ScenarioResource.php
@@ -369,13 +357,7 @@ parameters:
 		-
 			message: '#^Access to an undefined property App\\Http\\Resources\\StreamResource\:\:\$bucket\.$#'
 			identifier: property.notFound
-			count: 1
-			path: app/Http/Resources/StreamResource.php
-
-		-
-			message: '#^Access to an undefined property App\\Http\\Resources\\StreamResource\:\:\$bucket_id\.$#'
-			identifier: property.notFound
-			count: 1
+			count: 2
 			path: app/Http/Resources/StreamResource.php
 
 		-
@@ -397,7 +379,7 @@ parameters:
 			path: app/Http/Resources/StreamResource.php
 
 		-
-			message: '#^Access to an undefined property App\\Http\\Resources\\StreamResource\:\:\$id\.$#'
+			message: '#^Access to an undefined property App\\Http\\Resources\\StreamResource\:\:\$uuid\.$#'
 			identifier: property.notFound
 			count: 1
 			path: app/Http/Resources/StreamResource.php
@@ -600,6 +582,12 @@ parameters:
 			count: 2
 			path: app/Services/Streams/StatsService.php
 
+		-
+			message: '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model\:\:\$type\.$#'
+			identifier: property.notFound
+			count: 3
+			path: tests/Unit/Actions/CreateBucketActionTest.php
+
 		-
 			message: '#^Access to an undefined property Illuminate\\Database\\Eloquent\\Model\:\:\$allocation_type\.$#'
 			identifier: property.notFound