diff --git a/CHANGELOG.md b/CHANGELOG.md
index afcfde3..54c21f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,30 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Removed
 
+## [1.19.0] - 2020-09-08
+
+### Added
+- added `src/SecucardConnect/Product/Smart/Model/BaseDeliveryOptions.php ` class
+- added `src/SecucardConnect/Product/Smart/Model/DeliveryOptionsCollection.php` class
+- added `src/SecucardConnect/Product/Smart/Model/DeliveryOptionsShipping.php` class
+- added `src/SecucardConnect/Product/Smart/Model/DeliveryOptionsTimeSlot.php` class
+- `src/SecucardConnect/Product/Smart/Model/Transaction.php` added `delivery_options` property
+- `src/SecucardConnect/Product/Smart/Model/Transaction.php` added `setDeliveryOptions` method
+
+### Changed
+- changed `src/SecucardConnect/Product/Smart/Model/DeliveryOptionsTimeSlot.php` const `ORDER_OPTION_COLLECTION` into `DELIVERY_OPTIONS_COLLECTION`
+- changed `src/SecucardConnect/Product/Smart/Model/DeliveryOptionsTimeSlot.php` const `ORDER_OPTION_SHIPPING` into `DELIVERY_OPTIONS_SHIPPING`
+
+### Removed
+- removed `src/SecucardConnect/Product/General/Model/BaseDeliveryConfiguration.php` class
+- removed `src/SecucardConnect/Product/General/Model/CheckoutOptions.php` class
+- removed `src/SecucardConnect/Product/General/Model/CollectionDeliveryConfiguration.php` class
+- removed `src/SecucardConnect/Product/General/Model/ShippingDeliveryConfiguration.php` class
+- removed `src/SecucardConnect/Product/General/Model/OrderOptions.php` class
+- removed `src/SecucardConnect/Product/Smart/Model/PickupOptions.php` class
+- `src/SecucardConnect/Product/General/Model/Merchant.php` removed `order_options` and `checkout_options` properties
+- `src/SecucardConnect/Product/Smart/Model/Transaction.php` removed `order_option` and `pickup_options` properties
+
 ## [1.18.0] - 2020-06-24
 
 ### Added
@@ -641,3 +665,4 @@ First release
 [1.17.0]:https://github.com/secucard/secucard-connect-php-sdk/compare/1.16.0...1.17.0
 [1.17.1]:https://github.com/secucard/secucard-connect-php-sdk/compare/1.17.0...1.17.1
 [1.18.0]:https://github.com/secucard/secucard-connect-php-sdk/compare/1.17.1...1.18.0
+[1.19.0]:https://github.com/secucard/secucard-connect-php-sdk/compare/1.18.0...1.19.0
diff --git a/composer.json b/composer.json
index 7eedf42..58936ad 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "description": "secucard connect PHP client SDK",
     "license": "Apache-2.0",
     "homepage": "https://github.com/secucard/secucard-connect-php-sdk",
-    "version": "1.18.0",
+    "version": "1.19.0",
     "require": {
         "php": ">=5.5.0",
         "guzzlehttp/guzzle": "~6.3",
diff --git a/src/SecucardConnect/Product/General/Model/BaseDeliveryConfiguration.php b/src/SecucardConnect/Product/General/Model/BaseDeliveryConfiguration.php
deleted file mode 100644
index bd73d7e..0000000
--- a/src/SecucardConnect/Product/General/Model/BaseDeliveryConfiguration.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-
-namespace SecucardConnect\Product\General\Model;
-
-
-/**
- * BaseDeliveryConfiguration Api Model class
- */
-class BaseDeliveryConfiguration
-{
-    /**
-     * @var bool
-     */
-    public $enabled;
-}
\ No newline at end of file
diff --git a/src/SecucardConnect/Product/General/Model/CheckoutOptions.php b/src/SecucardConnect/Product/General/Model/CheckoutOptions.php
deleted file mode 100644
index 10783cc..0000000
--- a/src/SecucardConnect/Product/General/Model/CheckoutOptions.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace SecucardConnect\Product\General\Model;
-
-/**
- * CheckoutOptions Api Model class
- */
-class CheckoutOptions
-{
-    /**
-     * @var array
-     */
-    public $shipping;
-
-    /**
-     * @var array
-     */
-    public $collection;
-}
-
diff --git a/src/SecucardConnect/Product/General/Model/CollectionDeliveryConfiguration.php b/src/SecucardConnect/Product/General/Model/CollectionDeliveryConfiguration.php
deleted file mode 100644
index 8558f3a..0000000
--- a/src/SecucardConnect/Product/General/Model/CollectionDeliveryConfiguration.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-
-namespace SecucardConnect\Product\General\Model;
-
-
-/**
- * CollectionDeliveryConfiguration Api Model class
- */
-class CollectionDeliveryConfiguration extends BaseDeliveryConfiguration
-{
-    /**
-     * @var string
-     */
-    public $preparation_time;
-
-    /**
-     * @var array
-     */
-    public $collection_hours;
-
-    /**
-     * @var string
-     */
-    public $store_id;
-}
\ No newline at end of file
diff --git a/src/SecucardConnect/Product/General/Model/Merchant.php b/src/SecucardConnect/Product/General/Model/Merchant.php
index e0732f1..c688138 100644
--- a/src/SecucardConnect/Product/General/Model/Merchant.php
+++ b/src/SecucardConnect/Product/General/Model/Merchant.php
@@ -23,11 +23,6 @@ class Merchant extends BaseModel
      */
     public $legal_details;
 
-    /**
-     * @var OrderOptions
-     */
-    public $order_options;
-
     /**
      * @var int[]
      */
@@ -37,9 +32,4 @@ class Merchant extends BaseModel
      * @var MerchantUrl[]
      */
     public $merchant_urls;
-
-    /**
-     * @var CheckoutOptions
-     */
-    public $checkout_options;
 }
