diff --git a/Controller/Adminhtml/index/Ajax.php b/Controller/Adminhtml/index/Ajax.php
old mode 100755
new mode 100644
diff --git a/Controller/Adminhtml/index/Post.php b/Controller/Adminhtml/index/Post.php
old mode 100755
new mode 100644
diff --git a/Controller/Adminhtml/index/Sync.php b/Controller/Adminhtml/index/Sync.php
old mode 100755
new mode 100644
diff --git a/Controller/Index/Index.php b/Controller/Index/Index.php
index 3a09c89..8b4ea10 100644
--- a/Controller/Index/Index.php
+++ b/Controller/Index/Index.php
@@ -48,7 +48,7 @@ public function dubleoptinProcess($userEmail)
             $mailin = $this->_model->createObjMailin($apiKey);
 
             $data = array( "email" => $userEmail,
-                    "attributes" => array(),
+                    "attributes" => array("DOUBLE_OPT-IN"=>1),
                     "blacklisted" => 0,
                     "listid" => array($listId),
                     "listid_unlink" => array($optinListId),
diff --git a/Model/SendinblueSib.php b/Model/SendinblueSib.php
index d3b545c..96b852d 100644
--- a/Model/SendinblueSib.php
+++ b/Model/SendinblueSib.php
@@ -129,9 +129,6 @@ public function createNewList($response, $existList)
         ); 
         $listResp = $mailin->createList($data);
         $this->_resourceConfig->saveConfig('sendinblue/selected_list_data', trim($listResp['data']['id']), $this->_scopeTypeDefault, $this->_storeId);
-        //list id
-
-        $this->sendAllMailIDToSendin($listResp['data']['id']);
     }
 
 
