diff --git a/Stdlib/Base/Address.php b/Stdlib/Base/Address.php
index 2dca46b28..a7dfcd21b 100644
--- a/Stdlib/Base/Address.php
+++ b/Stdlib/Base/Address.php
@@ -44,10 +44,10 @@ class Address implements \JsonSerializable
     /**
      * Location.
      *
-     * @var null|Location
+     * @var Location
      * @since 1.0.0
      */
-    private ?Location $location = null;
+    private Location $location;
 
     /**
      * Constructor.
@@ -150,6 +150,10 @@ class Address implements \JsonSerializable
      */
     public function toArray() : array
     {
-        return ['recipient' => $this->recipient, 'fao' => $this->fao, 'location' => $this->location->toArray()];
+        return [
+            'recipient' => $this->recipient,
+            'fao'       => $this->fao,
+            'location'  => $this->location->toArray()
+        ];
     }
 }
diff --git a/Stdlib/Base/Heap.php b/Stdlib/Base/Heap.php
new file mode 100644
index 000000000..e69de29bb