diff --git a/src/SecucardConnect/Product/General/Model/OrderOptions.php b/src/SecucardConnect/Product/General/Model/OrderOptions.php
deleted file mode 100644
index 43c0cb2..0000000
--- a/src/SecucardConnect/Product/General/Model/OrderOptions.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-
-namespace SecucardConnect\Product\General\Model;
-
-
-/**
- * OrderOptions Api Model class
- */
-class OrderOptions
-{
-    /**
-     * @var ShippingDeliveryConfiguration
-     */
-    public $shipping;
-
-    /**
-     * @var CollectionDeliveryConfiguration
-     */
-    public $collection;
-}
\ No newline at end of file
diff --git a/src/SecucardConnect/Product/General/Model/ShippingDeliveryConfiguration.php b/src/SecucardConnect/Product/General/Model/ShippingDeliveryConfiguration.php
deleted file mode 100644
index 7e41b5b..0000000
--- a/src/SecucardConnect/Product/General/Model/ShippingDeliveryConfiguration.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-
-namespace SecucardConnect\Product\General\Model;
-
-
-/**
- * ShippingDeliveryConfiguration Api Model class
- */
-class ShippingDeliveryConfiguration extends BaseDeliveryConfiguration
-{
-
-}
\ No newline at end of file
diff --git a/src/SecucardConnect/Product/Smart/Model/BaseDeliveryOptions.php b/src/SecucardConnect/Product/Smart/Model/BaseDeliveryOptions.php
new file mode 100644
index 0000000..4708cc2
--- /dev/null
+++ b/src/SecucardConnect/Product/Smart/Model/BaseDeliveryOptions.php
@@ -0,0 +1,15 @@
+<?php
+
+
+namespace SecucardConnect\Product\Smart\Model;
+
+/**
+ * BaseDeliveryOptions Api Model class
+ */
+class BaseDeliveryOptions
+{
+    /**
+     * @var string
+     */
+    public $type;
+}
\ No newline at end of file
diff --git a/src/SecucardConnect/Product/Smart/Model/DeliveryOptionsCollection.php b/src/SecucardConnect/Product/Smart/Model/DeliveryOptionsCollection.php
new file mode 100644
index 0000000..e84234a
--- /dev/null
+++ b/src/SecucardConnect/Product/Smart/Model/DeliveryOptionsCollection.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace SecucardConnect\Product\Smart\Model;
+
+/**
+ * DeliveryOptionsCollection Api Model class
+ */
+class DeliveryOptionsCollection extends BaseDeliveryOptions
+{
+    /**
+     * @var string string
+     */
+    public $type = Transaction::DELIVERY_OPTIONS_COLLECTION;
+
+    /**
+     * @var string
+     */
+    public $store_id;
+
+    /**
+     * @var string
+     */
+    public $code;
+
+    /**
+     * @var DeliveryOptionsTimeSlot
+     */
+    public $scheduled_slot;
+
+    /**
+     * @var string
+     */
+    public $delivered_at;
+}
\ No newline at end of file
diff --git a/src/SecucardConnect/Product/Smart/Model/DeliveryOptionsShipping.php b/src/SecucardConnect/Product/Smart/Model/DeliveryOptionsShipping.php
new file mode 100644
index 0000000..6694fd0
--- /dev/null
+++ b/src/SecucardConnect/Product/Smart/Model/DeliveryOptionsShipping.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace SecucardConnect\Product\Smart\Model;
+
+/**
+ * DeliveryOptionsShipping Api Model class
+ */
+class DeliveryOptionsShipping extends BaseDeliveryOptions
+{
+    /**
+     * @var string
+     */
+    public $type = Transaction::DELIVERY_OPTIONS_SHIPPING;
+
+    /**
+     * @var string
+     */
+    public $shipped_at;
+
+    /**
+     * @var string
+     */
+    public $shipped_by;
+
+    /**
+     * @var string
+     */
+    public $tracking_code;
+
+    /**
+     * @var string
+     */
+    public $invoice_number;
+}
\ No newline at end of file
diff --git a/src/SecucardConnect/Product/Smart/Model/DeliveryOptionsTimeSlot.php b/src/SecucardConnect/Product/Smart/Model/DeliveryOptionsTimeSlot.php
new file mode 100644
index 0000000..6cfd237
--- /dev/null
+++ b/src/SecucardConnect/Product/Smart/Model/DeliveryOptionsTimeSlot.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace SecucardConnect\Product\Smart\Model;
+
+/**
+ * DeliveryOptionsTimeSlot Api Model class
+ */
+class DeliveryOptionsTimeSlot
+{
+    /**
+     * @var string
+     */
+    public $start_date;
+
+    /**
+     * @var string
+     */
+    public $end_date;
+}
\ No newline at end of file
diff --git a/src/SecucardConnect/Product/Smart/Model/PickupOptions.php b/src/SecucardConnect/Product/Smart/Model/PickupOptions.php
deleted file mode 100644
index e72700d..0000000
--- a/src/SecucardConnect/Product/Smart/Model/PickupOptions.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * PickupOptions Api Model class
- */
-namespace SecucardConnect\Product\Smart\Model;
-
-/**
- * PickupOptions Api Model class
- *
- */
-class PickupOptions
-{
-    /**
-     * @var string
-     */
-    public $code;
-
-    /**
-     * @var string
-     */
-    public $date;
-
-    /**
-     * @var \SecucardConnect\Product\General\Model\Store
-     */
-    public $store;
-}
diff --git a/src/SecucardConnect/Product/Smart/Model/Transaction.php b/src/SecucardConnect/Product/Smart/Model/Transaction.php
index bd4aa91..c251839 100644
--- a/src/SecucardConnect/Product/Smart/Model/Transaction.php
+++ b/src/SecucardConnect/Product/Smart/Model/Transaction.php
@@ -24,8 +24,8 @@ class Transaction extends BaseModel
     const STATUS_APPROVED = 'approved';
     const STATUS_OK = 'ok';
 
