diff --git a/src/Spryker/Client/Customer/Zed/CustomerStub.php b/src/Spryker/Client/Customer/Zed/CustomerStub.php
index 817e2dc4..5a68e4e1 100644
--- a/src/Spryker/Client/Customer/Zed/CustomerStub.php
+++ b/src/Spryker/Client/Customer/Zed/CustomerStub.php
@@ -30,7 +30,7 @@ public function __construct(ZedRequestClient $zedStub)
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerResponseTransfer
+     * @return \Generated\Shared\Transfer\CustomerResponseTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function hasCustomerWithEmailAndPassword(CustomerTransfer $customerTransfer)
     {
@@ -40,7 +40,7 @@ public function hasCustomerWithEmailAndPassword(CustomerTransfer $customerTransf
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerResponseTransfer
+     * @return \Generated\Shared\Transfer\CustomerResponseTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function sendPasswordRestoreMail(CustomerTransfer $customerTransfer)
     {
@@ -50,7 +50,7 @@ public function sendPasswordRestoreMail(CustomerTransfer $customerTransfer)
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerResponseTransfer
+     * @return \Generated\Shared\Transfer\CustomerResponseTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function restorePassword(CustomerTransfer $customerTransfer)
     {
@@ -60,7 +60,7 @@ public function restorePassword(CustomerTransfer $customerTransfer)
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerTransfer
+     * @return \Generated\Shared\Transfer\CustomerTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function confirmRegistration(CustomerTransfer $customerTransfer)
     {
@@ -70,7 +70,7 @@ public function confirmRegistration(CustomerTransfer $customerTransfer)
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerResponseTransfer
+     * @return \Generated\Shared\Transfer\CustomerResponseTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function register(CustomerTransfer $customerTransfer)
     {
@@ -80,7 +80,7 @@ public function register(CustomerTransfer $customerTransfer)
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerTransfer
+     * @return \Generated\Shared\Transfer\CustomerTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function get(CustomerTransfer $customerTransfer)
     {
@@ -90,7 +90,7 @@ public function get(CustomerTransfer $customerTransfer)
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerResponseTransfer
+     * @return \Generated\Shared\Transfer\CustomerResponseTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function update(CustomerTransfer $customerTransfer)
     {
@@ -100,7 +100,7 @@ public function update(CustomerTransfer $customerTransfer)
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerResponseTransfer
+     * @return \Generated\Shared\Transfer\CustomerResponseTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function updatePassword(CustomerTransfer $customerTransfer)
     {
@@ -110,7 +110,7 @@ public function updatePassword(CustomerTransfer $customerTransfer)
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Spryker\Client\ZedRequest\Client\Response
+     * @return \Spryker\Client\ZedRequest\Client\Response|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function delete(CustomerTransfer $customerTransfer)
     {
@@ -120,7 +120,7 @@ public function delete(CustomerTransfer $customerTransfer)
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $addressTransfer
      *
-     * @return \Generated\Shared\Transfer\AddressTransfer
+     * @return \Generated\Shared\Transfer\AddressTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function createAddress(AddressTransfer $addressTransfer)
     {
@@ -130,7 +130,7 @@ public function createAddress(AddressTransfer $addressTransfer)
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $addressTransfer
      *
-     * @return \Generated\Shared\Transfer\AddressTransfer
+     * @return \Generated\Shared\Transfer\AddressTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function updateAddress(AddressTransfer $addressTransfer)
     {
@@ -140,7 +140,7 @@ public function updateAddress(AddressTransfer $addressTransfer)
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $addressTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerTransfer
+     * @return \Generated\Shared\Transfer\CustomerTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function updateAddressAndCustomerDefaultAddresses(AddressTransfer $addressTransfer)
     {
@@ -150,7 +150,7 @@ public function updateAddressAndCustomerDefaultAddresses(AddressTransfer $addres
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $addressTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerTransfer
+     * @return \Generated\Shared\Transfer\CustomerTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function createAddressAndUpdateCustomerDefaultAddresses(AddressTransfer $addressTransfer)
     {
@@ -160,7 +160,7 @@ public function createAddressAndUpdateCustomerDefaultAddresses(AddressTransfer $
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $addressTransfer
      *
-     * @return \Generated\Shared\Transfer\AddressTransfer
+     * @return \Generated\Shared\Transfer\AddressTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function getAddress(AddressTransfer $addressTransfer)
     {
@@ -170,7 +170,7 @@ public function getAddress(AddressTransfer $addressTransfer)
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\AddressesTransfer
+     * @return \Generated\Shared\Transfer\AddressesTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function getAddresses(CustomerTransfer $customerTransfer)
     {
@@ -180,7 +180,7 @@ public function getAddresses(CustomerTransfer $customerTransfer)
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $AddressTransfer
      *
-     * @return \Generated\Shared\Transfer\AddressTransfer
+     * @return \Generated\Shared\Transfer\AddressTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function deleteAddress(AddressTransfer $AddressTransfer)
     {
@@ -190,7 +190,7 @@ public function deleteAddress(AddressTransfer $AddressTransfer)
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $AddressTransfer
      *
-     * @return \Generated\Shared\Transfer\AddressTransfer
+     * @return \Generated\Shared\Transfer\AddressTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function setDefaultBillingAddress(AddressTransfer $AddressTransfer)
     {
@@ -200,7 +200,7 @@ public function setDefaultBillingAddress(AddressTransfer $AddressTransfer)
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $AddressTransfer
      *
-     * @return \Generated\Shared\Transfer\AddressTransfer
+     * @return \Generated\Shared\Transfer\AddressTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function setDefaultShippingAddress(AddressTransfer $AddressTransfer)
     {
@@ -210,7 +210,7 @@ public function setDefaultShippingAddress(AddressTransfer $AddressTransfer)
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Spryker\Shared\Kernel\Transfer\TransferInterface
+     * @return \Generated\Shared\Transfer\CustomerTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function anonymizeCustomer(CustomerTransfer $customerTransfer)
     {
diff --git a/src/Spryker/Client/Customer/Zed/CustomerStubInterface.php b/src/Spryker/Client/Customer/Zed/CustomerStubInterface.php
index d9b742f9..72f1ef1d 100644
--- a/src/Spryker/Client/Customer/Zed/CustomerStubInterface.php
+++ b/src/Spryker/Client/Customer/Zed/CustomerStubInterface.php
@@ -16,133 +16,133 @@ interface CustomerStubInterface
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerResponseTransfer
+     * @return \Generated\Shared\Transfer\CustomerResponseTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function hasCustomerWithEmailAndPassword(CustomerTransfer $customerTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerResponseTransfer
+     * @return \Generated\Shared\Transfer\CustomerResponseTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function sendPasswordRestoreMail(CustomerTransfer $customerTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerResponseTransfer
+     * @return \Generated\Shared\Transfer\CustomerResponseTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function restorePassword(CustomerTransfer $customerTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerTransfer
+     * @return \Generated\Shared\Transfer\CustomerTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function confirmRegistration(CustomerTransfer $customerTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerResponseTransfer
+     * @return \Generated\Shared\Transfer\CustomerResponseTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function register(CustomerTransfer $customerTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerTransfer
+     * @return \Generated\Shared\Transfer\CustomerTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function get(CustomerTransfer $customerTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerResponseTransfer
+     * @return \Generated\Shared\Transfer\CustomerResponseTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function update(CustomerTransfer $customerTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerResponseTransfer
+     * @return \Generated\Shared\Transfer\CustomerResponseTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function updatePassword(CustomerTransfer $customerTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Spryker\Client\ZedRequest\Client\Response
+     * @return \Spryker\Client\ZedRequest\Client\Response|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function delete(CustomerTransfer $customerTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $addressTransfer
      *
-     * @return \Generated\Shared\Transfer\AddressTransfer
+     * @return \Generated\Shared\Transfer\AddressTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function createAddress(AddressTransfer $addressTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $addressTransfer
      *
-     * @return \Generated\Shared\Transfer\AddressTransfer
+     * @return \Generated\Shared\Transfer\AddressTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function updateAddress(AddressTransfer $addressTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $addressTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerTransfer
+     * @return \Generated\Shared\Transfer\CustomerTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function updateAddressAndCustomerDefaultAddresses(AddressTransfer $addressTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $addressTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerTransfer
+     * @return \Generated\Shared\Transfer\CustomerTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function createAddressAndUpdateCustomerDefaultAddresses(AddressTransfer $addressTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $addressTransfer
      *
-     * @return \Generated\Shared\Transfer\AddressTransfer
+     * @return \Generated\Shared\Transfer\AddressTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function getAddress(AddressTransfer $addressTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\AddressesTransfer
+     * @return \Generated\Shared\Transfer\AddressesTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function getAddresses(CustomerTransfer $customerTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $addressTransfer
      *
-     * @return \Generated\Shared\Transfer\AddressTransfer
+     * @return \Generated\Shared\Transfer\AddressTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function deleteAddress(AddressTransfer $addressTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $AddressTransfer
      *
-     * @return \Generated\Shared\Transfer\AddressTransfer
+     * @return \Generated\Shared\Transfer\AddressTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function setDefaultBillingAddress(AddressTransfer $AddressTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\AddressTransfer $AddressTransfer
      *
-     * @return \Generated\Shared\Transfer\AddressTransfer
+     * @return \Generated\Shared\Transfer\AddressTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function setDefaultShippingAddress(AddressTransfer $AddressTransfer);
 
     /**
      * @param \Generated\Shared\Transfer\CustomerTransfer $customerTransfer
      *
-     * @return \Generated\Shared\Transfer\CustomerTransfer
+     * @return \Generated\Shared\Transfer\CustomerTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
      */
     public function anonymizeCustomer(CustomerTransfer $customerTransfer);