diff --git a/src/Attribute.php b/src/Attribute.php
index c50cab75..49df4ed9 100644
--- a/src/Attribute.php
+++ b/src/Attribute.php
@@ -19,6 +19,11 @@
  * Class Attribute
  *
  * @package Webklex\PHPIMAP
+ *
+ * @implements ArrayAccess<TKey, TValue>
+ *
+ * @template TKey of array-key
+ * @template TValue
  */
 class Attribute implements ArrayAccess {
 
@@ -28,14 +33,14 @@ class Attribute implements ArrayAccess {
     /**
      * Value holder
      *
-     * @var array $values
+     * @var array<TKey, TValue> $values
      */
     protected array $values = [];
 
     /**
      * Attribute constructor.
      * @param string $name
-     * @param mixed|null $value
+     * @param TValue|TValue[]|null $value
      */
     public function __construct(string $name, mixed $value = null) {
         $this->setName($name);
@@ -57,7 +62,7 @@ public function __invoke(): array|string {
     /**
      * Return the serialized address
      *
-     * @return array
+     * @return array<TKey, TValue>
      */
     public function __serialize(){
         return $this->values;
@@ -84,7 +89,7 @@ public function toString(): string {
     /**
      * Convert instance to array
      *
-     * @return array
+     * @return array<TKey, TValue>
      */
     public function toArray(): array {
         return $this->__serialize();
@@ -105,7 +110,7 @@ public function toDate(): Carbon {
     /**
      * Determine if a value exists at a given key.
      *
-     * @param int|string $key
+     * @param TKey $key
      * @return bool
      */
     public function has(mixed $key = 0): bool {
@@ -115,7 +120,7 @@ public function has(mixed $key = 0): bool {
     /**
      * Determine if a value exists at a given key.
      *
-     * @param int|string $key
+     * @param TKey $key
      * @return bool
      */
     public function exist(mixed $key = 0): bool {
@@ -135,19 +140,20 @@ public function contains(mixed $value): bool {
     /**
      * Get a value by a given key.
      *
-     * @param int|string $key
-     * @return mixed
+     * @param TKey $key
+     *
+     * @return TValue|null
      */
-    public function get(int|string $key = 0): mixed {
+    public function get(int|string $key = 0) {
         return $this->values[$key] ?? null;
     }
 
     /**
      * Set the value by a given key.
      *
-     * @param mixed $key
-     * @param mixed $value
-     * @return Attribute
+     * @param TKey $key
+     * @param TValue $value
+     * @return $this
      */
     public function set(mixed $value, mixed $key = 0): Attribute {
         if (is_null($key)) {
@@ -161,8 +167,8 @@ public function set(mixed $value, mixed $key = 0): Attribute {
     /**
      * Unset a value by a given key.
      *
-     * @param int|string $key
-     * @return Attribute
+     * @param TKey $key
+     * @return $this
      */
     public function remove(int|string $key = 0): Attribute {
         if (isset($this->values[$key])) {
@@ -173,10 +179,10 @@ public function remove(int|string $key = 0): Attribute {
 
     /**
      * Add one or more values to the attribute
-     * @param array|mixed $value
+     * @param TValue|TValue[]|null $value
      * @param boolean $strict
      *
-     * @return Attribute
+     * @return $this
      */
     public function add(mixed $value, bool $strict = false): Attribute {
         if (is_array($value)) {
@@ -190,10 +196,10 @@ public function add(mixed $value, bool $strict = false): Attribute {
 
     /**
      * Merge a given array of values with the current values array
-     * @param array $values
+     * @param TValue[] $values
      * @param boolean $strict
      *
-     * @return Attribute
+     * @return $this
      */
     public function merge(array $values, bool $strict = false): Attribute {
         foreach ($values as $value) {
@@ -205,9 +211,9 @@ public function merge(array $values, bool $strict = false): Attribute {
 
     /**
      * Attach a given value to the current value array
-     * @param $value
+     * @param TValue $value
      * @param bool $strict
-     * @return Attribute
+     * @return $this
      */
     public function attach($value, bool $strict = false): Attribute {
         if ($strict === true) {
@@ -224,7 +230,7 @@ public function attach($value, bool $strict = false): Attribute {
      * Set the attribute name
      * @param $name
      *
-     * @return Attribute
+     * @return $this
      */
     public function setName($name): Attribute {
         $this->name = $name;
@@ -244,7 +250,7 @@ public function getName(): string {
     /**
      * Get all values
      *
-     * @return array
+     * @return array<TKey, TValue>
      */
     public function all(): array {
         reset($this->values);
@@ -254,7 +260,7 @@ public function all(): array {
     /**
      * Get the first value if possible
      *
-     * @return mixed|null
+     * @return TValue|null
      */
     public function first(): mixed {
         return reset($this->values);
@@ -263,7 +269,7 @@ public function first(): mixed {
     /**
      * Get the last value if possible
      *
-     * @return mixed|null
+     * @return TValue|null
      */
     public function last(): mixed {
         return end($this->values);
@@ -280,7 +286,7 @@ public function count(): int {
 
     /**
      * @see  ArrayAccess::offsetExists
-     * @param mixed $offset
+     * @param TKey $offset
      * @return bool
      */
     public function offsetExists(mixed $offset): bool {
@@ -289,8 +295,8 @@ public function offsetExists(mixed $offset): bool {
 
     /**
      * @see  ArrayAccess::offsetGet
-     * @param mixed $offset
-     * @return mixed
+     * @param TKey $offset
+     * @return TValue|null
      */
     public function offsetGet(mixed $offset): mixed {
         return $this->get($offset);
@@ -298,8 +304,8 @@ public function offsetGet(mixed $offset): mixed {
 
     /**
      * @see  ArrayAccess::offsetSet
-     * @param mixed $offset
-     * @param mixed $value
+     * @param TKey $offset
+     * @param TValue $value
      * @return void
      */
     public function offsetSet(mixed $offset, mixed $value): void {
@@ -308,7 +314,7 @@ public function offsetSet(mixed $offset, mixed $value): void {
 
     /**
      * @see  ArrayAccess::offsetUnset
-     * @param mixed $offset
+     * @param TKey $offset
      * @return void
      */
     public function offsetUnset(mixed $offset): void {
@@ -316,8 +322,9 @@ public function offsetUnset(mixed $offset): void {
     }
 
     /**
-     * @param callable $callback
-     * @return array
+     * @template TReturn
+     * @param callable(TValue):TReturn $callback
+     * @return array<TKey, TReturn>
      */
     public function map(callable $callback): array {
         return array_map($callback, $this->values);
diff --git a/src/Message.php b/src/Message.php
index 9d15a7b8..b5d9da49 100755
--- a/src/Message.php
+++ b/src/Message.php
@@ -51,37 +51,37 @@
  * @property integer $uid
  * @property integer $msgn
  * @property integer $size
- * @property Attribute $subject
- * @property Attribute $message_id
- * @property Attribute $message_no
- * @property Attribute $references
- * @property Attribute $date
- * @property Attribute $from
- * @property Attribute $to
- * @property Attribute $cc
- * @property Attribute $bcc
- * @property Attribute $reply_to
- * @property Attribute $in_reply_to
- * @property Attribute $sender
+ * @property Attribute<int, string> $subject
+ * @property Attribute<int, string> $message_id
+ * @property Attribute<int, int> $message_no
+ * @property Attribute<int, string> $references
+ * @property Attribute<int, \Carbon\Carbon> $date
+ * @property Attribute<int, Address> $from
+ * @property Attribute<int, Address> $to
+ * @property Attribute<int, Address> $cc
+ * @property Attribute<int, Address> $bcc
+ * @property Attribute<int, Address> $reply_to
+ * @property Attribute<int, string> $in_reply_to
+ * @property Attribute<int, Address> $sender
  *
  * @method integer getMsglist()
  * @method integer setMsglist($msglist)
  * @method integer getUid()
  * @method integer getMsgn()
  * @method integer getSize()
- * @method Attribute getPriority()
- * @method Attribute getSubject()
- * @method Attribute getMessageId()
- * @method Attribute getMessageNo()
- * @method Attribute getReferences()
- * @method Attribute getDate()
- * @method Attribute getFrom()
- * @method Attribute getTo()
- * @method Attribute getCc()
- * @method Attribute getBcc()
- * @method Attribute getReplyTo()
- * @method Attribute getInReplyTo()
- * @method Attribute getSender()
+ * @method Attribute<int, string|int> getPriority()
+ * @method Attribute<int, string> getSubject()
+ * @method Attribute<int, string> getMessageId()
+ * @method Attribute<int, int> getMessageNo()
+ * @method Attribute<int, string> getReferences()
+ * @method Attribute<int, \Carbon\Carbon> getDate()
+ * @method Attribute<int, Address> getFrom()
+ * @method Attribute<int, Address> getTo()
+ * @method Attribute<int, Address> getCc()
+ * @method Attribute<int, Address> getBcc()
+ * @method Attribute<int, Address> getReplyTo()
+ * @method Attribute<int, string> getInReplyTo()
+ * @method Attribute<int, Address> getSender()
  */
 class Message {
     use HasEvents;