diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 39adf0661215..89ddd2afaac5 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -25,6 +25,7 @@
 use CodeIgniter\Entity\Cast\URICast;
 use CodeIgniter\Entity\Exceptions\CastException;
 use CodeIgniter\I18n\Time;
+use DateTime;
 use Exception;
 use JsonSerializable;
 use ReturnTypeWillChange;
@@ -147,7 +148,7 @@ public function fill(?array $data = null)
      *
      * @param bool $onlyChanged If true, only return values that have changed since object creation
      * @param bool $cast        If true, properties will be cast.
-     * @param bool $recursive   If true, inner entities will be casted as array as well.
+     * @param bool $recursive   If true, inner entities will be cast as array as well.
      */
     public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recursive = false): array
     {
@@ -189,7 +190,7 @@ public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recu
      * Returns the raw values of the current attributes.
      *
      * @param bool $onlyChanged If true, only return values that have changed since object creation
-     * @param bool $recursive   If true, inner entities will be casted as array as well.
+     * @param bool $recursive   If true, inner entities will be cast as array as well.
      */
     public function toRawArray(bool $onlyChanged = false, bool $recursive = false): array
     {
@@ -247,7 +248,7 @@ public function syncOriginal()
      * was created. Or, without a parameter, checks if any
      * properties have changed.
      *
-     * @param string $key
+     * @param string|null $key class property
      */
     public function hasChanged(?string $key = null): bool
     {
@@ -308,11 +309,11 @@ protected function mapProperty(string $key)
      * Converts the given string|timestamp|DateTime|Time instance
      * into the "CodeIgniter\I18n\Time" object.
      *
-     * @param mixed $value
+     * @param DateTime|float|int|string|Time $value
      *
      * @throws Exception
      *
-     * @return mixed|Time
+     * @return Time
      */
     protected function mutateDate($value)
     {
@@ -324,13 +325,13 @@ protected function mutateDate($value)
      * Add ? at the beginning of $type  (i.e. ?string) to get NULL
      * instead of casting $value if $value === null
      *
-     * @param mixed  $value     Attribute value
-     * @param string $attribute Attribute name
-     * @param string $method    Allowed to "get" and "set"
+     * @param bool|float|int|string|null $value     Attribute value
+     * @param string                     $attribute Attribute name
+     * @param string                     $method    Allowed to "get" and "set"
      *
      * @throws CastException
      *
-     * @return mixed
+     * @return array|bool|float|int|object|string|null
      */
     protected function castAs($value, string $attribute, string $method = 'get')
     {
@@ -424,7 +425,7 @@ public function cast(?bool $cast = null)
      *  $this->my_property = $p;
      *  $this->setMyProperty() = $p;
      *
-     * @param mixed|null $value
+     * @param array|bool|float|int|object|string|null $value
      *
      * @throws Exception
      *
@@ -470,8 +471,9 @@ public function __set(string $key, $value = null)
      *  $p = $this->getMyProperty()
      *
      * @throws Exception
+     * @params string $key class property
      *
-     * @return mixed
+     * @return array|bool|float|int|object|string|null
      */
     public function __get(string $key)
     {