@@ -400,7 +397,7 @@ public function checkFolderList()
     public function sendAllMailIDToSendin($listId)
     {
         $emailValue = $this->getSubscribeCustomer();
-        $baseUrl = $this->_storeManagerInterface->getStore()->getBaseUrl();
+        $mediaUrl = $this->_storeManagerInterface->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
         $apiKey = !empty($this->apiKey) ? $this->apiKey : $this->getDbData('api_key');
         if ($emailValue > 0 && !empty($apiKey)) {
             $this->updateDbData('import_old_user_status', 1);
@@ -408,7 +405,7 @@ public function sendAllMailIDToSendin($listId)
             $listIdVal = explode('|', $listId);
             $mailinObj = $this->createObjMailin($apiKey);
             $userDataInformation['key'] = $apiKey;
-            $userDataInformation['url'] = $baseUrl.'pub/media/sendinblue_csv/ImportSubUsersToSendinblue.csv';
+            $userDataInformation['url'] = $mediaUrl.'sendinblue_csv/ImportSubUsersToSendinblue.csv';
             $userDataInformation['listids'] = $listIdVal; // $list;
             $userDataInformation['notify_url'] = '';
             $responseValue = $mailinObj->importUsers($userDataInformation);
@@ -813,9 +810,9 @@ public function importOrderhistory()
             $userDataInformation = array();
             $listIdVal = explode('|', $listId);
             $mailinObj = $this->createObjMailin($apiKey);
-            $baseUrl = $this->_storeManagerInterface->getStore()->getBaseUrl();
+            $baseUrl = $this->_storeManagerInterface->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
             $userDataInformation['key'] = $apiKey;
-            $userDataInformation['url'] = $baseUrl.'pub/media/sendinblue_csv/ImportOldOrdersToSendinblue.csv';
+            $userDataInformation['url'] = $baseUrl.'sendinblue_csv/ImportOldOrdersToSendinblue.csv';
             $userDataInformation['listids'] = $listIdVal; // $list;
             $userDataInformation['notify_url'] = '';
             $responseValue = $mailinObj->importUsers($userDataInformation);
@@ -1118,11 +1115,11 @@ public function subscribeByruntime($userEmail, $updateDataInSib)
         $sendinConfirmType = $this->getDbData('confirm_type');
         if ($sendinConfirmType === 'doubleoptin') {
             $listId = $this->getDbData('optin_list_id');
+            $updateDataInSib['DOUBLE_OPT-IN'] = 2;
         } else {
             $listId = $this->getDbData('selected_list_data');
         }
 
-        
         $apiKey = trim($this->getDbData('api_key'));
         if (!empty($apiKey)) {
             $mailin = $this->createObjMailin($apiKey);
@@ -1326,11 +1323,17 @@ public function sendWsTemplateMail($to)
 
             $to = array($to => '');
             $from = array($senderEmail, $senderName);
+            $searchValue = "({{\s*doubleoptin\s*}})";
 
             $htmlContent = str_replace('{title}', $subject, $htmlContent);
             $htmlContent = str_replace('https://[DOUBLEOPTIN]', '{subscribe_url}', $htmlContent);
             $htmlContent = str_replace('http://[DOUBLEOPTIN]', '{subscribe_url}', $htmlContent);
+            $htmlContent = str_replace('https://{{doubleoptin}}', '{subscribe_url}', $htmlContent);
+            $htmlContent = str_replace('http://{{doubleoptin}}', '{subscribe_url}', $htmlContent);
+            $htmlContent = str_replace('https://{{ doubleoptin }}', '{subscribe_url}', $htmlContent);
+            $htmlContent = str_replace('http://{{ doubleoptin }}', '{subscribe_url}', $htmlContent);
             $htmlContent = str_replace('[DOUBLEOPTIN]', '{subscribe_url}', $htmlContent);
+            $htmlContent = preg_replace($searchValue, '{subscribe_url}', $htmlContent);
             $htmlContent = str_replace('{site_name}', $siteName, $htmlContent);
             $htmlContent = str_replace('{unsubscribe_url}', $pathResp, $htmlContent);
             $htmlContent = str_replace('{subscribe_url}', $pathResp, $htmlContent);
diff --git a/Model/Transport.php b/Model/Transport.php
index d25af5d..b81e65c 100644
--- a/Model/Transport.php
+++ b/Model/Transport.php
@@ -4,50 +4,59 @@
  */
 namespace Sendinblue\Sendinblue\Model;
 
-class Transport extends \Zend_Mail_Transport_Smtp implements \Magento\Framework\Mail\TransportInterface
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Mail\MessageInterface;
+use Zend\Mail\Message;
+use Zend\Mail\Transport\SmtpOptions;
+use Zend\Mail\Transport\Smtp;
+
+class Transport
 {
-    /**
-     * @var \Magento\Framework\Mail\MessageInterface
-     */
+    /** @var MessageInterface */
     protected $_message;
-    public $scopeConfig;
+    
+    /** @var Smtp|\Zend_Mail_Transport_Smtp **/
+    protected $transport;
+
+    
     /**
      * @param MessageInterface $message
      * @param null $parameters
      * @throws \InvalidArgumentException
      */
-    public function __construct(\Magento\Framework\Mail\MessageInterface $message,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-        )
-    {
-        if (!$message instanceof \Zend_Mail) {
-                throw new \InvalidArgumentException('The message should be an instance of \Zend_Mail');
-        }
-
-        $smtpHost = '';
-        $smtpConf = array();
-        $relaySib = $scopeConfig->getValue('sendinblue/relay_data_status', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
-
-        if ($relaySib == 'enabled') {
-            $smtpHost = $scopeConfig->getValue('sendinblue/smtp_host', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
-            $smtpAuthentication = $scopeConfig->getValue('sendinblue/smtp_authentication', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
-            $smtpTls = $scopeConfig->getValue('sendinblue/smtp_tls', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
-            $smtpPort = $scopeConfig->getValue('sendinblue/smtp_port', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
-            $smtpUsername = $scopeConfig->getValue('sendinblue/smtp_username', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
-            $smtpPassword = $scopeConfig->getValue('sendinblue/smtp_password', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
-            $smtpConf = [
-                'auth' => $smtpAuthentication,
-                'tls' => $smtpTls, 
-                'port' => $smtpPort,
-                'username' => $smtpUsername,
-                'password' => $smtpPassword
-            ];
-
-            
-        }
-        parent::__construct($smtpHost, $smtpConf);
-        $this->_message = $message;  
-    
+    public function __construct(MessageInterface $message, ScopeConfigInterface $scopeConfig ){
+		$this->_message = $message;
+		
+		$relaySib = $scopeConfig->getValue('sendinblue/relay_data_status', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+		if ($relaySib == 'enabled') {
+			$smtpHost = "smtp-relay.sendinblue.com";
+			$smtpAuthentication = $scopeConfig->getValue('sendinblue/smtp_authentication', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+			$smtpTls = $scopeConfig->getValue('sendinblue/smtp_tls', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+			$smtpPort = $scopeConfig->getValue('sendinblue/smtp_port', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+			$smtpUsername = $scopeConfig->getValue('sendinblue/smtp_username', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+			$smtpPassword = $scopeConfig->getValue('sendinblue/smtp_password', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+			
+			if ($message instanceof \Zend_mail) {
+				$this->transport = new \Zend_Mail_Transport_Smtp($smtpHost, [
+					'auth' => $smtpAuthentication,
+					'tls' => $smtpTls, 
+					'port' => $smtpPort,
+					'username' => $smtpUsername,
+					'password' => $smtpPassword
+				]);
+			} elseif ($message instanceof MessageInterface) {
+				$this->transport = new Smtp( new SmtpOptions([
+					'host' => $smtpHost,
+					'port' => $smtpPort,
+					'connection_class' => $smtpAuthentication,
+					'connection_config' => [
+						'username' => $smtpUsername,
+						'password' => $smtpPassword,
+						'ssl' => $smtpTls,
+					],
+				]));
+			}
+		}  
     }
  
     /**
@@ -57,10 +66,16 @@ public function __construct(\Magento\Framework\Mail\MessageInterface $message,
      */
     public function sendMessage()
     {
-        try {
-            parent::send($this->_message);
-        } catch (\Exception $e) {
-            throw new \Magento\Framework\Exception\MailException(new \Magento\Framework\Phrase($e->getMessage()), $e);
+		if(null !== $this->transport){
+			try {
+				if ($this->_message instanceof \Zend_mail) {
+					$this->transport->send($this->_message);
+				} elseif ($this->_message instanceof MessageInterface) {
+					$this->transport->send(Message::fromString($this->_message->getRawMessage()));
+				}
+			} catch (\Exception $e) {
+				throw new \Magento\Framework\Exception\MailException(new \Magento\Framework\Phrase($e->getMessage()), $e);
+			}
         }
     }
     
diff --git a/Observer/SibNlObserver.php b/Observer/SibNlObserver.php
old mode 100755
new mode 100644
diff --git a/Observer/SibObserver.php b/Observer/SibObserver.php
old mode 100755
new mode 100644
diff --git a/Observer/SibOrderObserver.php b/Observer/SibOrderObserver.php
old mode 100755
new mode 100644
diff --git a/Observer/SibShipObserver.php b/Observer/SibShipObserver.php
old mode 100755
new mode 100644
diff --git a/Observer/SibaddrObserver.php b/Observer/SibaddrObserver.php
old mode 100755
new mode 100644
diff --git a/composer.json b/composer.json
index fbf40be..bc7ca6b 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
    "name": "sendinblue/module-sendinblue", 
    "description": "N/A",  
    "type": "magento2-module",
-   "version": "2.0.2",
+   "version": "2.0.3",
    "license": [
       "OSL-3.0",
       "AFL-3.0" 
diff --git a/etc/di.xml b/etc/di.xml
index dc6f48f..b106845 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -2,4 +2,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <!-- for override magento default Transport class with our custom module model-->
     <preference for="\Magento\Framework\Mail\Transport" type="Sendinblue\Sendinblue\Model\Transport"/>
+    <preference for="\Magento\Framework\Mail\TransportInterface" type="Sendinblue\Sendinblue\Model\Transport"/>
 </config>
diff --git a/etc/module.xml b/etc/module.xml
index 382111c..2eb32a6 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-		<module name="Sendinblue_Sendinblue" setup_version="2.0.2"></module>
+		<module name="Sendinblue_Sendinblue" setup_version="2.0.3"></module>
 </config>
diff --git a/view/adminhtml/templates/sib.phtml b/view/adminhtml/templates/sib.phtml
old mode 100755
new mode 100644
index f9ab621..04d18ce
--- a/view/adminhtml/templates/sib.phtml
+++ b/view/adminhtml/templates/sib.phtml
@@ -96,7 +96,7 @@ $formKey = $block->getFormValue();
                     <div class="form-box">
                         <h2 class="heading"><img alt="" src="<?php echo $block->getViewFileUrl('Sendinblue_Sendinblue::images/logo_white.png'); ?>"><?php echo __('Prerequisites'); ?></h2>
                         <div class="form-box-content">
-                            <p class="sub-heading"><?php echo __('You should have a SendinBlue account. You can create a free account here : '); ?><a class="link_action" href="https://www.sendinblue.com?utm_source=magento_plugin&amp;utm_medium=plugin&amp;utm_campaign=module_link" style="color:#268CCD;" target="_blank">&nbsp;https://www.sendinblue.com</a><br></p>
+                            <p class="sub-heading"><?php echo __('You should have a SendinBlue account. You can create a free account here : '); ?><a class="link_action" href="https://app.sendinblue.com/account/register/?utm_source=magento_plugin&amp;utm_medium=plugin&amp;utm_campaign=module_link" style="color:#268CCD;" target="_blank">&nbsp;https://www.sendinblue.com</a><br></p>
                         </div>
                     </div>
                     <!-- Section Ends -->
@@ -254,7 +254,7 @@ $formKey = $block->getFormValue();
                                                                     <?php 
                                                                     if (!empty($camp['campaign_records'])) {
                                                                         foreach ($camp['campaign_records'] as $templateData) {
-                                                                            if ($templateData['templ_status'] === 'Active' && stristr($templateData['html_content'], 'DOUBLEOPTIN') === false) {
+                                                                            if ($templateData['templ_status'] === 'Active' && stristr($templateData['html_content'], 'doubleoptin') === false) {
                                                 
                                                                     ?>
         
@@ -295,7 +295,7 @@ $formKey = $block->getFormValue();
                                                             $doubleOptinTempId = $model->getDbData('doubleoptin_template_id');
                                                             if (!empty($camp['campaign_records'])) {
                                                                 foreach ($camp['campaign_records'] as $templateData) {
-                                                                    if ($templateData['templ_status'] === 'Active' && stristr($templateData['html_content'], 'DOUBLEOPTIN') == true) {
+                                                                    if ($templateData['templ_status'] === 'Active' && stristr($templateData['html_content'], 'doubleoptin') == true) {
                                                                         if (trim($templateData['id']) == trim($doubleOptinTempId)) { echo  'selected="selected"'; }
                                                             ?>
         
@@ -343,7 +343,7 @@ $formKey = $block->getFormValue();
                                                                          $optinTempDb = $model->getDbData('final_template_id');
                                                                     if (!empty($camp['campaign_records'])) {
                                                                         foreach ($camp['campaign_records'] as $templateData) {
-                                                                            if ($templateData['templ_status'] === 'Active' && stristr($templateData['html_content'], 'DOUBLEOPTIN') === false) {
+                                                                            if ($templateData['templ_status'] === 'Active' && stristr($templateData['html_content'], 'doubleoptin') === false) {
                                                                                 if (trim($templateData['id']) == trim($optinTempDb)) { echo  'selected="selected"'; }
                                                                     ?>
         
@@ -373,10 +373,8 @@ $formKey = $block->getFormValue();
                                     <td>
                                         <input name="update_tempvalue" type="hidden" value="update_tempvalue" />
                                         <input class="button submitForm2 btn-primary btn" name="submitForm2" type="submit" value="<?php echo __('Update'); ?>">&nbsp;
-                                        <?php if($model->getDbData('import_old_user_status') == 1) { ?>
 											<input name="import_function" type="hidden" value="import_function" />
                                             <input class="button btn-success btn" name="submitUpdateImport" type="submit" value="<?php echo __('Import Old Subscribers'); ?>">
-                                        <?php } ?>
                                     </td>
                                 </tr>
                                 <tr class="managesubscribeBlock">