diff --git a/src/Model/Request/SubModel/Content/Customer/Addresses.php b/src/Model/Request/SubModel/Content/Customer/Addresses.php
index deee21a..1702ee5 100755
--- a/src/Model/Request/SubModel/Content/Customer/Addresses.php
+++ b/src/Model/Request/SubModel/Content/Customer/Addresses.php
@@ -17,8 +17,7 @@
 use RatePAY\Model\Request\SubModel\Content\Customer\Addresses\Address;
 
 /**
- * @method $this     addAddress(Address $address)
- * @method Address[] getAddresses()
+ * @method $this addAddress(Address $address)
  */
 class Addresses extends AbstractModel
 {
@@ -47,4 +46,26 @@ class Addresses extends AbstractModel
             'multiple' => true,
         ],
     ];
+
+    /**
+     * @return Address[]
+     */
+    public function getAddresses()
+    {
+        return $this->__get('Address');
+    }
+
+    /**
+     * @return Address
+     */
+    public function getAddress($type)
+    {
+        foreach ($this->getAddresses() as $address) {
+            if (strtolower($address->getType()) === strtolower($type)) {
+                return $address;
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/src/Model/Request/SubModel/Content/ShoppingBasket/Items.php b/src/Model/Request/SubModel/Content/ShoppingBasket/Items.php
index e7d7089..874777f 100755
--- a/src/Model/Request/SubModel/Content/ShoppingBasket/Items.php
+++ b/src/Model/Request/SubModel/Content/ShoppingBasket/Items.php
@@ -17,8 +17,7 @@
 use RatePAY\Model\Request\SubModel\Content\ShoppingBasket\Items\Item;
 
 /**
- * @method $this  addItem(Item $item)
- * @method Item[] getItems()
+ * @method $this addItem(Item $item)
  */
 class Items extends AbstractModel
 {
@@ -76,4 +75,9 @@ protected function rule()
 
         return true;
     }
+
+    public function getItems()
+    {
+        return $this->__get('Item');
+    }
 }