diff --git a/rector.php b/rector.php
index 9e3df776..470afda2 100644
--- a/rector.php
+++ b/rector.php
@@ -22,5 +22,5 @@
         codeQuality: true,
     )
     ->withSets([
-        SetList::PHP_81,
+        SetList::PHP_82,
     ]);
diff --git a/src/Api/CustomModelTypeInterface.php b/src/Api/CustomModelTypeInterface.php
index ccbb5d4b..53cd01b6 100644
--- a/src/Api/CustomModelTypeInterface.php
+++ b/src/Api/CustomModelTypeInterface.php
@@ -8,9 +8,6 @@
 
 namespace Dbout\WpOrm\Api;
 
-/**
- * @since 3.0.0
- */
 interface CustomModelTypeInterface
 {
     /**
diff --git a/src/Api/WithMetaModelInterface.php b/src/Api/WithMetaModelInterface.php
index be0cee5a..7ae2ebcf 100644
--- a/src/Api/WithMetaModelInterface.php
+++ b/src/Api/WithMetaModelInterface.php
@@ -10,9 +10,6 @@
 
 use Dbout\WpOrm\MetaMappingConfig;
 
-/**
- * @since 3.0.0
- */
 interface WithMetaModelInterface
 {
     /**
diff --git a/src/Builders/AbstractWithMetaBuilder.php b/src/Builders/AbstractWithMetaBuilder.php
index 840e8048..d32b0cd8 100644
--- a/src/Builders/AbstractWithMetaBuilder.php
+++ b/src/Builders/AbstractWithMetaBuilder.php
@@ -16,9 +16,6 @@
 use Dbout\WpOrm\Orm\Database;
 use Illuminate\Database\Eloquent\Model;
 
-/**
- * @since 3.0.0
- */
 abstract class AbstractWithMetaBuilder extends AbstractBuilder
 {
     /**
diff --git a/src/Enums/PingStatus.php b/src/Enums/PingStatus.php
index 6bbb54c5..5d51a4d2 100644
--- a/src/Enums/PingStatus.php
+++ b/src/Enums/PingStatus.php
@@ -8,9 +8,6 @@
 
 namespace Dbout\WpOrm\Enums;
 
-/**
- * @since 3.0.0
- */
 enum PingStatus: string
 {
     case Closed = 'closed';
diff --git a/src/Enums/PostStatus.php b/src/Enums/PostStatus.php
index 20bdb391..7944b4b0 100644
--- a/src/Enums/PostStatus.php
+++ b/src/Enums/PostStatus.php
@@ -10,7 +10,6 @@
 
 /**
  * @see https://wordpress.org/documentation/article/post-status/
- * @since 3.0.0
  */
 enum PostStatus: string
 {
diff --git a/src/Enums/YesNo.php b/src/Enums/YesNo.php
index 0008ec76..a38d2d80 100644
--- a/src/Enums/YesNo.php
+++ b/src/Enums/YesNo.php
@@ -8,9 +8,6 @@
 
 namespace Dbout\WpOrm\Enums;
 
-/**
- * @since 3.0.0
- */
 enum YesNo: string
 {
     case Yes = 'yes';
diff --git a/src/Exceptions/CannotOverrideCustomTypeException.php b/src/Exceptions/CannotOverrideCustomTypeException.php
index af41501e..678532bc 100644
--- a/src/Exceptions/CannotOverrideCustomTypeException.php
+++ b/src/Exceptions/CannotOverrideCustomTypeException.php
@@ -8,9 +8,6 @@
 
 namespace Dbout\WpOrm\Exceptions;
 
-/**
- * @since 3.0.0
- */
 class CannotOverrideCustomTypeException extends NotAllowedException
 {
     /**
diff --git a/src/Exceptions/WpOrmException.php b/src/Exceptions/WpOrmException.php
index bd6bdf5f..a6e107e4 100644
--- a/src/Exceptions/WpOrmException.php
+++ b/src/Exceptions/WpOrmException.php
@@ -8,9 +8,6 @@
 
 namespace Dbout\WpOrm\Exceptions;
 
-/**
- * @since 3.0.0
- */
 class WpOrmException extends \Exception
 {
 }
diff --git a/src/MetaMappingConfig.php b/src/MetaMappingConfig.php
index d03d25d9..bc3d60b7 100644
--- a/src/MetaMappingConfig.php
+++ b/src/MetaMappingConfig.php
@@ -8,9 +8,6 @@
 
 namespace Dbout\WpOrm;
 
-/**
- * @since 3.0.0
- */
 class MetaMappingConfig
 {
     /**
diff --git a/src/Scopes/CustomModelTypeScope.php b/src/Scopes/CustomModelTypeScope.php
index cfd25088..f5486b4b 100644
--- a/src/Scopes/CustomModelTypeScope.php
+++ b/src/Scopes/CustomModelTypeScope.php
@@ -14,9 +14,6 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Scope;
 
-/**
- * @since 3.0.0
- */
 class CustomModelTypeScope implements Scope
 {
     /**
diff --git a/src/Taps/Attachment/IsMimeTypeTap.php b/src/Taps/Attachment/IsMimeTypeTap.php
index 5f9cf226..22b3ae97 100644
--- a/src/Taps/Attachment/IsMimeTypeTap.php
+++ b/src/Taps/Attachment/IsMimeTypeTap.php
@@ -11,16 +11,13 @@
 use Dbout\WpOrm\Builders\PostBuilder;
 use Dbout\WpOrm\Models\Post;
 
-/**
- * @since 3.0.0
- */
-class IsMimeTypeTap
+readonly class IsMimeTypeTap
 {
     /**
      * @param string $mimeType
      */
     public function __construct(
-        protected readonly string $mimeType
+        protected string $mimeType
     ) {
     }
 
diff --git a/src/Taps/Comment/IsApprovedTap.php b/src/Taps/Comment/IsApprovedTap.php
index 3b7a993e..88304ccd 100644
--- a/src/Taps/Comment/IsApprovedTap.php
+++ b/src/Taps/Comment/IsApprovedTap.php
@@ -11,16 +11,13 @@
 use Dbout\WpOrm\Builders\CommentBuilder;
 use Dbout\WpOrm\Models\Comment;
 
-/**
- * @since 3.0.0
- */
-class IsApprovedTap
+readonly class IsApprovedTap
 {
     /**
      * @param bool $isApproved
      */
     public function __construct(
-        protected readonly bool $isApproved = true
+        protected bool $isApproved = true
     ) {
     }
 
diff --git a/src/Taps/Comment/IsCommentTypeTap.php b/src/Taps/Comment/IsCommentTypeTap.php
index 65ed6c0d..2361f2a5 100644
--- a/src/Taps/Comment/IsCommentTypeTap.php
+++ b/src/Taps/Comment/IsCommentTypeTap.php
@@ -11,16 +11,13 @@
 use Dbout\WpOrm\Builders\CommentBuilder;
 use Dbout\WpOrm\Models\Comment;
 
-/**
- * @since 3.0.0
- */
-class IsCommentTypeTap
+readonly class IsCommentTypeTap
 {
     /**
      * @param string $commentType
      */
     public function __construct(
-        protected readonly string $commentType
+        protected string $commentType
     ) {
     }
 
diff --git a/src/Taps/Comment/IsUserTap.php b/src/Taps/Comment/IsUserTap.php
index a0f282b8..4047dda2 100644
--- a/src/Taps/Comment/IsUserTap.php
+++ b/src/Taps/Comment/IsUserTap.php
@@ -12,16 +12,13 @@
 use Dbout\WpOrm\Models\Comment;
 use Dbout\WpOrm\Models\User;
 
-/**
- * @since 3.0.0
- */
-class IsUserTap
+readonly class IsUserTap
 {
     /**
      * @param int|User $user
      */
     public function __construct(
-        protected readonly int|User $user
+        protected int|User $user
     ) {
     }
 
diff --git a/src/Taps/Option/IsAutoloadTap.php b/src/Taps/Option/IsAutoloadTap.php
index 04e07d13..d1dbbc96 100644
--- a/src/Taps/Option/IsAutoloadTap.php
+++ b/src/Taps/Option/IsAutoloadTap.php
@@ -12,13 +12,10 @@
 use Dbout\WpOrm\Enums\YesNo;
 use Dbout\WpOrm\Models\Option;
 
-/**
- * @since 3.0.0
- */
-class IsAutoloadTap
+readonly class IsAutoloadTap
 {
     public function __construct(
-        protected readonly bool|YesNo $autoload = YesNo::Yes
+        protected bool|YesNo $autoload = YesNo::Yes
     ) {
     }
 
diff --git a/src/Taps/Post/IsAuthorTap.php b/src/Taps/Post/IsAuthorTap.php
index c3bd9097..5cd77169 100644
--- a/src/Taps/Post/IsAuthorTap.php
+++ b/src/Taps/Post/IsAuthorTap.php
@@ -12,10 +12,7 @@
 use Dbout\WpOrm\Models\Post;
 use Dbout\WpOrm\Models\User;
 
-/**
- * @since 3.0.0
- */
-class IsAuthorTap
+readonly class IsAuthorTap
 {
     /**
      * @param int|User $author
diff --git a/src/Taps/Post/IsPingStatusTap.php b/src/Taps/Post/IsPingStatusTap.php
index 1ba0285d..58af760a 100644
--- a/src/Taps/Post/IsPingStatusTap.php
+++ b/src/Taps/Post/IsPingStatusTap.php
@@ -12,16 +12,13 @@
 use Dbout\WpOrm\Enums\PingStatus;
 use Dbout\WpOrm\Models\Post;
 
-/**
- * @since 3.0.0
- */
-class IsPingStatusTap
+readonly class IsPingStatusTap
 {
     /**
      * @param string|PingStatus $status
      */
     public function __construct(
-        protected readonly string|PingStatus $status
+        protected string|PingStatus $status
     ) {
     }
 
diff --git a/src/Taps/Post/IsPostTypeTap.php b/src/Taps/Post/IsPostTypeTap.php
index c92de421..11af5abc 100644
--- a/src/Taps/Post/IsPostTypeTap.php
+++ b/src/Taps/Post/IsPostTypeTap.php
@@ -11,16 +11,13 @@
 use Dbout\WpOrm\Builders\PostBuilder;
 use Dbout\WpOrm\Models\Post;
 
-/**
- * @since 3.0.0
- */
-class IsPostTypeTap
+readonly class IsPostTypeTap
 {
     /**
      * @param string $postType
      */
     public function __construct(
-        protected readonly string $postType
+        protected string $postType
     ) {
     }
 
diff --git a/src/Taps/Post/IsStatusTap.php b/src/Taps/Post/IsStatusTap.php
index e6322cc1..ee9ec2c0 100644
--- a/src/Taps/Post/IsStatusTap.php
+++ b/src/Taps/Post/IsStatusTap.php
@@ -12,16 +12,13 @@
 use Dbout\WpOrm\Enums\PostStatus;
 use Dbout\WpOrm\Models\Post;
 
-/**
- * @since 3.0.0
- */
-class IsStatusTap
+readonly class IsStatusTap
 {
     /**
      * @param string|PostStatus $status
      */
     public function __construct(
-        protected readonly string|PostStatus $status
+        protected string|PostStatus $status
     ) {
     }