-    const ORDER_OPTION_COLLECTION = 'collection';
-    const ORDER_OPTION_SHIPPING = 'shipping';
+    const DELIVERY_OPTIONS_COLLECTION = 'collection';
+    const DELIVERY_OPTIONS_SHIPPING = 'shipping';
 
     const CHECKOUT_LAST_VISITED_PAGE_CHECKIN = 'checkin_page';
     const CHECKOUT_LAST_VISITED_PAGE_ADDRESS = 'address_page';
@@ -120,21 +120,11 @@ class Transaction extends BaseModel
      */
     public $payment_method;
 
-    /**
-     * @var string
-     */
-    public $order_option;
-
     /**
      * @var string
      */
     public $last_visited_page;
 
-    /**
-     * @var PickupOptions
-     */
-    public $pickup_options;
-
     /**
      * @var string
      */
@@ -190,6 +180,11 @@ class Transaction extends BaseModel
      */
     public $payment_links;
 
+    /**
+     * @var BaseDeliveryOptions
+     */
+    public $delivery_options;
+
     /**
      * @return array
      */
@@ -205,4 +200,26 @@ public function jsonFilterNullProperties()
             'error'
         ];
     }
+
+    /**
+     * @param array $payload
+     * @return $this
+     */
+    public function setDeliveryOptions(array $payload)
+    {
+        if (!isset($payload['type'])) {
+            return $this;
+        }
+
+        switch ($payload['type']) {
+            case self::DELIVERY_OPTIONS_SHIPPING:
+                $this->delivery_options = new DeliveryOptionsShipping();
+                break;
+            case self::DELIVERY_OPTIONS_COLLECTION:
+                $this->delivery_options = new DeliveryOptionsCollection();
+                break;
+        }
+
+        return $this;
+    }
 }
diff --git a/src/SecucardConnect/SecucardConnect.php b/src/SecucardConnect/SecucardConnect.php
index 0c169c1..78d60a8 100644
--- a/src/SecucardConnect/SecucardConnect.php
+++ b/src/SecucardConnect/SecucardConnect.php
@@ -33,7 +33,7 @@ final class SecucardConnect
     /**
      * SDK version
      */
-    const VERSION = '1.18.0';
+    const VERSION = '1.19.0';
 
     /**
      * @var OAuthProvider