diff --git a/.github/workflows/code-validation.yml b/.github/workflows/code-validation.yml
index 7899453d..cd9f45e0 100644
--- a/.github/workflows/code-validation.yml
+++ b/.github/workflows/code-validation.yml
@@ -40,7 +40,7 @@ jobs:
       matrix:
         node-version:
           - 20
-        php-version: ["8.1", "8.2", "8.3"]
+        php-version: ["8.1", "8.2", "8.3", "8.4"]
         dependencies:
           - "highest"
         composer-options:
@@ -59,7 +59,7 @@ jobs:
           ini-file: development
           tools: composer:2.2, cs2pr
         env:
-          COMPOSER_AUTH_JSON: |
+          COMPOSER_AUTH: |
             {
               "http-basic": {
                 "repo.magento.com": {
@@ -70,11 +70,31 @@ jobs:
             }
       - name: Validate Composer Files
         run: composer validate
+        env:
+          COMPOSER_AUTH: |
+            {
+              "http-basic": {
+                "repo.magento.com": {
+                  "username": "${{ secrets.REPO_MAGENTO_USER }}",
+                  "password": "${{ secrets.REPO_MAGENTO_PASSWORD }}"
+                }
+              }
+            }
       - name: Run Composer install
         uses: "ramsey/composer-install@v1"
         with:
           dependency-versions: "${{ matrix.dependencies }}"
           composer-options: "${{ matrix.composer-options }}"
+        env:
+          COMPOSER_AUTH: |
+            {
+              "http-basic": {
+                "repo.magento.com": {
+                  "username": "${{ secrets.REPO_MAGENTO_USER }}",
+                  "password": "${{ secrets.REPO_MAGENTO_PASSWORD }}"
+                }
+              }
+            }
       - name: Detect PhpCs violations
         run: |
           vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/,../../phpcompatibility/php-compatibility,../../magento/php-compatibility-fork
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..ef013868
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+
+# Playwright
+node_modules/
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+auth.json
+.github
+.idea
diff --git a/Api/Data/SubscriptionInterface.php b/Api/Data/SubscriptionInterface.php
new file mode 100644
index 00000000..48a29dcd
--- /dev/null
+++ b/Api/Data/SubscriptionInterface.php
@@ -0,0 +1,172 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Api\Data;
+
+interface SubscriptionInterface
+{
+    public const FIELD_ENTITY_ID = 'entity_id';
+    public const FIELD_CUSTOMER_ID = 'customer_id';
+    public const FIELD_STATUS = 'status';
+    public const FIELD_NEXT_ORDER_DATE = 'next_order_date';
+    public const FIELD_RECURRING_PROFILE_ID = 'recurring_profile_id';
+    public const FIELD_UPDATED_AT = 'updated_at';
+    public const FIELD_END_DATE = 'end_date';
+    public const FIELD_REPEAT_COUNT_LEFT = 'repeat_count_left';
+    public const FIELD_RETRY_COUNT = 'retry_count';
+    public const FIELD_NEXI_SUBSCRIPTION_ID = 'nexi_subscription_id';
+    public const STATUS_PENDING_PAYMENT = 'pending_payment';
+    public const STATUS_ACTIVE = 'active';
+    public const STATUS_CLOSED = 'closed';
+    public const STATUS_FAILED = 'failed';
+    public const STATUS_RESCHEDULED = 'rescheduled';
+
+    public const CLONEABLE_STATUSES = [
+        self::STATUS_ACTIVE,
+        self::STATUS_RESCHEDULED,
+    ];
+
+    /**
+     * Get ID.
+     *
+     * @return int
+     */
+    public function getId();
+
+    /**
+     * Get customer ID.
+     *
+     * @return int
+     */
+    public function getCustomerId();
+
+    /**
+     * Get status.
+     *
+     * @return string
+     */
+    public function getStatus(): string;
+
+    /**
+     * Get next order date.
+     *
+     * @return string
+     */
+    public function getNextOrderDate(): string;
+
+    /**
+     * Get recurring profile ID.
+     *
+     * @return int
+     */
+    public function getRecurringProfileId(): int;
+
+    /**
+     * Get updated at value.
+     *
+     * @return string
+     */
+    public function getUpdatedAt(): string;
+
+    /**
+     * Get repeat count left value.
+     *
+     * @return int
+     */
+    public function getRepeatCountLeft(): int;
+
+    /**
+     * Get retry count value.
+     *
+     * @return int
+     */
+    public function getRetryCount(): int;
+
+    /**
+     * Get nexi subscription ID.
+     *
+     * @return string
+     */
+    public function getNexiSubscriptionId(): string;
+
+    /**
+     * Set ID.
+     *
+     * @param int $entityId
+     *
+     * @return $this
+     */
+    public function setId(int $entityId): self;
+
+    /**
+     * Set customer ID.
+     *
+     * @param int $customerId
+     *
+     * @return $this
+     */
+    public function setCustomerId(int $customerId): self;
+
+    /**
+     * Set status.
+     *
+     * @param string $status
+     *
+     * @return $this
+     */
+    public function setStatus(string $status): self;
+
+    /**
+     * Set next order date.
+     *
+     * @param string $date
+     *
+     * @return $this
+     */
+    public function setNextOrderDate(string $date): self;
+
+    /**
+     * Set recurring profile ID.
+     *
+     * @param int $profileId
+     *
+     * @return $this
+     */
+    public function setRecurringProfileId(int $profileId): self;
+
+    /**
+     * Set updated at value.
+     *
+     * @param string $updatedAt
+     *
+     * @return $this
+     */
+    public function setUpdatedAt(string $updatedAt): self;
+
+    /**
+     * Set repeat count left value. How many times payment will be processed before it ends.
+     *
+     * @param int $count
+     *
+     * @return $this
+     */
+    public function setRepeatCountLeft(int $count): self;
+
+    /**
+     * Set retry count value. How many times a failed payment has been retried.
+     *
+     * @param int $count
+     *
+     * @return $this
+     */
+    public function setRetryCount(int $count): self;
+
+    /**
+     * Set nexi subscription ID.
+     *
+     * @param string $subscriptionId
+     *
+     * @return self
+     */
+    public function setNexiSubscriptionId(string $subscriptionId): self;
+}
diff --git a/Api/Data/SubscriptionLinkInterface.php b/Api/Data/SubscriptionLinkInterface.php
new file mode 100644
index 00000000..3a2aa54b
--- /dev/null
+++ b/Api/Data/SubscriptionLinkInterface.php
@@ -0,0 +1,56 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Api\Data;
+
+interface SubscriptionLinkInterface
+{
+    public const FIELD_LINK_ID = 'link_id';
+    public const FIELD_ORDER_ID = 'order_id';
+    public const FIELD_SUBSCRIPTION_ID = 'subscription_id';
+
+    /**
+     * Get ID.
+     *
+     * @return int
+     */
+    public function getId();
+
+    /**
+     * Get order ID.
+     *
+     * @return string
+     */
+    public function getOrderId();
+
+    /**
+     * Get subscription ID.
+     *
+     * @return string
+     */
+    public function getSubscriptionId();
+
+    /**
+     * Set ID.
+     *
+     * @param string $linkId
+     * @return $this
+     */
+    public function setId($linkId): self;
+
+    /**
+     * Set order ID.
+     *
+     * @param string $orderId
+     * @return $this
+     */
+    public function setOrderId($orderId): self;
+
+    /**
+     * Set subscription ID.
+     *
+     * @param string $subscriptionId
+     * @return $this
+     */
+    public function setSubscriptionId($subscriptionId): self;
+}
diff --git a/Api/Data/SubscriptionLinkSearchResultInterface.php b/Api/Data/SubscriptionLinkSearchResultInterface.php
new file mode 100644
index 00000000..09d7104a
--- /dev/null
+++ b/Api/Data/SubscriptionLinkSearchResultInterface.php
@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Api\Data;
+
+interface SubscriptionLinkSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
+{
+    /**
+     * Get items.
+     *
+     * @return \Nexi\Checkout\Api\Data\SubscriptionLinkInterface[] Array of collection items.
+     */
+    public function getItems();
+
+    /**
+     * Set items.
+     *
+     * @param \Nexi\Checkout\Api\Data\SubscriptionLinkInterface[] $items
+     * @return $this
+     */
+    public function setItems(array $items = null);
+}
diff --git a/Api/Data/SubscriptionProfileInterface.php b/Api/Data/SubscriptionProfileInterface.php
new file mode 100644
index 00000000..8356d8c8
--- /dev/null
+++ b/Api/Data/SubscriptionProfileInterface.php
@@ -0,0 +1,72 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Api\Data;
+
+interface SubscriptionProfileInterface
+{
+    public const FIELD_PROFILE_ID = 'profile_id';
+    public const FIELD_NAME = 'name';
+    public const FIELD_DESCRIPTION = 'description';
+    public const FIELD_SCHEDULE = 'schedule';
+
+    /**
+     * Get ID.
+     *
+     * @return int
+     */
+    public function getId();
+
+    /**
+     * Get name.
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Get description.
+     *
+     * @return string
+     */
+    public function getDescription();
+
+    /**
+     * Get schedule.
+     *
+     * @return string
+     */
+    public function getSchedule();
+
+    /**
+     * Set ID.
+     *
+     * @param int $profileId
+     * @return $this
+     */
+    public function setId($profileId): self;
+
+    /**
+     * Set name.
+     *
+     * @param string $name
+     * @return $this
+     */
+    public function setName($name): self;
+
+    /**
+     * Set description.
+     *
+     * @param string $description
+     * @return $this
+     */
+    public function setDescription($description): self;
+
+    /**
+     * Set schedule.
+     *
+     * @param string $schedule
+     * @return $this
+     */
+    public function setSchedule($schedule): self;
+}
diff --git a/Api/Data/SubscriptionProfileSearchResultInterface.php b/Api/Data/SubscriptionProfileSearchResultInterface.php
new file mode 100644
index 00000000..88ed1898
--- /dev/null
+++ b/Api/Data/SubscriptionProfileSearchResultInterface.php
@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Api\Data;
+
+interface SubscriptionProfileSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
+{
+    /**
+     * Get items.
+     *
+     * @return \Nexi\Checkout\Api\Data\SubscriptionProfileInterface[] Array of collection items.
+     */
+    public function getItems();
+
+    /**
+     * Set items.
+     *
+     * @param \Nexi\Checkout\Api\Data\SubscriptionProfileInterface[] $items
+     * @return $this
+     */
+    public function setItems(array $items = null);
+}
diff --git a/Api/Data/SubscriptionSearchResultInterface.php b/Api/Data/SubscriptionSearchResultInterface.php
new file mode 100644
index 00000000..6d7100dc
--- /dev/null
+++ b/Api/Data/SubscriptionSearchResultInterface.php
@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Api\Data;
+
+interface SubscriptionSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
+{
+    /**
+     * Get items.
+     *
+     * @return \Nexi\Checkout\Api\Data\SubscriptionInterface[] Array of collection items.
+     */
+    public function getItems();
+
+    /**
+     * Set items.
+     *
+     * @param \Nexi\Checkout\Api\Data\SubscriptionInterface[] $items
+     * @return $this
+     */
+    public function setItems(array $items = null);
+}
diff --git a/Api/PaymentInitializeInterface.php b/Api/PaymentInitializeInterface.php
new file mode 100644
index 00000000..3963536a
--- /dev/null
+++ b/Api/PaymentInitializeInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Api;
+
+use Magento\Quote\Api\Data\PaymentInterface;
+
+interface PaymentInitializeInterface
+{
+    /**
+     * Initialize Nexi payment
+     *
+     * @param string $cartId
+     * @param string $integrationType
+     * @param PaymentInterface $paymentMethod
+     *
+     * @return string
+     */
+    public function initialize(string $cartId, string $integrationType, PaymentInterface $paymentMethod);
+}
diff --git a/Api/PaymentValidateInterface.php b/Api/PaymentValidateInterface.php
new file mode 100644
index 00000000..58a46105
--- /dev/null
+++ b/Api/PaymentValidateInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Api;
+
+use Magento\Quote\Api\Data\PaymentInterface;
+
+interface PaymentValidateInterface
+{
+    /**
+     * Initialize Nexi payment
+     *
+     * @param string $cartId
+     * @param string $paymentId
+     *
+     * @return string
+     */
+    public function validate(string $cartId, string $paymentId);
+}
diff --git a/Api/SubscriptionLinkRepositoryInterface.php b/Api/SubscriptionLinkRepositoryInterface.php
new file mode 100644
index 00000000..7eaa1ada
--- /dev/null
+++ b/Api/SubscriptionLinkRepositoryInterface.php
@@ -0,0 +1,71 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Api;
+
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+interface SubscriptionLinkRepositoryInterface
+{
+    /**
+     * Get link.
+     *
+     * @param int $linkId
+     * @return Data\SubscriptionLinkInterface
+     * @throws NoSuchEntityException
+     */
+    public function get($linkId);
+
+    /**
+     * Save link.
+     *
+     * @param Data\SubscriptionLinkInterface $subscriptionLink
+     * @return Data\SubscriptionLinkInterface
+     * @throws CouldNotSaveException
+     */
+    public function save(Data\SubscriptionLinkInterface $subscriptionLink);
+
+    /**
+     * Delete link.
+     *
+     * @param Data\SubscriptionLinkInterface $subscriptionLink
+     * @throws CouldNotDeleteException
+     */
+    public function delete(Data\SubscriptionLinkInterface $subscriptionLink);
+
+    /**
+     * Get list of links.
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return Data\SubscriptionLinkSearchResultInterface
+     */
+    public function getList(SearchCriteriaInterface $searchCriteria): Data\SubscriptionLinkSearchResultInterface;
+
+    /**
+     * Get subscription from order ID.
+     *
+     * @param int $orderId
+     * @return mixed
+     */
+    public function getSubscriptionFromOrderId($orderId);
+
+    /**
+     * Link order to subscription.
+     *
+     * @param int $orderId
+     * @param int $subscriptionId
+     * @return mixed
+     */
+    public function linkOrderToSubscription($orderId, $subscriptionId);
+
+    /**
+     * Get order IDs from subscription ID.
+     *
+     * @param int $subscriptionId
+     * @return mixed
+     */
+    public function getOrderIdsBySubscriptionId($subscriptionId);
+}
diff --git a/Api/SubscriptionManagementInterface.php b/Api/SubscriptionManagementInterface.php
new file mode 100644
index 00000000..d2a15a23
--- /dev/null
+++ b/Api/SubscriptionManagementInterface.php
@@ -0,0 +1,37 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Api;
+
+use Magento\Framework\Api\SearchCriteriaInterface;
+
+/**
+ * @api
+ */
+interface SubscriptionManagementInterface
+{
+    /**
+     * Cancel active subscription.
+     *
+     * @param string $subscriptionId
+     * @return string
+     */
+    public function cancelSubscription(string $subscriptionId);
+
+    /**
+     * Shows customer subscriptions.
+     *
+     * @param  \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return \Nexi\Checkout\Api\Data\SubscriptionSearchResultInterface
+     */
+    public function showSubscriptions(SearchCriteriaInterface $searchCriteria);
+
+    /**
+     * Change subscription.
+     *
+     * @param string $subscriptionId
+     *
+     * @return bool
+     */
+    public function changeSubscription(string $subscriptionId): bool;
+}
diff --git a/Api/SubscriptionProfileRepositoryInterface.php b/Api/SubscriptionProfileRepositoryInterface.php
new file mode 100644
index 00000000..f88ee788
--- /dev/null
+++ b/Api/SubscriptionProfileRepositoryInterface.php
@@ -0,0 +1,46 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Api;
+
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+interface SubscriptionProfileRepositoryInterface
+{
+    /**
+     * Get profile.
+     *
+     * @param int $profileId
+     * @return Data\SubscriptionProfileInterface
+     * @throws NoSuchEntityException
+     */
+    public function get($profileId);
+
+    /**
+     * Save profile.
+     *
+     * @param Data\SubscriptionProfileInterface $profile
+     * @return Data\SubscriptionProfileInterface
+     * @throws CouldNotSaveException
+     */
+    public function save(Data\SubscriptionProfileInterface $profile);
+
+    /**
+     * Delete profile.
+     *
+     * @param Data\SubscriptionProfileInterface $profile
+     * @throws CouldNotDeleteException
+     */
+    public function delete(Data\SubscriptionProfileInterface $profile);
+
+    /**
+     * Get list of profiles.
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return Data\SubscriptionProfileSearchResultInterface
+     */
+    public function getList(SearchCriteriaInterface $searchCriteria): Data\SubscriptionProfileSearchResultInterface;
+}
diff --git a/Api/SubscriptionRepositoryInterface.php b/Api/SubscriptionRepositoryInterface.php
new file mode 100644
index 00000000..d134da6b
--- /dev/null
+++ b/Api/SubscriptionRepositoryInterface.php
@@ -0,0 +1,52 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Api;
+
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Nexi\Checkout\Api\Data\SubscriptionInterface;
+use Nexi\Checkout\Api\Data\SubscriptionSearchResultInterface;
+
+interface SubscriptionRepositoryInterface
+{
+    /**
+     * Get subscription.
+     *
+     * @param int $entityId
+     * @return SubscriptionInterface
+     *
+     * @throws NoSuchEntityException
+     */
+    public function get(int $entityId): SubscriptionInterface;
+
+    /**
+     * Save subscription.
+     *
+     * @param SubscriptionInterface $subscription
+     * @return SubscriptionInterface
+     *
+     * @throws CouldNotSaveException
+     */
+    public function save(SubscriptionInterface $subscription): SubscriptionInterface;
+
+    /**
+     * Get list of subscriptions.
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return \Nexi\Checkout\Api\Data\SubscriptionSearchResultInterface
+     */
+    public function getList(SearchCriteriaInterface $searchCriteria): SubscriptionSearchResultInterface;
+
+    /**
+     * Delete subscription.
+     *
+     * @param SubscriptionInterface $subscription
+     * @return void
+     *
+     * @throws CouldNotDeleteException
+     */
+    public function delete(SubscriptionInterface $subscription);
+}
diff --git a/Block/Adminhtml/Subscription/Edit/AbstractButton.php b/Block/Adminhtml/Subscription/Edit/AbstractButton.php
new file mode 100644
index 00000000..fe7183bc
--- /dev/null
+++ b/Block/Adminhtml/Subscription/Edit/AbstractButton.php
@@ -0,0 +1,66 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Block\Adminhtml\Subscription\Edit;
+
+use Magento\Backend\Block\Widget\Context;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+abstract class AbstractButton implements ButtonProviderInterface
+{
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * Constructor
+     *
+     * @param Context $context
+     * @param RequestInterface $request
+     */
+    public function __construct(
+        Context          $context,
+        RequestInterface $request
+    ) {
+        $this->urlBuilder = $context->getUrlBuilder();
+        $this->request = $request;
+    }
+
+    /**
+     * Return the synonyms group Id.
+     *
+     * @return int|null
+     */
+    public function getId()
+    {
+        return $this->request->getParam('id');
+    }
+
+    /**
+     * Get the URL for the given route and parameters.
+     *
+     * @param string $route
+     * @param array $params
+     *
+     * @return string
+     */
+    public function getUrl($route = '', $params = [])
+    {
+        return $this->urlBuilder->getUrl($route, $params);
+    }
+
+    /**
+     * Retrieve button data
+     *
+     * @return array|null
+     */
+    abstract public function getButtonData();
+}
diff --git a/Block/Adminhtml/Subscription/Edit/BackButton.php b/Block/Adminhtml/Subscription/Edit/BackButton.php
new file mode 100644
index 00000000..75693dc6
--- /dev/null
+++ b/Block/Adminhtml/Subscription/Edit/BackButton.php
@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Block\Adminhtml\Subscription\Edit;
+
+class BackButton extends AbstractButton
+{
+    /**
+     * Get button data for the back button.
+     *
+     * @return array
+     */
+    public function getButtonData()
+    {
+        return [
+            'label' => __('Back'),
+            'on_click' => sprintf("location.href = '%s';", $this->getBackUrl()),
+            'class' => 'back',
+            'sort_order' => 10
+        ];
+    }
+
+    /**
+     * Get URL for back (reset) button
+     *
+     * @return string
+     */
+    public function getBackUrl()
+    {
+        return $this->getUrl('*/*/');
+    }
+}
diff --git a/Block/Adminhtml/Subscription/Edit/DeleteButton.php b/Block/Adminhtml/Subscription/Edit/DeleteButton.php
new file mode 100644
index 00000000..08fc04c7
--- /dev/null
+++ b/Block/Adminhtml/Subscription/Edit/DeleteButton.php
@@ -0,0 +1,39 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Block\Adminhtml\Subscription\Edit;
+
+class DeleteButton extends AbstractButton
+{
+    /**
+     * Get button data for the delete button.
+     *
+     * @return array
+     */
+    public function getButtonData()
+    {
+        $data = [];
+        if ($this->getId()) {
+            $data = [
+                'label' => __('Delete'),
+                'class' => 'delete',
+                'on_click' => 'deleteConfirm(\''
+                    . __('Delete this entry?')
+                    . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})',
+                'sort_order' => 20,
+            ];
+        }
+
+        return $data;
+    }
+
+    /**
+     * Generates and returns the URL for the delete action, using the current object's identifier.
+     *
+     * @return string
+     */
+    public function getDeleteUrl()
+    {
+        return $this->getUrl('*/*/delete', ['id' => $this->getId()]);
+    }
+}
diff --git a/Block/Adminhtml/Subscription/Edit/ResetButton.php b/Block/Adminhtml/Subscription/Edit/ResetButton.php
new file mode 100644
index 00000000..85bfb317
--- /dev/null
+++ b/Block/Adminhtml/Subscription/Edit/ResetButton.php
@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Block\Adminhtml\Subscription\Edit;
+
+class ResetButton extends AbstractButton
+{
+    /**
+     * Retrieves data for configuring a button.
+     *
+     * @return array
+     */
+    public function getButtonData()
+    {
+        return [
+            'label' => __('Reset'),
+            'class' => 'reset',
+            'on_click' => 'location.reload();',
+            'sort_order' => 30
+        ];
+    }
+}
diff --git a/Block/Adminhtml/Subscription/Edit/SaveButton.php b/Block/Adminhtml/Subscription/Edit/SaveButton.php
new file mode 100644
index 00000000..07f51c86
--- /dev/null
+++ b/Block/Adminhtml/Subscription/Edit/SaveButton.php
@@ -0,0 +1,25 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Block\Adminhtml\Subscription\Edit;
+
+class SaveButton extends AbstractButton
+{
+    /**
+     * Retrieve configuration data for the button.
+     *
+     * @return array
+     */
+    public function getButtonData()
+    {
+        return [
+            'label' => __('Save'),
+            'class' => 'save primary',
+            'data_attribute' => [
+                'mage-init' => ['button' => ['event' => 'save']],
+                'form-role' => 'save',
+            ],
+            'sort_order' => 90,
+        ];
+    }
+}
diff --git a/Block/Adminhtml/Subscription/Edit/StopButton.php b/Block/Adminhtml/Subscription/Edit/StopButton.php
new file mode 100644
index 00000000..64ea91be
--- /dev/null
+++ b/Block/Adminhtml/Subscription/Edit/StopButton.php
@@ -0,0 +1,44 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Block\Adminhtml\Subscription\Edit;
+
+class StopButton extends AbstractButton
+{
+    /**
+     * Get button data for the stop schedule button.
+     *
+     * @return array
+     */
+    public function getButtonData()
+    {
+        $data = [];
+        if ($this->getId()) {
+            $data = [
+                'label' => __('Stop schedule'),
+                'class' => 'delete',
+                'on_click' => 'deleteConfirm(\''
+                    . __('Cancel any unpaid orders and prevent new recurring payments from being made?')
+                    . '\', \'' . $this->getStopScheduleUrl() . '\')',
+                'sort_order' => 40,
+            ];
+        }
+
+        return $data;
+    }
+
+    /**
+     * Generates and returns the URL for stopping the schedule, using the current object's identifier.
+     *
+     * @return string
+     */
+    private function getStopScheduleUrl()
+    {
+        return $this->getUrl(
+            '*/*/stopSchedule',
+            [
+                'id' => $this->getId()
+            ]
+        );
+    }
+}
diff --git a/Block/Info/Nexi.php b/Block/Info/Nexi.php
new file mode 100644
index 00000000..b919448a
--- /dev/null
+++ b/Block/Info/Nexi.php
@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Block\Info;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\View\Element\Template;
+use Magento\Payment\Block\Info;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Nexi\Checkout\Gateway\Config\Config;
+
+class Nexi extends Info
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Nexi_Checkout::info/checkout.phtml';
+    public const SELECTED_PATMENT_METHOD = 'selected_payment_method';
+    public const SELECTED_PATMENT_TYPE = 'selected_payment_type';
+
+    /**
+     * Nexi constructor.
+     *
+     * @param Template\Context $context
+     * @param OrderRepositoryInterface $orderRepository
+     * @param Config $gatewayConfig
+     * @param array $data
+     */
+    public function __construct(
+        Template\Context                 $context,
+        private OrderRepositoryInterface $orderRepository,
+        private Config $gatewayConfig,
+        array                            $data = []
+    ) {
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Get logo to be displayed in the payment method block.
+     *
+     * @return mixed|null
+     */
+    public function getLogo()
+    {
+        return $this->gatewayConfig->getNexiLogo();
+    }
+
+    /**
+     * Get the title to be displayed in the payment method block.
+     *
+     * @return mixed|null
+     */
+    public function getTitle()
+    {
+        return $this->gatewayConfig->getNexiTitle();
+    }
+
+    /**
+     * Get payment selected method data.
+     *
+     * @return string
+     */
+    public function getSelectedPaymentMethodData(): array
+    {
+        try {
+            $payment = $this->orderRepository->get($this->getInfo()->getOrder()->getId())->getPayment();
+
+            return [
+                self::SELECTED_PATMENT_METHOD => $payment->getAdditionalInformation(self::SELECTED_PATMENT_METHOD),
+                self::SELECTED_PATMENT_TYPE => $payment->getAdditionalInformation(self::SELECTED_PATMENT_TYPE),
+            ];
+        } catch (LocalizedException $e) {
+            $this->logger->critical($e);
+        }
+
+        return [];
+    }
+}
diff --git a/Block/Order/Payments.php b/Block/Order/Payments.php
new file mode 100644
index 00000000..93efa473
--- /dev/null
+++ b/Block/Order/Payments.php
@@ -0,0 +1,231 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Block\Order;
+
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Customer\Model\Session;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Phrase;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Theme\Block\Html\Pager;
+use Nexi\Checkout\Api\Data\SubscriptionInterface;
+use Nexi\Checkout\Gateway\Config\Config;
+use Nexi\Checkout\Model\Subscription\CustomerSubscriptionProvider;
+use Nexi\Checkout\Model\Subscription\TotalConfigProvider;
+use Nexi\Checkout\Model\ResourceModel\Subscription\Collection as SubscriptionCollection;
+use Nexi\Checkout\Model\ResourceModel\Subscription\CollectionFactory;
+
+class Payments extends Template
+{
+    /**
+     * @var string
+     */
+    protected $_template = 'Nexi_Checkout::order/payments.phtml';
+
+    /**
+     * Payments constructor.
+     *
+     * @param Context $context
+     * @param CollectionFactory $subscriptionCollectionFactory
+     * @param Session $customerSession
+     * @param StoreManagerInterface $storeManager
+     * @param TotalConfigProvider $totalConfigProvider
+     * @param Config $config
+     * @param CheckoutSession $checkoutSession
+     * @param CustomerSubscriptionProvider $customerSubscriptionProvider
+     * @param array $data
+     */
+    public function __construct(
+        Context                                $context,
+        private readonly CollectionFactory     $subscriptionCollectionFactory,
+        private readonly Session               $customerSession,
+        private readonly StoreManagerInterface $storeManager,
+        private readonly TotalConfigProvider   $totalConfigProvider,
+        private readonly Config                $config,
+        private readonly CheckoutSession       $checkoutSession,
+        private readonly CustomerSubscriptionProvider $customerSubscriptionProvider,
+        array                                  $data = []
+    ) {
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Payments protected constructor.
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        parent::_construct();
+        $this->pageConfig->getTitle()->set(__('My Subscriptions'));
+    }
+
+    /**
+     * Is Subscriptions functionality is enabled.
+     *
+     * @return bool
+     */
+    public function isSubscriptionsEnabled(): bool
+    {
+        return $this->totalConfigProvider->isSubscriptionsEnabled();
+    }
+
+    /**
+     * Get recurring payments (subscriptions).
+     *
+     * @return SubscriptionCollection
+     */
+    public function getCustomerSubscriptions()
+    {
+        return $this->customerSubscriptionProvider->getCustomerSubscriptions();
+    }
+
+    /**
+     * Get closed subscriptions.
+     *
+     * @return SubscriptionCollection
+     */
+    public function getCustomerClosedSubscriptions()
+    {
+        return $this->customerSubscriptionProvider->getCustomerClosedSubscriptions();
+    }
+
+    /**
+     * Validate date.
+     *
+     * @param string $date
+     *
+     * @return string
+     */
+    public function validateDate($date): string
+    {
+        $newDate = explode(' ', $date);
+
+        return $newDate[0];
+    }
+
+    /**
+     * Get recurring payment status name.
+     *
+     * @param string $recurringPaymentStatus
+     *
+     * @return Phrase|string
+     */
+    public function getRecurringPaymentStatusName(string $recurringPaymentStatus): Phrase|string
+    {
+        switch ($recurringPaymentStatus) {
+            case 'active':
+                return __('Active');
+            case 'paid':
+                return __('Paid');
+            case 'failed':
+                return __('Failed');
+            case 'pending_payment':
+                return __('Pending Payment');
+            case 'rescheduled':
+                return __('Rescheduled');
+            case 'closed':
+                return __('Closed');
+        }
+
+        return '';
+    }
+
+    /**
+     * Get current currency.
+     *
+     * @return string
+     * @throws NoSuchEntityException
+     * @throws LocalizedException
+     */
+    public function getCurrentCurrency()
+    {
+        return $this->storeManager->getStore()->getCurrentCurrency()->getCurrencySymbol();
+    }
+
+    /**
+     * Get view url.
+     *
+     * @param SubscriptionInterface $recurringPayment
+     *
+     * @return string
+     */
+    public function getViewUrl(SubscriptionInterface $recurringPayment)
+    {
+        return $this->getUrl('sales/order/view', ['order_id' => $recurringPayment->getOrderId()]);
+    }
+
+    /**
+     * Prepare layout.
+     *
+     * @return $this|Payments
+     * @throws LocalizedException
+     */
+    protected function _prepareLayout()
+    {
+        parent::_prepareLayout();
+        if ($this->getRecurringPayments()) {
+            $pager = $this->getLayout()->createBlock(
+                Pager::class,
+                'checkout.order.recurring.payments.pager'
+            )->setCollection(
+                $this->getRecurringPayments()
+            );
+            $this->setChild('pager', $pager);
+            $this->getRecurringPayments()->load();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get pager html.
+     *
+     * @return string
+     */
+    public function getPagerHtml()
+    {
+        return $this->getChildHtml('pager');
+    }
+
+    /**
+     * Get stop payment url.
+     *
+     * @param SubscriptionInterface $recurringPayment
+     *
+     * @return string
+     */
+    public function getStopPaymentUrl(SubscriptionInterface $recurringPayment)
+    {
+        return $this->getUrl('nexi/payment/stop', ['payment_id' => $recurringPayment->getId()]);
+    }
+
+    /**
+     * Get empty recurring payment message.
+     *
+     * @return Phrase
+     */
+    public function getEmptyRecurringPaymentsMessage(): Phrase
+    {
+        return __('You have no payments to display.');
+    }
+
+    /**
+     * Get previous error.
+     *
+     * @return Phrase|null
+     */
+    public function getPreviousError(): ?Phrase
+    {
+        if ($this->checkoutSession->getData('nexi_previous_error')) {
+            $previousError = $this->checkoutSession
+                ->getData('nexi_previous_error', 1);
+        }
+
+        return $previousError ?? null;
+    }
+}
diff --git a/Block/Order/Print/InvoicePrint.php b/Block/Order/Print/InvoicePrint.php
new file mode 100644
index 00000000..e884c19f
--- /dev/null
+++ b/Block/Order/Print/InvoicePrint.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Nexi\Checkout\Block\Order\Print;
+
+use Magento\Sales\Block\Order\PrintOrder\Invoice;
+use Nexi\Checkout\Block\Info\Nexi;
+use Nexi\Checkout\Gateway\Config\Config;
+
+class InvoicePrint extends Invoice
+{
+    /**
+     * Get payment information for the invoice print.
+     *
+     * @return string
+     */
+    public function getPaymentInfoHtml()
+    {
+        $payment = $this->getOrder()->getPayment();
+        if ($payment->getMethod() === Config::CODE) {
+            return "<p>" . $payment->getAdditionalInformation()['method_title'] . "</p>"
+                . "<p>" . $payment->getAdditionalInformation(Nexi::SELECTED_PATMENT_TYPE) . " - "
+                . $payment->getAdditionalInformation(Nexi::SELECTED_PATMENT_METHOD) . "</p>";
+        }
+        return $this->getChildHtml('payment_info');
+    }
+}
diff --git a/Console/Command/Bill.php b/Console/Command/Bill.php
new file mode 100644
index 00000000..1e07f7b1
--- /dev/null
+++ b/Console/Command/Bill.php
@@ -0,0 +1,56 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Console\Command;
+
+use Magento\Framework\App\Area;
+use Magento\Framework\App\State;
+use Magento\Framework\Console\Cli;
+use Magento\Framework\Exception\LocalizedException;
+use Nexi\Checkout\Model\Subscription\Bill as SubscriptionBill;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Bill extends Command
+{
+    /**
+     * Constructor
+     *
+     * @param SubscriptionBill $bill
+     * @param State $state
+     */
+    public function __construct(
+        private SubscriptionBill $bill,
+        private State         $state
+    ) {
+        parent::__construct();
+    }
+
+    /**
+     * Configure
+     *
+     * @return void
+     */
+    protected function configure()
+    {
+        $this->setName('nexi:subscription:bill');
+        $this->setDescription('Invoice customers of subscription orders');
+    }
+
+    /**
+     * Execute
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     * @throws LocalizedException
+     */
+    public function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->state->setAreaCode(Area::AREA_CRONTAB);
+        $this->bill->process();
+
+        return Cli::RETURN_SUCCESS;
+    }
+}
diff --git a/Console/Command/Notify.php b/Console/Command/Notify.php
new file mode 100644
index 00000000..0b5c868e
--- /dev/null
+++ b/Console/Command/Notify.php
@@ -0,0 +1,54 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Console\Command;
+
+use Magento\Framework\App\State;
+use Magento\Framework\Console\Cli;
+use Nexi\Checkout\Model\Subscription\Notify as SubscriptionNotify;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Notify extends Command
+{
+    /**
+     * Constructor
+     *
+     * @param SubscriptionNotify $notify
+     * @param State $state
+     */
+    public function __construct(
+        private SubscriptionNotify $notify,
+        private State           $state
+    ) {
+        parent::__construct();
+    }
+
+    /**
+     * Configure
+     *
+     * @return void
+     */
+    protected function configure()
+    {
+        $this->setName('nexi:subscription:notify');
+        $this->setDescription('Send subscription notification emails.');
+    }
+
+    /**
+     * Execute
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->state->setAreaCode(\Magento\Framework\App\Area::AREA_CRONTAB);
+        $this->notify->process();
+
+        return Cli::RETURN_SUCCESS;
+    }
+}
diff --git a/Controller/Adminhtml/Profile/Delete.php b/Controller/Adminhtml/Profile/Delete.php
new file mode 100644
index 00000000..95a76262
--- /dev/null
+++ b/Controller/Adminhtml/Profile/Delete.php
@@ -0,0 +1,49 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Controller\Adminhtml\Profile;
+
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Nexi\Checkout\Api\SubscriptionProfileRepositoryInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultInterface;
+
+class Delete implements HttpPostActionInterface
+{
+    /**
+     * Delete constructor.
+     *
+     * @param Context $context
+     * @param SubscriptionProfileRepositoryInterface $subscriptionProfileRepository
+     */
+    public function __construct(
+        private Context                             $context,
+        private SubscriptionProfileRepositoryInterface $subscriptionProfileRepository
+    ) {
+    }
+
+    /**
+     * Execute the action to delete a subscription profile.
+     *
+     * @return ResponseInterface|ResultInterface
+     */
+    public function execute()
+    {
+        $id             = $this->context->getRequest()->getParam('id');
+        $resultRedirect = $this->context->getResultFactory()->create(ResultFactory::TYPE_REDIRECT);
+
+        try {
+            $profile = $this->subscriptionProfileRepository->get($id);
+            $this->subscriptionProfileRepository->delete($profile);
+            $resultRedirect->setPath('subscriptions/profile');
+            $this->context->getMessageManager()->addSuccessMessage('Subscription profile deleted');
+        } catch (\Throwable $e) {
+            $this->context->getMessageManager()->addErrorMessage($e->getMessage());
+            $resultRedirect->setPath('subscriptions/profile/edit', ['id' => $id]);
+        }
+
+        return $resultRedirect;
+    }
+}
diff --git a/Controller/Adminhtml/Profile/Edit.php b/Controller/Adminhtml/Profile/Edit.php
new file mode 100644
index 00000000..c61be6cd
--- /dev/null
+++ b/Controller/Adminhtml/Profile/Edit.php
@@ -0,0 +1,53 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Controller\Adminhtml\Profile;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\Page;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\ResponseInterface;
+
+class Edit implements HttpGetActionInterface
+{
+    /**
+     * @param Context $context
+     */
+    public function __construct(
+        private Context $context
+    ) {
+    }
+
+    /**
+     * Executes the initialization of the page and sets the page title
+     * based on the presence of the 'id' parameter in the request.
+     *
+     * @return \Magento\Framework\View\Result\Page
+     */
+    public function execute()
+    {
+        $page  = $this->initialize();
+        $title = $this->context->getRequest()->getParam('id')
+            ? __('Edit Subscription profile')
+            : __('Add new profile');
+        $page->getConfig()->getTitle()->prepend($title);
+
+        return $page;
+    }
+
+    /**
+     * Initializes and configures the result page with the active menu.
+     *
+     * @return \Magento\Framework\View\Result\Page
+     */
+    private function initialize()
+    {
+        $resultPage = $this->context->getResultFactory()->create(
+            \Magento\Framework\Controller\ResultFactory::TYPE_PAGE
+        );
+        $resultPage->setActiveMenu('Magento_Sales::sales_order');
+
+        return $resultPage;
+    }
+}
diff --git a/Controller/Adminhtml/Profile/Index.php b/Controller/Adminhtml/Profile/Index.php
new file mode 100644
index 00000000..01c902d8
--- /dev/null
+++ b/Controller/Adminhtml/Profile/Index.php
@@ -0,0 +1,48 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Controller\Adminhtml\Profile;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\Page;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\ResponseInterface;
+
+class Index implements HttpGetActionInterface
+{
+    /**
+     * @param Context $context
+     */
+    public function __construct(
+        private Context $context
+    ) {
+    }
+
+    /**
+     * Executes the method to initialize a page and set the title to "Subscription Profiles".
+     *
+     * @return \Magento\Framework\View\Result\Page
+     */
+    public function execute()
+    {
+        $page = $this->initialize();
+        $page->getConfig()->getTitle()->prepend(__('Subscription Profiles'));
+
+        return $page;
+    }
+
+    /**
+     * Initializes the result page and sets the active menu for sales orders.
+     *
+     * @return \Magento\Framework\View\Result\Page
+     */
+    private function initialize()
+    {
+        $resultPage = $this->context->getResultFactory()
+            ->create(\Magento\Framework\Controller\ResultFactory::TYPE_PAGE);
+        $resultPage->setActiveMenu('Magento_Sales::sales_order');
+
+        return $resultPage;
+    }
+}
diff --git a/Controller/Adminhtml/Profile/MassDelete.php b/Controller/Adminhtml/Profile/MassDelete.php
new file mode 100644
index 00000000..6ab9245f
--- /dev/null
+++ b/Controller/Adminhtml/Profile/MassDelete.php
@@ -0,0 +1,60 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Controller\Adminhtml\Profile;
+
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Ui\Component\MassAction\Filter;
+use Nexi\Checkout\Model\ResourceModel\Subscription\Profile;
+use Nexi\Checkout\Model\ResourceModel\Subscription\Profile\CollectionFactory;
+
+class MassDelete implements HttpPostActionInterface
+{
+    /**
+     * MassDelete constructor.
+     *
+     * @param Context $context
+     * @param Filter $filter
+     * @param CollectionFactory $factory
+     * @param Profile $profileResource
+     */
+    public function __construct(
+        private Context           $context,
+        private Filter            $filter,
+        private CollectionFactory $factory,
+        private Profile           $profileResource
+    ) {
+    }
+
+    /**
+     * Executes the mass delete operation by deleting items from the collection.
+     *
+     * @return Redirect|ResponseInterface|ResultInterface
+     *
+     * @throws LocalizedException
+     */
+    public function execute()
+    {
+        /** @var Redirect $resultRedirect */
+        $resultRedirect = $this->context->getResultFactory()->create(ResultFactory::TYPE_REDIRECT);
+
+        $collection     = $this->filter->getCollection($this->factory->create());
+        $collectionSize = $collection->getSize();
+
+        foreach ($collection as $item) {
+            $this->profileResource->delete($item);
+        }
+
+        $this->context->getMessageManager()->addSuccessMessage(
+            __('A total of %1 record(s) have been deleted.', $collectionSize)
+        );
+
+        return $resultRedirect->setPath('*/*/');
+    }
+}
diff --git a/Controller/Adminhtml/Profile/Save.php b/Controller/Adminhtml/Profile/Save.php
new file mode 100644
index 00000000..9e5e3828
--- /dev/null
+++ b/Controller/Adminhtml/Profile/Save.php
@@ -0,0 +1,113 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Controller\Adminhtml\Profile;
+
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Store\Model\ScopeInterface;
+use Nexi\Checkout\Api\Data\SubscriptionProfileInterfaceFactory;
+use Nexi\Checkout\Api\SubscriptionProfileRepositoryInterface;
+
+class Save implements HttpPostActionInterface
+{
+    const DELETE_QUOTE_AFTER = 'checkout/cart/delete_quote_after';
+
+    public function __construct(
+        private Context                             $context,
+        private SubscriptionProfileRepositoryInterface $profileRepo,
+        private SubscriptionProfileInterfaceFactory    $factory,
+        private SerializerInterface                 $serializer,
+        private ScopeConfigInterface                $scopeConfig
+    ) {
+    }
+
+    /**
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
+     * @throws NoSuchEntityException
+     */
+    public function execute()
+    {
+        $id = $this->context->getRequest()->getParam('profile_id');
+        if ($id) {
+            $profile = $this->profileRepo->get($id);
+        } else {
+            $profile = $this->factory->create();
+        }
+
+        $data           = $this->getRequestData();
+        $resultRedirect = $this->context->getResultFactory()->create(ResultFactory::TYPE_REDIRECT);
+
+        if ($this->validateProfile($data) === false) {
+            $this->context->getMessageManager()->addErrorMessage(
+                "Schedule can't be saved due to the profile's payment period exceeding your store's quote lifetime.
+                Please make sure the quote lifetime is longer than your profile's payment schedule in days.
+                See Stores->Configuration->Sales->Checkout->Shopping Cart->Quote Lifetime (days)"
+            );
+            $resultRedirect->setPath('subscriptions/profile/edit', ['id' => $id]);
+            return $resultRedirect;
+        }
+
+        $profile->setData($data);
+        try {
+            $this->profileRepo->save($profile);
+            $resultRedirect->setPath('subscriptions/profile');
+        } catch (CouldNotSaveException $e) {
+            $this->context->getMessageManager()->addErrorMessage($e->getMessage());
+            $resultRedirect->setPath('subscriptions/profile/edit', ['id' => $id]);
+        }
+
+        return $resultRedirect;
+    }
+
+    private function getRequestData()
+    {
+        $data = $this->context->getRequest()->getParams();
+
+        if (isset($data['interval_period']) && isset($data['interval_unit'])) {
+            $schedule = [
+                'interval' => $data['interval_period'],
+                'unit'     => $data['interval_unit'],
+            ];
+
+            $data['schedule'] = $this->serializer->serialize($schedule);
+        }
+
+        if (!$data['profile_id']) {
+            unset($data['profile_id']);
+        }
+
+        return $data;
+    }
+
+    private function validateProfile($data)
+    {
+        $quoteLimit = $this->scopeConfig->getValue(
+            self::DELETE_QUOTE_AFTER,
+            ScopeInterface::SCOPE_STORE
+        );
+        switch ($data['interval_unit']) {
+            case 'D':
+                $days = 1;
+                break;
+            case 'W':
+                $days = 7;
+                break;
+            case 'M':
+                $days = 30.436875;
+                break;
+            case 'Y':
+                $days = 365.2425;
+                break;
+        }
+        if (isset($days) &&$data['interval_period'] * $days > $quoteLimit) {
+            return false;}
+
+        return true;
+    }
+}
diff --git a/Controller/Adminhtml/Subscription/Delete.php b/Controller/Adminhtml/Subscription/Delete.php
new file mode 100644
index 00000000..0525681c
--- /dev/null
+++ b/Controller/Adminhtml/Subscription/Delete.php
@@ -0,0 +1,48 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Controller\Adminhtml\Subscription;
+
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\ResultFactory;
+use Nexi\Checkout\Api\SubscriptionRepositoryInterface;
+
+class Delete implements HttpPostActionInterface
+{
+    /**
+     * Delete constructor.
+     *
+     * @param Context $context
+     * @param SubscriptionRepositoryInterface $subscriptionRepository
+     */
+    public function __construct(
+        private Context                         $context,
+        private SubscriptionRepositoryInterface $subscriptionRepository
+    ) {
+    }
+
+    /**
+     * Executes the deletion of a subscription based on the provided ID.
+     *
+     * @return Redirect
+     */
+    public function execute()
+    {
+        $id             = $this->context->getRequest()->getParam('id');
+        $resultRedirect = $this->context->getResultFactory()->create(ResultFactory::TYPE_REDIRECT);
+
+        try {
+            $payment = $this->subscriptionRepository->get((int)$id);
+            $this->subscriptionRepository->delete($payment);
+            $resultRedirect->setPath('subscriptions/subscription');
+            $this->context->getMessageManager()->addSuccessMessage('Subscription deleted');
+        } catch (\Throwable $e) {
+            $this->context->getMessageManager()->addErrorMessage($e->getMessage());
+            $resultRedirect->setPath('subscriptions/subscription/view', ['id' => $id]);
+        }
+
+        return $resultRedirect;
+    }
+}
diff --git a/Controller/Adminhtml/Subscription/Index.php b/Controller/Adminhtml/Subscription/Index.php
new file mode 100644
index 00000000..59582dfd
--- /dev/null
+++ b/Controller/Adminhtml/Subscription/Index.php
@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Controller\Adminhtml\Subscription;
+
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index implements HttpGetActionInterface
+{
+    public function __construct(
+        private Context $context,
+    ) {
+    }
+
+    public function execute()
+    {
+        $page = $this->initialize();
+        $page->getConfig()->getTitle()->prepend(__('Subscriptions'));
+
+        return $page;
+    }
+
+    private function initialize()
+    {
+        /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+        $resultPage = $this->context->getResultFactory()->create(\Magento\Framework\Controller\ResultFactory::TYPE_PAGE);
+        $resultPage->setActiveMenu('Magento_Sales::sales_order');
+
+        return $resultPage;
+    }
+}
diff --git a/Controller/Adminhtml/Subscription/MassDelete.php b/Controller/Adminhtml/Subscription/MassDelete.php
new file mode 100644
index 00000000..773a4136
--- /dev/null
+++ b/Controller/Adminhtml/Subscription/MassDelete.php
@@ -0,0 +1,40 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Controller\Adminhtml\Subscription;
+
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Ui\Component\MassAction\Filter;
+use Nexi\Checkout\Model\ResourceModel\Subscription;
+use Nexi\Checkout\Model\ResourceModel\Subscription\CollectionFactory;
+
+class MassDelete implements HttpPostActionInterface
+{
+    public function __construct(
+        private Context           $context,
+        private Filter            $filter,
+        private CollectionFactory $factory,
+        private Subscription      $subscription
+    ) {
+    }
+
+    public function execute()
+    {
+        $resultRedirect = $this->context->getResultFactory()->create(ResultFactory::TYPE_REDIRECT);
+
+        $collection     = $this->filter->getCollection($this->factory->create());
+        $collectionSize = $collection->getSize();
+
+        foreach ($collection as $item) {
+            $this->subscription->delete($item);
+        }
+
+        $this->context->getMessageManager()->addSuccessMessage(
+            __('A total of %1 record(s) have been deleted.', $collectionSize)
+        );
+
+        return $resultRedirect->setPath('*/*/');
+    }
+}
diff --git a/Controller/Adminhtml/Subscription/Save.php b/Controller/Adminhtml/Subscription/Save.php
new file mode 100644
index 00000000..2b07b8c7
--- /dev/null
+++ b/Controller/Adminhtml/Subscription/Save.php
@@ -0,0 +1,59 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Controller\Adminhtml\Subscription;
+
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Nexi\Checkout\Api\Data\SubscriptionLinkInterfaceFactory;
+use Nexi\Checkout\Api\SubscriptionRepositoryInterface;
+
+class Save implements HttpPostActionInterface
+{
+    /**
+     * Save constructor.
+     *
+     * @param Context $context
+     * @param SubscriptionRepositoryInterface $paymentRepositoryInterface
+     * @param SubscriptionLinkInterfaceFactory $factory
+     */
+    public function __construct(
+        private Context                          $context,
+        private SubscriptionRepositoryInterface  $paymentRepositoryInterface,
+        private SubscriptionLinkInterfaceFactory $factory
+    ) {
+    }
+
+    /**
+     * Executes the process of saving a payment entity.
+     *
+     * @return Redirect
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function execute()
+    {
+        $id = $this->context->getRequest()->getParam('entity_id');
+
+        if ($id) {
+            $payment = $this->paymentRepositoryInterface->get($id);
+        } else {
+            $payment = $this->factory->create();
+        }
+
+        $data = $this->getRequest()->getParams();
+        $payment->setData($data);
+        $resultRedirect = $this->context->getResultFactory()->create(ResultFactory::TYPE_REDIRECT);
+        try {
+            $this->paymentRepositoryInterface->save($payment);
+            $resultRedirect->setPath('recurring_payments/recurring');
+        } catch (CouldNotSaveException $e) {
+            $this->context->getMessageManager()->addErrorMessage($e->getMessage());
+            $resultRedirect->setPath('recurring_payments/recurring/edit', ['id' => $id]);
+        }
+
+        return $resultRedirect;
+    }
+}
diff --git a/Controller/Adminhtml/Subscription/StopSchedule.php b/Controller/Adminhtml/Subscription/StopSchedule.php
new file mode 100644
index 00000000..8be891a8
--- /dev/null
+++ b/Controller/Adminhtml/Subscription/StopSchedule.php
@@ -0,0 +1,146 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Controller\Adminhtml\Subscription;
+
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Sales\Api\OrderManagementInterface;
+use Nexi\Checkout\Api\Data\SubscriptionInterface;
+use Nexi\Checkout\Api\SubscriptionLinkRepositoryInterface;
+use Nexi\Checkout\Api\SubscriptionRepositoryInterface;
+use Nexi\Checkout\Model\SubscriptionManagement;
+
+class StopSchedule implements HttpGetActionInterface
+{
+    /**
+     * StopSchedule constructor.
+     *
+     * @param Context $context
+     * @param SubscriptionRepositoryInterface $subscriptionRepository
+     * @param OrderManagementInterface $orderManagement
+     * @param SubscriptionLinkRepositoryInterface $subscriptionLinkRepoInterface
+     */
+    public function __construct(
+        private Context                             $context,
+        private SubscriptionRepositoryInterface     $subscriptionRepository,
+        private OrderManagementInterface            $orderManagement,
+        private SubscriptionLinkRepositoryInterface $subscriptionLinkRepoInterface
+    ) {
+    }
+
+    /**
+     * Executes the process to cancel a recurring subscription.
+     *
+     * @return Redirect
+     */
+    public function execute()
+    {
+        $resultRedirect = $this->context->getResultFactory()->create(ResultFactory::TYPE_REDIRECT);
+        $resultRedirect->setPath($this->context->getRedirect()->getRefererUrl());
+        $id = $this->context->getRequest()->getParam('id');
+
+        $subscription = $this->getRecurringPayment((int)$id);
+        if (!$subscription) {
+            return $resultRedirect;
+        }
+        $this->cancelOrder($subscription);
+        $this->updateRecurringStatus($subscription);
+
+        return $resultRedirect;
+    }
+
+    /**
+     * Retrieves the recurring payment subscription by its ID.
+     *
+     * @param int $subscriptionId
+     * @return false|SubscriptionInterface
+     */
+    private function getRecurringPayment($subscriptionId)
+    {
+        try {
+            return $this->subscriptionRepository->get($subscriptionId);
+        } catch (NoSuchEntityException $e) {
+            $this->context->getMessageManager()->addErrorMessage(
+                \__(
+                    'Unable to load subscription with ID: %id',
+                    ['id' => $subscriptionId]
+                )
+            );
+        }
+
+        return false;
+    }
+
+    /**
+     * Cancels the order associated with the subscription if it is unpaid.
+     *
+     * @param SubscriptionInterface $subscription
+     * @return void
+     */
+    private function cancelOrder(SubscriptionInterface $subscription): void
+    {
+        try {
+            // Only cancel unpaid orders.
+            $ordersId = $this->subscriptionLinkRepoInterface->getOrderIdsBySubscriptionId($subscription->getId());
+            if ($subscription->getStatus() !== SubscriptionInterface::STATUS_CLOSED) {
+                foreach ($ordersId as $orderId) {
+                    $this->orderManagement->cancel($orderId);
+                }
+            } else {
+                $this->context->getMessageManager()->addWarningMessage(
+                    \__(
+                        'Order ID %id has a status other than %status,
+                        automatic order cancel disabled. If the order is unpaid please cancel it manually',
+                        [
+                            'id' => array_shift($ordersId),
+                            'status' => SubscriptionManagement::ORDER_PENDING_STATUS
+                        ]
+                    )
+                );
+            }
+        } catch (LocalizedException $exception) {
+            $this->context->getMessageManager()->addErrorMessage(
+                \__(
+                    'Error occurred while cancelling the order: %error',
+                    ['error' => $exception->getMessage()]
+                )
+            );
+        }
+    }
+
+    /**
+     * Updates the recurring status of a subscription to "closed".
+     *
+     * @param SubscriptionInterface $subscription
+     * @return void
+     */
+    private function updateRecurringStatus(SubscriptionInterface $subscription)
+    {
+        $subscription->setStatus(SubscriptionInterface::STATUS_CLOSED);
+
+        try {
+            $this->subscriptionRepository->save($subscription);
+            $this->context->getMessageManager()->addSuccessMessage(
+                \__(
+                    'Recurring payments stopped for payment id: %id',
+                    [
+                        'id' => $subscription->getId()
+                    ]
+                )
+            );
+        } catch (CouldNotSaveException $exception) {
+            $this->context->getMessageManager()->addErrorMessage(
+                \__(
+                    'Error occurred while updating recurring payment: %error',
+                    ['error' => $exception->getMessage()]
+                )
+            );
+        }
+    }
+}
diff --git a/Controller/Adminhtml/Subscription/View.php b/Controller/Adminhtml/Subscription/View.php
new file mode 100644
index 00000000..0ab3cc33
--- /dev/null
+++ b/Controller/Adminhtml/Subscription/View.php
@@ -0,0 +1,34 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Controller\Adminhtml\Subscription;
+
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\ActionInterface;
+
+class View implements ActionInterface
+{
+
+    public function __construct(
+        private Context $context,
+    ) {
+    }
+
+    public function execute()
+    {
+        $page = $this->initialize();
+        $page->getConfig()->getTitle()->prepend(__('View Subscription'));
+
+        return $page;
+    }
+
+    private function initialize()
+    {
+        $resultPage = $this->context->getResultFactory()->create(
+            \Magento\Framework\Controller\ResultFactory::TYPE_PAGE
+        );
+        $resultPage->setActiveMenu('Magento_Sales::sales_order');
+
+        return $resultPage;
+    }
+}
diff --git a/Controller/Adminhtml/System/Config/TestConnection.php b/Controller/Adminhtml/System/Config/TestConnection.php
index 18921c24..8026a9c2 100644
--- a/Controller/Adminhtml/System/Config/TestConnection.php
+++ b/Controller/Adminhtml/System/Config/TestConnection.php
@@ -53,10 +53,9 @@ public function __construct(
     }
 
     /**
-     * Check for connection to server
+     * Check for connection to the server
      *
      * @return Json
-     * @throws JsonException
      */
     public function execute()
     {
diff --git a/Controller/Hpp/CancelAction.php b/Controller/Hpp/CancelAction.php
index 51aad0f8..c25e4d04 100644
--- a/Controller/Hpp/CancelAction.php
+++ b/Controller/Hpp/CancelAction.php
@@ -1,42 +1,79 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Nexi\Checkout\Controller\Hpp;
 
 use Magento\Checkout\Model\Session;
 use Magento\Framework\App\ActionInterface;
 use Magento\Framework\Controller\Result\RedirectFactory;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\UrlInterface;
+use Magento\Sales\Api\OrderManagementInterface;
 
 class CancelAction implements ActionInterface
 {
     /**
+     * CancelAction constructor.
+     *
      * @param RedirectFactory $resultRedirectFactory
      * @param UrlInterface $url
      * @param Session $checkoutSession
+     * @param OrderManagementInterface $orderManagementInterface
      * @param ManagerInterface $messageManager
      */
     public function __construct(
-        private readonly RedirectFactory $resultRedirectFactory,
-        private readonly UrlInterface $url,
-        private readonly Session $checkoutSession,
-        private readonly ManagerInterface $messageManager
+        private readonly RedirectFactory          $resultRedirectFactory,
+        private readonly UrlInterface             $url,
+        private readonly Session                  $checkoutSession,
+        private readonly OrderManagementInterface $orderManagementInterface,
+        private readonly ManagerInterface         $messageManager
     ) {
     }
 
     /**
-     * Execute action based on request and return result
+     * Execute cancel action.
      *
      * @return ResultInterface
+     * @throws LocalizedException
      */
     public function execute(): ResultInterface
     {
         $this->checkoutSession->restoreQuote();
+        $this->cancelOrderById((int)$this->checkoutSession->getLastOrderId());
         $this->messageManager->addNoticeMessage(__('The payment has been canceled.'));
-        
+
         return $this->resultRedirectFactory->create()->setUrl(
             $this->url->getUrl('checkout/cart/index', ['_secure' => true])
         );
     }
+
+    /**
+     * CancelOrderById function.
+     *
+     * @param int $orderId
+     * @return void
+     * @throws LocalizedException
+     */
+    private function cancelOrderById($orderId): void
+    {
+        try {
+            $this->orderManagementInterface->cancel($orderId);
+        } catch (\Exception $e) {
+            $this->logger->critical(sprintf(
+                'Nexi exception during order cancel: %s,\n error trace: %s',
+                $e->getMessage(),
+                $e->getTraceAsString()
+            ));
+
+            // Mask and throw end-user friendly exception
+            throw new LocalizedException(__(
+                'Error while cancelling order.
+                    Please contact customer support with order id: %id to release discount coupons.',
+                ['id' => $orderId]
+            ));
+        }
+    }
 }
diff --git a/Controller/Order/Payments.php b/Controller/Order/Payments.php
new file mode 100644
index 00000000..9cbc49c9
--- /dev/null
+++ b/Controller/Order/Payments.php
@@ -0,0 +1,34 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Controller\Order;
+
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\View\Result\Page;
+use Magento\Sales\Controller\OrderInterface;
+use Magento\Framework\View\Result\PageFactory;
+
+class Payments implements OrderInterface, HttpGetActionInterface
+{
+
+    /**
+     * @param PageFactory $resultPageFactory
+     */
+    public function __construct(
+        private PageFactory $resultPageFactory
+    ) {
+    }
+
+    /**
+     * Customer order history
+     *
+     * @return Page
+     */
+    public function execute()
+    {
+        $resultPage = $this->resultPageFactory->create();
+        $resultPage->getConfig()->getTitle()->set(__('My Subscriptions'));
+
+        return $resultPage;
+    }
+}
diff --git a/Controller/Payment/Stop.php b/Controller/Payment/Stop.php
new file mode 100644
index 00000000..fe1029dd
--- /dev/null
+++ b/Controller/Payment/Stop.php
@@ -0,0 +1,95 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Controller\Payment;
+
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Action;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Nexi\Checkout\Api\SubscriptionLinkRepositoryInterface;
+use Nexi\Checkout\Api\SubscriptionRepositoryInterface;
+use Nexi\Checkout\Model\Validation\PreventAdminActions;
+use Psr\Log\LoggerInterface;
+
+class Stop implements Action\HttpGetActionInterface
+{
+    public const STATUS_CLOSED        = 'closed';
+    public const ORDER_PENDING_STATUS = 'pending';
+
+
+    /**
+     * @param Context $context
+     * @param Session $customerSession
+     * @param SubscriptionRepositoryInterface $subscriptionRepositoryInterface
+     * @param OrderRepositoryInterface $orderRepositoryInterface
+     * @param OrderManagementInterface $orderManagementInterface
+     * @param LoggerInterface $logger
+     * @param SubscriptionLinkRepositoryInterface $subscriptionLinkRepositoryInterface
+     * @param PreventAdminActions $preventAdminActions
+     * @param ManagerInterface $messageManager
+     */
+    public function __construct(
+        private Context                             $context,
+        private Session                             $customerSession,
+        private SubscriptionRepositoryInterface     $subscriptionRepositoryInterface,
+        private OrderRepositoryInterface            $orderRepositoryInterface,
+        private OrderManagementInterface            $orderManagementInterface,
+        private LoggerInterface                     $logger,
+        private SubscriptionLinkRepositoryInterface $subscriptionLinkRepositoryInterface,
+        private PreventAdminActions                 $preventAdminActions,
+        private ManagerInterface                    $messageManager
+    ) {
+    }
+
+    /**
+     * @return ResultInterface
+     */
+    public function execute()
+    {
+        $subscriptionId = $this->context->getRequest()->getParam('payment_id');
+        $resultRedirect = $this->context->getResultFactory()->create(ResultFactory::TYPE_REDIRECT);
+
+        if ($this->preventAdminActions->isAdminAsCustomer()) {
+            $this->messageManager->addErrorMessage(__('Admin user is not authorized for this operation'));
+            $resultRedirect->setPath('nexi/order/payments');
+
+            return $resultRedirect;
+        }
+
+        try {
+            $subscription = $this->subscriptionRepositoryInterface->get((int)$subscriptionId);
+            $orderIds     = $this->subscriptionLinkRepositoryInterface->getOrderIdsBySubscriptionId(
+                (int)$subscriptionId
+            );
+
+            foreach ($orderIds as $orderId) {
+                $order = $this->orderRepositoryInterface->get($orderId);
+                if (!$this->customerSession->getId() || $this->customerSession->getId() != $order->getCustomerId()) {
+                    throw new LocalizedException(__('Customer is not authorized for this operation'));
+                }
+                $subscription->setStatus(self::STATUS_CLOSED);
+                if ($order->getStatus() === Order::STATE_PENDING_PAYMENT
+                    || $order->getStatus() === self::ORDER_PENDING_STATUS) {
+                    $this->orderManagementInterface->cancel($order->getId());
+                }
+            }
+
+            $this->subscriptionRepositoryInterface->save($subscription);
+            $resultRedirect->setPath('nexi/order/payments');
+            $this->messageManager->addSuccessMessage('Subscription stopped successfully');
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage());
+            $this->messageManager->addErrorMessage(__('Unable to stop payment'));
+            $resultRedirect->setPath('nexi/order/payments');
+        }
+
+        return $resultRedirect;
+    }
+}
diff --git a/Controller/Payment/Webhook.php b/Controller/Payment/Webhook.php
index 321004db..66b2b126 100644
--- a/Controller/Payment/Webhook.php
+++ b/Controller/Payment/Webhook.php
@@ -15,6 +15,7 @@
 use Magento\Framework\Serialize\SerializerInterface;
 use Nexi\Checkout\Gateway\Config\Config;
 use Nexi\Checkout\Model\WebhookHandler;
+use NexiCheckout\Model\Webhook\WebhookBuilder;
 use Psr\Log\LoggerInterface;
 
 class Webhook extends Action implements CsrfAwareActionInterface, HttpPostActionInterface
@@ -42,7 +43,6 @@ public function __construct(
      * Execute the webhook action
      *
      * @return void
-     * @throws Exception
      */
     public function execute()
     {
@@ -54,25 +54,14 @@ public function execute()
 
         try {
             $content = $this->serializer->unserialize($this->getRequest()->getContent());
+            $this->logger->info('Webhook called:', ['webhook_data' => $content]);
 
-            if (!isset($content['event'])) {
-                return $this->_response
-                    ->setHttpResponseCode(400)
-                    ->setBody('Missing event name');
-            }
+            $webhook = WebhookBuilder::fromJson($this->getRequest()->getContent());
 
-            $this->webhookHandler->handle($content);
-
-            $this->logger->info(
-                'Webhook called:',
-                [
-                    'webhook_data' => json_encode($this->getRequest()->getContent()),
-                    'payment_id'   => $this->getRequest()->getParam('payment_id'),
-                ]
-            );
+            $this->webhookHandler->handle($webhook);
             $this->_response->setHttpResponseCode(200);
         } catch (Exception $e) {
-            $this->logger->error($e->getMessage(), ['stacktrace' => $e->getTrace()]);
+            $this->logger->error($e->getMessage(), ['stacktrace' => $e->getTraceAsString()]);
             $this->_response->setHttpResponseCode(500);
         }
     }
diff --git a/Cron/SubscriptionBill.php b/Cron/SubscriptionBill.php
new file mode 100644
index 00000000..e5ba8d2e
--- /dev/null
+++ b/Cron/SubscriptionBill.php
@@ -0,0 +1,35 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Cron;
+
+use Nexi\Checkout\Model\Subscription\Bill;
+use Nexi\Checkout\Model\Subscription\TotalConfigProvider;
+
+class SubscriptionBill
+{
+    /**
+     * SubscriptionBill constructor.
+     *
+     * @param Bill $bill
+     * @param TotalConfigProvider $totalConfigProvider config provider
+     */
+    public function __construct(
+        private Bill $bill,
+        private TotalConfigProvider $totalConfigProvider
+    ) {
+    }
+
+    /**
+     * Execute
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function execute()
+    {
+        if ($this->totalConfigProvider->isSubscriptionsEnabled()) {
+            $this->bill->process();
+        }
+    }
+}
diff --git a/Cron/SubscriptionNotify.php b/Cron/SubscriptionNotify.php
new file mode 100644
index 00000000..e77fbe32
--- /dev/null
+++ b/Cron/SubscriptionNotify.php
@@ -0,0 +1,34 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Cron;
+
+use Nexi\Checkout\Model\Subscription\Notify;
+use Nexi\Checkout\Model\Subscription\TotalConfigProvider;
+
+class SubscriptionNotify
+{
+    /**
+     * SubscriptionNotify constructor.
+     *
+     * @param Notify $notify
+     * @param TotalConfigProvider $totalConfigProvider
+     */
+    public function __construct(
+        private Notify              $notify,
+        private TotalConfigProvider $totalConfigProvider
+    ) {
+    }
+
+    /**
+     * Execute
+     *
+     * @return void
+     */
+    public function execute()
+    {
+        if ($this->totalConfigProvider->isSubscriptionsEnabled()) {
+            $this->notify->process();
+        }
+    }
+}
diff --git a/Exceptions/CheckoutException.php b/Exceptions/CheckoutException.php
new file mode 100755
index 00000000..b09ae58e
--- /dev/null
+++ b/Exceptions/CheckoutException.php
@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Exceptions;
+
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Class CheckoutException
+ */
+class CheckoutException extends LocalizedException
+{
+
+}
diff --git a/Exceptions/TransactionSuccessException.php b/Exceptions/TransactionSuccessException.php
new file mode 100755
index 00000000..0f86d624
--- /dev/null
+++ b/Exceptions/TransactionSuccessException.php
@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Exceptions;
+
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Class TransactionSuccessException
+ */
+class TransactionSuccessException extends LocalizedException
+{
+
+}
diff --git a/Gateway/Command/Initialize.php b/Gateway/Command/Initialize.php
old mode 100755
new mode 100644
index 55fb2daf..76d3675e
--- a/Gateway/Command/Initialize.php
+++ b/Gateway/Command/Initialize.php
@@ -7,7 +7,6 @@
 use Exception;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Payment\Gateway\Command\CommandManagerPoolInterface;
-use Magento\Payment\Gateway\Command\ResultInterface;
 use Magento\Payment\Gateway\CommandInterface;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Payment\Gateway\Helper\SubjectReader;
@@ -27,12 +26,14 @@ class Initialize implements CommandInterface
      * @param CommandManagerPoolInterface $commandManagerPool
      * @param LoggerInterface $logger
      * @param Builder $transactionBuilder
+     * @param Config $config
      */
     public function __construct(
         private readonly SubjectReader $subjectReader,
         private readonly CommandManagerPoolInterface $commandManagerPool,
         private readonly LoggerInterface $logger,
-        private readonly Builder $transactionBuilder
+        private readonly Builder $transactionBuilder,
+        private readonly Config $config
     ) {
     }
 
@@ -40,19 +41,26 @@ public function __construct(
      * Implementation of execute method, creating payment in Nexi Gateway when order is placed
      *
      * @param array $commandSubject
-     *
-     * @throws LocalizedException
      */
-    public function execute(array $commandSubject)
+    public function execute(array $commandSubject): void
     {
         /** @var PaymentDataObjectInterface $payment */
         $paymentData = $this->subjectReader->readPayment($commandSubject);
         $stateObject = $this->subjectReader->readStateObject($commandSubject);
 
+        // For embedded integration, we don't need to create payment here, it was already created for the quote.
+        if ($this->config->isEmbedded() && $paymentData->getPayment()->getAdditionalInformation('payment_id')) {
+            return;
+        }
+
+        if ($paymentData->getPayment()->getAdditionalInformation('subscription_id')) {
+            return;
+        }
+
         /** @var InfoInterface $payment */
         $payment = $paymentData->getPayment();
         $payment->setIsTransactionPending(true);
-        $payment->setIsTransactionIsClosed(false);
+        $payment->setIsTransactionClosed(false);
 
         $order = $payment->getOrder();
         $order->setCanSendNewEmailFlag(false);
@@ -61,9 +69,9 @@ public function execute(array $commandSubject)
         $stateObject->setStatus(self::STATUS_PENDING);
         $stateObject->setIsNotified(false);
 
-        $this->cratePayment($paymentData);
+        $this->createPayment($paymentData);
 
-        $transactionId      = $payment->getAdditionalInformation('payment_id');
+        $transactionId = $payment->getAdditionalInformation('payment_id');
         $orderTransaction = $this->transactionBuilder->build(
             $transactionId,
             $order,
@@ -82,22 +90,31 @@ public function execute(array $commandSubject)
      *
      * @param PaymentDataObjectInterface $payment
      *
-     * @return ResultInterface|null
      * @throws LocalizedException
      */
-    public function cratePayment(PaymentDataObjectInterface $payment): ?ResultInterface
+    public function createPayment(PaymentDataObjectInterface $payment): void
     {
         try {
             $commandPool = $this->commandManagerPool->get(Config::CODE);
-            $result      = $commandPool->executeByCode(
+            $commandPool->executeByCode(
                 commandCode: 'create_payment',
-                arguments  : ['payment' => $payment,]
+                arguments  : ['payment' => $payment]
             );
         } catch (Exception $e) {
             $this->logger->error($e->getMessage(), ['stacktrace' => $e->getTrace()]);
             throw new LocalizedException(__('An error occurred during the payment process. Please try again later.'));
         }
+    }
 
-        return $result;
+    /**
+     * Check if payment is already created
+     *
+     * @param PaymentDataObjectInterface $payment
+     *
+     * @return bool
+     */
+    private function isPaymentAlreadyCreated(PaymentDataObjectInterface $payment): bool
+    {
+        return (bool)$payment->getPayment()->getAdditionalInformation('payment_id');
     }
 }
diff --git a/Gateway/Config/Config.php b/Gateway/Config/Config.php
index 59316262..7491bcec 100644
--- a/Gateway/Config/Config.php
+++ b/Gateway/Config/Config.php
@@ -7,7 +7,10 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Payment\Gateway\Config\Config as MagentoConfig;
 use Magento\Payment\Model\MethodInterface;
+use Magento\Store\Model\ScopeInterface;
 use Nexi\Checkout\Model\Config\Source\Environment;
+use Nexi\Checkout\Model\Config\Source\PaymentTypesEnum;
+use NexiCheckout\Model\Request\Payment\IntegrationTypeEnum;
 
 class Config extends MagentoConfig
 {
@@ -126,6 +129,16 @@ public function getIntegrationType(): string
         return $this->getValue('integration_type');
     }
 
+    /**
+     * Check integration type
+     *
+     * @return bool
+     */
+    public function isEmbedded(): bool
+    {
+        return $this->getIntegrationType() === IntegrationTypeEnum::EmbeddedCheckout->name;
+    }
+
     /**
      * Get webhook secret
      *
@@ -155,6 +168,51 @@ public function getPaymentAction(): string
      */
     public function getCountryCode()
     {
-        return $this->scopeConfig->isSetFlag('general/country/default');
+        return $this->scopeConfig->getValue('general/country/default', ScopeInterface::SCOPE_STORE);
+    }
+
+    /**
+     * Get Nexi logo.
+     *
+     * @return mixed|null
+     */
+    public function getNexiLogo()
+    {
+        return $this->getValue('logo');
+    }
+
+    /**
+     * Get payment method title.
+     *
+     * @return mixed|null
+     */
+    public function getNexiTitle()
+    {
+        return $this->getValue('title');
+    }
+
+    /**
+     * Get the value of pay_type_splitting.
+     *
+     * @return bool
+     */
+    public function getPayTypeSplitting(): bool
+    {
+        return (bool)$this->getValue('pay_type_splitting');
+    }
+
+    /**
+     * Retrieve the payment type options
+     *
+     * @return PaymentTypesEnum[]
+     */
+    public function getPayTypeOptions(): array
+    {
+        $values = explode(',', (string)$this->getValue('pay_type_options'));
+
+        return array_map(
+            fn($value) => \Nexi\Checkout\Model\Config\Source\PaymentTypesEnum::from($value),
+            array_filter($values)
+        );
     }
 }
diff --git a/Gateway/Handler/Capture.php b/Gateway/Handler/Capture.php
index e2f8296a..0089aa2d 100644
--- a/Gateway/Handler/Capture.php
+++ b/Gateway/Handler/Capture.php
@@ -11,8 +11,6 @@
 class Capture implements HandlerInterface
 {
     /**
-     * Constructor
-     *
      * @param SubjectReader $subjectReader
      */
     public function __construct(
@@ -31,6 +29,10 @@ public function handle(array $handlingSubject, array $response)
         /** @var ChargeResult[] $response */
         $chargeResult = reset($response);
 
+        if (!$chargeResult instanceof ChargeResult) {
+            return;
+        }
+
         $chargeId = $chargeResult->getChargeId();
 
         $payment->setAdditionalInformation('charge_id', $chargeId);
diff --git a/Gateway/Handler/CreatePayment.php b/Gateway/Handler/CreatePayment.php
index 869f2624..417f83d8 100644
--- a/Gateway/Handler/CreatePayment.php
+++ b/Gateway/Handler/CreatePayment.php
@@ -6,6 +6,8 @@
 
 use Magento\Payment\Gateway\Helper\SubjectReader;
 use Magento\Payment\Gateway\Response\HandlerInterface;
+use NexiCheckout\Model\Result\Payment\PaymentWithHostedCheckoutResult;
+use NexiCheckout\Model\Result\PaymentResult;
 
 class CreatePayment implements HandlerInterface
 {
@@ -24,10 +26,13 @@ public function handle(array $handlingSubject, array $response)
     {
         $paymentDO = $this->subjectReader->readPayment($handlingSubject);
         $payment   = $paymentDO->getPayment();
+        $paymentResult = reset($response);
+        if ($paymentResult instanceof PaymentResult) {
+            $payment->setAdditionalInformation('payment_id', $paymentResult->getPaymentId());
 
-        $response = reset($response);
-
-        $payment->setAdditionalInformation('payment_id', $response->getPaymentId());
-        $payment->setAdditionalInformation('redirect_url', $response->getHostedPaymentPageUrl());
+            if ($paymentResult instanceof PaymentWithHostedCheckoutResult) {
+                $payment->setAdditionalInformation('redirect_url', $paymentResult->getHostedPaymentPageUrl());
+            }
+        }
     }
 }
diff --git a/Gateway/Handler/RefundCharge.php b/Gateway/Handler/RefundCharge.php
index a0398a1a..5b7660dd 100644
--- a/Gateway/Handler/RefundCharge.php
+++ b/Gateway/Handler/RefundCharge.php
@@ -25,11 +25,12 @@ public function handle(array $handlingSubject, array $response)
     {
         $paymentDO = $this->subjectReader->readPayment($handlingSubject);
         $payment   = $paymentDO->getPayment();
+        $refundChargeResult = reset($response);
 
-        /** @var RefundChargeResult $response */
-        $response = reset($response);
-
-        $payment->setLastTransId($response->getRefundId());
-        $payment->setTransactionId($response->getRefundId());
+        /** @var RefundChargeResult $refundChargeResult */
+        if ($refundChargeResult instanceof RefundChargeResult) {
+            $payment->setLastTransId($refundChargeResult->getRefundId());
+            $payment->setTransactionId($refundChargeResult->getRefundId());
+        }
     }
 }
diff --git a/Gateway/Handler/Retrieve.php b/Gateway/Handler/Retrieve.php
new file mode 100644
index 00000000..7b66da82
--- /dev/null
+++ b/Gateway/Handler/Retrieve.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Gateway\Handler;
+
+use Magento\Payment\Gateway\Helper\SubjectReader;
+use Magento\Payment\Gateway\Response\HandlerInterface;
+use NexiCheckout\Model\Result\ChargeResult;
+use NexiCheckout\Model\Result\RetrievePaymentResult;
+
+class Retrieve implements HandlerInterface
+{
+    /**
+     * @param SubjectReader $subjectReader
+     */
+    public function __construct(
+        private readonly SubjectReader $subjectReader
+    ) {
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function handle(array $handlingSubject, array $response)
+    {
+        $paymentDO = $this->subjectReader->readPayment($handlingSubject);
+        $payment   = $paymentDO->getPayment();
+
+        /** @var ChargeResult[] $response */
+        $retrieveResult = reset($response);
+
+        if (!$retrieveResult instanceof RetrievePaymentResult) {
+            return;
+        }
+
+        $payment->setData('retrieved_payment', $retrieveResult);
+    }
+}
diff --git a/Gateway/Handler/SubscriptionCharge.php b/Gateway/Handler/SubscriptionCharge.php
new file mode 100644
index 00000000..6ea2f2db
--- /dev/null
+++ b/Gateway/Handler/SubscriptionCharge.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Gateway\Handler;
+
+use Magento\Payment\Gateway\Helper\SubjectReader;
+use Magento\Payment\Gateway\Response\HandlerInterface;
+use NexiCheckout\Model\Result\Payment\PaymentWithHostedCheckoutResult;
+use NexiCheckout\Model\Result\PaymentResult;
+
+class SubscriptionCharge implements HandlerInterface
+{
+    /**
+     * @param SubjectReader $subjectReader
+     */
+    public function __construct(
+        private readonly SubjectReader $subjectReader
+    ) {
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function handle(array $handlingSubject, array $response)
+    {
+        $paymentDO = $this->subjectReader->readPayment($handlingSubject);
+        $payment   = $paymentDO->getPayment();
+        $paymentResult = reset($response);
+        if ($paymentResult instanceof PaymentResult) {
+            $payment->setAdditionalInformation('payment_id', $paymentResult->getPaymentId());
+
+        }
+    }
+}
diff --git a/Gateway/Http/Client.php b/Gateway/Http/Client.php
index af37de50..55d271ac 100644
--- a/Gateway/Http/Client.php
+++ b/Gateway/Http/Client.php
@@ -10,12 +10,16 @@
 use Nexi\Checkout\Gateway\Config\Config;
 use NexiCheckout\Api\Exception\PaymentApiException;
 use NexiCheckout\Api\PaymentApi;
+use NexiCheckout\Api\SubscriptionApi;
 use NexiCheckout\Factory\PaymentApiFactory;
+use NexiCheckout\Model\Request\BulkChargeSubscription;
 use Psr\Log\LoggerInterface;
 
 class Client implements ClientInterface
 {
     /**
+     * Client constructor.
+     *
      * @param PaymentApiFactory $paymentApiFactory
      * @param Config $config
      * @param LoggerInterface $logger
@@ -23,7 +27,7 @@ class Client implements ClientInterface
     public function __construct(
         private readonly PaymentApiFactory $paymentApiFactory,
         private readonly Config            $config,
-        private readonly LoggerInterface   $logger
+        private readonly LoggerInterface   $logger,
     ) {
     }
 
@@ -38,7 +42,12 @@ public function __construct(
     public function placeRequest(TransferInterface $transferObject): array
     {
         try {
-            $paymentApi = $this->getPaymentApi();
+            if (($transferObject->getBody() instanceof BulkChargeSubscription)) {
+                $paymentApi = $this->getSubscriptionApi();
+            } else {
+                $paymentApi = $this->getPaymentApi();
+            }
+
             $nexiMethod = $transferObject->getUri();
             $this->logger->debug(
                 'Nexi Client request: ',
@@ -47,6 +56,7 @@ public function placeRequest(TransferInterface $transferObject): array
                     'request' => $transferObject->getBody()
                 ]
             );
+
             if (is_array($transferObject->getBody())) {
                 $response = $paymentApi->$nexiMethod(...$transferObject->getBody());
             } else {
@@ -57,6 +67,7 @@ public function placeRequest(TransferInterface $transferObject): array
                 'Nexi Client response: ',
                 ['response' => var_export($response, true)]
             );
+
         } catch (PaymentApiException|\Exception $e) {
             $this->logger->error($e->getMessage(), [$e]);
             throw new LocalizedException(__('An error occurred during the payment process. Please try again later.'));
@@ -77,4 +88,17 @@ public function getPaymentApi(): PaymentApi
             $this->config->isLiveMode()
         );
     }
+
+    /**
+     * Get Subscription API Client
+     *
+     * @return SubscriptionApi
+     */
+    public function getSubscriptionApi(): SubscriptionApi
+    {
+        return $this->paymentApiFactory->createSubscriptionApi(
+            (string)$this->config->getApiKey(),
+            $this->config->isLiveMode()
+        );
+    }
 }
diff --git a/Gateway/Http/TransferFactory.php b/Gateway/Http/TransferFactory.php
index 966b4f49..a21606c0 100644
--- a/Gateway/Http/TransferFactory.php
+++ b/Gateway/Http/TransferFactory.php
@@ -31,6 +31,7 @@ public function create(array $request): TransferInterface
     {
         $nexiMethod = $request['nexi_method'];
         unset($request['nexi_method']);
+
         return $this->transferBuilder
             ->setBody($request['body'])
             ->setUri($nexiMethod)
diff --git a/Gateway/Request/CreatePaymentRequestBuilder.php b/Gateway/Request/CreatePaymentRequestBuilder.php
index 5224a43f..e322faad 100644
--- a/Gateway/Request/CreatePaymentRequestBuilder.php
+++ b/Gateway/Request/CreatePaymentRequestBuilder.php
@@ -4,19 +4,21 @@
 
 namespace Nexi\Checkout\Gateway\Request;
 
-use libphonenumber\NumberParseException;
-use libphonenumber\PhoneNumberUtil;
 use Magento\Directory\Api\CountryInformationAcquirerInterface;
-use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\UrlInterface;
 use Magento\Payment\Gateway\Request\BuilderInterface;
+use Magento\Quote\Model\Quote;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Item as OrderItem;
+use Nexi\Checkout\Gateway\AmountConverter as AmountConverter;
 use Nexi\Checkout\Gateway\Config\Config;
+use Nexi\Checkout\Gateway\Request\NexiCheckout\GlobalRequestBuilder;
 use Nexi\Checkout\Gateway\Request\NexiCheckout\SalesDocumentItemsBuilder;
 use Nexi\Checkout\Gateway\StringSanitizer;
-use Nexi\Checkout\Model\WebhookHandler;
+use Nexi\Checkout\Model\Subscription\NextDateCalculator;
+use Nexi\Checkout\Model\Subscription\TotalConfigProvider;
 use NexiCheckout\Model\Request\Item;
 use NexiCheckout\Model\Request\Payment;
 use NexiCheckout\Model\Request\Payment\Address;
@@ -25,33 +27,31 @@
 use NexiCheckout\Model\Request\Payment\HostedCheckout;
 use NexiCheckout\Model\Request\Payment\IntegrationTypeEnum;
 use NexiCheckout\Model\Request\Payment\PrivatePerson;
-use NexiCheckout\Model\Request\Payment\PhoneNumber;
 use NexiCheckout\Model\Request\Shared\Notification;
-use NexiCheckout\Model\Request\Shared\Notification\Webhook;
-use NexiCheckout\Model\Request\Shared\Order as NexiRequestOrder;
-use Nexi\Checkout\Gateway\AmountConverter as AmountConverter;
 
 class CreatePaymentRequestBuilder implements BuilderInterface
 {
-    public const NEXI_PAYMENT_WEBHOOK_PATH = 'nexi/payment/webhook';
-
     /**
+     * CreatePaymentRequestBuilder constructor.
+     *
      * @param UrlInterface $url
      * @param Config $config
      * @param CountryInformationAcquirerInterface $countryInformationAcquirer
-     * @param EncryptorInterface $encryptor
-     * @param WebhookHandler $webhookHandler
      * @param AmountConverter $amountConverter
      * @param StringSanitizer $stringSanitizer
+     * @param TotalConfigProvider $totalConfigProvider
+     * @param GlobalRequestBuilder $globalRequestBuilder
+     * @param NextDateCalculator $nextDateCalculator
      */
     public function __construct(
-        private readonly UrlInterface $url,
-        private readonly Config $config,
+        private readonly UrlInterface                        $url,
+        private readonly Config                              $config,
         private readonly CountryInformationAcquirerInterface $countryInformationAcquirer,
-        private readonly EncryptorInterface $encryptor,
-        private readonly WebhookHandler $webhookHandler,
-        private readonly AmountConverter $amountConverter,
-        private readonly StringSanitizer $stringSanitizer,
+        private readonly AmountConverter                     $amountConverter,
+        private readonly StringSanitizer                     $stringSanitizer,
+        private readonly TotalConfigProvider                 $totalConfigProvider,
+        private readonly GlobalRequestBuilder                $globalRequestBuilder,
+        private readonly NextDateCalculator $nextDateCalculator
     ) {
     }
 
@@ -65,71 +65,59 @@ public function __construct(
      */
     public function build(array $buildSubject): array
     {
-        /** @var Order $order */
-        $order = $buildSubject['payment']->getPayment()->getOrder();
+        /** @var Order $paymentSubject */
+        $paymentSubject = $buildSubject['payment']->getPayment()->getOrder();
+
+        if (!$paymentSubject) {
+            $paymentSubject = $buildSubject['payment']->getPayment()->getQuote();
+        }
 
         return [
-            'nexi_method' => 'createHostedPayment',
-            'body'        => [
-                'payment' => $this->buildPayment($order),
+            'nexi_method' => $this->isEmbedded() ? 'createEmbeddedPayment' : 'createHostedPayment',
+            'body' => [
+                'payment' => $this->buildPayment($paymentSubject),
             ]
         ];
     }
 
-    /**
-     * Build the Sdk order object
-     *
-     * @param Order $order
-     *
-     * @return NexiRequestOrder
-     */
-    public function buildOrder(Order $order): NexiRequestOrder
-    {
-        return new NexiRequestOrder(
-            items    : $this->buildItems($order),
-            currency : $order->getBaseCurrencyCode(),
-            amount   : $this->amountConverter->convertToNexiAmount($order->getBaseGrandTotal()),
-            reference: $order->getIncrementId()
-        );
-    }
-
     /**
      * Build the Sdk items object
      *
-     * @param Order $order
+     * @param Order|Quote $paymentSubject
      *
      * @return OrderItem|array
      */
-    private function buildItems(Order $order): OrderItem|array
+    public function buildItems(Order|Quote $paymentSubject): OrderItem|array
     {
-        /** @var OrderItem $items */
-        foreach ($order->getAllVisibleItems() as $item) {
-            $items[] = new Item(
-                name            : $item->getName(),
-                quantity        : (float)$item->getQtyOrdered(),
-                unit            : 'pcs',
-                unitPrice       : $this->amountConverter->convertToNexiAmount($item->getPrice()),
-                grossTotalAmount: $this->amountConverter->convertToNexiAmount($item->getRowTotalInclTax()),
-                netTotalAmount  : $this->amountConverter->convertToNexiAmount($item->getRowTotal()),
-                reference       : $item->getSku(),
-                taxRate         : $this->amountConverter->convertToNexiAmount($item->getTaxPercent()),
-                taxAmount       : $this->amountConverter->convertToNexiAmount($item->getTaxAmount()),
-            );
+        $items = $this->globalRequestBuilder->getProductsData($paymentSubject);
+
+        if ($paymentSubject instanceof Order) {
+            $shippingInfoHolder = $paymentSubject;
+        } else {
+            $shippingInfoHolder = $paymentSubject->getShippingAddress();
         }
 
-        if ($order->getShippingAmount()) {
+        if ($shippingInfoHolder->getShippingInclTax()) {
             $items[] = new Item(
-                name            : $order->getShippingDescription(),
-                quantity        : 1,
-                unit            : 'pcs',
-                unitPrice       : $this->amountConverter->convertToNexiAmount($order->getShippingAmount()),
-                grossTotalAmount: $this->amountConverter->convertToNexiAmount($order->getShippingInclTax()),
-                netTotalAmount  : $this->amountConverter->convertToNexiAmount($order->getShippingAmount()),
-                reference       : SalesDocumentItemsBuilder::SHIPPING_COST_REFERENCE,
-                taxRate         : $this->amountConverter->convertToNexiAmount(
-                    $order->getTaxAmount() / $order->getGrandTotal()
+                name: $shippingInfoHolder->getShippingDescription(),
+                quantity: 1,
+                unit: 'pcs',
+                unitPrice: $this->amountConverter->convertToNexiAmount(
+                    $shippingInfoHolder->getBaseShippingAmount()
+                ),
+                grossTotalAmount: $this->amountConverter->convertToNexiAmount(
+                    $shippingInfoHolder->getBaseShippingInclTax()
+                ),
+                netTotalAmount: $this->amountConverter->convertToNexiAmount(
+                    $shippingInfoHolder->getBaseShippingAmount()
+                ),
+                reference: SalesDocumentItemsBuilder::SHIPPING_COST_REFERENCE,
+                taxRate: $this->amountConverter->convertToNexiAmount(
+                    $this->globalRequestBuilder->getShippingTaxRate($paymentSubject)
+                ),
+                taxAmount: $this->amountConverter->convertToNexiAmount(
+                    $shippingInfoHolder->getBaseShippingTaxAmount()
                 ),
-                taxAmount       : $this->amountConverter->convertToNexiAmount($order->getShippingTaxAmount()),
             );
         }
 
@@ -137,142 +125,162 @@ private function buildItems(Order $order): OrderItem|array
     }
 
     /**
-     * Build The Sdk payment object
+     * Build payment object for a request
      *
-     * @param Order $order
+     * @param Order|Quote $order
      *
      * @return Payment
-     * @throws NoSuchEntityException
      */
-    private function buildPayment(Order $order): Payment
+    private function buildPayment(Order|Quote $order): Payment
     {
         return new Payment(
-            order       : $this->buildOrder($order),
-            checkout    : $this->buildCheckout($order),
-            notification: new Notification($this->buildWebhooks()),
+            order: $this->globalRequestBuilder->buildOrder($order),
+            checkout: $this->buildCheckout($order),
+            notification: new Notification($this->globalRequestBuilder->buildWebhooks()),
+            subscription: $this->getSubscriptionSetup($order),
+            paymentMethodsConfiguration: $this->globalRequestBuilder->buildPaymentMethodsConfiguration(
+                $order
+            ),
         );
     }
 
     /**
-     * Build the webhooks for the payment
+     * Build Checkout request object
      *
-     * @return array<Webhook>
+     * @param Order|Quote $salesObject
      *
-     * added all for now, we need to check wh
+     * @return HostedCheckout|EmbeddedCheckout
      */
-    public function buildWebhooks(): array
+    public function buildCheckout(Quote|Order $salesObject): HostedCheckout|EmbeddedCheckout
     {
-        $webhooks = [];
-        foreach ($this->webhookHandler->getWebhookProcessors() as $eventName => $processor) {
-            $webhookUrl = $this->url->getUrl(self::NEXI_PAYMENT_WEBHOOK_PATH);
-            $webhooks[] = new Webhook(
-                eventName    : $eventName,
-                url          : $webhookUrl,
-                authorization: $this->encryptor->hash($this->config->getWebhookSecret())
-            );
-        }
-
-        return $webhooks;
+        return $this->isEmbedded() ?
+            $this->buildEmbeddedCheckout($salesObject) :
+            $this->buildHostedCheckout($salesObject);
     }
 
     /**
-     * Build the checkout object
+     * Build the consumer object
      *
-     * @param Order $order
+     * @param Order|Quote $salesObject
      *
-     * @return HostedCheckout|EmbeddedCheckout
-     * @throws NoSuchEntityException
+     * @return Consumer
      */
-    public function buildCheckout(Order $order): HostedCheckout|EmbeddedCheckout
+    private function buildConsumer(Order|Quote $salesObject): Consumer
     {
-        if ($this->config->getIntegrationType() == IntegrationTypeEnum::EmbeddedCheckout) {
-            return new EmbeddedCheckout(
-                url             : $this->url->getUrl('checkout'),
-                termsUrl        : $this->config->getPaymentsTermsAndConditionsUrl(),
-                merchantTermsUrl: $this->config->getWebshopTermsAndConditionsUrl(),
-                consumer        : $this->buildConsumer($order),
-            );
-        }
+        $customerId = $salesObject->getCustomerId();
+        $shippingAddress = $salesObject->getShippingAddress();
+        $billingAddress = $salesObject->getBillingAddress();
+        $lastName = $salesObject->getCustomerLastname() ?: $shippingAddress->getLastname();
+        $firstName = $salesObject->getCustomerFirstname() ?: $shippingAddress->getFirstname();
+        $email = $salesObject->getCustomerEmail() ?: $shippingAddress->getEmail();
 
-        return new HostedCheckout(
-            returnUrl                  : $this->url->getUrl('checkout/onepage/success'),
-            cancelUrl                  : $this->url->getUrl('nexi/hpp/cancelaction'),
-            termsUrl                   : $this->config->getWebshopTermsAndConditionsUrl(),
-            consumer                   : $this->buildConsumer($order),
-            isAutoCharge               : $this->config->getPaymentAction() == 'authorize_capture',
+        return new Consumer(
+            email: $email,
+            reference: $customerId,
+            shippingAddress: new Address(
+                addressLine1: $this->stringSanitizer->sanitize($shippingAddress->getStreetLine(1)),
+                addressLine2: $this->stringSanitizer->sanitize($shippingAddress->getStreetLine(2)),
+                postalCode: $shippingAddress->getPostcode(),
+                city: $this->stringSanitizer->sanitize($shippingAddress->getCity()),
+                country: $this->getThreeLetterCountryCode($shippingAddress->getCountryId()),
+            ),
+            billingAddress: new Address(
+                addressLine1: $this->stringSanitizer->sanitize($billingAddress->getStreetLine(1)),
+                addressLine2: $this->stringSanitizer->sanitize($billingAddress->getStreetLine(2)),
+                postalCode: $billingAddress->getPostcode(),
+                city: $this->stringSanitizer->sanitize($billingAddress->getCity()),
+                country: $this->getThreeLetterCountryCode($billingAddress->getCountryId()),
+            ),
+            privatePerson: new PrivatePerson(
+                firstName: $this->stringSanitizer->sanitize($firstName),
+                lastName: $this->stringSanitizer->sanitize($lastName),
+            ),
+            phoneNumber: $this->globalRequestBuilder->getNumber($salesObject)
+        );
+    }
+
+    /**
+     * Check integration type
+     *
+     * @return bool
+     */
+    public function isEmbedded(): bool
+    {
+        return $this->config->getIntegrationType() === IntegrationTypeEnum::EmbeddedCheckout->name;
+    }
+
+    /**
+     * Build Embedded Checkout request object
+     *
+     * @param Quote|Order $salesObject
+     *
+     * @return EmbeddedCheckout
+     */
+    public function buildEmbeddedCheckout(Quote|Order $salesObject): EmbeddedCheckout
+    {
+        return new EmbeddedCheckout(
+            url: $this->url->getUrl('checkout/onepage/success'),
+            termsUrl: $this->config->getPaymentsTermsAndConditionsUrl(),
+            consumer: $this->buildConsumer($salesObject),
+            isAutoCharge: $this->config->getPaymentAction() == 'authorize_capture',
             merchantHandlesConsumerData: true,
-            countryCode                : $this->getThreeLetterCountryCode(),
+            countryCode: $this->getThreeLetterCountryCode($this->config->getCountryCode()),
         );
     }
 
     /**
-     * Build the consumer object
+     * Build the checkout for hosted integration type
      *
-     * @param Order $order
+     * @param Quote|Order $salesObject
      *
-     * @return Consumer
-     * @throws NoSuchEntityException
+     * @return HostedCheckout
      */
-    private function buildConsumer(Order $order): Consumer
+    public function buildHostedCheckout(Quote|Order $salesObject): HostedCheckout
     {
-        return new Consumer(
-            email          : $order->getCustomerEmail(),
-            reference      : $order->getCustomerId(),
-            shippingAddress: new Address(
-                addressLine1: $this->stringSanitizer->sanitize($order->getShippingAddress()->getStreetLine(1)),
-                addressLine2: $this->stringSanitizer->sanitize($order->getShippingAddress()->getStreetLine(2)),
-                postalCode  : $order->getShippingAddress()->getPostcode(),
-                city        : $this->stringSanitizer->sanitize($order->getShippingAddress()->getCity()),
-                country     : $this->getThreeLetterCountryCode(),
-            ),
-            billingAddress : new Address(
-                addressLine1: $this->stringSanitizer->sanitize($order->getBillingAddress()->getStreetLine(1)),
-                addressLine2: $this->stringSanitizer->sanitize($order->getBillingAddress()->getStreetLine(2)),
-                postalCode  : $order->getBillingAddress()->getPostcode(),
-                city        : $order->getBillingAddress()->getCity(),
-                country     : $this->getThreeLetterCountryCode(),
-            ),
-            privatePerson  : new PrivatePerson(
-                firstName: $this->stringSanitizer->sanitize($order->getCustomerFirstname()),
-                lastName : $this->stringSanitizer->sanitize($order->getCustomerLastname()),
-            ),
-            phoneNumber    : $this->getNumber($order)
+        return new HostedCheckout(
+            returnUrl: $this->url->getUrl('checkout/onepage/success'),
+            cancelUrl: $this->url->getUrl('nexi/hpp/cancelaction'),
+            termsUrl: $this->config->getWebshopTermsAndConditionsUrl(),
+            consumer: $this->buildConsumer($salesObject),
+            isAutoCharge: $this->config->getPaymentAction() == 'authorize_capture',
+            merchantHandlesConsumerData: true,
+            countryCode: $this->getThreeLetterCountryCode($this->config->getCountryCode()),
         );
     }
 
     /**
      * Get the three-letter country code
      *
+     * @param string $countryCode
+     *
      * @return string
-     * @throws NoSuchEntityException
      */
-    public function getThreeLetterCountryCode(): string
+    public function getThreeLetterCountryCode(string $countryCode): string
     {
         return $this->countryInformationAcquirer->getCountryInfo(
-            $this->config->getCountryCode()
+            $countryCode
         )->getThreeLetterAbbreviation();
     }
 
     /**
-     * Build phone number object for the payment
-     *
-     * @param Order $order
+     * Set subscription setup for the payment.
      *
      * @return PhoneNumber
-     * @throws NumberParseException
      */
-    public function getNumber(Order $order): PhoneNumber
+    private function getSubscriptionSetup(): ?Payment\Subscription
     {
-        $lib = PhoneNumberUtil::getInstance();
+        if ($this->totalConfigProvider->isSubscriptionScheduled()
+            && $this->totalConfigProvider->isSubscriptionsEnabled()
+        ) {
+            $subscriptionProfileId = $this->totalConfigProvider->getSubscriptionProfileId();
 
-        $number = $lib->parse(
-            $order->getShippingAddress()->getTelephone(),
-            $order->getShippingAddress()->getCountryId()
-        );
+            return new Payment\Subscription(
+                subscriptionId: null,
+                endDate: new \DateTime((int)date('Y') + 100 . '-01-01'),
+                interval: $this->nextDateCalculator->getDaysInterval((int)$subscriptionProfileId),
+            );
+        }
 
-        return new PhoneNumber(
-            prefix: '+' . $number->getCountryCode(),
-            number: (string)$number->getNationalNumber(),
-        );
+        return null;
     }
 }
diff --git a/Gateway/Request/NexiCheckout/GlobalRequestBuilder.php b/Gateway/Request/NexiCheckout/GlobalRequestBuilder.php
new file mode 100644
index 00000000..2b094eb5
--- /dev/null
+++ b/Gateway/Request/NexiCheckout/GlobalRequestBuilder.php
@@ -0,0 +1,350 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Gateway\Request\NexiCheckout;
+
+use libphonenumber\PhoneNumberUtil;
+use Magento\Bundle\Model\Product\Price;
+use Magento\Bundle\Model\Product\Type as BundleType;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
+use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Item as OrderItem;
+use Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector;
+use Nexi\Checkout\Gateway\AmountConverter as AmountConverter;
+use Nexi\Checkout\Gateway\Config\Config;
+use Nexi\Checkout\Model\WebhookHandler;
+use NexiCheckout\Model\Request\Item;
+use NexiCheckout\Model\Request\Payment\MethodConfiguration;
+use NexiCheckout\Model\Request\Payment\PhoneNumber;
+use NexiCheckout\Model\Request\Shared\Notification\Webhook;
+use NexiCheckout\Model\Request\Shared\Order as NexiRequestOrder;
+
+class GlobalRequestBuilder
+{
+    public const NEXI_PAYMENT_WEBHOOK_PATH = 'nexi/payment/webhook';
+
+    /**
+     * GlobalRequestBuilder constructor.
+     *
+     * @param UrlInterface $url
+     * @param Config $config
+     * @param EncryptorInterface $encryptor
+     * @param WebhookHandler $webhookHandler
+     * @param AmountConverter $amountConverter
+     */
+    public function __construct(
+        private readonly UrlInterface $url,
+        private readonly Config $config,
+        private readonly EncryptorInterface $encryptor,
+        private readonly WebhookHandler $webhookHandler,
+        private readonly AmountConverter $amountConverter,
+    ) {
+    }
+
+    /**
+     * Build the webhooks for the payment
+     *
+     * @return array
+     */
+    public function buildWebhooks(): array
+    {
+        $webhooks = [];
+        foreach ($this->webhookHandler->getWebhookProcessors() as $eventName => $processor) {
+            $webhookUrl = $this->url->getUrl(self::NEXI_PAYMENT_WEBHOOK_PATH);
+            $webhooks[] = new Webhook(
+                eventName    : $eventName,
+                url          : $webhookUrl,
+                authorization: $this->encryptor->hash($this->config->getWebhookSecret())
+            );
+        }
+
+        return $webhooks;
+    }
+
+    /**
+     * Get Phone number from the address
+     *
+     * @param Order|Quote $salesObject
+     *
+     * @return PhoneNumber
+     */
+    public function getNumber(Order|Quote $salesObject): PhoneNumber
+    {
+        $lib = PhoneNumberUtil::getInstance();
+
+        $telephone = $salesObject->getShippingAddress()->getTelephone();
+        $countryId = $salesObject->getShippingAddress()->getCountryId();
+
+        $number = $lib->parse(
+            $telephone,
+            $countryId
+        );
+
+        return new PhoneNumber(
+            prefix: '+' . $number->getCountryCode(),
+            number: (string)$number->getNationalNumber(),
+        );
+    }
+
+    /**
+     * Build the Sdk order object
+     *
+     * @param Quote|Order $order
+     *
+     * @return NexiRequestOrder
+     */
+    public function buildOrder(Quote|Order $order): NexiRequestOrder
+    {
+        return new NexiRequestOrder(
+            items    : $this->buildItems($order),
+            currency : $order->getBaseCurrencyCode(),
+            amount   : $this->amountConverter->convertToNexiAmount($order->getBaseGrandTotal()),
+            reference: $order->getIncrementId()
+        );
+    }
+
+    /**
+     * Build the Sdk items object
+     *
+     * @param Order|Quote $paymentSubject
+     *
+     * @return OrderItem|array
+     */
+    private function buildItems(Order|Quote $paymentSubject): OrderItem|array
+    {
+        $items = $this->getProductsData($paymentSubject);
+
+        if ($paymentSubject instanceof Order) {
+            $shippingInfoHolder = $paymentSubject;
+        } else {
+            $shippingInfoHolder = $paymentSubject->getShippingAddress();
+        }
+
+        if ($shippingInfoHolder->getShippingInclTax()) {
+            $items[] = new Item(
+                name            : $shippingInfoHolder->getShippingDescription(),
+                quantity        : 1,
+                unit            : 'pcs',
+                unitPrice       : $this->amountConverter->convertToNexiAmount(
+                    $shippingInfoHolder->getBaseShippingAmount()
+                ),
+                grossTotalAmount: $this->amountConverter->convertToNexiAmount(
+                    $shippingInfoHolder->getBaseShippingInclTax()
+                ),
+                netTotalAmount  : $this->amountConverter->convertToNexiAmount(
+                    $shippingInfoHolder->getBaseShippingAmount()
+                ),
+                reference       : SalesDocumentItemsBuilder::SHIPPING_COST_REFERENCE,
+                taxRate         : $this->amountConverter->convertToNexiAmount(
+                    $this->getShippingTaxRate($paymentSubject)
+                ),
+                taxAmount       : $this->amountConverter->convertToNexiAmount(
+                    $shippingInfoHolder->getBaseShippingTaxAmount()
+                ),
+            );
+        }
+
+        return $items;
+    }
+
+    /**
+     * Get shipping tax rate from the order
+     *
+     * @param Order|Quote $paymentSubject
+     *
+     * @return float
+     */
+    public function getShippingTaxRate(Order|Quote $paymentSubject)
+    {
+        if ($paymentSubject instanceof Order) {
+            foreach ($paymentSubject->getExtensionAttributes()?->getItemAppliedTaxes() as $tax) {
+                if ($tax->getType() == CommonTaxCollector::ITEM_TYPE_SHIPPING) {
+                    $appliedTaxes = $tax->getAppliedTaxes();
+                    return reset($appliedTaxes)->getPercent();
+                }
+            }
+        }
+        if ($paymentSubject instanceof Quote) {
+            if (!(float)$paymentSubject->getShippingAddress()->getBaseShippingAmount()) {
+                return 0.0;
+            }
+            $shippingTaxRate = $paymentSubject->getShippingAddress()->getBaseShippingTaxAmount() /
+                $paymentSubject->getShippingAddress()->getBaseShippingAmount() * 100;
+            if ($shippingTaxRate) {
+                return $shippingTaxRate;
+            }
+        }
+
+        return 0.0;
+    }
+
+    /**
+     * Build payload with order items data based on product type
+     *
+     * @param Order|Quote $paymentSubject
+     *
+     * @return array
+     */
+    public function getProductsData(Order|Quote $paymentSubject): array
+    {
+        $items = [];
+        /** @var OrderItem|Quote\Item $item */
+        foreach ($paymentSubject->getAllVisibleItems() as $item) {
+
+            if ($item->getParentItem()) {
+                continue;
+            }
+
+            switch ($item->getProductType()) {
+                case ConfigurableType::TYPE_CODE:
+                    $children = $this->getChildren($item);
+                    foreach ($children as $childItem) {
+                        $base = $this->createItemBaseData($childItem);
+                        $enriched = $this->appendPriceData($base, $item);
+                        $items[] = $this->createFinalItem($enriched);
+                    }
+                    break;
+                case BundleType::TYPE_CODE:
+                    $isDynamicPrice = $item->getProduct()->getPriceType() == Price::PRICE_TYPE_DYNAMIC;
+                    $children = $this->getChildren($item);
+                    if ($isDynamicPrice) {
+                        foreach ($children as $childItem) {
+                            $base = $this->createItemBaseData($childItem);
+                            $enriched = $this->appendPriceData($base, $childItem);
+                            $items[] = $this->createFinalItem($enriched);
+                        }
+                    } else {
+                        $base = $this->createItemBaseData($item);
+                        $enriched = $this->appendPriceData($base, $item);
+                        $items[] = $this->createFinalItem($enriched);
+                    }
+                    break;
+                default:
+                    $base = $this->createItemBaseData($item);
+                    $enriched = $this->appendPriceData($base, $item);
+                    $items[] = $this->createFinalItem($enriched);
+            }
+        }
+
+        return $items;
+    }
+
+    /**
+     * Create the nexi SDK item
+     *
+     * @param array $data
+     *
+     * @return Item
+     */
+    private function createFinalItem(array $data): Item
+    {
+        return new Item(
+            name            : $data['name'],
+            quantity        : $data['quantity'],
+            unit            : $data['unit'],
+            unitPrice       : $data['unitPrice'],
+            grossTotalAmount: $data['grossTotalAmount'],
+            netTotalAmount  : $data['netTotalAmount'],
+            reference       : $data['reference'],
+            taxRate         : $data['taxRate'],
+            taxAmount       : $data['taxAmount'],
+        );
+    }
+
+    /**
+     * Creates base data array for an item including name, SKU, quantity, and unit.
+     *
+     * @param mixed $item
+     *
+     * @return array
+     */
+    private function createItemBaseData(mixed $item): array
+    {
+        return [
+            'name'      => $item->getName(),
+            'reference' => $item->getSku(),
+            'quantity'  => $this->getQuantity($item),
+            'unit'      => 'pcs'
+        ];
+    }
+
+    /**
+     * Get children items of a given order item or quote item.
+     *
+     * @param OrderItem|Quote\Item $item
+     *
+     * @return array|Quote\Item\AbstractItem[]
+     */
+    private function getChildren(OrderItem|Quote\Item $item): array
+    {
+        $children = $item instanceof OrderItem ? $item->getChildrenItems() : $item->getChildren();
+
+        return $children;
+    }
+
+    /**
+     * Returns the quantity of the item.
+     *
+     * @param mixed $item
+     *
+     * @return float
+     */
+    private function getQuantity(mixed $item): float
+    {
+        $qtyOrdered = $item instanceof OrderItem ? $item->getQtyOrdered() : $item->getQty();
+
+        return (float)$qtyOrdered;
+    }
+
+    /**
+     * Appends pricing and tax data to the given item data array.
+     *
+     * @param array $data
+     * @param mixed $item
+     *
+     * @return array
+     */
+    private function appendPriceData(array $data, mixed $item): array
+    {
+        $data['unitPrice'] = $this->amountConverter->convertToNexiAmount(
+            $item->getBasePrice() - $item->getBaseDiscountAmount() / $this->getQuantity($item)
+        );
+        $data['grossTotalAmount'] = $this->amountConverter->convertToNexiAmount(
+            $item->getBaseRowTotal() - $item->getBaseDiscountAmount() + $item->getBaseTaxAmount()
+        );
+        $data['netTotalAmount'] = $this->amountConverter->convertToNexiAmount(
+            $item->getBaseRowTotal() - $item->getBaseDiscountAmount()
+        );
+        $data['taxRate'] = $this->amountConverter->convertToNexiAmount($item->getTaxPercent());
+        $data['taxAmount'] = $this->amountConverter->convertToNexiAmount($item->getBaseTaxAmount());
+
+        return $data;
+    }
+
+    /**
+     * Build the payment methods configuration for the order or quote.
+     *
+     * @param Quote|Order $salesObject
+     *
+     * @return MethodConfiguration[]
+     */
+    public function buildPaymentMethodsConfiguration(Quote|Order $salesObject): array
+    {
+        $subselection = $salesObject->getPayment()->getAdditionalInformation('subselection');
+
+        if (!$this->config->getPayTypeSplitting() || !$subselection) {
+            return [];
+        }
+
+        return [
+            new MethodConfiguration(
+                name   : $subselection,
+                enabled: true
+            )
+        ];
+    }
+}
diff --git a/Gateway/Request/NexiCheckout/SalesDocumentItemsBuilder.php b/Gateway/Request/NexiCheckout/SalesDocumentItemsBuilder.php
index d7822fcf..c9852778 100644
--- a/Gateway/Request/NexiCheckout/SalesDocumentItemsBuilder.php
+++ b/Gateway/Request/NexiCheckout/SalesDocumentItemsBuilder.php
@@ -15,6 +15,8 @@ class SalesDocumentItemsBuilder
     public const SHIPPING_COST_REFERENCE = 'shipping_cost_ref';
 
     /**
+     * SalesDocumentItemsBuilder constructor.
+     *
      * @param AmountConverter $amountConverter
      * @param StringSanitizer $stringSanitizer
      */
@@ -35,16 +37,19 @@ public function build(CreditmemoInterface|InvoiceInterface $salesObject): array
     {
         $items = [];
         foreach ($salesObject->getAllItems() as $item) {
+            if ((double)$item->getBasePrice() === 0.0) {
+                continue;
+            }
             $items[] = new Item(
                 name            : $this->stringSanitizer->sanitize($item->getName()),
                 quantity        : (float)$item->getQty(),
                 unit            : 'pcs',
-                unitPrice       : $this->amountConverter->convertToNexiAmount($item->getPrice()),
-                grossTotalAmount: $this->amountConverter->convertToNexiAmount($item->getRowTotalInclTax()),
-                netTotalAmount  : $this->amountConverter->convertToNexiAmount($item->getRowTotal()),
+                unitPrice       : $this->amountConverter->convertToNexiAmount($item->getBasePrice()),
+                grossTotalAmount: $this->amountConverter->convertToNexiAmount($item->getBaseRowTotalInclTax()),
+                netTotalAmount  : $this->amountConverter->convertToNexiAmount($item->getBaseRowTotal()),
                 reference       : $this->stringSanitizer->sanitize($item->getSku()),
-                taxRate         : $this->amountConverter->convertToNexiAmount($item->getTaxPercent()),
-                taxAmount       : $this->amountConverter->convertToNexiAmount($item->getTaxAmount()),
+                taxRate         : $this->amountConverter->convertToNexiAmount($this->calculateTaxRate($item)),
+                taxAmount       : $this->amountConverter->convertToNexiAmount($item->getBaseTaxAmount()),
             );
         }
 
@@ -53,18 +58,46 @@ public function build(CreditmemoInterface|InvoiceInterface $salesObject): array
                 name            : $this->stringSanitizer->sanitize($salesObject->getOrder()->getShippingDescription()),
                 quantity        : 1,
                 unit            : 'pcs',
-                unitPrice       : $this->amountConverter->convertToNexiAmount($salesObject->getShippingAmount()),
-                grossTotalAmount: $this->amountConverter->convertToNexiAmount($salesObject->getShippingInclTax()),
-                netTotalAmount  : $this->amountConverter->convertToNexiAmount($salesObject->getShippingAmount()),
+                unitPrice       : $this->amountConverter->convertToNexiAmount($salesObject->getBaseShippingAmount()),
+                grossTotalAmount: $this->amountConverter->convertToNexiAmount($salesObject->getBaseShippingInclTax()),
+                netTotalAmount  : $this->amountConverter->convertToNexiAmount($salesObject->getBaseShippingAmount()),
                 reference       : self::SHIPPING_COST_REFERENCE,
                 taxRate         : $salesObject->getGrandTotal() ?
                     $this->amountConverter->convertToNexiAmount(
-                        $salesObject->getTaxAmount() / $salesObject->getGrandTotal()
+                        $this->calculateShippingTaxRate($salesObject)
                     ) : 0,
-                taxAmount       : $this->amountConverter->convertToNexiAmount($salesObject->getShippingTaxAmount()),
+                taxAmount       : $this->amountConverter->convertToNexiAmount($salesObject->getBaseShippingTaxAmount()),
             );
         }
 
         return $items;
     }
+
+    /**
+     * Calculate the tax rate for a given item.
+     *
+     * @param mixed $item
+     *
+     * @return mixed
+     */
+    private function calculateTaxRate(mixed $item): mixed
+    {
+        return $item->getTaxAmount() / $item->getRowTotal() * 100;
+    }
+
+    /**
+     * Calculate the shipping tax rate for a given sales object.
+     *
+     * @param InvoiceInterface|CreditmemoInterface $salesObject
+     *
+     * @return float|int
+     */
+    private function calculateShippingTaxRate(InvoiceInterface|CreditmemoInterface $salesObject): int|float
+    {
+        if ($salesObject->getShippingAmount() == 0) {
+            return 0;
+        }
+
+        return $salesObject->getShippingTaxAmount() / $salesObject->getShippingAmount() * 100;
+    }
 }
diff --git a/Gateway/Request/RetrieveRequestBuilder.php b/Gateway/Request/RetrieveRequestBuilder.php
new file mode 100644
index 00000000..fd36515f
--- /dev/null
+++ b/Gateway/Request/RetrieveRequestBuilder.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Gateway\Request;
+
+use Magento\Payment\Gateway\Request\BuilderInterface;
+use Magento\Sales\Model\Order;
+use Nexi\Checkout\Gateway\Request\NexiCheckout\SalesDocumentItemsBuilder;
+use NexiCheckout\Model\Request\Charge\Shipping;
+use NexiCheckout\Model\Request\PartialRefundCharge;
+
+class RetrieveRequestBuilder implements BuilderInterface
+{
+    /**
+     * @param SalesDocumentItemsBuilder $documentItemsBuilder
+     */
+    public function __construct(
+        private readonly SalesDocumentItemsBuilder $documentItemsBuilder
+    ) {
+    }
+
+    /**
+     * Build nexi PartialRefundCharge request
+     *
+     * @param array $buildSubject
+     *
+     * @return array
+     */
+    public function build(array $buildSubject): array
+    {
+        /** @var Order $order */
+        $payment    = $buildSubject['payment']->getPayment();
+        $creditmemo = $payment->getCreditmemo();
+
+        return [
+            'nexi_method' => 'retrievePayment',
+            'body'        => [
+                'paymentId' => $payment->getAdditionalInformation('payment_id')
+            ]
+        ];
+    }
+}
diff --git a/Gateway/Request/SubscriptionChargeRequestBuilder.php b/Gateway/Request/SubscriptionChargeRequestBuilder.php
new file mode 100644
index 00000000..174c1ee7
--- /dev/null
+++ b/Gateway/Request/SubscriptionChargeRequestBuilder.php
@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Gateway\Request;
+
+use Magento\Payment\Gateway\Request\BuilderInterface;
+use Magento\Sales\Model\Order;
+use Nexi\Checkout\Gateway\Request\NexiCheckout\GlobalRequestBuilder;
+use Nexi\Checkout\Model\Subscription\SubscriptionLinkRepository;
+use NexiCheckout\Model\Request\BulkChargeSubscription;
+use NexiCheckout\Model\Request\BulkChargeSubscription\Subscription;
+use NexiCheckout\Model\Request\Shared\Notification;
+
+class SubscriptionChargeRequestBuilder implements BuilderInterface
+{
+    /**
+     * SubscriptionChargeRequestBuilder constructor.
+     *
+     * @param SubscriptionLinkRepository $subscriptionLinkRepository
+     * @param GlobalRequestBuilder $globalRequestBuilder
+     */
+    public function __construct(
+        private readonly SubscriptionLinkRepository $subscriptionLinkRepository,
+        private readonly GlobalRequestBuilder $globalRequestBuilder
+    ) {
+    }
+
+    /**
+     * Build the request for subscription charge.
+     *
+     * @param array $buildSubject
+     * @return array
+     */
+    public function build(array $buildSubject)
+    {
+        /** @var Order $paymentSubject */
+        $paymentSubject = $buildSubject['order'];
+
+        if (!$paymentSubject) {
+            $paymentSubject = $buildSubject['order']->getPayment()->getQuote();
+        }
+
+        $subscription = $this->subscriptionLinkRepository->getSubscriptionFromOrderId($paymentSubject->getId());
+
+        return [
+            'body' => new BulkChargeSubscription(
+                externalBulkChargeId: 'bulkChargeId_' . $paymentSubject->getIncrementId(),
+                notification: new Notification($this->globalRequestBuilder->buildWebhooks()),
+                subscriptions: [
+                    new Subscription(
+                        subscriptionId: $subscription->getNexiSubscriptionId(),
+                        externalReference: $paymentSubject->getIncrementId(),
+                        order: $this->globalRequestBuilder->buildOrder($paymentSubject)
+                    )
+                ]
+            ),
+            'nexi_method' => 'bulkChargeSubscription',
+        ];
+    }
+}
diff --git a/Gateway/Request/UpdateOrderRequestBuilder.php b/Gateway/Request/UpdateOrderRequestBuilder.php
new file mode 100644
index 00000000..2e98f5fa
--- /dev/null
+++ b/Gateway/Request/UpdateOrderRequestBuilder.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Gateway\Request;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Payment\Gateway\Request\BuilderInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Sales\Model\Order;
+use Nexi\Checkout\Gateway\AmountConverter;
+use NexiCheckout\Model\Request\UpdateOrder;
+
+class UpdateOrderRequestBuilder implements BuilderInterface
+{
+    /**
+     * @param CreatePaymentRequestBuilder $createPaymentRequestBuilder
+     * @param AmountConverter $amountConverter
+     */
+    public function __construct(
+        private readonly CreatePaymentRequestBuilder $createPaymentRequestBuilder,
+        private readonly AmountConverter $amountConverter
+    ) {
+    }
+
+    /**
+     * Build the request for updating the payment order.
+     *
+     * @param array $buildSubject
+     *
+     * @return array
+     */
+    public function build(array $buildSubject): array
+    {
+        /** @var Order|Quote $paymentSubject */
+        $paymentSubject = $buildSubject['payment']?->getPayment()?->getOrder();
+
+        if (!$paymentSubject) {
+            $paymentSubject = $buildSubject['payment']?->getPayment()?->getQuote();
+        }
+
+        if (!$paymentSubject) {
+            $paymentSubject = $buildSubject['payment']?->getQuote();
+        }
+
+        return [
+            'nexi_method' => 'updatePaymentOrder',
+            'body'        => [
+                'paymentId'    => $paymentSubject->getPayment()->getAdditionalInformation('payment_id'),
+                'updateOrder' => new UpdateOrder(
+                    amount        : $this->amountConverter->convertToNexiAmount($paymentSubject->getGrandTotal()),
+                    items         : $this->createPaymentRequestBuilder->buildItems($paymentSubject),
+                    shipping      : new UpdateOrder\Shipping(costSpecified: true),
+                    paymentMethods: [],
+                )
+            ]
+        ];
+    }
+}
diff --git a/Gateway/Request/UpdateReferenceRequestBuilder.php b/Gateway/Request/UpdateReferenceRequestBuilder.php
new file mode 100644
index 00000000..3becca1a
--- /dev/null
+++ b/Gateway/Request/UpdateReferenceRequestBuilder.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Gateway\Request;
+
+use Magento\Framework\UrlInterface;
+use Magento\Payment\Gateway\Request\BuilderInterface;
+use Magento\Sales\Model\Order;
+use NexiCheckout\Model\Request\ReferenceInformation;
+
+class UpdateReferenceRequestBuilder implements BuilderInterface
+{
+    /**
+     * @param UrlInterface $url
+     */
+    public function __construct(
+        private readonly UrlInterface $url
+    ) {
+    }
+
+    /**
+     * Build the request for updating the reference - order Increment ID.
+     *
+     * @param array $buildSubject
+     *
+     * @return array
+     */
+    public function build(array $buildSubject): array
+    {
+        /** @var Order $order */
+        $order = $buildSubject['order'];
+        $payment = $order->getPayment();
+        $incrementId = $order->getIncrementId();
+
+        return [
+            'nexi_method' => 'updateReferenceInformation',
+            'body' => [
+                'paymentId' => $payment->getAdditionalInformation('payment_id'),
+                'referenceInformation' => new ReferenceInformation(
+                    checkoutUrl: $this->url->getUrl('checkout/onepage/success'),
+                    reference: $incrementId,
+                )
+            ]
+        ];
+    }
+}
diff --git a/Gateway/Request/VoidRequestBuilder.php b/Gateway/Request/VoidRequestBuilder.php
new file mode 100644
index 00000000..3dc92b45
--- /dev/null
+++ b/Gateway/Request/VoidRequestBuilder.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Gateway\Request;
+
+use Magento\Payment\Gateway\Helper\SubjectReader;
+use Magento\Payment\Gateway\Request\BuilderInterface;
+use Magento\Sales\Model\Order;
+use NexiCheckout\Model\Request\Cancel;
+use Nexi\Checkout\Gateway\AmountConverter;
+
+class VoidRequestBuilder implements BuilderInterface
+{
+    /**
+     * @param AmountConverter $amountConverter
+     */
+    public function __construct(
+        private readonly AmountConverter $amountConverter
+    ) {
+    }
+
+    /**
+     * Build Nexi cancel payment request
+     *
+     * @param array $buildSubject
+     *
+     * @return array
+     */
+    public function build(array $buildSubject): array
+    {
+        /** @var Order\Payment $payment */
+        $payment = SubjectReader::readPayment($buildSubject)->getPayment();
+
+        return [
+            'nexi_method' => 'cancel',
+            'body' => [
+                'paymentId' => $payment->getAdditionalInformation('payment_id'),
+                'cancel' => new Cancel(
+                    amount: $this->amountConverter->convertToNexiAmount(
+                        $payment->getBaseAmountAuthorized()
+                    )
+                )
+            ]
+        ];
+    }
+}
diff --git a/Model/Api/ShowSubscriptionsDataProvider.php b/Model/Api/ShowSubscriptionsDataProvider.php
new file mode 100644
index 00000000..28b2b7ea
--- /dev/null
+++ b/Model/Api/ShowSubscriptionsDataProvider.php
@@ -0,0 +1,49 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Api;
+
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Nexi\Checkout\Api\SubscriptionLinkRepositoryInterface;
+
+class ShowSubscriptionsDataProvider
+{
+    /**
+     * @var SubscriptionLinkRepositoryInterface
+     */
+    private $subscriptionLinkRepository;
+
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * ShowSubscriptionsDataProvider constructor.
+     *
+     * @param SubscriptionLinkRepositoryInterface $subscriptionLinkRepository
+     * @param OrderRepositoryInterface $orderRepository
+     */
+    public function __construct(
+        SubscriptionLinkRepositoryInterface $subscriptionLinkRepository,
+        OrderRepositoryInterface $orderRepository,
+    ) {
+        $this->subscriptionLinkRepository = $subscriptionLinkRepository;
+        $this->orderRepository = $orderRepository;
+    }
+
+    /**
+     * @param $subscriptionId
+     * @return array
+     */
+    public function getOrderDataFromSubscriptionId($subscriptionId)
+    {
+        $orderIds = array_last($this->subscriptionLinkRepository->getOrderIdsBySubscriptionId($subscriptionId));
+        $order = $this->orderRepository->get($orderIds);
+
+        return [
+            'increment_id' => $order->getIncrementId(),
+            'grand_total' => $order->getGrandTotal()
+        ];
+    }
+}
diff --git a/Model/Attribute/SelectData.php b/Model/Attribute/SelectData.php
new file mode 100644
index 00000000..cf644992
--- /dev/null
+++ b/Model/Attribute/SelectData.php
@@ -0,0 +1,47 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Attribute;
+
+use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
+use Nexi\Checkout\Model\ResourceModel\Subscription\Profile\CollectionFactory;
+
+class SelectData extends AbstractSource
+{
+    public const NO_SUBSCRIPTION_VALUE = null;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory
+    ) {
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * Get all options
+     * @return array
+     */
+    public function getAllOptions()
+    {
+        $profilesCollection = $this->collectionFactory->create();
+        $collectionData = $profilesCollection->getData();
+
+        if (!$this->_options && $collectionData) {
+            foreach ($collectionData as $data) {
+                if (isset($data['schedule']) && isset($data['profile_id'])) {
+                    $this->_options[] = ['label' => $data['name'], 'value' => $data['profile_id']];
+                }
+            }
+            $this->_options[] = ['label' => __('No recurring payment'), 'value' => self::NO_SUBSCRIPTION_VALUE];
+        }
+
+        return $this->_options;
+    }
+}
diff --git a/Model/Config/Source/Order/NewStatus.php b/Model/Config/Source/Order/NewStatus.php
new file mode 100644
index 00000000..8a7cb4c9
--- /dev/null
+++ b/Model/Config/Source/Order/NewStatus.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Config\Source\Order;
+
+use Magento\Framework\Data\OptionSourceInterface;
+use Magento\Sales\Model\Order\Config;
+
+class NewStatus implements OptionSourceInterface
+{
+    /**
+     * @var string
+     */
+    protected string $stateStatuses = \Magento\Sales\Model\Order::STATE_NEW;
+
+    /**
+     * @param Config $orderConfig
+     */
+    public function __construct(
+        private readonly Config $orderConfig
+    ) {
+    }
+
+    /**
+     * Return array of options as value-label pairs
+     *
+     * @return array
+     */
+    public function toOptionArray(): array
+    {
+        $statuses = $this->stateStatuses
+            ? $this->orderConfig->getStateStatuses($this->stateStatuses)
+            : $this->orderConfig->getStatuses();
+
+        $options = [];
+        foreach ($statuses as $code => $label) {
+            $options[] = ['value' => $code, 'label' => $label];
+        }
+        return $options;
+    }
+}
diff --git a/Model/Config/Source/PayTypeOptions.php b/Model/Config/Source/PayTypeOptions.php
new file mode 100644
index 00000000..e62d7992
--- /dev/null
+++ b/Model/Config/Source/PayTypeOptions.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Config\Source;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+class PayTypeOptions implements OptionSourceInterface
+{
+    /**
+     * Return an array of options as value-label pairs
+     *
+     * @return array
+     */
+    public function toOptionArray(): array
+    {
+        $options = [];
+        foreach (PaymentTypesEnum::cases() as $case) {
+            $options[] = [
+                'value' => $case->value,
+                'label' => __($case->value)
+            ];
+        }
+        return $options;
+    }
+}
diff --git a/Model/Config/Source/PaymentTypesEnum.php b/Model/Config/Source/PaymentTypesEnum.php
new file mode 100644
index 00000000..a0f8fc50
--- /dev/null
+++ b/Model/Config/Source/PaymentTypesEnum.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Config\Source;
+
+enum PaymentTypesEnum: string
+{
+    // Credit card payment type
+    case CARD = 'Card';
+
+    // Other payment methods
+    case PAYPAL = 'PayPal';
+    case VIPPS = 'Vipps';
+    case MOBILE_PAY = 'MobilePay';
+    case SWISH = 'Swish';
+    case ARVATO = 'Arvato';
+    case EASY_INVOICE = 'EasyInvoice';
+    case EASY_INSTALLMENT = 'EasyInstallment';
+    case EASY_CAMPAIGN = 'EasyCampaign';
+    case RATE_PAY_INVOICE = 'RatePayInvoice';
+    case RATE_PAY_INSTALLMENT = 'RatePayInstallment';
+    case RATE_PAY_SEPA = 'RatePaySepa';
+    case SOFORT = 'Sofort';
+    case TRUSTLY = 'Trustly';
+    case APPLE_PAY = 'ApplePay';
+    case KLARNA = 'Klarna';
+    case GOOGLE_PAY = 'GooglePay';
+}
diff --git a/Model/Language.php b/Model/Language.php
new file mode 100644
index 00000000..2e778aa3
--- /dev/null
+++ b/Model/Language.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model;
+
+use Magento\Framework\Locale\ResolverInterface;
+
+class Language
+{
+    /**
+     * Default locale to use if the current locale is not supported
+     */
+    public const DEFAULT_LOCALE = 'en-GB';
+
+    /**
+     * List of supported locales for Nexi Checkout
+     */
+    private const SUPPORTED_LOCALES = [
+        'en-GB', // English (United Kingdom)
+        'da-DK', // Danish
+        'nl-NL', // Dutch
+        'ee-EE', // Estonian
+        'fi-FI', // Finnish
+        'fr-FR', // French
+        'de-DE', // German
+        'it-IT', // Italian
+        'lv-LV', // Latvian
+        'lt-LT', // Lithuanian
+        'nb-NO', // Norwegian
+        'pl-PL', // Polish
+        'es-ES', // Spanish
+        'sk-SK', // Slovak
+        'sv-SE', // Swedish
+    ];
+
+    /**
+     * @param ResolverInterface $localeResolver
+     */
+    public function __construct(
+        private readonly ResolverInterface $localeResolver
+    ) {
+    }
+
+    /**
+     * Returns the locale code based on the provided locale.
+     *
+     * @return string The validated locale or the default locale if not supported
+     */
+    public function getCode(): string
+    {
+        $locale = str_replace('_', '-', $this->localeResolver->getLocale());
+
+        return in_array($locale, self::SUPPORTED_LOCALES) ? $locale : self::DEFAULT_LOCALE;
+    }
+}
diff --git a/Model/OptionSource/IntervalUnits.php b/Model/OptionSource/IntervalUnits.php
new file mode 100644
index 00000000..dd8ef4c5
--- /dev/null
+++ b/Model/OptionSource/IntervalUnits.php
@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\OptionSource;
+
+class IntervalUnits implements \Magento\Framework\Data\OptionSourceInterface
+{
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => 'D',
+                'label' => __('Days')
+            ],
+            [
+                'value' => 'W',
+                'label' => __('Weeks')
+            ],
+            [
+                'value' => 'M',
+                'label' => __('Months')
+            ],
+            [
+                'value' => 'Y',
+                'label' => __('Years')
+            ],
+        ];
+    }
+}
diff --git a/Model/OptionSource/ProfileOptions.php b/Model/OptionSource/ProfileOptions.php
new file mode 100644
index 00000000..9ed82622
--- /dev/null
+++ b/Model/OptionSource/ProfileOptions.php
@@ -0,0 +1,43 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\OptionSource;
+
+use Nexi\Checkout\Model\ResourceModel\Subscription\Profile\Collection;
+
+class ProfileOptions implements \Magento\Framework\Data\OptionSourceInterface
+{
+    /**
+     * @var \Nexi\Checkout\Model\ResourceModel\Subscription\Profile\CollectionFactory
+     */
+    private $collectionFactory;
+
+    public function __construct(
+        \Nexi\Checkout\Model\ResourceModel\Subscription\Profile\CollectionFactory $collectionFactory
+    ) {
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    public function toOptionArray()
+    {
+        /** @var Collection $profiles */
+        $profiles = $this->collectionFactory->create();
+        $profiles->addFieldToSelect(['profile_id', 'name']);
+
+        return $this->formatProfilesToOptions($profiles);
+    }
+
+    private function formatProfilesToOptions(Collection $profiles)
+    {
+        $options = [];
+        /** @var \Nexi\Checkout\Api\Data\RecurringProfileInterface $profile */
+        foreach ($profiles as $profile) {
+            $options[] = [
+                'value' => $profile->getId(),
+                'label' => $profile->getName()
+            ];
+        }
+
+        return $options;
+    }
+}
diff --git a/Model/OptionSource/SubscriptionStatus.php b/Model/OptionSource/SubscriptionStatus.php
new file mode 100644
index 00000000..ecd77cbd
--- /dev/null
+++ b/Model/OptionSource/SubscriptionStatus.php
@@ -0,0 +1,35 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\OptionSource;
+
+use \Nexi\Checkout\Api\Data\SubscriptionInterface;
+
+class SubscriptionStatus implements \Magento\Framework\Data\OptionSourceInterface
+{
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => SubscriptionInterface::STATUS_PENDING_PAYMENT,
+                'label' => __('Pending Payment')
+            ],
+            [
+                'value' => SubscriptionInterface::STATUS_ACTIVE,
+                'label' => __('Paid')
+            ],
+            [
+                'value' => SubscriptionInterface::STATUS_CLOSED,
+                'label' => __('Closed')
+            ],
+            [
+                'value' => SubscriptionInterface::STATUS_FAILED,
+                'label' => __('Failed')
+            ],
+            [
+                'value' => SubscriptionInterface::STATUS_RESCHEDULED,
+                'label' => __('Rescheduled')
+            ],
+        ];
+    }
+}
diff --git a/Model/Order/Comment.php b/Model/Order/Comment.php
new file mode 100644
index 00000000..cdee756d
--- /dev/null
+++ b/Model/Order/Comment.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Order;
+
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Phrase;
+use Magento\Sales\Api\Data\OrderStatusHistoryInterfaceFactory;
+use Magento\Sales\Api\OrderStatusHistoryRepositoryInterface;
+use Magento\Sales\Model\Order;
+
+class Comment
+{
+    /**
+     * @param OrderStatusHistoryRepositoryInterface $historyRepository
+     * @param OrderStatusHistoryInterfaceFactory $historyFactory
+     */
+    public function __construct(
+        private readonly OrderStatusHistoryRepositoryInterface $historyRepository,
+        private readonly OrderStatusHistoryInterfaceFactory $historyFactory
+    ) {
+    }
+
+    /**
+     * Save a comment to the order's status history.
+     *
+     * @param string $comment
+     * @param Order $order
+     */
+    public function saveComment(string|Phrase $comment, Order $order): void
+    {
+        $history = $this->historyFactory->create();
+        $history->setComment($comment)
+            ->setIsCustomerNotified(false)
+            ->setStatus($order->getStatus()) // Default status, can be changed as needed
+            ->setParentId($order->getId());
+
+        $this->historyRepository->save($history);
+    }
+}
diff --git a/Model/PaymentInitialize.php b/Model/PaymentInitialize.php
new file mode 100644
index 00000000..f3975c44
--- /dev/null
+++ b/Model/PaymentInitialize.php
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model;
+
+use Magento\Checkout\Model\Session;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Payment\Gateway\Data\PaymentDataObjectFactoryInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Nexi\Checkout\Gateway\Command\Initialize;
+use Nexi\Checkout\Api\PaymentInitializeInterface;
+use Nexi\Checkout\Gateway\Config\Config;
+use NexiCheckout\Model\Request\UpdateOrder\PaymentMethod;
+use Psr\Log\LoggerInterface;
+
+class PaymentInitialize implements PaymentInitializeInterface
+{
+    /**
+     * @param CartRepositoryInterface $quoteRepository
+     * @param Initialize $initializeCommand
+     * @param PaymentDataObjectFactoryInterface $paymentDataObjectFactory
+     * @param QuoteIdMaskFactory $quoteIdMaskFactory
+     * @param Config $config
+     * @param LoggerInterface $logger
+     * @param Session $checkoutSession
+     */
+    public function __construct(
+        private readonly CartRepositoryInterface $quoteRepository,
+        private readonly Initialize $initializeCommand,
+        private readonly PaymentDataObjectFactoryInterface $paymentDataObjectFactory,
+        private readonly QuoteIdMaskFactory $quoteIdMaskFactory,
+        private readonly Config $config,
+        private readonly LoggerInterface $logger,
+        private readonly Session $checkoutSession
+    ) {
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function initialize(string $cartId, string $integrationType, PaymentInterface $paymentMethod): string
+    {
+        try {
+            if (!is_numeric($cartId)) {
+                $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
+                $cartId = $quoteIdMask->getQuoteId();
+            }
+            $quote = $this->quoteRepository->get($cartId);
+
+            if (!$quote->getIsActive()) {
+                $this->checkoutSession->restoreQuote();
+            }
+            $quotePayment = $quote->getPayment();
+            if (!$quotePayment) {
+                throw new LocalizedException(__('No payment method found for the quote'));
+            }
+
+            $paymentData = $this->paymentDataObjectFactory->create($quotePayment);
+
+            if (isset($paymentMethod->getAdditionalData()['subselection'])) {
+                $paymentData->getPayment()->setAdditionalInformation(
+                    'subselection',
+                    $paymentMethod->getAdditionalData()['subselection']
+                );
+            }
+
+            $this->initializeCommand->createPayment($paymentData);
+            $this->quoteRepository->save($quote);
+
+            return json_encode([
+                'paymentId'   => $quotePayment->getAdditionalInformation('payment_id'),
+                'checkoutKey' => $this->config->getCheckoutKey()
+            ]);
+        } catch (\Exception $e) {
+            $this->logger->error(
+                'Error initializing payment:',
+                [
+                    'exception' => $e->getMessage(),
+                    'trace'     => $e->getTraceAsString()
+                ]
+            );
+            throw new LocalizedException(__('Could not initialize payment.'), $e);
+        }
+    }
+}
diff --git a/Model/PaymentValidate.php b/Model/PaymentValidate.php
new file mode 100644
index 00000000..e24e4f82
--- /dev/null
+++ b/Model/PaymentValidate.php
@@ -0,0 +1,112 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model;
+
+use Magento\Checkout\Model\Session;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Payment\Gateway\Command\CommandManagerPoolInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Nexi\Checkout\Api\PaymentValidateInterface;
+use Nexi\Checkout\Gateway\AmountConverter;
+use Nexi\Checkout\Gateway\Config\Config;
+use NexiCheckout\Model\Result\RetrievePaymentResult;
+use Psr\Log\LoggerInterface;
+
+class PaymentValidate implements PaymentValidateInterface
+{
+    /**
+     * @param CartRepositoryInterface $quoteRepository
+     * @param QuoteIdMaskFactory $quoteIdMaskFactory
+     * @param LoggerInterface $logger
+     * @param Json $json
+     * @param CommandManagerPoolInterface $commandManagerPool
+     * @param AmountConverter $amountConverter
+     * @param Session $session
+     */
+    public function __construct(
+        private readonly CartRepositoryInterface $quoteRepository,
+        private readonly QuoteIdMaskFactory $quoteIdMaskFactory,
+        private readonly LoggerInterface $logger,
+        private readonly Json $json,
+        private readonly CommandManagerPoolInterface $commandManagerPool,
+        private readonly AmountConverter $amountConverter,
+        private readonly Session $session,
+    ) {
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @throws LocalizedException
+     */
+    public function validate(string $cartId, string $paymentId): string
+    {
+        try {
+            if (!is_numeric($cartId)) {
+                $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
+                $cartId = $quoteIdMask->getQuoteId();
+            }
+            $quote = $this->quoteRepository->get($cartId);
+
+            $paymentMethod = $quote->getPayment();
+            if (!$paymentMethod) {
+                throw new LocalizedException(__('No payment method found for the quote'));
+            }
+
+            $quotePaymentId = $paymentMethod->getAdditionalInformation('payment_id');
+
+            if ($quotePaymentId !== $paymentId) {
+                throw new LocalizedException(__('Payment ID does not match the current cart payment ID.'));
+            }
+
+            $this->commandManagerPool->get(Config::CODE)->executeByCode(
+                'retrieve',
+                $paymentMethod,
+                [
+                    'quote' => $quote
+                ]
+            );
+
+            $this->compareAmounts($paymentMethod->getData('retrieved_payment'), $quote);
+
+            return $this->json->serialize([
+                'payment_id' => $quotePaymentId,
+                'success'    => true
+            ]);
+
+        } catch (\Exception $e) {
+            $this->logger->error(
+                'Error initializing payment:',
+                [
+                    'exception' => $e->getMessage(),
+                    'trace'     => $e->getTraceAsString()
+                ]
+            );
+            throw new LocalizedException(__('Could not validate the payment.'), $e);
+        }
+    }
+
+    /**
+     * Compare items and amounts between retrieved payment and quote
+     *
+     * @param RetrievePaymentResult $retrievedPayment
+     * @param CartInterface $quote
+     *
+     * @return void
+     * @throws LocalizedException
+     */
+    private function compareAmounts(RetrievePaymentResult $retrievedPayment, CartInterface $quote): void
+    {
+        $quoteTotal = $this->amountConverter->convertToNexiAmount($quote->getGrandTotal());
+        $retrievedTotal = $retrievedPayment->getPayment()->getOrderDetails()->getAmount();
+
+        if ($quoteTotal !== $retrievedTotal) {
+            throw new LocalizedException(__('The payment amount does not match the quote total.'));
+        }
+    }
+}
diff --git a/Model/ResourceModel/Subscription.php b/Model/ResourceModel/Subscription.php
new file mode 100644
index 00000000..dd7d3dcd
--- /dev/null
+++ b/Model/ResourceModel/Subscription.php
@@ -0,0 +1,160 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\ResourceModel;
+
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Model\ResourceModel\Db\VersionControl\AbstractDb;
+use Nexi\Checkout\Api\Data\SubscriptionInterface;
+
+class Subscription extends AbstractDb
+{
+    public const NEXI_SUBSCRIPTIONS_TABLENAME = 'nexi_subscriptions';
+
+    /**
+     * Subscription constructor.
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(self::NEXI_SUBSCRIPTIONS_TABLENAME, 'entity_id');
+    }
+
+    /**
+     * Fetches an array of [ nexi_subscriptions::entity_id => Sales_order::entity_id ]
+     * Consider limiting query results to certain count to allow for better performance when hundreds or thousands of
+     * recurring payments exist.
+     *
+     * @return array
+     * @throws LocalizedException
+     */
+    public function getClonableOrderIds()
+    {
+        $connection = $this->getConnection();
+        $newestOrderIds = $this->getNewestOrderIds(true);
+
+        return $this->filterUnPaidIds($connection, $newestOrderIds);
+    }
+
+    /**
+     * BeforeSave function
+     *
+     * @param \Magento\Framework\Model\AbstractModel $object
+     * @return $this|Subscription
+     * @throws CouldNotSaveException
+     */
+    protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
+    {
+        if (!$this->canSave($object)) {
+            throw new CouldNotSaveException(__('Invalid recurring payment profile'));
+        }
+
+        return $this;
+    }
+
+    /**
+     * CanSave function
+     *
+     * @param \Magento\Framework\Model\AbstractModel $object
+     * @return bool
+     * @throws CouldNotSaveException
+     */
+    private function canSave(\Magento\Framework\Model\AbstractModel $object)
+    {
+        if (!$object->getData('recurring_profile_id')) {
+            throw new CouldNotSaveException(__('Cannot save recurring payments without profiles'));
+        }
+
+        $connection = $this->getConnection();
+
+        $select = $connection->select()
+            ->from('recurring_payment_profiles')
+            ->where('profile_id = ?', $object->getData('recurring_profile_id'));
+
+        return !empty($this->getConnection()->fetchRow($select));
+    }
+
+    /**
+     * Updates subscription status to failed with a direct query.
+     *
+     * @param int $subscriptionId
+     * @return void
+     */
+    public function forceFailedStatus($subscriptionId)
+    {
+        $connection = $this->getConnection();
+
+        $connection->update(
+            self::NEXI_SUBSCRIPTIONS_TABLENAME,
+            ['status' => SubscriptionInterface::STATUS_FAILED],
+            $connection->quoteInto('entity_id = ?', $subscriptionId)
+        );
+    }
+
+    /**
+     * GetNewestOrderIds function
+     *
+     * @param bool $addDateFilter
+     * @return array
+     */
+    public function getNewestOrderIds($addDateFilter = false)
+    {
+        $select = $this->getConnection()->select();
+        $select->from(
+            ['sublink' => 'nexi_subscription_link'],
+            [
+                'subscription_id' => 'subscription_id',
+                'order_id' => 'MAX(order_id)'
+            ]
+        );
+        $select->join(
+            ['sub' => self::NEXI_SUBSCRIPTIONS_TABLENAME],
+            'sub.entity_id = sublink.subscription_id',
+            []
+        );
+        $select->where(
+            'sub.status IN (?)',
+            SubscriptionInterface::CLONEABLE_STATUSES
+        );
+
+        if ($addDateFilter) {
+            $date = new \DateTime();
+            $date->modify('+7 day'); // consider making this configurable.
+            $select->where(
+                'sub.next_order_date < ?',
+                $date->format('Y-m-d H:i:s')
+            );
+        }
+
+        $select->group('sublink.subscription_id');
+
+        return $this->getConnection()->fetchPairs($select);
+    }
+
+    /**
+     * FilterUnPaidIds function
+     *
+     * @param AdapterInterface|false $connection
+     * @param array $newestOrderIds
+     * @return mixed
+     */
+    private function filterUnPaidIds($connection, array $newestOrderIds)
+    {
+        $select = $connection->select();
+        $select->from(
+            ['sublink' => 'nexi_subscription_link'],
+            ['subscription_id', 'order_id']
+        );
+        $select->where('order_id IN (?)', $newestOrderIds);
+        $select->join(
+            ['so' => 'sales_order'],
+            'so.entity_id = sublink.order_id',
+            []
+        );
+
+        return $connection->fetchPairs($select);
+    }
+}
diff --git a/Model/ResourceModel/Subscription/Collection.php b/Model/ResourceModel/Subscription/Collection.php
new file mode 100644
index 00000000..21653c0f
--- /dev/null
+++ b/Model/ResourceModel/Subscription/Collection.php
@@ -0,0 +1,101 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\ResourceModel\Subscription;
+
+use Magento\Framework\Api\SearchResultsInterface;
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Nexi\Checkout\Api\Data\SubscriptionSearchResultInterface;
+
+class Collection extends AbstractCollection implements SubscriptionSearchResultInterface
+{
+    /** @var \Magento\Framework\Api\SearchCriteriaInterface */
+    private $searchCriteria;
+
+    protected function _construct()
+    {
+        $this->_init(
+            \Nexi\Checkout\Model\Subscription::class,
+            \Nexi\Checkout\Model\ResourceModel\Subscription::class
+        );
+    }
+
+    /**
+     * Set items list.
+     *
+     * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
+     * @return $this
+     * @throws \Exception
+     */
+    public function setItems(array $items = null)
+    {
+        if (!$items) {
+            return $this;
+        }
+        foreach ($items as $item) {
+            $this->addItem($item);
+        }
+        return $this;
+    }
+
+    /**
+     * Get search criteria.
+     *
+     * @return \Magento\Framework\Api\SearchCriteriaInterface|null
+     */
+    public function getSearchCriteria()
+    {
+        return $this->searchCriteria;
+    }
+
+    /**
+     * Set search criteria.
+     *
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
+    {
+        $this->searchCriteria = $searchCriteria;
+
+        return $this;
+    }
+
+    /**
+     * Get total count.
+     *
+     * @return int
+     */
+    public function getTotalCount()
+    {
+        return $this->getSize();
+    }
+
+    /**
+     * Set total count.
+     *
+     * @param int $totalCount
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setTotalCount($totalCount)
+    {
+        // total count is the collections size, do not modify it.
+        return $this;
+    }
+
+    public function getBillingCollectionByOrderIds($orderIds)
+    {
+        $this->join(
+            ['links' => SubscriptionLink::LINK_TABLE_NAME],
+            $this->getConnection()->quoteInto(
+                'links.subscription_id = main_table.entity_id AND links.order_id IN (?)',
+                $orderIds
+            ),
+            ['order_id']
+        );
+
+        return $this;
+    }
+}
diff --git a/Model/ResourceModel/Subscription/Profile.php b/Model/ResourceModel/Subscription/Profile.php
new file mode 100644
index 00000000..44bbc2ca
--- /dev/null
+++ b/Model/ResourceModel/Subscription/Profile.php
@@ -0,0 +1,38 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\ResourceModel\Subscription;
+
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+
+class Profile extends AbstractDb
+{
+    protected function _construct()
+    {
+        $this->_init('recurring_payment_profiles', 'profile_id');
+    }
+
+    protected function _beforeDelete(\Magento\Framework\Model\AbstractModel $object)
+    {
+        if (!$this->canDelete($object)) {
+            throw new CouldNotDeleteException(__('Profiles that are in use by recurring payments cannot be deleted'));
+        }
+
+        return parent::_beforeDelete($object);
+    }
+
+    /**
+     * @param \Magento\Framework\Model\AbstractModel $object
+     * @return bool
+     */
+    private function canDelete(\Magento\Framework\Model\AbstractModel $object): bool
+    {
+        $connection = $this->getConnection();
+        $select = $connection->select()
+            ->from('nexi_subscriptions', ['entity_id', 'recurring_profile_id'])
+            ->where('recurring_profile_id = ?', $object->getData('profile_id'));
+
+        return empty($connection->fetchPairs($select));
+    }
+}
diff --git a/Model/ResourceModel/Subscription/Profile/Collection.php b/Model/ResourceModel/Subscription/Profile/Collection.php
new file mode 100644
index 00000000..c6df7d4f
--- /dev/null
+++ b/Model/ResourceModel/Subscription/Profile/Collection.php
@@ -0,0 +1,80 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\ResourceModel\Subscription\Profile;
+
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Nexi\Checkout\Api\Data\SubscriptionProfileSearchResultInterface;
+use Nexi\Checkout\Model\Subscription\Profile;
+use Nexi\Checkout\Model\ResourceModel\Subscription\Profile as ProfileResource;
+
+class Collection extends AbstractCollection implements SubscriptionProfileSearchResultInterface
+{
+    /** @var \Magento\Framework\Api\SearchCriteriaInterface */
+    private $searchCriteria;
+
+    protected function _construct()
+    {
+        $this->_init(
+            Profile::class,
+            ProfileResource::class
+        );
+    }
+
+    /**
+     * Set items list.
+     *
+     * @param \Magento\Framework\DataObject[] $items
+     * @return \Nexi\Checkout\Model\ResourceModel\Subscription\Profile\Collection
+     * @throws \Exception
+     */
+    public function setItems(array $items = null)
+    {
+        if (!$items) {
+            return $this;
+        }
+        foreach ($items as $item) {
+            $this->addItem($item);
+        }
+        return $this;
+    }
+
+    public function getSearchCriteria()
+    {
+        return $this->searchCriteria;
+    }
+
+    /**
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return $this|Collection
+     */
+    public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
+    {
+        $this->searchCriteria = $searchCriteria;
+
+        return $this;
+    }
+
+    /**
+     * Get total count.
+     *
+     * @return int
+     */
+    public function getTotalCount()
+    {
+        return $this->getSize();
+    }
+
+    /**
+     * Set total count.
+     *
+     * @param int $totalCount
+     * @return \Nexi\Checkout\Model\ResourceModel\Subscription\Profile\Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setTotalCount($totalCount)
+    {
+        // total count is the collections size, do not modify it.
+        return $this;
+    }
+}
diff --git a/Model/ResourceModel/Subscription/SubscriptionLink.php b/Model/ResourceModel/Subscription/SubscriptionLink.php
new file mode 100644
index 00000000..ccf110be
--- /dev/null
+++ b/Model/ResourceModel/Subscription/SubscriptionLink.php
@@ -0,0 +1,19 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\ResourceModel\Subscription;
+
+use Magento\Framework\Model\ResourceModel\Db\VersionControl\AbstractDb;
+use Nexi\Checkout\Api\Data\SubscriptionLinkInterface;
+
+class SubscriptionLink extends AbstractDb
+{
+    public const LINK_TABLE_NAME = 'nexi_subscription_link';
+    /**
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(self::LINK_TABLE_NAME, SubscriptionLinkInterface::FIELD_LINK_ID);
+    }
+}
diff --git a/Model/ResourceModel/Subscription/SubscriptionLink/Collection.php b/Model/ResourceModel/Subscription/SubscriptionLink/Collection.php
new file mode 100644
index 00000000..72363ed1
--- /dev/null
+++ b/Model/ResourceModel/Subscription/SubscriptionLink/Collection.php
@@ -0,0 +1,86 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\ResourceModel\Subscription\SubscriptionLink;
+
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Nexi\Checkout\Api\Data\SubscriptionLinkSearchResultInterface;
+use Nexi\Checkout\Model\Subscription\SubscriptionLink;
+use Nexi\Checkout\Model\ResourceModel\Subscription\SubscriptionLink as SubscriptionLinkResource;
+
+class Collection extends AbstractCollection implements SubscriptionLinkSearchResultInterface
+{
+    /** @var \Magento\Framework\Api\SearchCriteriaInterface */
+    private $searchCriteria;
+
+    /**
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            SubscriptionLink::class,
+            SubscriptionLinkResource::class
+        );
+    }
+
+    /**
+     * Set items list.
+     *
+     * @param \Magento\Framework\DataObject[] $items
+     * @return \Nexi\Checkout\Model\ResourceModel\Subscription\SubscriptionLink\Collection
+     * @throws \Exception
+     */
+    public function setItems(array $items = null)
+    {
+        if (!$items) {
+            return $this;
+        }
+        foreach ($items as $item) {
+            $this->addItem($item);
+        }
+        return $this;
+    }
+
+    /**
+     * @return \Magento\Framework\Api\SearchCriteriaInterface
+     */
+    public function getSearchCriteria()
+    {
+        return $this->searchCriteria;
+    }
+
+    /**
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return $this|Collection
+     */
+    public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
+    {
+        $this->searchCriteria = $searchCriteria;
+
+        return $this;
+    }
+
+    /**
+     * Get total count.
+     *
+     * @return int
+     */
+    public function getTotalCount()
+    {
+        return $this->getSize();
+    }
+
+    /**
+     * Set total count.
+     *
+     * @param int $totalCount
+     * @return \Nexi\Checkout\Model\ResourceModel\Subscription\SubscriptionLink\Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setTotalCount($totalCount)
+    {
+        // total count is the collections size, do not modify it.
+        return $this;
+    }
+}
diff --git a/Model/ResourceModel/Subscriptions/Profile.php b/Model/ResourceModel/Subscriptions/Profile.php
new file mode 100644
index 00000000..c079243d
--- /dev/null
+++ b/Model/ResourceModel/Subscriptions/Profile.php
@@ -0,0 +1,38 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\ResourceModel\Subscriptions;
+
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+
+class Profile extends AbstractDb
+{
+    protected function _construct()
+    {
+        $this->_init('subscriptions_profiles', 'profile_id');
+    }
+
+    protected function _beforeDelete(\Magento\Framework\Model\AbstractModel $object)
+    {
+        if (!$this->canDelete($object)) {
+            throw new CouldNotDeleteException(__('Profiles that are in use by subscriptions cannot be deleted'));
+        }
+
+        return parent::_beforeDelete($object);
+    }
+
+    /**
+     * @param \Magento\Framework\Model\AbstractModel $object
+     * @return bool
+     */
+    private function canDelete(\Magento\Framework\Model\AbstractModel $object): bool
+    {
+        $connection = $this->getConnection();
+        $select = $connection->select()
+            ->from('nexi_subscriptions', ['entity_id', 'subscription_profile_id'])
+            ->where('subscription_profile_id = ?', $object->getData('profile_id'));
+
+        return empty($connection->fetchPairs($select));
+    }
+}
diff --git a/Model/ResourceModel/Subscriptions/Profile/Collection.php b/Model/ResourceModel/Subscriptions/Profile/Collection.php
new file mode 100644
index 00000000..b03c3065
--- /dev/null
+++ b/Model/ResourceModel/Subscriptions/Profile/Collection.php
@@ -0,0 +1,80 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\ResourceModel\Subscriptions\Profile;
+
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Nexi\Checkout\Api\Data\SubscriptionProfileSearchResultInterface;
+use Nexi\Checkout\Model\Subscriptions\Profile;
+use Nexi\Checkout\Model\ResourceModel\Subscriptions\Profile as ProfileResource;
+
+class Collection extends AbstractCollection implements SubscriptionProfileSearchResultInterface
+{
+    /** @var \Magento\Framework\Api\SearchCriteriaInterface */
+    private $searchCriteria;
+
+    protected function _construct()
+    {
+        $this->_init(
+            Profile::class,
+            ProfileResource::class
+        );
+    }
+
+    /**
+     * Set items list.
+     *
+     * @param \Magento\Framework\DataObject[] $items
+     * @return \Nexi\Checkout\Model\ResourceModel\Subscriptions\Profile\Collection
+     * @throws \Exception
+     */
+    public function setItems(array $items = null)
+    {
+        if (!$items) {
+            return $this;
+        }
+        foreach ($items as $item) {
+            $this->addItem($item);
+        }
+        return $this;
+    }
+
+    public function getSearchCriteria()
+    {
+        return $this->searchCriteria;
+    }
+
+    /**
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return $this|Collection
+     */
+    public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
+    {
+        $this->searchCriteria = $searchCriteria;
+
+        return $this;
+    }
+
+    /**
+     * Get total count.
+     *
+     * @return int
+     */
+    public function getTotalCount()
+    {
+        return $this->getSize();
+    }
+
+    /**
+     * Set total count.
+     *
+     * @param int $totalCount
+     * @return \Nexi\Checkout\Model\ResourceModel\Subscriptions\Profile\Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setTotalCount($totalCount)
+    {
+        // total count is the collections size, do not modify it.
+        return $this;
+    }
+}
diff --git a/Model/Subscription.php b/Model/Subscription.php
new file mode 100644
index 00000000..d21a8862
--- /dev/null
+++ b/Model/Subscription.php
@@ -0,0 +1,109 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model;
+
+use Nexi\Checkout\Api\Data\SubscriptionInterface;
+
+class Subscription extends \Magento\Framework\Model\AbstractModel implements SubscriptionInterface
+{
+    /**
+     * Initialize resource model
+     *
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(\Nexi\Checkout\Model\ResourceModel\Subscription::class);
+    }
+
+    public function getId()
+    {
+        return $this->getData(SubscriptionInterface::FIELD_ENTITY_ID);
+    }
+
+    public function getCustomerId()
+    {
+        return $this->getData(SubscriptionInterface::FIELD_CUSTOMER_ID);
+    }
+
+    public function getStatus(): string
+    {
+        return $this->getData(SubscriptionInterface::FIELD_STATUS);
+    }
+
+    public function getNextOrderDate(): string
+    {
+        return $this->getData(SubscriptionInterface::FIELD_NEXT_ORDER_DATE);
+    }
+
+    public function getRecurringProfileId(): int
+    {
+        return (int)$this->getData(SubscriptionInterface::FIELD_RECURRING_PROFILE_ID);
+    }
+
+    public function getUpdatedAt(): string
+    {
+        return $this->getData(SubscriptionInterface::FIELD_UPDATED_AT);
+    }
+
+    public function getRepeatCountLeft(): int
+    {
+        return $this->getData(SubscriptionInterface::FIELD_REPEAT_COUNT_LEFT);
+    }
+
+    public function getRetryCount(): int
+    {
+        return $this->getData(SubscriptionInterface::FIELD_RETRY_COUNT);
+    }
+
+    public function getNexiSubscriptionId(): string
+    {
+        return $this->getData(SubscriptionInterface::FIELD_NEXI_SUBSCRIPTION_ID);
+    }
+
+    public function setId($entityId): self
+    {
+        return $this->setData(SubscriptionInterface::FIELD_ENTITY_ID, $entityId);
+    }
+
+    public function setCustomerId($customerId): self
+    {
+        return $this->setData(SubscriptionInterface::FIELD_CUSTOMER_ID, $customerId);
+    }
+
+    public function setStatus($status): SubscriptionInterface
+    {
+        return $this->setData(SubscriptionInterface::FIELD_STATUS, $status);
+    }
+
+    public function setNextOrderDate(string $date): SubscriptionInterface
+    {
+        return $this->setData(SubscriptionInterface::FIELD_NEXT_ORDER_DATE, $date);
+    }
+
+    public function setRecurringProfileId(int $profileId): SubscriptionInterface
+    {
+        return $this->setData(SubscriptionInterface::FIELD_RECURRING_PROFILE_ID, $profileId);
+    }
+
+    public function setUpdatedAt(string $updatedAt): SubscriptionInterface
+    {
+        return $this->setData(SubscriptionInterface::FIELD_UPDATED_AT, $updatedAt);
+    }
+
+    public function setRepeatCountLeft(int $count): SubscriptionInterface
+    {
+        return $this->setData(SubscriptionInterface::FIELD_REPEAT_COUNT_LEFT, $count);
+    }
+
+    public function setRetryCount(int $count): SubscriptionInterface
+    {
+        return $this->setData(SubscriptionInterface::FIELD_RETRY_COUNT, $count);
+    }
+
+    public function setNexiSubscriptionId(string $subscriptionId): SubscriptionInterface
+    {
+        return $this->setData(SubscriptionInterface::FIELD_NEXI_SUBSCRIPTION_ID, $subscriptionId);
+    }
+}
diff --git a/Model/Subscription/ActiveOrderProvider.php b/Model/Subscription/ActiveOrderProvider.php
new file mode 100644
index 00000000..25337975
--- /dev/null
+++ b/Model/Subscription/ActiveOrderProvider.php
@@ -0,0 +1,65 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Subscription;
+
+class ActiveOrderProvider
+{
+    /**
+     * @var \Nexi\Checkout\Model\ResourceModel\Subscription\SubscriptionLink\CollectionFactory
+     */
+    private $linkFactory;
+    private \Magento\Sales\Model\Order\Config $orderConfig;
+
+    public function __construct(
+        \Nexi\Checkout\Model\ResourceModel\Subscription\SubscriptionLink\CollectionFactory $collectionFactory,
+        \Magento\Sales\Model\Order\Config $orderConfig
+    ) {
+        $this->linkFactory = $collectionFactory;
+        $this->orderConfig = $orderConfig;
+    }
+
+    /**
+     * @return int[]
+     */
+    public function getPayableOrderIds()
+    {
+        return $this->getCollection()->getColumnValues('order_id');
+    }
+
+    /**
+     * @return \Nexi\Checkout\Model\ResourceModel\Subscription\SubscriptionLink\Collection
+     */
+    private function getCollection(): \Nexi\Checkout\Model\ResourceModel\Subscription\SubscriptionLink\Collection
+    {
+        /** @var \Nexi\Checkout\Model\ResourceModel\Subscription\SubscriptionLink\Collection $subscriptionLinks */
+        $subscriptionLinks = $this->linkFactory->create();
+        $subscriptionLinks->join(
+            ['sub' =>\Nexi\Checkout\Model\ResourceModel\Subscription::NEXI_SUBSCRIPTIONS_TABLENAME],
+            'main_table.subscription_id = sub.entity_id',
+        );
+        $subscriptionLinks->join(
+            'sales_order',
+            'main_table.order_id = sales_order.entity_id'
+        );
+        $select = $subscriptionLinks->getSelect();
+        $select->where(
+            'sub.status IN (?)',
+            \Nexi\Checkout\Api\Data\SubscriptionInterface::CLONEABLE_STATUSES
+        );
+        $select->where(
+            'sales_order.status IN (?)',
+            $this->orderConfig->getStateDefaultStatus(
+                \Magento\Sales\Model\Order::STATE_PENDING_PAYMENT
+            )
+        );
+
+        $currentDate = new \DateTime();
+        $select->where(
+            'sub.next_order_date <= ?',
+            $currentDate->format('Y-m-d H:i:s')
+        );
+
+        return $subscriptionLinks;
+    }
+}
diff --git a/Model/Subscription/Bill.php b/Model/Subscription/Bill.php
new file mode 100644
index 00000000..38cd2af5
--- /dev/null
+++ b/Model/Subscription/Bill.php
@@ -0,0 +1,55 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Subscription;
+
+use Nexi\Checkout\Model\Subscription\ActiveOrderProvider;
+use Nexi\Checkout\Model\Subscription\OrderBiller;
+use Nexi\Checkout\Model\ResourceModel\Subscription;
+
+class Bill
+{
+    /**
+     * @var OrderBiller
+     */
+    private $orderBiller;
+
+    /**
+     * @var ActiveOrderProvider
+     */
+    private $activeOrders;
+
+    /**
+     * @param OrderBiller $orderBiller
+     * @param ActiveOrderProvider $activeOrderProvider
+     */
+    public function __construct(
+        OrderBiller $orderBiller,
+        ActiveOrderProvider $activeOrderProvider
+    ) {
+        $this->orderBiller = $orderBiller;
+        $this->activeOrders = $activeOrderProvider;
+    }
+
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function process()
+    {
+        $validOrders = $this->getValidOrderIds();
+
+        if (empty($validOrders)) {
+            return;
+        }
+        $this->orderBiller->billOrdersById($validOrders);
+    }
+
+    /**
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getValidOrderIds()
+    {
+        return $this->activeOrders->getPayableOrderIds();
+    }
+}
diff --git a/Model/Subscription/CustomerSubscriptionProvider.php b/Model/Subscription/CustomerSubscriptionProvider.php
new file mode 100644
index 00000000..56af6a00
--- /dev/null
+++ b/Model/Subscription/CustomerSubscriptionProvider.php
@@ -0,0 +1,88 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Subscription;
+
+use Magento\Customer\Model\Session;
+use Nexi\Checkout\Api\Data\SubscriptionInterface;
+use Nexi\Checkout\Model\ResourceModel\Subscription\Collection as SubscriptionCollection;
+use Nexi\Checkout\Model\ResourceModel\Subscription\CollectionFactory;
+
+class CustomerSubscriptionProvider
+{
+    /**
+     * CustomerSubscriptionProvider constructor.
+     *
+     * @param CollectionFactory $subscriptionCollectionFactory
+     * @param Session $customerSession
+     */
+    public function __construct(
+        private CollectionFactory $subscriptionCollectionFactory,
+        private Session $customerSession
+    ) {
+    }
+
+    /**
+     * Get customer subscriptions.
+     *
+     * @return SubscriptionCollection
+     */
+    public function getCustomerSubscriptions()
+    {
+        $collection = $this->subscriptionCollectionFactory->create();
+        $collection->addFieldToFilter('main_table.status', ['active', 'pending_payment', 'failed', 'rescheduled']);
+
+        $collection->getSelect()->join(
+            ['link' => 'nexi_subscription_link'],
+            'main_table.entity_id = link.subscription_id'
+        )->columns('MAX(link.order_id) as max_id')
+            ->group('link.subscription_id');
+
+        $collection->getSelect()->join(
+            ['so' => 'sales_order'],
+            'link.order_id = so.entity_id',
+            ['main_table.entity_id', 'so.base_grand_total']
+        );
+        $collection->getSelect()->join(
+            ['rpp' => 'recurring_payment_profiles'],
+            'main_table.recurring_profile_id = rpp.profile_id',
+            'name'
+        );
+
+        $collection->addFieldToFilter('main_table.customer_id', $this->customerSession->getId());
+
+        return $collection;
+    }
+
+    /**
+     * Get customer closed subscriptions.
+     *
+     * @return SubscriptionCollection
+     */
+    public function getCustomerClosedSubscriptions()
+    {
+        $collection = $this->subscriptionCollectionFactory->create();
+        $collection->addFieldToFilter('main_table.status', SubscriptionInterface::STATUS_CLOSED);
+
+        $collection->getSelect()->join(
+            ['link' => 'nexi_subscription_link'],
+            'main_table.entity_id = link.subscription_id'
+        )->columns('MAX(link.order_id) as max_id')
+            ->group('link.subscription_id');
+
+        $collection->getSelect()->join(
+            ['so' => 'sales_order'],
+            'link.order_id = so.entity_id',
+            ['main_table.entity_id', 'so.base_grand_total']
+        );
+        $collection->getSelect()->join(
+            ['rpp' => 'recurring_payment_profiles'],
+            'main_table.recurring_profile_id = rpp.profile_id',
+            'name'
+        );
+
+        $collection->addFieldToFilter('main_table.customer_id', $this->customerSession->getId());
+
+        return $collection;
+    }
+}
diff --git a/Model/Subscription/Email.php b/Model/Subscription/Email.php
new file mode 100644
index 00000000..86a9ef01
--- /dev/null
+++ b/Model/Subscription/Email.php
@@ -0,0 +1,179 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Subscription;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address\Renderer;
+use Magento\Store\Model\App\Emulation;
+use Psr\Log\LoggerInterface;
+
+class Email
+{
+    private const XML_PATH_EMAIL_TEMPLATE = 'sales/recurring_payment/email_template';
+    private const XML_PATH_EMAIL_WARNING_PERIOD = 'sales/recurring_payment/warning_period';
+
+    /**
+     * Email constructor.
+     *
+     * @param TransportBuilder $transportBuilder
+     * @param Emulation $emulation
+     * @param Renderer $addressRenderer
+     * @param ScopeConfigInterface $scopeConfig
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        private TransportBuilder $transportBuilder,
+        private Emulation $emulation,
+        private Renderer $addressRenderer,
+        private ScopeConfigInterface $scopeConfig,
+        private LoggerInterface $logger
+    ) {
+    }
+
+    /**
+     * Send notifications to customers about cloned orders
+     *
+     * @param Order[] $clonedOrders
+     */
+    public function sendNotifications(array $clonedOrders)
+    {
+        foreach ($clonedOrders as $order) {
+            $this->notify($order);
+        }
+    }
+
+    /**
+     * Notify customer about the cloned order
+     *
+     * @param $order
+     * @return void
+     */
+    private function notify($order)
+    {
+        try {
+            $transport = $this->transportBuilder->setTemplateIdentifier($this->getEmailTemplateId($order))
+                ->setTemplateOptions($this->getTemplateOptions($order))
+                ->setTemplateVars($this->prepareTemplateVars($order))
+                ->setFromByScope(
+                    'sales',
+                    $order->getStoreId()
+                )->addTo($order->getCustomerEmail())
+                ->getTransport();
+
+            $this->emulation->startEnvironmentEmulation($order->getStoreId());
+            $transport->sendMessage();
+            $this->emulation->stopEnvironmentEmulation();
+        } catch (\Exception $e) {
+            $this->logger->info($e->getMessage());
+        }
+    }
+
+    /**
+     * Get email template ID from configuration
+     *
+     * @param Order $order
+     * @return string
+     */
+    private function getEmailTemplateId($order)
+    {
+        return $this->scopeConfig->getValue(
+            self::XML_PATH_EMAIL_TEMPLATE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $order->getStoreId()
+        );
+    }
+
+    /**
+     * Prepare template variables for email
+     *
+     * @param Order $order
+     * @return string[]
+     */
+    private function prepareTemplateVars($order): array
+    {
+        return [
+            'order' => $order,
+            'order_id' => $order->getId(),
+            'billing' => $order->getBillingAddress(),
+            'payment_html' => $this->getPaymentHtml($order),
+            'store' => $order->getStore(),
+            'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
+            'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+            'created_at_formatted' => $order->getCreatedAtFormatted(2),
+            'warning_period' => $this->getWarningPeriod($order),
+            'order_data' => [
+                'customer_name' => $order->getCustomerName(),
+                'is_not_virtual' => $order->getIsNotVirtual(),
+                'email_customer_note' => $order->getEmailCustomerNote(),
+                'frontend_status_label' => $order->getFrontendStatusLabel()
+            ]
+        ];
+    }
+
+    /**
+     * Get payment info block as html
+     *
+     * @param Order $order
+     * @return string
+     */
+    private function getPaymentHtml(Order $order)
+    {
+        return $order->getPayment()->getMethod();
+    }
+
+    /**
+     * Render shipping address into html.
+     *
+     * @param Order $order
+     * @return string|null
+     */
+    private function getFormattedShippingAddress($order)
+    {
+        return $order->getIsVirtual()
+            ? null
+            : $this->addressRenderer->format($order->getShippingAddress(), 'html');
+    }
+
+    /**
+     * Render billing address into html.
+     *
+     * @param Order $order
+     * @return string|null
+     */
+    private function getFormattedBillingAddress($order)
+    {
+        return $this->addressRenderer->format($order->getBillingAddress(), 'html');
+    }
+
+    /**
+     * Get template options for email
+     *
+     * @param Order $order
+     * @return array
+     */
+    private function getTemplateOptions(Order $order): array
+    {
+        return [
+            'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
+            'store' => $order->getStoreId(),
+        ];
+    }
+
+    /**
+     * Retrieve the warning period configuration value
+     *
+     * @param Order $order
+     * @return mixed
+     */
+    private function getWarningPeriod($order)
+    {
+        return $this->scopeConfig->getValue(
+            self::XML_PATH_EMAIL_WARNING_PERIOD,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $order->getStoreId()
+        );
+    }
+}
diff --git a/Model/Subscription/NextDateCalculator.php b/Model/Subscription/NextDateCalculator.php
new file mode 100644
index 00000000..4ec7857a
--- /dev/null
+++ b/Model/Subscription/NextDateCalculator.php
@@ -0,0 +1,182 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Subscription;
+
+use Carbon\Carbon;
+use Exception;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Serialize\SerializerInterface;
+use Nexi\Checkout\Api\Data\SubscriptionProfileInterface;
+use Nexi\Checkout\Api\SubscriptionProfileRepositoryInterface;
+
+class NextDateCalculator
+{
+    /**
+     * @var SubscriptionProfileInterface[]
+     */
+    private $profiles = [];
+
+    /**
+     * @var bool
+     */
+    private bool $forceWeekdays;
+
+    /**
+     * NextDateCalculator constructor.
+     *
+     * @param SubscriptionProfileRepositoryInterface $profileRepositoryInterface
+     * @param SerializerInterface $serializer
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        private SubscriptionProfileRepositoryInterface $profileRepositoryInterface,
+        private SerializerInterface                    $serializer,
+        private ScopeConfigInterface                   $scopeConfig
+    ) {
+    }
+
+    /**
+     * Calculate next date for a profile.
+     *
+     * @param int $profileId
+     * @param string $startDate
+     *
+     * @return Carbon
+     * @throws NoSuchEntityException
+     * @throws Exception
+     */
+    public function getNextDate($profileId, $startDate = 'now'): Carbon
+    {
+        $profile = $this->getProfileById($profileId);
+
+        return $this->calculateNextDate($profile->getSchedule(), $startDate);
+    }
+
+    /**
+     * Calculate the number of days interval until the next date for a profile.
+     *
+     * @param int $profileId
+     * @param string $startDate
+     *
+     * @return int
+     * @throws NoSuchEntityException
+     * @throws Exception
+     */
+    public function getDaysInterval($profileId, $startDate = 'now'): int
+    {
+        $nextDate = $this->getNextDate($profileId, $startDate);
+
+        return (int)abs($nextDate->diffInDays($startDate));
+    }
+
+    /**
+     * Calculate next date based on the schedule.
+     *
+     * @param string $schedule
+     * @param string $startDate
+     *
+     * @return Carbon
+     * @throws Exception
+     */
+    private function calculateNextDate($schedule, $startDate): Carbon
+    {
+        $schedule   = $this->serializer->unserialize($schedule);
+        $carbonDate = $startDate === 'now' ? Carbon::now() : Carbon::createFromFormat('Y-m-d H:i:s', $startDate);
+
+        switch ($schedule['unit']) {
+            case 'D':
+                $nextDate = $carbonDate->addDays((int)$schedule['interval']);
+                break;
+            case 'W':
+                $nextDate = $carbonDate->addWeeks((int)$schedule['interval']);
+                break;
+            case 'M':
+                $nextDate = $this->addMonthsNoOverflow($carbonDate, (int)$schedule['interval']);
+                break;
+            case 'Y':
+                $nextDate = $carbonDate->addYearsNoOverflow((int)$schedule['interval']);
+                break;
+            default:
+                throw new LocalizedException(__('Schedule type not supported'));
+        }
+
+        if ($this->isForceWeekdays()) {
+            $nextDate = $this->getNextWeekday($nextDate);
+        }
+
+        return $nextDate;
+    }
+
+    /**
+     * Get profile by id
+     *
+     * @param int $profileId
+     *
+     * @return SubscriptionProfileInterface
+     * @throws NoSuchEntityException
+     */
+    private function getProfileById($profileId): SubscriptionProfileInterface
+    {
+        if (!isset($this->profiles[$profileId])) {
+            $this->profiles[$profileId] = $this->profileRepositoryInterface->get($profileId);
+        }
+
+        return $this->profiles[$profileId];
+    }
+
+    /**
+     * Get force weekdays config
+     *
+     * @return bool
+     */
+    private function isForceWeekdays(): bool
+    {
+        if (!isset($this->forceWeekdays)) {
+            $this->forceWeekdays = $this->scopeConfig->isSetFlag('sales/recurring_payment/force_weekdays');
+        }
+        return $this->forceWeekdays;
+    }
+
+    /**
+     * Get next weekday
+     *
+     * @param Carbon $nextDate
+     *
+     * @return Carbon
+     */
+    private function getNextWeekday($nextDate): Carbon
+    {
+        $newCarbonDate = new Carbon($nextDate);
+        if (!$newCarbonDate->isWeekday()) {
+            $newCarbonDate = $newCarbonDate->nextWeekday();
+            if ($nextDate->format('m') != $newCarbonDate->format('m')) {
+                $newCarbonDate = $newCarbonDate->previousWeekday();
+            }
+        }
+        return $newCarbonDate;
+    }
+
+    /**
+     * Add months no overflow
+     *
+     * @param Carbon $carbonDate
+     * @param int $interval
+     *
+     * @return Carbon
+     */
+    private function addMonthsNoOverflow($carbonDate, $interval): Carbon
+    {
+        $isLastOfMonth = $carbonDate->isLastOfMonth();
+        $nextDate      = $carbonDate->addMonthsNoOverflow($interval);
+
+        // adjust date to match the last day of month if the previous date was also last date of month.
+        if ($isLastOfMonth) {
+            $nextDate->endOfMonth();
+        }
+
+        return $nextDate;
+    }
+}
diff --git a/Model/Subscription/Notify.php b/Model/Subscription/Notify.php
new file mode 100644
index 00000000..d3f569cb
--- /dev/null
+++ b/Model/Subscription/Notify.php
@@ -0,0 +1,104 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Subscription;
+
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
+use Nexi\Checkout\Api\Data\SubscriptionInterface;
+use Nexi\Checkout\Model\Subscription\Email;
+use Nexi\Checkout\Model\Subscription\OrderCloner;
+use Nexi\Checkout\Model\Subscription\SubscriptionLinkRepository;
+use Nexi\Checkout\Model\ResourceModel\Subscription;
+use Psr\Log\LoggerInterface;
+
+class Notify
+{
+    private const ARRAY_INDEX_ZERO = 0;
+
+    /**
+     * @var OrderCloner
+     */
+    private $orderCloner;
+
+    /**
+     * @var Subscription
+     */
+    private $subscriptionResource;
+
+    /**
+     * @var Email
+     */
+    private $email;
+
+    /**
+     * @var SubscriptionLinkRepository
+     */
+    private $subscriptionLinkRepository;
+
+    private LoggerInterface $logger;
+
+    /**
+     * @param OrderCloner $orderCloner
+     * @param Subscription $subscriptionResource
+     * @param Email $email
+     * @param SubscriptionLinkRepository $subscriptionLinkRepository
+     */
+    public function __construct(
+        OrderCloner                $orderCloner,
+        Subscription               $subscriptionResource,
+        Email                      $email,
+        SubscriptionLinkRepository $subscriptionLinkRepository,
+        LoggerInterface            $logger
+    ) {
+        $this->orderCloner = $orderCloner;
+        $this->subscriptionResource = $subscriptionResource;
+        $this->email = $email;
+        $this->subscriptionLinkRepository = $subscriptionLinkRepository;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Clones recurring payments that are due in the next payment period and notifies customer's whos orders were
+     * cloned.
+     *
+     * @return void
+     */
+    public function process()
+    {
+        $validIds = $this->getValidOrderIds();
+        if (empty($validIds)) {
+            return;
+        }
+
+        $clonedOrders = $this->orderCloner->cloneOrders($validIds);
+        $i = self::ARRAY_INDEX_ZERO;
+        $validIds = array_values($validIds);
+
+        if (count($validIds) === count($clonedOrders)) {
+            foreach ($clonedOrders as $clonedOrder) {
+                $this->subscriptionLinkRepository->linkOrderToSubscription(
+                    $clonedOrder->getId(),
+                    $this->subscriptionLinkRepository->getSubscriptionIdFromOrderId($validIds[$i])
+                );
+                $i++;
+            }
+        }
+
+        $this->email->sendNotifications($clonedOrders);
+    }
+
+    private function getValidOrderIds()
+    {
+        try {
+            return $this->subscriptionResource->getClonableOrderIds();
+        } catch (LocalizedException $e) {
+            $this->logger->error(\__(
+                'Recurring Payment unable to fetch clonable order ids: %error',
+                ['error' => $e->getMessage()]
+            ));
+
+            return [];
+        }
+    }
+}
diff --git a/Model/Subscription/OrderBiller.php b/Model/Subscription/OrderBiller.php
new file mode 100644
index 00000000..00ab9fad
--- /dev/null
+++ b/Model/Subscription/OrderBiller.php
@@ -0,0 +1,171 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Subscription;
+
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Payment\Gateway\Command\CommandManagerPool;
+use Magento\Sales\Model\Order\Email\Sender\OrderSender;
+use Magento\Sales\Model\OrderRepository;
+use Nexi\Checkout\Api\SubscriptionLinkRepositoryInterface;
+use Nexi\Checkout\Api\SubscriptionRepositoryInterface;
+use Nexi\Checkout\Gateway\Config\Config;
+use Nexi\Checkout\Model\ResourceModel\Subscription as SubscriptionResource;
+use Nexi\Checkout\Model\ResourceModel\Subscription\CollectionFactory;
+use Nexi\Checkout\Model\Subscription;
+use Psr\Log\LoggerInterface;
+use Nexi\Checkout\Model\ResourceModel\Subscription\Collection;
+
+class OrderBiller
+{
+    /**
+     * OrderBiller constructor.
+     *
+     * @param PaymentCount $paymentCount
+     * @param CollectionFactory $collectionFactory
+     * @param NextDateCalculator $nextDateCalculator
+     * @param SubscriptionRepositoryInterface $subscriptionRepository
+     * @param SubscriptionResource $subscriptionResource
+     * @param LoggerInterface $logger
+     * @param SubscriptionLinkRepositoryInterface $subscriptionLinkRepository
+     * @param OrderSender $orderSender
+     * @param OrderRepository $orderRepository
+     * @param CommandManagerPool $commandManagerPool
+     */
+    public function __construct(
+        private PaymentCount                        $paymentCount,
+        private CollectionFactory                   $collectionFactory,
+        private NextDateCalculator                  $nextDateCalculator,
+        private SubscriptionRepositoryInterface     $subscriptionRepository,
+        private SubscriptionResource                $subscriptionResource,
+        private LoggerInterface                     $logger,
+        private SubscriptionLinkRepositoryInterface $subscriptionLinkRepository,
+        private OrderSender                         $orderSender,
+        private OrderRepository                     $orderRepository,
+        private CommandManagerPool                  $commandManagerPool
+    ) {
+    }
+
+    /**
+     * Bill orders by ID.
+     *
+     * @param int[] $orderIds
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function billOrdersById($orderIds)
+    {
+        foreach ($orderIds as $orderId) {
+            $paymentSuccess = $this->chargeSubscription($orderId);
+            if (!$paymentSuccess) {
+                /** @var Subscription $subscription */
+                $subscription = $this->subscriptionLinkRepository->getSubscriptionFromOrderId($orderId);
+                $this->paymentCount->reduceFailureRetryCount($subscription);
+                continue;
+            }
+            /** @var Collection $subscriptionsToCharge */
+            $subscriptionsToCharge = $this->collectionFactory->create();
+            $subscriptionsToCharge->getBillingCollectionByOrderIds($orderIds);
+            $this->sendOrderConfirmationEmail($subscription->getId());
+            $this->updateNextOrderDate($subscription);
+        }
+    }
+
+    /**
+     * Send order confirmation email.
+     *
+     * @param string $subscriptionId
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function sendOrderConfirmationEmail($subscriptionId)
+    {
+        $orderIds = $this->subscriptionLinkRepository->getOrderIdsBySubscriptionId($subscriptionId);
+        $this->orderSender->send($this->orderRepository->get(array_last($orderIds)));
+    }
+
+    /**
+     * Create MIT payment request.
+     *
+     * @param string $orderId
+     *
+     * @return bool
+     * For subscription param @see Collection::getBillingCollectionByOrderIds
+     */
+    private function chargeSubscription($orderId): bool
+    {
+        $paymentSuccess = false;
+        try {
+            $order = $this->orderRepository->get($orderId);
+            $commandExecutor = $this->commandManagerPool->get(Config::CODE);
+
+            $commandExecutor->executeByCode(
+                commandCode: 'subscription_charge',
+                arguments: ['order' => $order]
+            );
+        } catch (LocalizedException $e) {
+            $this->logger->error(
+                \__(
+                    "Subscription: Unable to create a charge to customer's subscription error: %error",
+                    ['error' => $e->getMessage()]
+                )
+            );
+        }
+
+        return $paymentSuccess;
+    }
+
+    /**
+     * Update next order date.
+     *
+     * @param Subscription $subscription
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function updateNextOrderDate(Subscription $subscription)
+    {
+        $subscription->setNextOrderDate(
+            $this->nextDateCalculator->getNextDate(
+                $subscription->getRecurringProfileId(),
+                $subscription->getNextOrderDate()
+            )->format('Y-m-d')
+        );
+
+        $this->saveSubscription($subscription);
+    }
+
+    /**
+     * Save subscription.
+     *
+     * @param Subscription $subscription
+     *
+     * @return void
+     */
+    private function saveSubscription(Subscription $subscription): void
+    {
+        try {
+            $this->subscriptionRepository->save($subscription);
+        } catch (CouldNotSaveException $e) {
+            $this->logger->critical(
+                \__(
+                    'Recurring payment:
+                    Cancelling subscription %id, unable to update subscription\'s next order date: %error',
+                    [
+                        'id' => $subscription->getId(),
+                        'error' => $e->getMessage()
+                    ]
+                )
+            );
+
+            // Prevent subscription from being rebilled over and over again
+            // if for some reason the subscription is unable to be saved.
+            $this->subscriptionResource->forceFailedStatus($subscription->getId());
+        }
+    }
+}
diff --git a/Model/Subscription/OrderCloner.php b/Model/Subscription/OrderCloner.php
new file mode 100644
index 00000000..ff49f5ff
--- /dev/null
+++ b/Model/Subscription/OrderCloner.php
@@ -0,0 +1,176 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Subscription;
+
+use Exception;
+use Magento\Backend\Model\Session\Quote;
+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Model\QuoteManagement;
+use Magento\Sales\Model\Order\Reorder\UnavailableProductsProvider;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
+use Psr\Log\LoggerInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+
+class OrderCloner
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $orderCollection;
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+    /**
+     * @var UnavailableProductsProvider
+     */
+    private $unavailableProducts;
+    /**
+     * @var Quote
+     */
+    private $quoteSession;
+    /**
+     * @var QuoteManagement
+     */
+    private $quoteManagement;
+    /**
+     * @var JoinProcessorInterface
+     */
+    private $joinProcessor;
+    /**
+     * @var \Magento\Quote\Api\CartRepositoryInterface
+     */
+    private $cartRepositoryInterface;
+
+    /**
+     * @param CollectionFactory $orderCollection
+     * @param UnavailableProductsProvider $unavailableProducts
+     * @param Quote $quoteSession
+     * @param JoinProcessorInterface $joinProcessor
+     * @param QuoteManagement $quoteManagement
+     * @param LoggerInterface $logger
+     * @param CartRepositoryInterface $cartRepositoryInterface
+     */
+    public function __construct(
+        CollectionFactory           $orderCollection,
+        UnavailableProductsProvider $unavailableProducts,
+        Quote                       $quoteSession,
+        JoinProcessorInterface      $joinProcessor,
+        QuoteManagement             $quoteManagement,
+        LoggerInterface             $logger,
+        CartRepositoryInterface     $cartRepositoryInterface
+    ) {
+        $this->orderCollection = $orderCollection;
+        $this->unavailableProducts = $unavailableProducts;
+        $this->quoteSession = $quoteSession;
+        $this->joinProcessor = $joinProcessor;
+        $this->quoteManagement = $quoteManagement;
+        $this->logger = $logger;
+        $this->cartRepositoryInterface = $cartRepositoryInterface;
+    }
+
+    /**
+     * Clones orders by existing order ids, if performance becomes an issue. Consider limiting results from
+     * @param int[] $orderIds
+     * @return \Magento\Sales\Model\Order[]
+     * @see \Nexi\Checkout\Model\ResourceModel\Subscription::getClonableOrderIds
+     *
+     */
+    public function cloneOrders($orderIds): array
+    {
+        if (empty($orderIds)) {
+            return [];
+        }
+
+        $orderCollection = $this->orderCollection->create();
+        $orderCollection->addFieldToFilter('entity_id', $orderIds);
+        $this->joinProcessor->process($orderCollection);
+        $newOrders = [];
+
+        /** @var \Magento\Sales\Model\Order $order */
+        foreach ($orderCollection as $order) {
+            try {
+                $clonedOrder = $this->clone($order);
+                $newOrders[$clonedOrder->getId()] = $clonedOrder;
+            } catch (Exception $exception) {
+                $this->logger->error(__(
+                    'Recurring payment order cloning error: %error',
+                    ['error' => $exception->getMessage()]
+                ));
+                continue;
+            }
+        }
+
+        return $newOrders;
+    }
+
+    /**
+     * @param \Magento\Sales\Api\Data\OrderInterface|\Magento\Sales\Model\Order $oldOrder
+     * @throws LocalizedException
+     */
+    private function clone(
+        \Magento\Sales\Api\Data\OrderInterface $oldOrder
+    ) {
+        $this->validateOrder($oldOrder);
+
+        $this->quoteSession->clearStorage();
+        $this->quoteSession->setData('use_old_shipping_method', true);
+        $oldOrder->setData('reordered', true);
+
+        $quote = $this->getQuote($oldOrder);
+
+        $this->removeNonScheduledProducts($quote);
+        $quote->getPayment()->setAdditionalInformation('subscription_id', $oldOrder->getPayment()->getAdditionalInformation('subscription_id'));
+
+        return $this->quoteManagement->submit($quote);
+    }
+
+    /**
+     * @param $quote
+     * @return void
+     */
+    private function removeNonScheduledProducts($quote): void
+    {
+        foreach ($quote->getAllVisibleItems() as $quoteItem) {
+            if (!$quoteItem->getProduct()->getSubscriptionSchedule()) {
+                $quote->deleteItem($quoteItem);
+                $quote->setTotalsCollectedFlag(false);
+            }
+        }
+
+        $quote->save();
+        $quote->collectTotals();
+    }
+
+    /**
+     * @param \Magento\Sales\Model\Order $order
+     */
+    private function validateOrder($order)
+    {
+        if ($order->canReorder()
+            && count($this->unavailableProducts->getForOrder($order)) == 0
+        ) {
+            return true;
+        }
+
+        throw new LocalizedException(__(
+            'Order id: %id cannot be reordered',
+            ['id' => $order->getId()]
+        ));
+    }
+
+    /**
+     * @param \Magento\Sales\Model\Order $oldOrder
+     * @return \Magento\Quote\Model\Quote
+     * @throws LocalizedException
+     */
+    private function getQuote(\Magento\Sales\Api\Data\OrderInterface $oldOrder): \Magento\Quote\Model\Quote
+    {
+        $quote = $this->cartRepositoryInterface->get($oldOrder->getQuoteId());
+        $quote->setData('recurring_payment_flag', true);
+
+        return $quote;
+    }
+}
diff --git a/Model/Subscription/PaymentCount.php b/Model/Subscription/PaymentCount.php
new file mode 100644
index 00000000..53894d16
--- /dev/null
+++ b/Model/Subscription/PaymentCount.php
@@ -0,0 +1,53 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Subscription;
+
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
+use Nexi\Checkout\Api\Data\SubscriptionInterface;
+use Nexi\Checkout\Api\SubscriptionRepositoryInterface;
+
+class PaymentCount
+{
+    /**
+     * @var SubscriptionRepositoryInterface
+     */
+    private $subscriptionRepository;
+
+    private \Psr\Log\LoggerInterface $logger;
+
+    public function __construct(
+        SubscriptionRepositoryInterface $subscriptionRepository,
+        \Psr\Log\LoggerInterface $logger
+    ) {
+        $this->subscriptionRepository = $subscriptionRepository;
+        $this->logger = $logger;
+    }
+
+    public function reduceFailureRetryCount($subscription)
+    {
+        $subscription->setRetryCount($subscription->getRetryCount()-1);
+        if ($subscription->getRetryCount() <= 0) {
+            $subscription->setStatus(SubscriptionInterface::STATUS_FAILED);
+        }
+
+        $this->save($subscription);
+    }
+
+    /**
+     * @param $subscription
+     * @return void
+     */
+    private function save($subscription): void
+    {
+        try {
+            $this->subscriptionRepository->save($subscription);
+        } catch (CouldNotSaveException $e) {
+            $this->logger->error(\__(
+                'Unable to reduce subscription retry count or mark subscription id: %id as failed',
+                ['id' => $subscription->getId()]
+            ));
+        }
+    }
+}
diff --git a/Model/Subscription/Profile.php b/Model/Subscription/Profile.php
new file mode 100644
index 00000000..2d46cca7
--- /dev/null
+++ b/Model/Subscription/Profile.php
@@ -0,0 +1,67 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Subscription;
+
+use Magento\Framework\Model\AbstractModel;
+use Nexi\Checkout\Api\Data\SubscriptionProfileInterface;
+
+class Profile extends AbstractModel implements SubscriptionProfileInterface
+{
+    protected function _construct()
+    {
+        $this->_init(\Nexi\Checkout\Model\ResourceModel\Subscription\Profile::class);
+    }
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->getData(SubscriptionProfileInterface::FIELD_PROFILE_ID);
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->getData(SubscriptionProfileInterface::FIELD_NAME);
+    }
+
+    /**
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->getData(SubscriptionProfileInterface::FIELD_DESCRIPTION);
+    }
+
+    /**
+     * @return string
+     */
+    public function getSchedule()
+    {
+        return $this->getData(SubscriptionProfileInterface::FIELD_SCHEDULE);
+    }
+
+    public function setId($profileId): self
+    {
+        return $this->setData(SubscriptionProfileInterface::FIELD_PROFILE_ID, $profileId);
+    }
+
+    public function setName($name): self
+    {
+        return $this->setData(SubscriptionProfileInterface::FIELD_NAME, $name);
+    }
+
+    public function setDescription($description): self
+    {
+        return $this->setData(SubscriptionProfileInterface::FIELD_DESCRIPTION, $description);
+    }
+
+    public function setSchedule($schedule): self
+    {
+        return $this->setData(SubscriptionProfileInterface::FIELD_SCHEDULE, $schedule);
+    }
+}
diff --git a/Model/Subscription/ProfileRepository.php b/Model/Subscription/ProfileRepository.php
new file mode 100644
index 00000000..e88d8b2a
--- /dev/null
+++ b/Model/Subscription/ProfileRepository.php
@@ -0,0 +1,111 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Subscription;
+
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Nexi\Checkout\Api\Data;
+use Nexi\Checkout\Api\Data\SubscriptionProfileSearchResultInterface;
+use Nexi\Checkout\Api\SubscriptionProfileRepositoryInterface;
+use Nexi\Checkout\Model\Subscription;
+
+class ProfileRepository implements SubscriptionProfileRepositoryInterface
+{
+    /**
+     * @var \Nexi\Checkout\Model\ResourceModel\Subscription\Profile
+     */
+    private $profileResource;
+    /**
+     * @var Data\SubscriptionProfileInterfaceFactory
+     */
+    private $profileFactory;
+    /**
+     * @var \Nexi\Checkout\Model\ResourceModel\Subscription\Profile
+     */
+    private $profileResultFactory;
+    /**
+     * @var \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    public function __construct(
+        \Nexi\Checkout\Model\ResourceModel\Subscription\Profile              $profileResource,
+        \Nexi\Checkout\Api\Data\SubscriptionProfileInterfaceFactory            $profileFactory,
+        \Nexi\Checkout\Api\Data\SubscriptionProfileSearchResultInterfaceFactory $profileResultFactory,
+        \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface $collectionProcessor
+    ) {
+        $this->profileResource = $profileResource;
+        $this->profileFactory = $profileFactory;
+        $this->profileResultFactory = $profileResultFactory;
+        $this->collectionProcessor = $collectionProcessor;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function get($profileId)
+    {
+        /** @var Subscription $subscription */
+        $subscription = $this->profileFactory->create();
+        $this->profileResource->load($subscription, $profileId);
+
+        if (!$subscription->getId()) {
+            throw new NoSuchEntityException(\__(
+                'No subscription profile found with id %id',
+                [
+                    'id' => $profileId
+                ]
+            ));
+        }
+
+        return $subscription;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(Data\SubscriptionProfileInterface $profile)
+    {
+        try {
+            $this->profileResource->save($profile);
+        } catch (\Throwable $e) {
+            throw new CouldNotSaveException(\__(
+                'Could not save Recurring Profile: %error',
+                ['error' => $e->getMessage()]
+            ));
+        }
+
+        return $profile;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function delete(Data\SubscriptionProfileInterface $profile)
+    {
+        try {
+            $this->profileResource->delete($profile);
+        } catch (\Exception $e) {
+            throw new CouldNotDeleteException(__(
+                'Unable to delete recurring profile: %error',
+                ['error' => $e->getMessage()]
+            ));
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getList(
+        \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+    ) : SubscriptionProfileSearchResultInterface {
+        /** @var Data\RecurringProfileSearchResultInterface $searchResult */
+        $searchResult = $this->profileResultFactory->create();
+        $this->collectionProcessor->process($searchCriteria, $searchResult);
+        $searchResult->setSearchCriteria($searchCriteria);
+
+        return $searchResult;
+    }
+}
diff --git a/Model/Subscription/SubscriptionLink.php b/Model/Subscription/SubscriptionLink.php
new file mode 100644
index 00000000..7fbd3fc4
--- /dev/null
+++ b/Model/Subscription/SubscriptionLink.php
@@ -0,0 +1,69 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Subscription;
+
+use Magento\Framework\Model\AbstractModel;
+use Nexi\Checkout\Api\Data\SubscriptionLinkInterface;
+
+class SubscriptionLink extends AbstractModel implements SubscriptionLinkInterface
+{
+    /**
+     * @return void
+     */
+    protected function _construct()
+    {
+        $this->_init(\Nexi\Checkout\Model\ResourceModel\Subscription\SubscriptionLink::class);
+    }
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->getData(self::FIELD_LINK_ID);
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrderId()
+    {
+        return $this->getData(self::FIELD_ORDER_ID);
+    }
+
+    /**
+     * @return string
+     */
+    public function getSubscriptionId()
+    {
+        return $this->getData(self::FIELD_SUBSCRIPTION_ID);
+    }
+
+    /**
+     * @param $linkId
+     * @return $this
+     */
+    public function setId($linkId): self
+    {
+        return $this->setData(self::FIELD_LINK_ID, $linkId);
+    }
+
+    /**
+     * @param $orderId
+     * @return $this
+     */
+    public function setOrderId($orderId): self
+    {
+        return $this->setData(self::FIELD_ORDER_ID, $orderId);
+    }
+
+    /**
+     * @param $subscriptionId
+     * @return $this
+     */
+    public function setSubscriptionId($subscriptionId): self
+    {
+        return $this->setData(self::FIELD_SUBSCRIPTION_ID, $subscriptionId);
+    }
+}
diff --git a/Model/Subscription/SubscriptionLinkRepository.php b/Model/Subscription/SubscriptionLinkRepository.php
new file mode 100644
index 00000000..d99a0f4b
--- /dev/null
+++ b/Model/Subscription/SubscriptionLinkRepository.php
@@ -0,0 +1,223 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Subscription;
+
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
+use Nexi\Checkout\Api\Data;
+use Nexi\Checkout\Api\Data\SubscriptionInterface;
+use Nexi\Checkout\Api\Data\SubscriptionInterfaceFactory;
+use Nexi\Checkout\Api\Data\SubscriptionLinkInterfaceFactory;
+use Nexi\Checkout\Api\Data\SubscriptionLinkSearchResultInterfaceFactory;
+use Nexi\Checkout\Api\SubscriptionLinkRepositoryInterface;
+use Nexi\Checkout\Model\ResourceModel\Subscription as SubscriptionResource;
+use Nexi\Checkout\Model\ResourceModel\Subscription\SubscriptionLink;
+use Nexi\Checkout\Model\ResourceModel\Subscription\SubscriptionLink\CollectionFactory;
+use Nexi\Checkout\Model\Subscription;
+
+class SubscriptionLinkRepository implements SubscriptionLinkRepositoryInterface
+{
+    /**
+     * @var SubscriptionLink
+     */
+    private SubscriptionLink $subscriptionLinkResource;
+
+    /**
+     * @var SubscriptionLinkInterfaceFactory
+     */
+    private $subscriptionLinkFactory;
+
+    /**
+     * @var SubscriptionLink
+     */
+    private $subscriptionLinkResultFactory;
+
+    /**
+     * @var CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    /**
+     * @var MessageManagerInterface
+     */
+    private $messageManager;
+
+    /**
+     * @var SubscriptionResource
+     */
+    private $subscriptionResource;
+
+    /**
+     * @var SubscriptionInterfaceFactory
+     */
+    private $subscriptionFactory;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $subscriptionLinkCollectionFactory;
+
+    /**
+     * @param SubscriptionLink $subscriptionLinkResource
+     * @param SubscriptionLinkInterfaceFactory $subscriptionLinkFactory
+     * @param SubscriptionLinkSearchResultInterfaceFactory $subscriptionLinkResultFactory
+     * @param CollectionProcessorInterface $collectionProcessor
+     * @param MessageManagerInterface $messageManager
+     * @param SubscriptionResource $subscriptionResource
+     * @param SubscriptionInterfaceFactory $subscriptionFactory
+     * @param CollectionFactory $subscriptionLinkCollectionFactory
+     */
+    public function __construct(
+        SubscriptionLink                             $subscriptionLinkResource,
+        SubscriptionLinkInterfaceFactory             $subscriptionLinkFactory,
+        SubscriptionLinkSearchResultInterfaceFactory $subscriptionLinkResultFactory,
+        CollectionProcessorInterface                 $collectionProcessor,
+        MessageManagerInterface                      $messageManager,
+        SubscriptionResource                         $subscriptionResource,
+        SubscriptionInterfaceFactory                 $subscriptionFactory,
+        CollectionFactory                            $subscriptionLinkCollectionFactory
+    ) {
+        $this->subscriptionLinkResource = $subscriptionLinkResource;
+        $this->subscriptionLinkFactory = $subscriptionLinkFactory;
+        $this->subscriptionLinkResultFactory = $subscriptionLinkResultFactory;
+        $this->collectionProcessor = $collectionProcessor;
+        $this->messageManager = $messageManager;
+        $this->subscriptionResource = $subscriptionResource;
+        $this->subscriptionFactory = $subscriptionFactory;
+        $this->subscriptionLinkCollectionFactory = $subscriptionLinkCollectionFactory;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function get($linkId)
+    {
+        /** @var Subscription $subscription */
+        $subscription = $this->subscriptionLinkFactory->create();
+        $this->subscriptionLinkResource->load($subscription, $linkId);
+
+        if (!$subscription->getId()) {
+            throw new NoSuchEntityException(\__(
+                'No subscription link found with id %id',
+                [
+                    'id' => $linkId
+                ]
+            ));
+        }
+
+        return $subscription;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(Data\SubscriptionLinkInterface $subscriptionLink)
+    {
+        try {
+            $this->subscriptionLinkResource->save($subscriptionLink);
+        } catch (\Throwable $e) {
+            throw new CouldNotSaveException(\__(
+                'Could not save Recurring Profile: %error',
+                ['error' => $e->getMessage()]
+            ));
+        }
+
+        return $subscriptionLink;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function delete(Data\SubscriptionLinkInterface $subscriptionLink)
+    {
+        try {
+            $this->subscriptionLinkResource->delete($subscriptionLink);
+        } catch (\Exception $e) {
+            throw new CouldNotDeleteException(__(
+                'Unable to delete subscription link: %error',
+                ['error' => $e->getMessage()]
+            ));
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getList(
+        \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+    ): Data\SubscriptionLinkSearchResultInterface {
+        /** @var Data\RecurringProfileSearchResultInterface $searchResult */
+        $searchResult = $this->subscriptionLinkResultFactory->create();
+        $this->collectionProcessor->process($searchCriteria, $searchResult);
+        $searchResult->setSearchCriteria($searchCriteria);
+
+        return $searchResult;
+    }
+
+    /**
+     * @param $orderId
+     * @return SubscriptionInterface
+     */
+    public function getSubscriptionFromOrderId($orderId): SubscriptionInterface
+    {
+        $subscriptionId = $this->getSubscriptionIdFromOrderId($orderId);
+        $subscription = $this->subscriptionFactory->create();
+        $this->subscriptionResource->load($subscription, $subscriptionId, 'entity_id');
+
+        return $subscription;
+    }
+
+    /**
+     * @param $orderId
+     * @param $subscriptionId
+     * @return mixed|void
+     */
+    public function linkOrderToSubscription($orderId, $subscriptionId)
+    {
+        try {
+            $subscriptionLink = $this->subscriptionLinkFactory->create();
+            $subscriptionLink->setOrderId($orderId);
+            $subscriptionLink->setSubscriptionId($subscriptionId);
+            $this->save($subscriptionLink);
+        } catch (CouldNotSaveException $e) {
+            $this->messageManager->addErrorMessage($e->getMessage());
+        }
+    }
+
+    /**
+     * @param $orderId
+     * @return string
+     */
+    public function getSubscriptionIdFromOrderId($orderId)
+    {
+        $subscription = $this->subscriptionLinkFactory->create();
+        $this->subscriptionLinkResource->load($subscription, $orderId, 'order_id');
+
+        return $subscription->getSubscriptionId();
+    }
+
+    /**
+     * @param $subscriptionId
+     * @return array
+     */
+    public function getOrderIdsBySubscriptionId($subscriptionId): array
+    {
+        $collection = $this->subscriptionLinkCollectionFactory->create();
+        $collection->addFieldToFilter(
+            'subscription_id',
+            ['eq' => $subscriptionId]
+        );
+
+        $subscriptionLinks = [];
+        foreach ($collection->getItems() as $item) {
+            $subscriptionLinks[] = $item->getOrderId();
+        }
+
+        return $subscriptionLinks;
+    }
+
+}
diff --git a/Model/Subscription/TotalConfigProvider.php b/Model/Subscription/TotalConfigProvider.php
new file mode 100644
index 00000000..ed2dfae4
--- /dev/null
+++ b/Model/Subscription/TotalConfigProvider.php
@@ -0,0 +1,126 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Subscription;
+
+use Magento\Checkout\Model\ConfigProviderInterface;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\ScopeInterface;
+
+class TotalConfigProvider implements ConfigProviderInterface
+{
+    private const NO_SCHEDULE_VALUE = null;
+    private const IS_SUBSCRIPTIONS_ENABLED = 'nexi/subscriptions/active_subscriptions';
+
+    /**
+     * TotalConfigProvider constructor.
+     *
+     * @param Session $checkoutSession
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        private Session $checkoutSession,
+        private ScopeConfigInterface $scopeConfig
+    ) {
+    }
+
+    /**
+     * Is recurring payment feature enable.
+     *
+     * @return bool
+     */
+    public function isSubscriptionsEnabled(): bool
+    {
+        return (bool)$this->scopeConfig->getValue(
+            self::IS_SUBSCRIPTIONS_ENABLED,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Get subscription values to config.
+     *
+     * @return array
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    public function getConfig(): array
+    {
+        return [
+            'isRecurringScheduled' => $this->isSubscriptionScheduled(),
+            'recurringSubtotal' => $this->getSubscriptionSubtotal()
+            ];
+    }
+
+    /**
+     * Is cart has subscription schedule products.
+     *
+     * @return bool
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    public function isSubscriptionScheduled(): bool
+    {
+        $quoteItems = $this->checkoutSession->getQuote()->getAllItems();
+        if ($quoteItems) {
+            foreach ($quoteItems as $item) {
+                if ($item->getProduct()->getCustomAttribute('subscription_schedule') != self::NO_SCHEDULE_VALUE) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get subscription profile ID.
+     *
+     * @return string
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    public function getSubscriptionProfileId(): string
+    {
+        $profileId = '';
+        $quoteItems = $this->checkoutSession->getQuote()->getAllItems();
+        if ($quoteItems) {
+            foreach ($quoteItems as $item) {
+                if ($item->getProduct()->getCustomAttribute('subscription_schedule')) {
+                    $profileId = $item->getProduct()->getCustomAttribute('subscription_schedule')->getValue();
+                }
+            }
+        }
+
+        return $profileId;
+    }
+
+    /**
+     * Get subscription cart subtotal value.
+     *
+     * @return float
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    private function getSubscriptionSubtotal(): float
+    {
+        $recurringSubtotal = 0.00;
+        if ($this->isSubscriptionsEnabled()) {
+
+            if ($this->isSubscriptionScheduled()) {
+                $quoteItems = $this->checkoutSession->getQuote()->getAllItems();
+                foreach ($quoteItems as $item) {
+                    if ($item->getProduct()
+                            ->getCustomAttribute('subscription_schedule') != self::NO_SCHEDULE_VALUE) {
+                        $recurringSubtotal = $recurringSubtotal + ($item->getPrice() * $item->getQty());
+                    }
+                }
+            }
+        }
+
+        return $recurringSubtotal;
+    }
+}
diff --git a/Model/SubscriptionManagement.php b/Model/SubscriptionManagement.php
new file mode 100644
index 00000000..2c0095eb
--- /dev/null
+++ b/Model/SubscriptionManagement.php
@@ -0,0 +1,297 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model;
+
+use Exception;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\Search\FilterGroupBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Nexi\Checkout\Api\Data\SubscriptionInterface;
+use Nexi\Checkout\Api\Data\SubscriptionInterfaceFactory;
+use Nexi\Checkout\Api\SubscriptionLinkRepositoryInterface;
+use Nexi\Checkout\Api\SubscriptionManagementInterface;
+use Nexi\Checkout\Api\SubscriptionRepositoryInterface;
+use Nexi\Checkout\Model\Api\ShowSubscriptionsDataProvider;
+use Nexi\Checkout\Model\Subscription\NextDateCalculator;
+use Nexi\Checkout\Model\Validation\CustomerData;
+use Psr\Log\LoggerInterface;
+
+class SubscriptionManagement implements SubscriptionManagementInterface
+{
+    private const STATUS_CLOSED = 'closed';
+    public const ORDER_PENDING_STATUS = 'pending';
+    private const SCHEDULED_ATTRIBUTE_CODE = 'subscription_schedule';
+    private const REPEAT_COUNT_STATIC_VALUE = 5;
+
+    /**
+     * SubscriptionManagement constructor.
+     *
+     * @param UserContextInterface $userContext
+     * @param SubscriptionRepositoryInterface $subscriptionRepository
+     * @param SubscriptionLinkRepositoryInterface $subscriptionLinkRepository
+     * @param OrderRepositoryInterface $orderRepository
+     * @param OrderManagementInterface $orderManagementInterface
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param LoggerInterface $logger
+     * @param FilterBuilder $filterBuilder
+     * @param FilterGroupBuilder $groupBuilder
+     * @param CustomerData $customerData
+     * @param ShowSubscriptionsDataProvider $showSubscriptionsDataProvider
+     * @param ProductRepositoryInterface $productRepository
+     * @param SubscriptionInterfaceFactory $subscriptionInterfaceFactory
+     * @param NextDateCalculator $dateCalculator
+     */
+    public function __construct(
+        private UserContextInterface                $userContext,
+        private SubscriptionRepositoryInterface     $subscriptionRepository,
+        private SubscriptionLinkRepositoryInterface $subscriptionLinkRepository,
+        private OrderRepositoryInterface            $orderRepository,
+        private OrderManagementInterface            $orderManagementInterface,
+        private SearchCriteriaBuilder               $searchCriteriaBuilder,
+        private LoggerInterface                     $logger,
+        private FilterBuilder                       $filterBuilder,
+        private FilterGroupBuilder                  $groupBuilder,
+        private CustomerData                        $customerData,
+        private ShowSubscriptionsDataProvider       $showSubscriptionsDataProvider,
+        private ProductRepositoryInterface          $productRepository,
+        private SubscriptionInterfaceFactory        $subscriptionInterfaceFactory,
+        private NextDateCalculator                  $dateCalculator
+    ) {
+    }
+
+    /**
+     * Process a subscription for the given order and Nexi subscription ID.
+     *
+     * @param Order $order
+     * @param string $nexiSubscriptionId
+     * @return SubscriptionInterface
+     * @throws CouldNotSaveException
+     */
+    public function processSubscription($order, $nexiSubscriptionId): SubscriptionInterface
+    {
+        $orderSchedule = $this->getSubscriptionSchedule($order);
+        if (empty($orderSchedule)) {
+            throw new CouldNotSaveException(__('No valid subscription schedule found for order.'));
+        }
+        $subscription = $this->createSubscription($order, $orderSchedule, $nexiSubscriptionId);
+        $order->getPayment()->setAdditionalInformation(
+            'subscription_id',
+            $nexiSubscriptionId
+        );
+
+        $this->subscriptionRepository->save($subscription);
+
+        return $subscription;
+    }
+
+    /**
+     * Create a new subscription based on the order and its schedule.
+     *
+     * @param Order $order
+     * @param array $orderSchedule
+     * @param string $subscriptionId
+     * @return SubscriptionInterface
+     * @throws CouldNotSaveException
+     */
+    public function createSubscription($order, $orderSchedule, $subscriptionId): SubscriptionInterface
+    {
+        try {
+            $subscription = $this->subscriptionInterfaceFactory->create();
+            $subscription->setStatus(SubscriptionInterface::STATUS_ACTIVE);
+            $subscription->setCustomerId($order->getCustomerId());
+            $subscription->setNextOrderDate($this->dateCalculator->getNextDate(reset($orderSchedule))->format('Y-m-d'));
+            $subscription->setRecurringProfileId((int)reset($orderSchedule));
+            $subscription->setRepeatCountLeft(self::REPEAT_COUNT_STATIC_VALUE);
+            $subscription->setRetryCount(self::REPEAT_COUNT_STATIC_VALUE);
+            $subscription->setNexiSubscriptionId($subscriptionId);
+
+            $this->subscriptionRepository->save($subscription);
+
+            $this->subscriptionLinkRepository->linkOrderToSubscription($order->getId(), $subscription->getId());
+
+            return $subscription;
+        } catch (\Exception $exception) {
+            throw new CouldNotSaveException(__($exception->getMessage()));
+        }
+    }
+
+    /**
+     * Cancel a subscription by its ID.
+     *
+     * @param int $subscriptionId
+     * @return string
+     * @throws LocalizedException
+     */
+    public function cancelSubscription($subscriptionId)
+    {
+        $customerId = $this->userContext->getUserId();
+        if (!$customerId) {
+            throw new LocalizedException(__('Customer is not authorized for this operation'));
+        }
+
+        try {
+            $subscription = $this->subscriptionRepository->get((int)$subscriptionId);
+            if ($subscription->getStatus() === self::STATUS_CLOSED) {
+                return __('Subscription is closed')->render();
+            }
+
+            $customerId = $this->userContext->getUserId();
+            $orderIds = $this->subscriptionLinkRepository->getOrderIdsBySubscriptionId((int)$subscriptionId);
+            $searchCriteria = $this->searchCriteriaBuilder
+                ->addFilter('entity_id', $orderIds, 'in')
+                ->create();
+            $orders = $this->orderRepository->getList($searchCriteria);
+
+            foreach ($orders->getItems() as $order) {
+                if ($customerId != $order->getCustomerId()) {
+                    throw new LocalizedException(__('Customer is not authorized for this operation'));
+                }
+                $subscription->setStatus(self::STATUS_CLOSED);
+                if ($order->getStatus() === Order::STATE_PENDING_PAYMENT
+                    || $order->getStatus() === self::ORDER_PENDING_STATUS) {
+                    $this->orderManagementInterface->cancel($order->getId());
+                }
+            }
+
+            $this->subscriptionRepository->save($subscription);
+        } catch (Exception $e) {
+            $this->logger->error($e->getMessage());
+            throw new LocalizedException(__("Subscription couldn't be canceled"));
+        }
+
+        return __('Subscription has been canceled correctly')->render();
+    }
+
+    /**
+     * Show subscriptions for the logged-in customer based on search criteria.
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return array
+     * @throws LocalizedException
+     */
+    public function showSubscriptions(SearchCriteriaInterface $searchCriteria): array
+    {
+        $subscriptions = [];
+        try {
+            if ($this->userContext->getUserId()) {
+                $this->filterByCustomer($searchCriteria);
+                $subscriptionCollection = $this->subscriptionRepository->getList($searchCriteria)->getItems();
+
+                foreach ($subscriptionCollection as $subscription) {
+                    $orderData = $this->showSubscriptionsDataProvider
+                        ->getOrderDataFromSubscriptionId($subscription->getId());
+                    $subscriptions[] = [
+                        'entity_id' => $subscription->getId(),
+                        'customer_id' => $subscription->getCustomerId(),
+                        'status' => $subscription->getStatus(),
+                        'next_order_date' => $subscription->getNextOrderDate(),
+                        'recurring_profile_id' => $subscription->getRecurringProfileId(),
+                        'updated_at' => $subscription->getUpdatedAt(),
+                        'repeat_count_left' => $subscription->getRepeatCountLeft(),
+                        'retry_count' => $subscription->getRetryCount(),
+                        'grand_total' => $orderData['grand_total'],
+                        'last_order_increment_id' => $orderData['increment_id']
+                    ];
+                }
+
+                return $subscriptions;
+            }
+        } catch (\Throwable $e) {
+            $this->logger->error($e->getMessage());
+            throw new LocalizedException(__("Subscription orders can't be shown"));
+        }
+
+        throw new LocalizedException(__("Customer is not logged in"));
+    }
+
+    /**
+     * Get the subscription schedule from the order items.
+     *
+     * @param Order $order
+     * @return array
+     */
+    public function getSubscriptionSchedule($order): array
+    {
+        $orderSchedule = [];
+        try {
+            foreach ($order->getItems() as $item) {
+                $product = $this->productRepository->getById($item->getProductId());
+                if (is_object($product->getCustomAttribute(self::SCHEDULED_ATTRIBUTE_CODE))) {
+                    if ($product->getCustomAttribute(self::SCHEDULED_ATTRIBUTE_CODE)->getValue() >= 0) {
+                        $orderSchedule[] = $product->getCustomAttribute(self::SCHEDULED_ATTRIBUTE_CODE)->getValue();
+                    }
+                }
+            }
+        } catch (NoSuchEntityException $e) {
+            return [];
+        }
+
+        return $orderSchedule;
+    }
+
+    /**
+     * Filter search criteria by customer ID.
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return void
+     */
+    private function filterByCustomer(SearchCriteriaInterface $searchCriteria): void
+    {
+        $customerFilter = $this->filterBuilder
+            ->setField('customer_id')
+            ->setValue($this->userContext->getUserId())
+            ->setConditionType('eq')
+            ->create();
+        $customerFilterGroup = $this->groupBuilder->addFilter($customerFilter)->create();
+        $groups = $searchCriteria->getFilterGroups();
+        $groups[] = $customerFilterGroup;
+        $searchCriteria->setFilterGroups($groups);
+    }
+
+    /**
+     * Change subscription
+     *
+     * @param string $subscriptionId
+     *
+     * @return bool
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    public function changeSubscription(string $subscriptionId): bool
+    {
+        $subscription = $this->subscriptionRepository->get((int)$subscriptionId);
+
+        $customerId = (int)$this->userContext->getUserId();
+
+        $this->customerData->validateSubscriptionsCustomer($subscription, $customerId);
+
+        return $this->save($subscription);
+    }
+
+    /**
+     * Save the subscription entity.
+     *
+     * @param SubscriptionInterface $subscription
+     * @return bool
+     */
+    private function save(SubscriptionInterface $subscription): bool
+    {
+        try {
+            $this->subscriptionRepository->save($subscription);
+        } catch (CouldNotSaveException $e) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/Model/SubscriptionRepository.php b/Model/SubscriptionRepository.php
new file mode 100644
index 00000000..f9e1a9a9
--- /dev/null
+++ b/Model/SubscriptionRepository.php
@@ -0,0 +1,87 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model;
+
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Nexi\Checkout\Api\Data\SubscriptionInterface;
+use Nexi\Checkout\Api\Data\SubscriptionSearchResultInterface;
+use Nexi\Checkout\Api\Data\SubscriptionSearchResultInterfaceFactory;
+use Nexi\Checkout\Api\SubscriptionRepositoryInterface;
+
+class SubscriptionRepository implements SubscriptionRepositoryInterface
+{
+    /**
+     * SubscriptionRepository constructor.
+     *
+     * @param ResourceModel\Subscription $subscriptionResource
+     * @param SubscriptionFactory $subscriptionFactory
+     * @param SubscriptionSearchResultInterfaceFactory $searchResultFactory
+     * @param CollectionProcessorInterface $collectionProcessor
+     */
+    public function __construct(
+        private \Nexi\Checkout\Model\ResourceModel\Subscription $subscriptionResource,
+        private SubscriptionFactory $subscriptionFactory,
+        private SubscriptionSearchResultInterfaceFactory $searchResultFactory,
+        private CollectionProcessorInterface $collectionProcessor
+    ) {
+    }
+
+    public function get(int $entityId): SubscriptionInterface
+    {
+        /** @var Subscription $subscription */
+        $subscription = $this->subscriptionFactory->create();
+        $this->subscriptionResource->load($subscription, $entityId);
+
+        if (!$subscription->getId()) {
+            throw new NoSuchEntityException(\__(
+                'No recurring payment found with id %id',
+                [
+                    'id' => $entityId
+                ]
+            ));
+        }
+
+        return $subscription;
+    }
+
+    public function save(SubscriptionInterface $subscription): SubscriptionInterface
+    {
+        try {
+            $this->subscriptionResource->save($subscription);
+        } catch (\Throwable $e) {
+            throw new CouldNotSaveException(\__(
+                'Could not save Recurring Payment: %error',
+                ['error' => $e->getMessage()]
+            ));
+        }
+
+        return $subscription;
+    }
+
+    public function getList(
+        \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+    ): SubscriptionSearchResultInterface {
+        /** @var SubscriptionSearchResultInterface $searchResult */
+        $searchResult = $this->searchResultFactory->create();
+        $this->collectionProcessor->process($searchCriteria, $searchResult);
+        $searchResult->setSearchCriteria($searchCriteria);
+
+        return $searchResult;
+    }
+
+    public function delete(SubscriptionInterface $subscription)
+    {
+        try {
+            $this->subscriptionResource->delete($subscription);
+        } catch (\Exception $e) {
+            throw new CouldNotDeleteException(__(
+                'Unable to delete recurring payment: %error',
+                ['error' => $e->getMessage()]
+            ));
+        }
+    }
+}
diff --git a/Model/Transaction/Builder.php b/Model/Transaction/Builder.php
index 0803f0c8..7ad490b6 100644
--- a/Model/Transaction/Builder.php
+++ b/Model/Transaction/Builder.php
@@ -6,6 +6,7 @@
 
 use Magento\Sales\Api\Data\TransactionInterface;
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment\Transaction;
 use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface;
 use Nexi\Checkout\Gateway\Config\Config;
 
@@ -36,9 +37,7 @@ public function build($transactionId, Order $order, $transactionData, $action):
         return $this->transactionBuilder->setOrder($order)
             ->setPayment($order->getPayment())
             ->setTransactionId($transactionId)
-            ->setAdditionalInformation(
-                [\Magento\Sales\Model\Order\Payment\Transaction::RAW_DETAILS => $transactionData]
-            )
+            ->setAdditionalInformation([Transaction::RAW_DETAILS => $transactionData])
             ->setFailSafe(true)
             ->setMessage('Payment transaction - return action.')
             ->build($action ?: $this->config->getPaymentAction());
diff --git a/Model/Ui/ConfigProvider.php b/Model/Ui/ConfigProvider.php
index 5e25f360..7d0a1958 100644
--- a/Model/Ui/ConfigProvider.php
+++ b/Model/Ui/ConfigProvider.php
@@ -6,42 +6,138 @@
 
 use Magento\Checkout\Model\ConfigProviderInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\View\Asset\Repository;
 use Nexi\Checkout\Gateway\Config\Config;
 use Magento\Payment\Helper\Data as PaymentHelper;
+use Nexi\Checkout\Model\Config\Source\PaymentTypesEnum;
+use Nexi\Checkout\Model\Subscription\TotalConfigProvider;
 
 class ConfigProvider implements ConfigProviderInterface
 {
+    /**
+     * Payment methods that could be used for subscription payment.
+     */
+    public const SUBSCRIPTION_PAYMENT_TYPES = [
+        PaymentTypesEnum::CARD
+    ];
+
     /**
      * @param Config $config
      * @param PaymentHelper $paymentHelper
+     * @param TotalConfigProvider $totalConfigProvider
+     * @param Repository $assetRepo
      */
     public function __construct(
         private readonly Config $config,
         private readonly PaymentHelper $paymentHelper,
+        private readonly TotalConfigProvider $totalConfigProvider,
+        private readonly Repository $assetRepo
     ) {
     }
 
     /**
      * Returns Nexi configuration values.
      *
-     * @return array|\array[][]
-     * @throws LocalizedException
+     * @return array
      */
-    public function getConfig()
+    public function getConfig(): array
     {
         if (!$this->config->isActive()) {
             return [];
         }
 
-        return [
+        $config = [
             'payment' => [
                 Config::CODE => [
-                    'isActive'    => $this->config->isActive(),
-                    'environment' => $this->config->getEnvironment(),
-                    'label'       => $this->paymentHelper->getMethodInstance(Config::CODE)->getTitle(),
-                    'integrationType' => $this->config->getIntegrationType(),
+                    'isActive'         => $this->config->isActive(),
+                    'environment'      => $this->config->getEnvironment(),
+                    'label'            => $this->paymentHelper->getMethodInstance(Config::CODE)->getTitle(),
+                    'integrationType'  => $this->config->getIntegrationType(),
+                    'payTypeSplitting' => $this->config->getPayTypeSplitting(),
+                    'subselections'    => $this->getSubselections(),
+                    'methodIcons'      => $this->getMethodIcons(),
                 ]
             ]
         ];
+
+        if ($this->config->isEmbedded()) {
+            $config['payment'][Config::CODE]['checkoutKey'] = $this->config->getCheckoutKey();
+        }
+
+        return $config;
+    }
+
+    /**
+     * Get subselections for payment types.
+     *
+     * @return array
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    private function getSubselections(): array
+    {
+        if (!$this->config->getPayTypeSplitting()) {
+            return [];
+        }
+
+        $subselections  = [];
+        $payTypeOptions = $this->config->getPayTypeOptions();
+
+        if ($this->totalConfigProvider->isSubscriptionScheduled()) {
+            $payTypeOptions = $this->filterSubselectionsForSubscription($payTypeOptions);
+        }
+
+        /** @var PaymentTypesEnum $option */
+        foreach ($payTypeOptions as $option) {
+            $subselections[] = [
+                'value' => $option->value,
+                'label' => __($option->value),
+            ];
+        }
+
+        return $subselections;
+    }
+
+    /**
+     * Filter payment types for subscription.
+     *
+     * @param array $payTypeOptions
+     *
+     * @return array
+     */
+    private function filterSubselectionsForSubscription(array $payTypeOptions): array
+    {
+        return array_filter($payTypeOptions, function ($type) {
+            return in_array($type, self::SUBSCRIPTION_PAYMENT_TYPES, true);
+        });
+    }
+
+    /**
+     * Get icons for payment methods.
+     *
+     * @return string[]
+     */
+    public function getMethodIcons(): array
+    {
+        $icons = [
+            PaymentTypesEnum::CARD->value                 => 'nexi-cards.png',
+            PaymentTypesEnum::PAYPAL->value               => 'paypal.png',
+            PaymentTypesEnum::VIPPS->value                => 'vipps.png',
+            PaymentTypesEnum::MOBILE_PAY->value           => 'mobilepay.png',
+            PaymentTypesEnum::SWISH->value                => 'swish.png',
+            PaymentTypesEnum::RATE_PAY_INVOICE->value     => 'ratepay.png',
+            PaymentTypesEnum::RATE_PAY_INSTALLMENT->value => 'ratepay.png',
+            PaymentTypesEnum::RATE_PAY_SEPA->value        => 'ratepay.png',
+            PaymentTypesEnum::SOFORT->value               => 'sofort.png',
+            PaymentTypesEnum::TRUSTLY->value              => 'trustly.png',
+            PaymentTypesEnum::APPLE_PAY->value            => 'applepay.png',
+            PaymentTypesEnum::KLARNA->value               => 'klarna.png',
+            PaymentTypesEnum::GOOGLE_PAY->value           => 'googlepay.png',
+        ];
+
+        return array_map(function ($image) {
+            return $this->assetRepo->getUrl('Nexi_Checkout::images/' . $image);
+        }, $icons);
     }
 }
diff --git a/Model/Ui/DataProvider/Product/Form/Modifier/Attributes.php b/Model/Ui/DataProvider/Product/Form/Modifier/Attributes.php
new file mode 100644
index 00000000..91f41007
--- /dev/null
+++ b/Model/Ui/DataProvider/Product/Form/Modifier/Attributes.php
@@ -0,0 +1,70 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Ui\DataProvider\Product\Form\Modifier;
+
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
+use Magento\Framework\Stdlib\ArrayManager;
+use Nexi\Checkout\Model\Subscription\TotalConfigProvider;
+
+class Attributes extends AbstractModifier
+{
+    private ArrayManager $arrayManager;
+
+    private TotalConfigProvider $totalConfigProvider;
+
+    /**
+     * @param ArrayManager $arrayManager
+     * @param TotalConfigProvider $totalConfigProvider
+     */
+    public function __construct(
+        ArrayManager        $arrayManager,
+        TotalConfigProvider $totalConfigProvider
+    ) {
+        $this->arrayManager        = $arrayManager;
+        $this->totalConfigProvider = $totalConfigProvider;
+    }
+
+    /**
+     * ModifyData
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function modifyData(array $data)
+    {
+        return $data;
+    }
+
+    /**
+     * ModifyMeta.
+     *
+     * @param array $meta
+     *
+     * @return array
+     */
+    public function modifyMeta(array $meta)
+    {
+        if (isset($meta['product-details']['children']['container_subscription_schedule'])) {
+            $attribute = 'subscription_schedule';
+            $path = $this->arrayManager->findPath($attribute, $meta, null, 'children');
+
+            if (!$this->totalConfigProvider->isSubscriptionsEnabled()) {
+                $meta = $this->arrayManager->set(
+                    "{$path}/arguments/data/config/visible",
+                    $meta,
+                    false
+                );
+            } else {
+                $meta = $this->arrayManager->set(
+                    "{$path}/arguments/data/config/visible",
+                    $meta,
+                    true
+                );
+            }
+        }
+
+        return $meta;
+    }
+}
diff --git a/Model/Validation/CustomerData.php b/Model/Validation/CustomerData.php
new file mode 100644
index 00000000..12fdc00f
--- /dev/null
+++ b/Model/Validation/CustomerData.php
@@ -0,0 +1,23 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Validation;
+
+use Magento\Framework\Exception\LocalizedException;
+use Nexi\Checkout\Api\Data\SubscriptionInterface;
+
+class CustomerData
+{
+    /**
+     * @param SubscriptionInterface $subscription
+     * @param int $customerId
+     * @return void
+     * @throws LocalizedException
+     */
+    public function validateSubscriptionsCustomer(SubscriptionInterface $subscription, int $customerId): void
+    {
+        if ((int)$subscription->getCustomerId() !== $customerId) {
+            throw new LocalizedException(__("The subscription doesn't belong to the customer"));
+        }
+    }
+}
diff --git a/Model/Validation/PreventAdminActions.php b/Model/Validation/PreventAdminActions.php
new file mode 100644
index 00000000..f7183698
--- /dev/null
+++ b/Model/Validation/PreventAdminActions.php
@@ -0,0 +1,37 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Model\Validation;
+
+use Magento\Customer\Model\Session;
+
+class PreventAdminActions
+{
+    const KEY_LOGIN_AS_CUSTOMER_SESSION = 'logged_as_customer_admind_id';
+
+    /**
+     * @var Session
+     */
+    private Session $customerSession;
+
+    /**
+     * @param Session $customerSession
+     */
+    public function __construct(
+        Session $customerSession
+    ) {
+        $this->customerSession = $customerSession;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isAdminAsCustomer(): bool
+    {
+        if ($this->customerSession->getData(self::KEY_LOGIN_AS_CUSTOMER_SESSION)) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/Model/Webhook/Data/WebhookDataLoader.php b/Model/Webhook/Data/WebhookDataLoader.php
index 9d9c9d9a..befe790d 100644
--- a/Model/Webhook/Data/WebhookDataLoader.php
+++ b/Model/Webhook/Data/WebhookDataLoader.php
@@ -41,7 +41,7 @@ public function getTransactionByPaymentId(
 
         $transactions = $this->transactionRepository->getList($searchCriteria)->getItems();
 
-        if (count($transactions) !== 1) {
+        if ($transactions === null || count($transactions) !== 1) {
             return null;
         }
 
@@ -68,8 +68,8 @@ public function getTransactionByOrderId(
 
         $transactions = $this->transactionRepository->getList($searchCriteria)->getItems();
 
-        if (count($transactions) !== 1) {
-            throw new NotFoundException(__('Transaction not found or multiple transactions found for payment ID.'));
+        if ($transactions === null || count($transactions) === 0) {
+            throw new NotFoundException(__('Transaction not found for payment ID.'));
         }
 
         return reset($transactions);
@@ -80,12 +80,16 @@ public function getTransactionByOrderId(
      *
      * @param string $paymentId
      *
-     * @return mixed
+     * @return Order
+     * @throws NotFoundException
      */
     public function loadOrderByPaymentId(string $paymentId): Order
     {
         $transaction = $this->getTransactionByPaymentId($paymentId);
-        $order       = $transaction->getOrder();
+        if ($transaction === null) {
+            throw new NotFoundException(__('Transaction not found for payment ID: %1', $paymentId));
+        }
+        $order = $transaction->getOrder();
 
         return $order;
     }
diff --git a/Model/Webhook/PaymentCancelCreated.php b/Model/Webhook/PaymentCancelCreated.php
index 9586784c..1e251ee1 100644
--- a/Model/Webhook/PaymentCancelCreated.php
+++ b/Model/Webhook/PaymentCancelCreated.php
@@ -4,13 +4,34 @@
 
 namespace Nexi\Checkout\Model\Webhook;
 
+use Magento\Sales\Model\Order;
+use Nexi\Checkout\Model\Order\Comment;
+use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use NexiCheckout\Model\Webhook\WebhookInterface;
+
 class PaymentCancelCreated implements WebhookProcessorInterface
 {
+    /**
+     * @param WebhookDataLoader $webhookDataLoader
+     * @param Comment $comment
+     */
+    public function __construct(
+        private readonly WebhookDataLoader $webhookDataLoader,
+        private readonly Comment $comment,
+    ) {
+    }
+
     /**
      * @inheritdoc
      */
-    public function processWebhook(array $webhookData): void
+    public function processWebhook(WebhookInterface $webhook): void
     {
-        // TODO: Implement webhook processor logic here
+        /* @var Order $order */
+        $order = $this->webhookDataLoader->loadOrderByPaymentId($webhook->getData()->getPaymentId());
+
+        $this->comment->saveComment(
+            __('Webhook Received. Payment cancel created for payment ID: %1', $webhook->getData()->getPaymentId()),
+            $order
+        );
     }
 }
diff --git a/Model/Webhook/PaymentCancelFailed.php b/Model/Webhook/PaymentCancelFailed.php
index eb2cb8d3..59a171bc 100644
--- a/Model/Webhook/PaymentCancelFailed.php
+++ b/Model/Webhook/PaymentCancelFailed.php
@@ -4,13 +4,34 @@
 
 namespace Nexi\Checkout\Model\Webhook;
 
+use Magento\Sales\Model\Order;
+use Nexi\Checkout\Model\Order\Comment;
+use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use NexiCheckout\Model\Webhook\WebhookInterface;
+
 class PaymentCancelFailed implements WebhookProcessorInterface
 {
+    /**
+     * @param WebhookDataLoader $webhookDataLoader
+     * @param Comment $comment
+     */
+    public function __construct(
+        private readonly WebhookDataLoader $webhookDataLoader,
+        private readonly Comment $comment,
+    ) {
+    }
+
     /**
      * @inheritdoc
      */
-    public function processWebhook(array $webhookData): void
+    public function processWebhook(WebhookInterface $webhook): void
     {
-        // TODO: Implement webhook processor logic here
+        /* @var Order $order */
+        $order = $this->webhookDataLoader->loadOrderByPaymentId($webhook->getData()->getPaymentId());
+
+        $this->comment->saveComment(
+            __('Webhook Received. Payment cancel failed for payment ID: %1', $webhook->getData()->getPaymentId()),
+            $order
+        );
     }
 }
diff --git a/Model/Webhook/PaymentChargeCreated.php b/Model/Webhook/PaymentChargeCreated.php
index e608d9a2..fd508d57 100644
--- a/Model/Webhook/PaymentChargeCreated.php
+++ b/Model/Webhook/PaymentChargeCreated.php
@@ -5,15 +5,19 @@
 namespace Nexi\Checkout\Model\Webhook;
 
 use Exception;
-use Magento\Framework\Exception\AlreadyExistsException;
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Sales\Api\Data\TransactionInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order;
-use Nexi\Checkout\Gateway\Request\NexiCheckout\SalesDocumentItemsBuilder;
+use Nexi\Checkout\Gateway\AmountConverter;
+use Nexi\Checkout\Model\Order\Comment;
 use Nexi\Checkout\Model\Transaction\Builder;
 use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use Nexi\Checkout\Setup\Patch\Data\AddPaymentAuthorizedOrderStatus;
+use NexiCheckout\Model\Webhook\ChargeCreated;
+use NexiCheckout\Model\Webhook\Shared\Data;
+use NexiCheckout\Model\Webhook\WebhookInterface;
 
 class PaymentChargeCreated implements WebhookProcessorInterface
 {
@@ -21,27 +25,30 @@ class PaymentChargeCreated implements WebhookProcessorInterface
      * @param OrderRepositoryInterface $orderRepository
      * @param WebhookDataLoader $webhookDataLoader
      * @param Builder $transactionBuilder
+     * @param Comment $comment
+     * @param AmountConverter $amountConverter
      */
     public function __construct(
         private readonly OrderRepositoryInterface $orderRepository,
         private readonly WebhookDataLoader $webhookDataLoader,
-        private readonly Builder $transactionBuilder
+        private readonly Builder $transactionBuilder,
+        private readonly Comment $comment,
+        private readonly AmountConverter $amountConverter,
     ) {
     }
 
     /**
      * ProcessWebhook function for 'payment.charge.created.v2' event.
      *
-     * @param array $webhookData
+     * @param WebhookInterface $webhook
      *
      * @return void
-     * @throws LocalizedException
+     * @throws NotFoundException
      */
-    public function processWebhook(array $webhookData): void
+    public function processWebhook(WebhookInterface $webhook): void
     {
-        $order = $this->webhookDataLoader->loadOrderByPaymentId($webhookData['data']['paymentId']);
-        $this->processOrder($order, $webhookData);
-
+        $order = $this->webhookDataLoader->loadOrderByPaymentId($webhook->getData()->getPaymentId());
+        $this->processOrder($order, $webhook);
         $this->orderRepository->save($order);
     }
 
@@ -49,70 +56,76 @@ public function processWebhook(array $webhookData): void
      * ProcessOrder function.
      *
      * @param Order $order
-     * @param array $webhookData
+     * @param ChargeCreated $webhook
      *
      * @return void
-     * @throws AlreadyExistsException
-     * @throws LocalizedException
+     * @throws CouldNotSaveException
      * @throws NotFoundException
      */
-    private function processOrder(Order $order, array $webhookData): void
+    private function processOrder(Order $order, ChargeCreated $webhook): void
     {
         $reservationTxn = $this->webhookDataLoader->getTransactionByOrderId(
-            $order->getId(),
+            (int)$order->getId(),
             TransactionInterface::TYPE_AUTH
         );
 
-        if ($order->getState() !== Order::STATE_PENDING_PAYMENT) {
-            throw new Exception('Order state is not pending payment.');
-        }
-
-        $chargeTxnId = $webhookData['data']['chargeId'];
+        $chargeTxnId = $webhook->getData()->getChargeId();
 
         if ($this->webhookDataLoader->getTransactionByPaymentId($chargeTxnId, TransactionInterface::TYPE_CAPTURE)) {
-            throw new AlreadyExistsException(__('Transaction already exists.'));
+            return;
         }
 
-        $chargeTransaction = $this->transactionBuilder
+        $this->transactionBuilder
             ->build(
                 $chargeTxnId,
                 $order,
                 [
-                    'payment_id' => $webhookData['data']['paymentId'],
-                    'webhook'    => json_encode($webhookData, JSON_PRETTY_PRINT),
+                    'payment_id' => $webhook->getData()->getPaymentId(),
+                    'webhook'    => json_encode(
+                        [
+                            'webhook_id' => $webhook->getId(),
+                            'charge_id'  => $webhook->getData()->getChargeId(),
+                            'amount'     => $webhook->getData()->getAmount()->getAmount(),
+                            'currency'   => $webhook->getData()->getAmount()->getCurrency(),
+                        ],
+                        JSON_PRETTY_PRINT
+                    ),
                 ],
                 TransactionInterface::TYPE_CAPTURE
             )->setParentId($reservationTxn->getTransactionId())
             ->setParentTxnId($reservationTxn->getTxnId());
 
-        $order->getPayment()->addTransactionCommentsToOrder(
-            $chargeTransaction,
-            __(
-                'Payment charge created, amount: %1 %2',
-                $webhookData['data']['amount']['amount'] / 100,
-                $webhookData['data']['amount']['currency']
-            )
-        );
+        $this->saveOrderHistoryComment($webhook->getData(), $order);
 
-        if ($this->isFullCharge($webhookData, $order)) {
+        if ($this->isFullCharge($webhook, $order)) {
+            if ($order->getStatus() !== AddPaymentAuthorizedOrderStatus::STATUS_NEXI_AUTHORIZED) {
+                throw new Exception('Order status is not authorized.');
+            }
             $this->fullInvoice($order, $chargeTxnId);
         } else {
-            $this->partialInvoice($order, $chargeTxnId, $webhookData['data']['orderItems']);
+            $order->addCommentToStatusHistory(
+                'Partial charge received from the Nexi | Nets Portal gateway. ' .
+                'The order processing could not be completed automatically. '
+            );
         }
+
         $order->setState(Order::STATE_PROCESSING)->setStatus(Order::STATE_PROCESSING);
     }
 
     /**
      * Validate charge transaction.
      *
-     * @param array $webhookData
+     * @param ChargeCreated $webhook
      * @param Order $order
      *
      * @return bool
      */
-    private function isFullCharge(array $webhookData, Order $order): bool
+    private function isFullCharge(ChargeCreated $webhook, Order $order): bool
     {
-        return (int)($order->getBaseGrandTotal() * 100) === $webhookData['data']['amount']['amount'];
+        $grandTotalConverted = (int)$this->amountConverter->convertToNexiAmount($order->getGrandTotal());
+        $webhookAmount = (int)$webhook->getData()->getAmount()->getAmount();
+
+        return $grandTotalConverted === $webhookAmount;
     }
 
     /**
@@ -122,7 +135,6 @@ private function isFullCharge(array $webhookData, Order $order): bool
      * @param string $chargeTxnId
      *
      * @return void
-     * @throws LocalizedException
      */
     public function fullInvoice(Order $order, string $chargeTxnId): void
     {
@@ -139,48 +151,26 @@ public function fullInvoice(Order $order, string $chargeTxnId): void
     }
 
     /**
-     * Create partial invoice. Add shipping amount if charged
-     *
-     * TODO: investigate how to invoice only shipping cost in magento? probably not possible separately - without any
-     * TODO: order item invoiced now its only in order history comments (if charge only for shipping)
+     * Save order history comment.
      *
+     * @param Data $data
      * @param Order $order
-     * @param string $chargeTxnId
-     * @param array $webhookItems
      *
      * @return void
-     * @throws LocalizedException
      */
-    private function partialInvoice(Order $order, string $chargeTxnId, array $webhookItems): void
+    private function saveOrderHistoryComment(Data $data, Order $order): void
     {
-        if ($order->canInvoice()) {
-            $qtys         = [];
-            $shippingItem = null;
-            foreach ($webhookItems as $webhookItem) {
-
-                if ($webhookItem['reference'] === SalesDocumentItemsBuilder::SHIPPING_COST_REFERENCE) {
-                    $shippingItem = $webhookItem;
-                    continue;
-                }
-
-                foreach ($order->getAllItems() as $item) {
-                    if ($item->getSku() === $webhookItem['reference']) {
-                        $qtys[$item->getId()] = (int)$webhookItem['quantity'];
-                    }
-                }
-            }
-            $invoice = $order->prepareInvoice($qtys);
-            $invoice->setTransactionId($chargeTxnId);
-            if ($shippingItem) {
-                $invoice->setShippingAmount($shippingItem['netTotalAmount'] / 100);
-                $invoice->setShippingInclTax($shippingItem['grossTotalAmount'] / 100);
-                $invoice->setShippingTaxAmount($shippingItem['taxAmount'] / 100);
-            }
-
-            $invoice->pay();
-
-            $invoice->register();
-            $order->addRelatedObject($invoice);
-        }
+        $this->comment->saveComment(
+            __(
+                'Webhook Received. Payment charge created for payment ID: %1'
+                . '<br/>Charge ID: %2'
+                . '<br/>Amount: %3 %4.',
+                $data->getPaymentId(),
+                $data->getChargeId(),
+                number_format($data->getAmount()->getAmount() / 100, 2, '.', ''),
+                $data->getAmount()->getCurrency()
+            ),
+            $order
+        );
     }
 }
diff --git a/Model/Webhook/PaymentChargeFailed.php b/Model/Webhook/PaymentChargeFailed.php
index 351faf01..bb3eb756 100644
--- a/Model/Webhook/PaymentChargeFailed.php
+++ b/Model/Webhook/PaymentChargeFailed.php
@@ -4,13 +4,35 @@
 
 namespace Nexi\Checkout\Model\Webhook;
 
+use Magento\Sales\Model\Order;
+use Nexi\Checkout\Model\Order\Comment;
+use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use NexiCheckout\Model\Webhook\WebhookInterface;
+
 class PaymentChargeFailed implements WebhookProcessorInterface
 {
+    /**
+     * @param WebhookDataLoader $webhookDataLoader
+     * @param Comment $comment
+     */
+    public function __construct(
+        private readonly WebhookDataLoader $webhookDataLoader,
+        private readonly Comment $comment,
+    ) {
+    }
+
     /**
      * @inheritdoc
      */
-    public function processWebhook(array $webhookData): void
+    public function processWebhook(WebhookInterface $webhook): void
     {
-        // TODO: Implement webhook processor logic here
+        $paymentId = $webhook->getData()->getPaymentId();
+
+        $order = $this->webhookDataLoader->loadOrderByPaymentId($paymentId);
+
+        $this->comment->saveComment(
+            __('Webhook Received. Payment charge failed for payment ID: %1', $paymentId),
+            $order
+        );
     }
 }
diff --git a/Model/Webhook/PaymentCreated.php b/Model/Webhook/PaymentCreated.php
index 058c913b..3f69d561 100644
--- a/Model/Webhook/PaymentCreated.php
+++ b/Model/Webhook/PaymentCreated.php
@@ -4,14 +4,17 @@
 
 namespace Nexi\Checkout\Model\Webhook;
 
-use Magento\Checkout\Exception;
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Reports\Model\ResourceModel\Order\CollectionFactory;
 use Magento\Sales\Api\Data\TransactionInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order;
+use Nexi\Checkout\Model\Order\Comment;
+use Magento\Sales\Model\ResourceModel\Order\Payment\CollectionFactory as PaymentCollectionFactory;
 use Nexi\Checkout\Model\Transaction\Builder;
 use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use NexiCheckout\Model\Webhook\Data\PaymentCreatedData;
+use NexiCheckout\Model\Webhook\WebhookInterface;
 
 class PaymentCreated implements WebhookProcessorInterface
 {
@@ -22,38 +25,79 @@ class PaymentCreated implements WebhookProcessorInterface
      * @param CollectionFactory $orderCollectionFactory
      * @param WebhookDataLoader $webhookDataLoader
      * @param OrderRepositoryInterface $orderRepository
+     * @param PaymentCollectionFactory $paymentCollectionFactory
+     * @param Comment $comment
      */
     public function __construct(
         private readonly Builder $transactionBuilder,
         private readonly CollectionFactory $orderCollectionFactory,
         private readonly WebhookDataLoader $webhookDataLoader,
-        private readonly OrderRepositoryInterface $orderRepository
+        private readonly OrderRepositoryInterface $orderRepository,
+        private readonly PaymentCollectionFactory $paymentCollectionFactory,
+        private readonly Comment $comment,
     ) {
     }
 
     /**
      * PaymentCreated webhook service.
      *
-     * @param array $webhookData
+     * @param WebhookInterface $webhook
      *
      * @return void
+     * @throws NotFoundException
      */
-    public function processWebhook(array $webhookData): void
+    public function processWebhook(WebhookInterface $webhook): void
     {
-        $transaction = $this->webhookDataLoader->getTransactionByPaymentId($webhookData['data']['paymentId']);
+        /** @var PaymentCreatedData $data */
+        $data = $webhook->getData();
+        $paymentId = $data->getPaymentId();
+        $transaction = $this->webhookDataLoader->getTransactionByPaymentId($paymentId);
 
-        if ($transaction) {
-            return;
+        $orderReference = $data->getOrder()->getReference();
+
+        if ($orderReference === null) {
+            $order = $this->getOrderByPaymentId($paymentId);
+            if (!$order->getId()) {
+                throw new NotFoundException(__('Order not found for payment ID: %1', $paymentId));
+            }
+        } else {
+            $order = $this->orderCollectionFactory->create()->addFieldToFilter(
+                'increment_id',
+                $orderReference
+            )->getFirstItem();
         }
 
-        $order = $this->orderCollectionFactory->create()->addFieldToFilter(
-            'increment_id',
-            $webhookData['data']['order']['reference']
-        )->getFirstItem();
+        if (!$transaction) {
+            $this->createPaymentTransaction($order, $data->getPaymentId());
+            $this->orderRepository->save($order);
+            $this->comment->saveComment(
+                __(
+                    'Webhook Received. Payment created for Payment ID: %1'
+                    . '<br />Amount: %2 %3.',
+                    $data->getPaymentId(),
+                    number_format($data->getOrder()->getAmount()->getAmount() / 100, 2, '.', ''),
+                    $data->getOrder()->getAmount()->getCurrency()
+                ),
+                $order
+            );
+        }
+    }
 
-        $this->createPaymentTransaction($order, $webhookData['data']['paymentId']);
+    /**
+     * Get order by payment id.
+     *
+     * @param string $paymentId
+     *
+     * @return Order
+     */
+    private function getOrderByPaymentId(string $paymentId)
+    {
+        $payment = $this->paymentCollectionFactory->create()
+            ->addFieldToFilter('last_trans_id', $paymentId)
+            ->getFirstItem();
+        $orderId = $payment->getParentId();
 
-        $this->orderRepository->save($order);
+        return $this->orderCollectionFactory->create()->addFieldToFilter('entity_id', $orderId)->getFirstItem();
     }
 
     /**
@@ -70,7 +114,7 @@ private function createPaymentTransaction(Order $order, string $paymentId): void
             return;
         }
         $order->setState(Order::STATE_PENDING_PAYMENT)->setStatus(Order::STATE_PENDING_PAYMENT);
-        $paymentTransaction = $this->transactionBuilder
+        $this->transactionBuilder
             ->build(
                 $paymentId,
                 $order,
@@ -79,9 +123,5 @@ private function createPaymentTransaction(Order $order, string $paymentId): void
                 ],
                 TransactionInterface::TYPE_PAYMENT
             );
-        $order->getPayment()->addTransactionCommentsToOrder(
-            $paymentTransaction,
-            __('Payment created in Nexi Gateway.')
-        );
     }
 }
diff --git a/Model/Webhook/PaymentRefundCompleted.php b/Model/Webhook/PaymentRefundCompleted.php
index cc00e52f..0fa77b85 100644
--- a/Model/Webhook/PaymentRefundCompleted.php
+++ b/Model/Webhook/PaymentRefundCompleted.php
@@ -5,14 +5,19 @@
 namespace Nexi\Checkout\Model\Webhook;
 
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Phrase;
 use Magento\Sales\Api\Data\TransactionInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Api\CreditmemoManagementInterface;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\CreditmemoFactory;
 use Nexi\Checkout\Gateway\AmountConverter;
+use Nexi\Checkout\Model\Order\Comment;
 use Nexi\Checkout\Model\Transaction\Builder;
 use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use NexiCheckout\Model\Webhook\Data\RefundCompletedData;
+use NexiCheckout\Model\Webhook\WebhookInterface;
 
 class PaymentRefundCompleted implements WebhookProcessorInterface
 {
@@ -23,6 +28,7 @@ class PaymentRefundCompleted implements WebhookProcessorInterface
      * @param CreditmemoFactory $creditmemoFactory
      * @param CreditmemoManagementInterface $creditmemoManagement
      * @param AmountConverter $amountConverter
+     * @param Comment $comment
      */
     public function __construct(
         private readonly WebhookDataLoader $webhookDataLoader,
@@ -31,54 +37,122 @@ public function __construct(
         private readonly CreditmemoFactory $creditmemoFactory,
         private readonly CreditmemoManagementInterface $creditmemoManagement,
         private readonly AmountConverter $amountConverter,
+        private readonly Comment $comment,
     ) {
     }
 
     /**
      * ProcessWebhook function for 'payment.refund.completed' event.
      *
-     * @param array $webhookData
+     * @param WebhookInterface $webhook
      *
      * @return void
-     * @throws LocalizedException
      */
-    public function processWebhook(array $webhookData): void
+    public function processWebhook(WebhookInterface $webhook): void
     {
-        $order = $this->webhookDataLoader->loadOrderByPaymentId($webhookData['data']['paymentId']);
+        /** @var RefundCompletedData $data */
+        $data = $webhook->getData();
+        $paymentId      = $data->getPaymentId();
+        $refundId       = $data->getRefundId();
+        $refundAmount   = number_format($data->getAmount()->getAmount() / 100, 2, '.', '');
+        $refundCurrency = $data->getAmount()->getCurrency();
 
-        $refund = $this->transactionBuilder
-            ->build(
-                $webhookData['id'],
-                $order,
-                ['payment_id' => $webhookData['data']['paymentId']],
-                TransactionInterface::TYPE_REFUND
-            )->setParentTxnId($webhookData['data']['paymentId'])
-            ->setAdditionalInformation('details', json_encode($webhookData));
+        $order = $this->webhookDataLoader->loadOrderByPaymentId($paymentId);
 
-        if ($this->isFullRefund($webhookData, $order)) {
-            $this->processFullRefund($webhookData, $order);
+        if ($this->findRefundTransaction($refundId)) {
+            return;
         }
 
-        $order->getPayment()->addTransactionCommentsToOrder(
-            $refund,
-            __('Payment refund created, amount: %1', $webhookData['data']['amount']['amount'] / 100)
-        );
+        $this->validateChargeTransactionExists($order);
+
+        $refundTransaction = $this->createRefundTransaction($refundId, $order, $paymentId, $data);
+        $order->getPayment()->addTransaction($refundTransaction);
+
+        if ($this->canRefund($data, $order) && $order->canCreditmemo()) {
+            $this->processFullRefund($data, $order);
+        } else {
+            $order->addCommentToStatusHistory(
+                'Partial refund created for payment. ' .
+                'Automatic credit memo processing is not supported for this case. ' .
+                'You can still create a credit memo manually with offline refund.'
+            );
+        }
 
         $this->orderRepository->save($order);
+
+        $this->comment->saveComment(
+            $this->createRefundComment($paymentId, $refundId, $refundAmount, $refundCurrency),
+            $order
+        );
+    }
+
+    /**
+     * Create a refund comment for the order.
+     *
+     * @param string $paymentId
+     * @param string $refundId
+     * @param string $refundAmount
+     * @param string $currency
+     *
+     * @return Phrase
+     */
+    private function createRefundComment(
+        string $paymentId,
+        string $refundId,
+        string $refundAmount,
+        string $currency
+    ): Phrase {
+        return __(
+            'Webhook Received. Refund created for payment ID: %1'
+            . '<br/>Refund ID: %2'
+            . '<br/>Amount: %3 %4',
+            $paymentId,
+            $refundId,
+            $refundAmount,
+            $currency
+        );
+    }
+
+    /**
+     * Build a refund transaction based on webhook data.
+     *
+     * @param string $refundId
+     * @param Order $order
+     * @param string $paymentId
+     * @param RefundCompletedData $webhookData
+     *
+     * @return TransactionInterface
+     * @throws LocalizedException
+     */
+    private function createRefundTransaction(
+        string $refundId,
+        Order $order,
+        string $paymentId,
+        RefundCompletedData $webhookData
+    ): TransactionInterface {
+        return $this->transactionBuilder
+            ->build(
+                $refundId,
+                $order,
+                ['payment_id' => $paymentId],
+                TransactionInterface::TYPE_REFUND
+            )
+            ->setParentTxnId($paymentId)
+            ->setAdditionalInformation('details', json_encode($webhookData));
     }
 
     /**
      * Create creditmemo for whole order
      *
-     * @param array $webhookData
+     * @param RefundCompletedData $webhookData
      * @param Order $order
      *
      * @return void
      */
-    public function processFullRefund(array $webhookData, Order $order): void
+    private function processFullRefund(RefundCompletedData $webhookData, Order $order): void
     {
         $creditmemo = $this->creditmemoFactory->createByOrder($order);
-        $creditmemo->setTransactionId($webhookData['id']);
+        $creditmemo->setTransactionId($webhookData->getRefundId());
 
         $this->creditmemoManagement->refund($creditmemo);
     }
@@ -86,15 +160,45 @@ public function processFullRefund(array $webhookData, Order $order): void
     /**
      * Amount check
      *
-     * @param array $webhookData
+     * @param RefundCompletedData $webhookData
      * @param Order $order
      *
      * @return bool
      */
-    private function isFullRefund(array $webhookData, Order $order): bool
+    private function canRefund(RefundCompletedData $webhookData, Order $order): bool
     {
-        $GrandTotal = $this->amountConverter->convertToNexiAmount($order->getGrandTotal());
+        $grandTotal    = $this->amountConverter->convertToNexiAmount($order->getGrandTotal());
+        $totalRefunded = $order->getTotalRefunded();
 
-        return $GrandTotal == $webhookData['data']['amount']['amount'];
+        return $grandTotal === $webhookData->getAmount()->getAmount()
+            && 0 == $totalRefunded;
+    }
+
+    /**
+     * Finds and retrieves a refund transaction based on the provided payment ID.
+     *
+     * @param string $id
+     *
+     * @return TransactionInterface|null
+     */
+    private function findRefundTransaction(string $id): ?TransactionInterface
+    {
+        return $this->webhookDataLoader->getTransactionByPaymentId($id, TransactionInterface::TYPE_REFUND);
+    }
+
+    /**
+     * Check if charge transaction exists for the given payment ID.
+     *
+     * @param Order $order
+     *
+     * @return void
+     * @throws NotFoundException
+     */
+    private function validateChargeTransactionExists(Order $order): void
+    {
+        $this->webhookDataLoader->getTransactionByOrderId(
+            (int)$order->getId(),
+            TransactionInterface::TYPE_CAPTURE
+        );
     }
 }
diff --git a/Model/Webhook/PaymentRefundFailed.php b/Model/Webhook/PaymentRefundFailed.php
index b8cb634e..d5d5c803 100644
--- a/Model/Webhook/PaymentRefundFailed.php
+++ b/Model/Webhook/PaymentRefundFailed.php
@@ -4,13 +4,33 @@
 
 namespace Nexi\Checkout\Model\Webhook;
 
+use Nexi\Checkout\Model\Order\Comment;
+use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use NexiCheckout\Model\Webhook\WebhookInterface;
+
 class PaymentRefundFailed implements WebhookProcessorInterface
 {
+    /**
+     * @param WebhookDataLoader $webhookDataLoader
+     * @param Comment $comment
+     */
+    public function __construct(
+        private readonly WebhookDataLoader $webhookDataLoader,
+        private readonly Comment $comment,
+    ) {
+    }
+
     /**
      * @inheritdoc
      */
-    public function processWebhook(array $webhookData): void
+    public function processWebhook(WebhookInterface $webhook): void
     {
-        // TODO: Implement webhook processor logic here
+        $paymentId = $webhook->getData()->getPaymentId();
+        $order = $this->webhookDataLoader->loadOrderByPaymentId($paymentId);
+
+        $this->comment->saveComment(
+            __('Webhook Received. Payment refund failed for payment ID: %1', $paymentId),
+            $order
+        );
     }
 }
diff --git a/Model/Webhook/PaymentReservationCreated.php b/Model/Webhook/PaymentReservationCreated.php
index 56dbb5f5..b60daa86 100644
--- a/Model/Webhook/PaymentReservationCreated.php
+++ b/Model/Webhook/PaymentReservationCreated.php
@@ -4,12 +4,21 @@
 
 namespace Nexi\Checkout\Model\Webhook;
 
+use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Sales\Api\Data\TransactionInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order;
+use Nexi\Checkout\Block\Info\Nexi;
+use Nexi\Checkout\Model\Order\Comment;
+use Nexi\Checkout\Model\SubscriptionManagement;
 use Nexi\Checkout\Model\Transaction\Builder;
 use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use Nexi\Checkout\Setup\Patch\Data\AddPaymentAuthorizedOrderStatus;
+use NexiCheckout\Model\Webhook\Data\ReservationCreatedData;
+use NexiCheckout\Model\Webhook\ReservationCreated;
+use NexiCheckout\Model\Webhook\WebhookInterface;
+use Psr\Log\LoggerInterface;
 
 class PaymentReservationCreated implements WebhookProcessorInterface
 {
@@ -17,36 +26,52 @@ class PaymentReservationCreated implements WebhookProcessorInterface
      * @param OrderRepositoryInterface $orderRepository
      * @param WebhookDataLoader $webhookDataLoader
      * @param Builder $transactionBuilder
+     * @param Comment $comment
+     * @param SubscriptionManagement $subscriptionManagement
+     * @param LoggerInterface $logger
      */
     public function __construct(
         private readonly OrderRepositoryInterface $orderRepository,
         private readonly WebhookDataLoader $webhookDataLoader,
         private readonly Builder $transactionBuilder,
+        private readonly Comment $comment,
+        private readonly SubscriptionManagement $subscriptionManagement,
+        private readonly LoggerInterface $logger
     ) {
     }
 
     /**
      * ProcessWebhook function for 'payment.reservation.created.v2' event.
      *
-     * @param array $webhookData
+     * @param WebhookInterface $webhook
      *
      * @return void
+     * @throws CouldNotSaveException
      * @throws NotFoundException
      */
-    public function processWebhook(array $webhookData): void
+    public function processWebhook(WebhookInterface $webhook): void
     {
-        $paymentId          = $webhookData['data']['paymentId'];
+        /* @var ReservationCreatedData $data */
+        $data = $webhook->getData();
+        $paymentId = $data->getPaymentId();
         $paymentTransaction = $this->webhookDataLoader->getTransactionByPaymentId($paymentId);
         if (!$paymentTransaction) {
             throw new NotFoundException(__('Payment transaction not found for %1.', $paymentId));
         }
 
-        /** @var \Magento\Sales\Model\Order $order */
+        /** @var Order $order */
         $order = $paymentTransaction->getOrder();
 
-        $order->setState(Order::STATE_PENDING_PAYMENT)->setStatus(Order::STATE_PENDING_PAYMENT);
+        if ($this->authorizationAlreadyExists($webhook->getId())) {
+            return;
+        }
+
+        $order->setState(Order::STATE_PENDING_PAYMENT)
+            ->setStatus(AddPaymentAuthorizedOrderStatus::STATUS_NEXI_AUTHORIZED);
+        $this->setSelectedPaymentMethodData($order, $data);
+
         $reservationTransaction = $this->transactionBuilder->build(
-            $webhookData['id'],
+            $webhook->getId(),
             $order,
             ['payment_id' => $paymentId],
             TransactionInterface::TYPE_AUTH
@@ -55,11 +80,82 @@ public function processWebhook(array $webhookData): void
         $reservationTransaction->setParentTxnId($paymentId);
         $reservationTransaction->setParentId($paymentTransaction->getTransactionId());
 
-        $order->getPayment()->addTransactionCommentsToOrder(
-            $reservationTransaction,
-            __('Payment reservation created.')
-        );
+        if ($data->getSubscriptionId() !== null) {
+            $order->getPayment()->setAdditionalInformation('subscription_id', $data->getSubscriptionId());
+            $this->subscriptionManagement->processSubscription($order, $data->getSubscriptionId());
+        }
+
+        $payment = $order->getPayment();
+        $amount = $data->getAmount()->getAmount() / 100;
+        $amount = $payment->formatAmount($amount, true);
+        $payment->setBaseAmountAuthorized($amount);
 
         $this->orderRepository->save($order);
+
+        $this->saveComment($paymentId, $data, $order);
+    }
+
+    /**
+     * Checks if an authorization already exists for the given ID.
+     *
+     * @param string $id
+     *
+     * @return bool
+     */
+    private function authorizationAlreadyExists(string $id): bool
+    {
+        return $this->webhookDataLoader->getTransactionByPaymentId($id, TransactionInterface::TYPE_AUTH) !== null;
+    }
+
+    /**
+     * Saves a comment in the order with details from the webhook data.
+     *
+     * @param mixed $paymentId
+     * @param ReservationCreatedData $webhookData
+     * @param Order $order
+     *
+     * @return void
+     */
+    private function saveComment(mixed $paymentId, ReservationCreatedData $webhookData, Order $order): void
+    {
+        $this->comment->saveComment(
+            __(
+                'Webhook Received. Payment reservation created for payment ID: %1'
+                . '<br/>Reservation Id: %2'
+                . '<br/>Amount: %3 %4.',
+                $paymentId,
+                $webhookData->getPaymentId(),
+                number_format($webhookData->getAmount()->getAmount() / 100, 2, '.', ''),
+                $webhookData->getAmount()->getCurrency()
+            ),
+            $order
+        );
+    }
+
+    /**
+     * Sets the selected payment method data in the order's payment information.
+     *
+     * @param Order $order
+     * @param ReservationCreatedData $webhookData
+     *
+     * @return void
+     */
+    private function setSelectedPaymentMethodData(Order $order, ReservationCreatedData $webhookData): void
+    {
+        try {
+            $payment = $order->getPayment();
+            if ($payment) {
+                $payment->setAdditionalInformation(
+                    Nexi::SELECTED_PATMENT_METHOD,
+                    $webhookData->getPaymentMethod()
+                );
+                $payment->setAdditionalInformation(
+                    Nexi::SELECTED_PATMENT_TYPE,
+                    $webhookData->getPaymentType()
+                );
+            }
+        } catch (\Exception $e) {
+            $this->logger->critical($e);
+        }
     }
 }
diff --git a/Model/Webhook/WebhookProcessorInterface.php b/Model/Webhook/WebhookProcessorInterface.php
index b751ccc6..6e8e138f 100644
--- a/Model/Webhook/WebhookProcessorInterface.php
+++ b/Model/Webhook/WebhookProcessorInterface.php
@@ -1,15 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Nexi\Checkout\Model\Webhook;
 
+use NexiCheckout\Model\Webhook\WebhookInterface;
+
 interface WebhookProcessorInterface
 {
     /**
      * Process the webhook data.
      *
-     * @param array $webhookData
+     * @param WebhookInterface $webhook
      *
      * @return void
      */
-    public function processWebhook(array $webhookData): void;
+    public function processWebhook(WebhookInterface $webhook): void;
 }
diff --git a/Model/WebhookHandler.php b/Model/WebhookHandler.php
index 49c3d130..9ada9c52 100644
--- a/Model/WebhookHandler.php
+++ b/Model/WebhookHandler.php
@@ -5,6 +5,7 @@
 namespace Nexi\Checkout\Model;
 
 use Nexi\Checkout\Model\Webhook\WebhookProcessorInterface;
+use NexiCheckout\Model\Webhook\WebhookInterface;
 
 class WebhookHandler
 {
@@ -19,15 +20,15 @@ public function __construct(
     /**
      * Handler passes forward on to the appropriate handler.
      *
-     * @param array $webhookData
+     * @param WebhookInterface $webhook
      *
      * @return void
      */
-    public function handle(array $webhookData): void
+    public function handle(WebhookInterface $webhook): void
     {
-        $event = $webhookData['event'];
+        $event = $webhook->getEvent()->value;
         if (array_key_exists($event, $this->webhookProcessors)) {
-            $this->webhookProcessors[$event]->processWebhook($webhookData);
+            $this->webhookProcessors[$event]->processWebhook($webhook);
         }
     }
 
diff --git a/Observer/CartRevokeObserver.php b/Observer/CartRevokeObserver.php
new file mode 100644
index 00000000..e69de29b
diff --git a/Observer/ReactivateQuoteObserver.php b/Observer/ReactivateQuoteObserver.php
new file mode 100644
index 00000000..a6e9e87d
--- /dev/null
+++ b/Observer/ReactivateQuoteObserver.php
@@ -0,0 +1,56 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Observer;
+
+use Magento\Checkout\Model\Session;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+use Nexi\Checkout\Gateway\Config\Config;
+
+class ReactivateQuoteObserver implements ObserverInterface
+{
+    public const NEXI_LAST_ORDER_ID = 'nexi_last_order_id';
+
+    /**
+     * @param Session $session
+     * @param Config $config
+     */
+    public function __construct(
+        private readonly Session $session,
+        private readonly Config $config,
+    ) {
+    }
+
+    /**
+     * Reactivate quote after an order is placed for Nexi payment method
+     *
+     * @param Observer $observer
+     * @return void
+     */
+    public function execute(Observer $observer): void
+    {
+        $order = $observer->getEvent()->getOrder();
+        $quote = $observer->getEvent()->getQuote();
+
+        if (!$order || !$quote) {
+            return;
+        }
+
+        $payment = $order->getPayment();
+
+        if (!$payment instanceof OrderPaymentInterface
+            || $payment->getMethod() !== Config::CODE
+            || !$this->config->isEmbedded()
+        ) {
+            return;
+        }
+
+        // Restore the quote in the session
+        $this->session->restoreQuote();
+
+        // Set the last real order ID to the session for the success page
+        $this->session->setData(self::NEXI_LAST_ORDER_ID, $order->getIncrementId());
+    }
+}
diff --git a/Observer/ScheduledCartValidation.php b/Observer/ScheduledCartValidation.php
new file mode 100644
index 00000000..4f83e106
--- /dev/null
+++ b/Observer/ScheduledCartValidation.php
@@ -0,0 +1,59 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Observer;
+
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Nexi\Checkout\Model\Subscription\TotalConfigProvider;
+use Nexi\Checkout\Plugin\PreventDifferentScheduledCart;
+
+class ScheduledCartValidation implements ObserverInterface
+{
+    /**
+     * ScheduledCartValidation constructor.
+     *
+     * @param CartRepositoryInterface $cartRepository
+     * @param TotalConfigProvider $totalConfigProvider
+     */
+    public function __construct(
+        private CartRepositoryInterface $cartRepository,
+        private TotalConfigProvider     $totalConfigProvider
+    ) {
+    }
+
+    /**
+     * Execute.
+     *
+     * @param Observer $observer
+     *
+     * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    public function execute(Observer $observer)
+    {
+        $cartSchedule = null;
+        $cartId = $observer->getEvent()->getOrder()->getQuoteId();
+        $cart = $this->cartRepository->get($cartId);
+
+        if ($cart->getItems() && $this->totalConfigProvider->isSubscriptionsEnabled()) {
+            foreach ($cart->getItems() as $cartItem) {
+                $cartItemSchedule = $cartItem
+                    ->getProduct()
+                    ->getCustomAttribute(PreventDifferentScheduledCart::SCHEDULE_CODE);
+
+                if ($cartItemSchedule && $cartItemSchedule->getValue()) {
+                    if (null !== $cartSchedule && $cartSchedule !== $cartItemSchedule->getValue()) {
+                        throw new LocalizedException(__("Can't place order with different scheduled products in cart"));
+                    } else {
+                        $cartSchedule = $cartItemSchedule->getValue();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Observer/UpdateOrderReference.php b/Observer/UpdateOrderReference.php
new file mode 100644
index 00000000..8598ba7b
--- /dev/null
+++ b/Observer/UpdateOrderReference.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Observer;
+
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Payment\Gateway\Command\CommandManagerPoolInterface;
+use Nexi\Checkout\Gateway\Config\Config;
+use Psr\Log\LoggerInterface;
+
+class UpdateOrderReference implements ObserverInterface
+{
+    /**
+     * @param CommandManagerPoolInterface $commandManagerPool
+     * @param Config $config
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        private readonly CommandManagerPoolInterface $commandManagerPool,
+        private readonly Config $config,
+        private readonly LoggerInterface $logger
+    ) {
+    }
+
+    /**
+     * Add Reference Number - order increment id - to the Nexi payment after order is placed - Embedded only
+     *
+     * @param Observer $observer
+     * @return void
+     */
+    public function execute(Observer $observer): void
+    {
+        $order = $observer->getEvent()->getOrder();
+        $payment = $order->getPayment();
+        if ($payment->getMethod() !== Config::CODE || !$this->config->isEmbedded()) {
+            return;
+        }
+        try {
+            $commandPool = $this->commandManagerPool->get(Config::CODE);
+            $commandPool->executeByCode(
+                commandCode: 'update_reference',
+                arguments: ['order' => $order]
+            );
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage(), ['stacktrace' => $e->getTrace()]);
+        }
+    }
+}
diff --git a/Plugin/CheckoutSession.php b/Plugin/CheckoutSession.php
new file mode 100644
index 00000000..5cab8eb3
--- /dev/null
+++ b/Plugin/CheckoutSession.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Plugin;
+
+use Magento\Checkout\Model\Session;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\OrderFactory;
+use Nexi\Checkout\Observer\ReactivateQuoteObserver;
+
+class CheckoutSession
+{
+    /**
+     * @param OrderFactory $orderFactory
+     */
+    public function __construct(
+        private readonly OrderFactory $orderFactory
+    ) {
+    }
+
+    /**
+     * Get the last order ID from the Nexi payment method.
+     *
+     * @param Session $subject
+     * @param callable $proceed
+     *
+     * @return Order
+     */
+    public function aroundGetLastRealOrder(Session $subject, callable $proceed): Order
+    {
+        $result = $proceed();
+
+        if ($result->getId()) {
+            return $result;
+        }
+
+        $orderId = $subject->getData(ReactivateQuoteObserver::NEXI_LAST_ORDER_ID);
+        $order   = $this->orderFactory->create();
+        if ($orderId) {
+            $order->loadByIncrementId($orderId);
+        }
+
+        return $order;
+    }
+}
diff --git a/Plugin/DisableVoidAfterCapturePlugin.php b/Plugin/DisableVoidAfterCapturePlugin.php
new file mode 100644
index 00000000..8a05924f
--- /dev/null
+++ b/Plugin/DisableVoidAfterCapturePlugin.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Plugin;
+
+use Magento\Sales\Model\Order\Payment;
+use Nexi\Checkout\Gateway\Config\Config;
+
+class DisableVoidAfterCapturePlugin
+{
+    /**
+     * Do not allow to void captured orders.
+     *
+     * @param Payment $subject
+     * @param bool $result
+     * @return bool
+     */
+    public function afterCanVoid(Payment $subject, bool $result) : bool
+    {
+        $order = $subject->getOrder();
+        $payment = $order->getPayment();
+
+        if ($payment->getMethod() === Config::CODE &&
+            $order->getBaseGrandTotal() === $payment->getBaseAmountPaid()
+        ) {
+            return false;
+        }
+
+        return $result;
+    }
+}
diff --git a/Plugin/Order/Data/PaymentMethodCustomerOrderInfo.php b/Plugin/Order/Data/PaymentMethodCustomerOrderInfo.php
new file mode 100644
index 00000000..3c85d4ec
--- /dev/null
+++ b/Plugin/Order/Data/PaymentMethodCustomerOrderInfo.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Plugin\Order\Data;
+
+use Magento\Sales\Block\Order\Info;
+use Nexi\Checkout\Block\Info\Nexi;
+use Nexi\Checkout\Gateway\Config\Config;
+
+class PaymentMethodCustomerOrderInfo
+{
+    /**
+     * Around plugin for getPaymentInfoHtml method in Info class.
+     *
+     * @param Info $subject
+     * @return string
+     */
+    public function aroundGetPaymentInfoHtml(Info $subject)
+    {
+        $emptyData = '';
+        $payment = $subject->getOrder()->getPayment();
+        if ($payment->getMethod() === Config::CODE) {
+            return "<p>" . $payment->getAdditionalInformation()['method_title'] . "</p>"
+                . "<p>" . $payment->getAdditionalInformation(Nexi::SELECTED_PATMENT_TYPE) . " - "
+                . $payment->getAdditionalInformation(Nexi::SELECTED_PATMENT_METHOD) . "</p>";
+        } else {
+            return $subject->getChildHtml('payment_info');
+        }
+    }
+}
diff --git a/Plugin/PaymentData.php b/Plugin/PaymentData.php
new file mode 100644
index 00000000..fb1246b8
--- /dev/null
+++ b/Plugin/PaymentData.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Plugin;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Model\Quote\Payment;
+
+class PaymentData
+{
+    /**
+     * After plugin for importing payment data.
+     *
+     * @param Payment $subject
+     * @param PaymentInterface $result
+     * @param array $data
+     *
+     * @return PaymentInterface
+     * @throws LocalizedException
+     */
+    public function afterImportData(Payment $subject, PaymentInterface $result, array $data)
+    {
+        if (isset($data['extension_attributes']) && $data['extension_attributes']->getSubselection()) {
+            $result->setAdditionalInformation(
+                'subselection',
+                $data['extension_attributes']->getSubselection()
+            );
+        }
+
+        return $result;
+    }
+}
diff --git a/Plugin/PaymentInformationManagementPlugin.php b/Plugin/PaymentInformationManagementPlugin.php
index 20ff006e..415757b6 100644
--- a/Plugin/PaymentInformationManagementPlugin.php
+++ b/Plugin/PaymentInformationManagementPlugin.php
@@ -7,17 +7,17 @@
 use Magento\Checkout\Model\GuestPaymentInformationManagement;
 use Magento\Checkout\Model\PaymentInformationManagement;
 use Magento\Checkout\Model\Session;
-use Psr\Log\LoggerInterface;
+use Nexi\Checkout\Model\Language;
 
 class PaymentInformationManagementPlugin
 {
     /**
      * @param Session $checkoutSession
-     * @param LoggerInterface $logger
+     * @param Language $language
      */
     public function __construct(
         private readonly Session $checkoutSession,
-        private readonly LoggerInterface $logger
+        private readonly Language $language
     ) {
     }
 
@@ -45,13 +45,20 @@ public function afterSavePaymentInformationAndPlaceOrder(
     /**
      * Get the redirect URL from the order payment information.
      *
-     * @return string[]
+     * @return string
      */
     private function getRedirectUrl()
     {
         $order   = $this->checkoutSession->getLastRealOrder();
         $payment = $order->getPayment();
 
-        return $payment->getAdditionalInformation('redirect_url');
+        $redirectUrl = $payment?->getAdditionalInformation('redirect_url');
+
+        if ($redirectUrl && $this->language->getCode() !== Language::DEFAULT_LOCALE) {
+            $separator = strpos((string)$redirectUrl, '?') !== false ? '&' : '?';
+            $redirectUrl .= $separator . 'language=' . $this->language->getCode();
+        }
+
+        return $redirectUrl;
     }
 }
diff --git a/Plugin/PreventDifferentScheduledCart.php b/Plugin/PreventDifferentScheduledCart.php
new file mode 100644
index 00000000..f53a46d7
--- /dev/null
+++ b/Plugin/PreventDifferentScheduledCart.php
@@ -0,0 +1,47 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Plugin;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type\AbstractType;
+use Magento\Framework\DataObject;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Model\Quote;
+
+class PreventDifferentScheduledCart
+{
+    public const SCHEDULE_CODE = 'subscription_schedule';
+
+    /**
+     * BeforeAddProduct plugin.
+     *
+     * @param Quote $subject
+     * @param mixed $product
+     * @param null|float|DataObject $request
+     * @param null|string $processMode
+     *
+     * @return array
+     * @throws LocalizedException
+     */
+    public function beforeAddProduct(
+        Quote   $subject,
+        Product $product,
+                $request = null,
+                $processMode = AbstractType::PROCESS_MODE_FULL
+    ) {
+        $cartItems       = $subject->getItems() ?: [];
+        $addItemSchedule = $product->getCustomAttribute(self::SCHEDULE_CODE);
+        if (!$addItemSchedule) {
+            return [$product, $request, $processMode];
+        }
+        foreach ($cartItems as $item) {
+            $cartItemSchedule = $item->getProduct()->getCustomAttribute(self::SCHEDULE_CODE);
+            if ($cartItemSchedule && $cartItemSchedule->getValue() != $addItemSchedule->getValue()) {
+                throw new LocalizedException(__("Can't add product with different payment schedule"));
+            }
+        }
+
+        return [$product, $request, $processMode];
+    }
+}
diff --git a/Plugin/QouteToOrder/ProcessTransactionId.php b/Plugin/QouteToOrder/ProcessTransactionId.php
new file mode 100644
index 00000000..53987a7f
--- /dev/null
+++ b/Plugin/QouteToOrder/ProcessTransactionId.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Plugin\QouteToOrder;
+
+use Magento\Quote\Model\Quote\Payment;
+use Magento\Quote\Model\Quote\Payment\ToOrderPayment;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+
+class ProcessTransactionId
+{
+    /**
+     * After converting the payment, set the last transaction ID
+     *
+     * @param ToOrderPayment $subject
+     * @param OrderPaymentInterface $result
+     * @param Payment $object
+     * @param array $data
+     *
+     * @return OrderPaymentInterface
+     */
+    public function afterConvert(ToOrderPayment $subject, OrderPaymentInterface $result, Payment $object, $data = [])
+    {
+        if ($result->getAdditionalInformation('payment_id')) {
+            $result->setLastTransId($result->getAdditionalInformation('payment_id'));
+        }
+
+        return $result;
+    }
+}
diff --git a/Plugin/RecurringToOrderGrid.php b/Plugin/RecurringToOrderGrid.php
new file mode 100644
index 00000000..4d19f655
--- /dev/null
+++ b/Plugin/RecurringToOrderGrid.php
@@ -0,0 +1,47 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Plugin;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Sales\Model\ResourceModel\Order\Grid\Collection;
+
+class RecurringToOrderGrid
+{
+    /**
+     * @param Collection $subject
+     * @return null
+     * @throws LocalizedException
+     */
+    public function beforeLoad(Collection $subject)
+    {
+        if (!$subject->isLoaded()) {
+            $primaryKey = $subject->getResource()->getIdFieldName();
+            $tableName = $subject->getResource()->getTable('nexi_subscription_link');
+
+            $subject->getSelect()->joinLeft(
+                $tableName,
+                'main_table.' . $primaryKey . ' = ' . $tableName . '.order_id',
+                'subscription_id'
+            );
+
+            $subject->getSelect()->joinLeft(
+                $subject->getResource()->getTable('nexi_subscriptions'),
+                $tableName . '.subscription_id = nexi_subscriptions.entity_id',
+                [
+                    'recurring_status' => 'nexi_subscriptions.status',
+                    'customer_id' => 'nexi_subscriptions.customer_id',
+                    'subscription_id' => 'nexi_subscriptions.entity_id'
+                ]
+            );
+
+            $subject->getSelect()->joinLeft(
+                $subject->getResource()->getTable('recurring_payment_profiles'),
+                'nexi_subscriptions.recurring_profile_id = recurring_payment_profiles.profile_id',
+                ['recurring_profile' => 'recurring_payment_profiles.name']
+            );
+        }
+
+        return null;
+    }
+}
diff --git a/Plugin/SendEmailPlugin.php b/Plugin/SendEmailPlugin.php
new file mode 100644
index 00000000..aa51b527
--- /dev/null
+++ b/Plugin/SendEmailPlugin.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Plugin;
+
+use Magento\Framework\Event\Observer;
+use Magento\Quote\Observer\SubmitObserver;
+use Magento\Sales\Model\Order;
+use Nexi\Checkout\Gateway\Config\Config;
+
+class SendEmailPlugin
+{
+    /**
+     * @param Config $config
+     */
+    public function __construct(private readonly Config $config)
+    {
+    }
+
+    /**
+     * Don't send email at that point if embedded checkout is enabled.
+     *
+     * @param SubmitObserver $subject
+     * @param Observer $observer
+     *
+     * @return array
+     */
+    public function beforeExecute(SubmitObserver $subject, Observer $observer): array
+    {
+        if ($this->config->isEmbedded()) {
+            $observer->getEvent()->getOrder()->setCanSendNewEmailFlag(false);
+        }
+
+        return [$observer];
+    }
+}
diff --git a/README.md b/README.md
index bfaf0f76..e69de29b 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +0,0 @@
-# magento-nexi-checkout
-Nexi payment module for Adobe Commerce (Magento 2)
diff --git a/Setup/Patch/Data/AddPaymentAuthorizedOrderStatus.php b/Setup/Patch/Data/AddPaymentAuthorizedOrderStatus.php
new file mode 100644
index 00000000..e6aaa08c
--- /dev/null
+++ b/Setup/Patch/Data/AddPaymentAuthorizedOrderStatus.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Nexi. All rights reserved.
+ */
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Setup\Patch\Data;
+
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Sales\Model\Order;
+
+/**
+ * Add payment_authorized order status for pending_payment state
+ */
+class AddPaymentAuthorizedOrderStatus implements DataPatchInterface
+{
+    public const STATUS_NEXI_AUTHORIZED = 'nexi_payment_authorized';
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        private readonly ModuleDataSetupInterface $moduleDataSetup
+    ) {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->startSetup();
+
+        $data = [
+            'status' => self::STATUS_NEXI_AUTHORIZED,
+            'label'  => __('Payment Authorized')
+        ];
+
+        $this->moduleDataSetup->getConnection()->insertOnDuplicate(
+            $this->moduleDataSetup->getTable('sales_order_status'),
+            $data,
+            ['status', 'label']
+        );
+
+        $data = [
+            'status'           => self::STATUS_NEXI_AUTHORIZED,
+            'state'            => Order::STATE_PENDING_PAYMENT,
+            'is_default'       => 0,
+            'visible_on_front' => 1
+        ];
+
+        $this->moduleDataSetup->getConnection()->insertOnDuplicate(
+            $this->moduleDataSetup->getTable('sales_order_status_state'),
+            $data,
+            ['status', 'state', 'is_default', 'visible_on_front']
+        );
+
+        $this->moduleDataSetup->endSetup();
+
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/Setup/Patch/Data/AddSubscriptionScheduleAttribute.php b/Setup/Patch/Data/AddSubscriptionScheduleAttribute.php
new file mode 100644
index 00000000..3854ff02
--- /dev/null
+++ b/Setup/Patch/Data/AddSubscriptionScheduleAttribute.php
@@ -0,0 +1,96 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Setup\Patch\Data;
+
+use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Validator\ValidateException;
+use Nexi\Checkout\Model\Attribute\SelectData;
+
+class AddSubscriptionScheduleAttribute implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var EavSetupFactory
+     */
+    private $eavSetupFactory;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param EavSetupFactory $eavSetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        EavSetupFactory $eavSetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->eavSetupFactory = $eavSetupFactory;
+    }
+
+    /**
+     * @return DataPatchInterface
+     * @throws LocalizedException
+     * @throws ValidateException
+     */
+    public function apply()
+    {
+        /** @var EavSetup $eavSetup */
+        $eavSetup = $this->eavSetupFactory->create(['setup' => $this->moduleDataSetup]);
+
+        $eavSetup->addAttribute(\Magento\Catalog\Model\Product::ENTITY, 'subscription_schedule', [
+            'type' => 'int',
+            'backend' => '',
+            'frontend' => '',
+            'label' => 'Subscription Schedule',
+            'input' => 'select',
+            'class' => '',
+            'source' => 'Nexi\Checkout\Model\Attribute\SelectData',
+            'global' => ScopedAttributeInterface::SCOPE_GLOBAL,
+            'visible' => true,
+            'required' => false,
+            'user_defined' => false,
+            'default' => SelectData::NO_SUBSCRIPTION_VALUE,
+            'searchable' => true,
+            'filterable' => true,
+            'comparable' => false,
+            'visible_on_front' => true,
+            'used_in_product_listing' => true,
+            'unique' => false,
+        ]);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.0.0';
+    }
+}
diff --git a/Setup/Patch/Data/GenerateWebhookSecret.php b/Setup/Patch/Data/GenerateWebhookSecret.php
index 13a9e3d9..9a492284 100644
--- a/Setup/Patch/Data/GenerateWebhookSecret.php
+++ b/Setup/Patch/Data/GenerateWebhookSecret.php
@@ -24,10 +24,9 @@ public function __construct(
     }
 
     /**
-     * Generate secret key for webhook verification
+     * Generate a secret key for webhook verification
      *
      * @return void
-     * @throws Exception
      */
     public function apply(): void
     {
diff --git a/Setup/Patch/Data/InstallProfilesPatch.php b/Setup/Patch/Data/InstallProfilesPatch.php
new file mode 100644
index 00000000..c123726e
--- /dev/null
+++ b/Setup/Patch/Data/InstallProfilesPatch.php
@@ -0,0 +1,97 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Setup\Patch\Data;
+
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+class InstallProfilesPatch implements
+    DataPatchInterface
+{
+    const DEFAULT_PROFILE_DATA = [
+        [
+            'name' => 'Weekly',
+            'schedule' => [
+                'interval' => 1,
+                'unit' => 'W'
+            ]
+        ],
+        [
+            'name' => 'Monthly',
+            'schedule' => [
+                'interval' => 1,
+                'unit' => 'M'
+            ]
+        ],
+    ];
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        SerializerInterface $serializer
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+        $this->addDefaultProfiles();
+        $this->moduleDataSetup->getConnection()->endSetup();
+
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    private function addDefaultProfiles()
+    {
+        $connection = $this->moduleDataSetup->getConnection();
+        $this->moduleDataSetup->getConnection()->insertMultiple(
+            $connection->getTableName('recurring_payment_profiles'),
+            $this->getProfileData()
+        );
+    }
+
+    private function getProfileData()
+    {
+        $data = [];
+
+        foreach (self::DEFAULT_PROFILE_DATA as $profile) {
+            $profile['schedule'] = $this->serializer->serialize($profile['schedule']);
+            $data[] = $profile;
+        }
+
+        return $data;
+    }
+}
diff --git a/Test/Unit/Controller/Adminhtml/System/Config/TestConnectionTest.php b/Test/Unit/Controller/Adminhtml/System/Config/TestConnectionTest.php
new file mode 100644
index 00000000..4f2f7228
--- /dev/null
+++ b/Test/Unit/Controller/Adminhtml/System/Config/TestConnectionTest.php
@@ -0,0 +1,142 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Test\Unit\Controller\Adminhtml\System\Config;
+
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Filter\StripTags;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Url;
+use Magento\Store\Model\ScopeInterface;
+use Nexi\Checkout\Controller\Adminhtml\System\Config\TestConnection;
+use Nexi\Checkout\Gateway\Config\Config;
+use Nexi\Checkout\Model\Config\Source\Environment;
+use NexiCheckout\Api\Exception\PaymentApiException;
+use NexiCheckout\Api\PaymentApi;
+use NexiCheckout\Factory\PaymentApiFactory;
+use PHPUnit\Framework\TestCase;
+
+class TestConnectionTest extends TestCase
+{
+    /**
+     * @var TestConnection
+     */
+    private $controller;
+
+    /**
+     * @var JsonFactory
+     */
+    private $jsonFactoryMock;
+
+    /**
+     * @var Json
+     */
+    private $jsonMock;
+
+    /**
+     * @var RequestInterface
+     */
+    private $requestMock;
+
+    /**
+     * @var PaymentApiFactory
+     */
+    private $paymentApiFactoryMock;
+
+    /**
+     * @var Config
+     */
+    private $configMock;
+
+    /**
+     * @var Url
+     */
+    private $urlMock;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfigMock;
+
+    protected function setUp(): void
+    {
+        $objectManager = new ObjectManager($this);
+
+        $contextMock                 = $this->createMock(Context::class);
+        $this->requestMock           = $this->createMock(RequestInterface::class);
+        $this->jsonFactoryMock       = $this->createMock(JsonFactory::class);
+        $this->jsonMock              = $this->createMock(Json::class);
+        $this->paymentApiFactoryMock = $this->createMock(PaymentApiFactory::class);
+        $this->configMock            = $this->createMock(Config::class);
+        $this->urlMock               = $this->createMock(Url::class);
+        $this->scopeConfigMock       = $this->createMock(ScopeConfigInterface::class);
+        $stripTagsMock               = $this->createMock(StripTags::class);
+
+        $contextMock->method('getRequest')->willReturn($this->requestMock);
+        $this->jsonFactoryMock->method('create')->willReturn($this->jsonMock);
+
+        $this->scopeConfigMock->method('getValue')->with(
+            'currency/options/default',
+            ScopeInterface::SCOPE_STORE
+        )->willReturn('USD');
+
+        $this->urlMock->method('getUrl')->willReturn('https://example.com');
+
+        $this->controller = $objectManager->getObject(
+            TestConnection::class,
+            [
+                'context'           => $contextMock,
+                'resultJsonFactory' => $this->jsonFactoryMock,
+                'tagFilter'         => $stripTagsMock,
+                'paymentApiFactory' => $this->paymentApiFactoryMock,
+                'config'            => $this->configMock,
+                'url'               => $this->urlMock,
+                'scopeConfig'       => $this->scopeConfigMock
+            ]
+        );
+    }
+
+    public function testExecuteSuccess()
+    {
+        $this->requestMock->method('getParams')->willReturn([
+                                                                'secret_key'     => 'valid_api_key',
+                                                                'environment' => Environment::LIVE
+                                                            ]);
+
+        $apiMock = $this->createMock(PaymentApi::class);
+        $this->paymentApiFactoryMock->method('create')->willReturn($apiMock);
+        $apiMock->method('retrievePayment')->willThrowException(new \Exception('should be in guid format'));
+
+        $this->jsonMock->expects($this->once())
+            ->method('setData')
+            ->with(['success' => true, 'errorMessage' => ''])
+            ->willReturnSelf();
+
+        $this->controller->execute();
+    }
+
+    public function testExecuteFailure()
+    {
+        $this->requestMock->method('getParams')->willReturn([
+                                                                'secret_key'     => 'invalid_api_key',
+                                                                'environment' => Environment::LIVE
+                                                            ]);
+
+        $apiMock = $this->createMock(PaymentApi::class);
+        $this->paymentApiFactoryMock->method('create')->willReturn($apiMock);
+        $apiMock->method('createEmbeddedPayment')
+            ->willThrowException(new PaymentApiException('Invalid API key'));
+
+        $this->jsonMock->expects($this->once())
+            ->method('setData')
+            ->with(['success' => false, 'errorMessage' => ' Please check your API key and environment.'])
+            ->willReturnSelf();
+
+        $this->controller->execute();
+    }
+}
diff --git a/Test/Unit/Controller/Hpp/CancelActionTest.php b/Test/Unit/Controller/Hpp/CancelActionTest.php
new file mode 100644
index 00000000..66c5e2f6
--- /dev/null
+++ b/Test/Unit/Controller/Hpp/CancelActionTest.php
@@ -0,0 +1,111 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Test\Unit\Controller\Hpp;
+
+use Magento\Checkout\Model\Session;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\Result\RedirectFactory;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Sales\Api\OrderManagementInterface;
+use Nexi\Checkout\Controller\Hpp\CancelAction;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+class CancelActionTest extends TestCase
+{
+    /**
+     * @var CancelAction
+     */
+    private $controller;
+
+    /**
+     * @var RedirectFactory
+     */
+    private $redirectFactoryMock;
+
+    /**
+     * @var Redirect
+     */
+    private $redirectMock;
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlMock;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $loggerMock;
+
+    /**
+     * @var Session
+     */
+    private $checkoutSessionMock;
+
+    /**
+     * @var ManagerInterface
+     */
+    private $messageManagerMock;
+
+    /**
+     * @var Quote
+     */
+    private $quoteMock;
+
+    /**
+     * @var OrderManagementInterface
+     */
+    private $orderManagementInterfaceMock;
+
+    protected function setUp(): void
+    {
+        $this->redirectMock = $this->createMock(Redirect::class);
+        $this->redirectFactoryMock = $this->createMock(RedirectFactory::class);
+        $this->redirectFactoryMock->method('create')
+            ->willReturn($this->redirectMock);
+        $this->urlMock = $this->createMock(UrlInterface::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->checkoutSessionMock = $this->createMock(Session::class);
+        $this->quoteMock = $this->createMock(Quote::class);
+        $this->checkoutSessionMock->method('getQuote')
+            ->willReturn($this->quoteMock);
+        $this->quoteMock->method('getPayment')
+            ->willReturn($this->createMock(\Magento\Quote\Model\Quote\Payment::class));
+        $this->messageManagerMock = $this->createMock(ManagerInterface::class);
+        $this->orderManagementInterfaceMock = $this->createMock(OrderManagementInterface::class);
+        $this->orderManagementInterfaceMock->method('cancel');
+
+        $this->controller = new CancelAction(
+            $this->redirectFactoryMock,
+            $this->urlMock,
+            $this->checkoutSessionMock,
+            $this->orderManagementInterfaceMock,
+            $this->messageManagerMock
+        );
+    }
+
+    public function testExecuteSuccess()
+    {
+        $this->checkoutSessionMock->expects($this->once())
+            ->method('restoreQuote');
+        $this->orderManagementInterfaceMock->expects($this->once())
+            ->method('cancel');
+        $this->messageManagerMock->expects($this->once())
+            ->method('addNoticeMessage')
+            ->with(__('The payment has been canceled.'));
+        $this->urlMock->method('getUrl')
+            ->willReturn('checkout/cart/index');
+        $this->redirectMock->expects($this->once())
+            ->method('setUrl')
+            ->with('checkout/cart/index')
+            ->willReturnSelf();
+
+        $result = $this->controller->execute();
+        $this->assertSame($this->redirectMock, $result);
+    }
+}
diff --git a/Test/Unit/EnvironmentTest.php b/Test/Unit/EnvironmentTest.php
index e2e0987c..ffa2f3d5 100644
--- a/Test/Unit/EnvironmentTest.php
+++ b/Test/Unit/EnvironmentTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Nexi\Checkout\Model\Config\Source;
 
 use PHPUnit\Framework\TestCase;
diff --git a/Test/Unit/Gateway/AmountConverterTest.php b/Test/Unit/Gateway/AmountConverterTest.php
new file mode 100644
index 00000000..41dca8ff
--- /dev/null
+++ b/Test/Unit/Gateway/AmountConverterTest.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Nexi\Checkout\Test\Unit\Gateway;
+
+use InvalidArgumentException;
+use Nexi\Checkout\Gateway\AmountConverter;
+use PHPUnit\Framework\TestCase;
+
+class AmountConverterTest extends TestCase
+{
+    /**
+     * @var AmountConverter
+     */
+    private $amountConverter;
+
+    protected function setUp(): void
+    {
+        $this->amountConverter = new AmountConverter();
+    }
+
+    /**
+     * Test successful conversion of amount to Nexi format (cents)
+     *
+     * @dataProvider amountDataProvider
+     */
+    public function testConvertToNexiAmount($amount, $expected): void
+    {
+        $result = $this->amountConverter->convertToNexiAmount($amount);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * Test exception when non-numeric amount is provided
+     */
+    public function testConvertToNexiAmountWithInvalidInput(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Amount must be a numeric value.');
+        $this->amountConverter->convertToNexiAmount('not-a-number');
+    }
+
+    /**
+     * Data provider for testConvertToNexiAmount
+     *
+     * @return array
+     */
+    public function amountDataProvider(): array
+    {
+        return [
+            'integer amount' => [100, 10000],
+            'float amount' => [10.55, 1055],
+            'zero amount' => [0, 0],
+            'small decimal' => [0.01, 1],
+            'rounding up' => [10.995, 1100],
+            'rounding down' => [10.994, 1099],
+            'string numeric' => ['10.55', 1055],
+        ];
+    }
+}
diff --git a/Test/Unit/Gateway/Command/InitializeTest.php b/Test/Unit/Gateway/Command/InitializeTest.php
new file mode 100644
index 00000000..019c484b
--- /dev/null
+++ b/Test/Unit/Gateway/Command/InitializeTest.php
@@ -0,0 +1,188 @@
+<?php
+
+namespace Nexi\Checkout\Test\Unit\Gateway\Command;
+
+use Exception;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Payment\Gateway\Command\CommandManagerInterface;
+use Magento\Payment\Gateway\Command\CommandManagerPoolInterface;
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+use Magento\Payment\Gateway\Helper\SubjectReader;
+use Magento\Payment\Model\InfoInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\TransactionInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
+use Nexi\Checkout\Gateway\Command\Initialize;
+use Nexi\Checkout\Gateway\Config\Config;
+use Nexi\Checkout\Model\Transaction\Builder;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+class InitializeTest extends TestCase
+{
+    /**
+     * @var CommandManagerPoolInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $commandManagerPoolMock;
+
+    /**
+     * @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var Builder|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $transactionBuilderMock;
+
+    /**
+     * @var SubjectReader|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $subjectReaderMock;
+
+    /**
+     * @var Initialize
+     */
+    private $initialize;
+
+    /**
+     * @var Config|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $configMock;
+
+    protected function setUp(): void
+    {
+        $this->commandManagerPoolMock = $this->createMock(CommandManagerPoolInterface::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->transactionBuilderMock = $this->createMock(Builder::class);
+        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->configMock = $this->createMock(Config::class);
+
+        $this->initialize = new Initialize(
+            $this->subjectReaderMock,
+            $this->commandManagerPoolMock,
+            $this->loggerMock,
+            $this->transactionBuilderMock,
+            $this->configMock,
+        );
+    }
+
+    /**
+     * Test createPayment method with successful execution
+     */
+    public function testcreatePaymentSuccess(): void
+    {
+        // Mock payment data object
+        $paymentDataMock = $this->createMock(PaymentDataObjectInterface::class);
+
+        // Setup expectations for commandManagerPool
+        $commandManagerMock = $this->createMock(CommandManagerInterface::class);
+        $this->commandManagerPoolMock->expects($this->once())
+            ->method('get')
+            ->with(Config::CODE)
+            ->willReturn($commandManagerMock);
+        $commandManagerMock->expects($this->once())
+            ->method('executeByCode')
+            ->with(
+                'create_payment',
+                null,
+                ['payment' => $paymentDataMock]
+            );
+
+        // Execute the method
+        $this->initialize->createPayment($paymentDataMock);
+    }
+
+    /**
+     * Test createPayment method with exception
+     */
+    public function testcreatePaymentException(): void
+    {
+        // Mock payment data object
+        $paymentDataMock = $this->createMock(PaymentDataObjectInterface::class);
+
+        // Setup expectations for commandManagerPool to throw exception
+        $commandManagerMock = $this->createMock(CommandManagerInterface::class);
+        $this->commandManagerPoolMock->expects($this->once())
+            ->method('get')
+            ->with(Config::CODE)
+            ->willReturn($commandManagerMock);
+        $commandManagerMock->expects($this->once())
+            ->method('executeByCode')
+            ->with(
+                'create_payment',
+                null,
+                ['payment' => $paymentDataMock]
+            )
+            ->willThrowException(new Exception('Test exception'));
+
+        // Setup expectations for logger
+        $this->loggerMock->expects($this->once())
+            ->method('error')
+            ->with('Test exception', $this->anything());
+
+        // Execute the method and expect exception
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage('An error occurred during the payment process. Please try again later.');
+        $this->initialize->createPayment($paymentDataMock);
+    }
+
+    /**
+     * Test isPaymentAlreadyCreated method when payment ID exists
+     */
+    public function testIsPaymentAlreadyCreatedTrue(): void
+    {
+        // Use reflection to test private method
+        $reflectionClass = new \ReflectionClass(Initialize::class);
+        $method = $reflectionClass->getMethod('isPaymentAlreadyCreated');
+        $method->setAccessible(true);
+
+        // Mock payment data object
+        $paymentDataMock = $this->createMock(PaymentDataObjectInterface::class);
+        $paymentMock = $this->createMock(Payment::class);
+
+        // Setup expectations
+        $paymentDataMock->expects($this->once())
+            ->method('getPayment')
+            ->willReturn($paymentMock);
+        $paymentMock->expects($this->once())
+            ->method('getAdditionalInformation')
+            ->with('payment_id')
+            ->willReturn('existing-payment-id');
+
+        // Execute the method
+        $result = $method->invoke($this->initialize, $paymentDataMock);
+        $this->assertTrue($result);
+    }
+
+    /**
+     * Test isPaymentAlreadyCreated method when payment ID does not exist
+     */
+    public function testIsPaymentAlreadyCreatedFalse(): void
+    {
+        // Use reflection to test private method
+        $reflectionClass = new \ReflectionClass(Initialize::class);
+        $method = $reflectionClass->getMethod('isPaymentAlreadyCreated');
+        $method->setAccessible(true);
+
+        // Mock payment data object
+        $paymentDataMock = $this->createMock(PaymentDataObjectInterface::class);
+        $paymentMock = $this->createMock(Payment::class);
+
+        // Setup expectations
+        $paymentDataMock->expects($this->once())
+            ->method('getPayment')
+            ->willReturn($paymentMock);
+        $paymentMock->expects($this->once())
+            ->method('getAdditionalInformation')
+            ->with('payment_id')
+            ->willReturn(null);
+
+        // Execute the method
+        $result = $method->invoke($this->initialize, $paymentDataMock);
+        $this->assertFalse($result);
+    }
+}
diff --git a/Test/Unit/Gateway/Config/ConfigTest.php b/Test/Unit/Gateway/Config/ConfigTest.php
new file mode 100644
index 00000000..dcebbd49
--- /dev/null
+++ b/Test/Unit/Gateway/Config/ConfigTest.php
@@ -0,0 +1,197 @@
+<?php
+
+namespace Nexi\Checkout\Test\Unit\Gateway\Config;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Payment\Model\MethodInterface;
+use Magento\Store\Model\ScopeInterface;
+use Nexi\Checkout\Gateway\Config\Config;
+use Nexi\Checkout\Model\Config\Source\Environment;
+use NexiCheckout\Model\Request\Payment\IntegrationTypeEnum;
+use PHPUnit\Framework\TestCase;
+
+class ConfigTest extends TestCase
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $scopeConfigMock;
+
+    protected function setUp(): void
+    {
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->config = new Config(
+            $this->scopeConfigMock,
+            Config::CODE
+        );
+    }
+
+    /**
+     * Test getEnvironment method
+     */
+    public function testGetEnvironment(): void
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with('payment/nexi/environment')
+            ->willReturn(Environment::LIVE);
+
+        $this->assertEquals(Environment::LIVE, $this->config->getEnvironment());
+    }
+
+    /**
+     * Test isLiveMode method when environment is live
+     */
+    public function testIsLiveModeTrueWhenEnvironmentIsLive(): void
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with('payment/nexi/environment')
+            ->willReturn(Environment::LIVE);
+
+        $this->assertTrue($this->config->isLiveMode());
+    }
+
+    /**
+     * Test isLiveMode method when environment is not live
+     */
+    public function testIsLiveModeFalseWhenEnvironmentIsNotLive(): void
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with('payment/nexi/environment')
+            ->willReturn(Environment::TEST);
+
+        $this->assertFalse($this->config->isLiveMode());
+    }
+
+    /**
+     * Test isActive method
+     */
+    public function testIsActive(): void
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with('payment/nexi/active')
+            ->willReturn('1');
+
+        $this->assertTrue($this->config->isActive());
+    }
+
+    /**
+     * Test getApiKey method when in live mode
+     */
+    public function testGetApiKeyInLiveMode(): void
+    {
+        $this->scopeConfigMock->expects($this->exactly(2))
+            ->method('getValue')
+            ->willReturnMap([
+                ['payment/nexi/environment', ScopeInterface::SCOPE_STORE, null, Environment::LIVE],
+                ['payment/nexi/secret_key', ScopeInterface::SCOPE_STORE, null, 'live-api-key']
+            ]);
+
+        $this->assertEquals('live-api-key', $this->config->getApiKey());
+    }
+
+    /**
+     * Test getApiKey method when in test mode
+     */
+    public function testGetApiKeyInTestMode(): void
+    {
+        $this->scopeConfigMock->expects($this->exactly(2))
+            ->method('getValue')
+            ->willReturnMap([
+                ['payment/nexi/environment', ScopeInterface::SCOPE_STORE, null, Environment::TEST],
+                ['payment/nexi/test_secret_key', ScopeInterface::SCOPE_STORE, null, 'test-api-key']
+            ]);
+
+        $this->assertEquals('test-api-key', $this->config->getApiKey());
+    }
+
+    /**
+     * Test getCheckoutKey method when in live mode
+     */
+    public function testGetCheckoutKeyInLiveMode(): void
+    {
+        $this->scopeConfigMock->expects($this->exactly(2))
+            ->method('getValue')
+            ->willReturnMap([
+                ['payment/nexi/environment', ScopeInterface::SCOPE_STORE, null, Environment::LIVE],
+                ['payment/nexi/checkout_key', ScopeInterface::SCOPE_STORE, null, 'live-checkout-key']
+            ]);
+
+        $this->assertEquals('live-checkout-key', $this->config->getCheckoutKey());
+    }
+
+    /**
+     * Test getCheckoutKey method when in test mode
+     */
+    public function testGetCheckoutKeyInTestMode(): void
+    {
+        $this->scopeConfigMock->expects($this->exactly(2))
+            ->method('getValue')
+            ->willReturnMap([
+                ['payment/nexi/environment', ScopeInterface::SCOPE_STORE, null, Environment::TEST],
+                ['payment/nexi/test_checkout_key', ScopeInterface::SCOPE_STORE, null, 'test-checkout-key']
+            ]);
+
+        $this->assertEquals('test-checkout-key', $this->config->getCheckoutKey());
+    }
+
+    /**
+     * Test isEmbedded method when integration type is embedded
+     */
+    public function testIsEmbeddedTrue(): void
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with('payment/nexi/integration_type')
+            ->willReturn(IntegrationTypeEnum::EmbeddedCheckout->name);
+
+        $this->assertTrue($this->config->isEmbedded());
+    }
+
+    /**
+     * Test isEmbedded method when integration type is not embedded
+     */
+    public function testIsEmbeddedFalse(): void
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with('payment/nexi/integration_type')
+            ->willReturn(IntegrationTypeEnum::HostedPaymentPage->name);
+
+        $this->assertFalse($this->config->isEmbedded());
+    }
+
+    /**
+     * Test getPaymentAction method when auto capture is enabled
+     */
+    public function testGetPaymentActionWithAutoCapture(): void
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with('payment/nexi/is_auto_capture')
+            ->willReturn('1');
+
+        $this->assertEquals(MethodInterface::ACTION_AUTHORIZE_CAPTURE, $this->config->getPaymentAction());
+    }
+
+    /**
+     * Test getPaymentAction method when auto capture is disabled
+     */
+    public function testGetPaymentActionWithoutAutoCapture(): void
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with('payment/nexi/is_auto_capture')
+            ->willReturn('0');
+
+        $this->assertEquals(MethodInterface::ACTION_AUTHORIZE, $this->config->getPaymentAction());
+    }
+}
diff --git a/Test/Unit/Gateway/Http/ClientTest.php b/Test/Unit/Gateway/Http/ClientTest.php
new file mode 100644
index 00000000..70561c22
--- /dev/null
+++ b/Test/Unit/Gateway/Http/ClientTest.php
@@ -0,0 +1,136 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Test\Unit\Gateway\Http;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Payment\Gateway\Http\TransferInterface;
+use Nexi\Checkout\Gateway\Config\Config;
+use Nexi\Checkout\Gateway\Http\Client;
+use NexiCheckout\Api\Exception\PaymentApiException;
+use NexiCheckout\Api\PaymentApi;
+use NexiCheckout\Factory\PaymentApiFactory;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+class ClientTest extends TestCase
+{
+    /**
+     * @var Client
+     */
+    private $client;
+
+    /**
+     * @var PaymentApiFactory|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $paymentApiFactoryMock;
+
+    /**
+     * @var Config|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var PaymentApi|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $paymentApiMock;
+
+    protected function setUp(): void
+    {
+        $this->paymentApiFactoryMock = $this->createMock(PaymentApiFactory::class);
+        $this->configMock = $this->createMock(Config::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+
+        // Create a mock for PaymentApi with the testMethod method
+        $this->paymentApiMock = $this->getMockBuilder(PaymentApi::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        // We'll set up the testMethod in each test
+
+        $this->client = new Client(
+            $this->paymentApiFactoryMock,
+            $this->configMock,
+            $this->loggerMock
+        );
+    }
+
+    /**
+     * Test getPaymentApi method
+     */
+    public function testGetPaymentApi(): void
+    {
+        // Setup expectations for config
+        $this->configMock->expects($this->once())
+            ->method('getApiKey')
+            ->willReturn('test-api-key');
+        $this->configMock->expects($this->once())
+            ->method('isLiveMode')
+            ->willReturn(false);
+
+        // Setup expectations for payment API factory
+        $this->paymentApiFactoryMock->expects($this->once())
+            ->method('create')
+            ->with('test-api-key', false)
+            ->willReturn($this->paymentApiMock);
+
+        // Execute the method
+        $result = $this->client->getPaymentApi();
+        $this->assertSame($this->paymentApiMock, $result);
+    }
+
+    /**
+     * Test placeRequest method with exception
+     */
+    public function testPlaceRequestWithException(): void
+    {
+        // Create mock for transfer object
+        $transferMock = $this->createMock(TransferInterface::class);
+        $transferMock->expects($this->once())
+            ->method('getUri')
+            ->willReturn('retrievePayment');
+        $transferMock->expects($this->exactly(4))
+            ->method('getBody')
+            ->willReturn('test-body');
+
+        // Set up the PaymentApi mock
+        $this->paymentApiMock = $this->getMockBuilder(PaymentApi::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        // Set up the retrievePayment method to throw an exception
+        $this->paymentApiMock->expects($this->once())
+            ->method('retrievePayment')
+            ->with('test-body')
+            ->willThrowException(new PaymentApiException('Test exception'));
+
+        // Setup expectations for payment API factory
+        $this->paymentApiFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->paymentApiMock);
+
+        // Setup expectations for config
+        $this->configMock->expects($this->once())
+            ->method('getApiKey')
+            ->willReturn('test-api-key');
+        $this->configMock->expects($this->once())
+            ->method('isLiveMode')
+            ->willReturn(false);
+
+        // Setup expectations for logger
+        $this->loggerMock->expects($this->once())
+            ->method('debug');
+        $this->loggerMock->expects($this->once())
+            ->method('error');
+
+        // Execute the method and expect exception
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage('An error occurred during the payment process. Please try again later.');
+        $this->client->placeRequest($transferMock);
+    }
+}
diff --git a/Test/Unit/Gateway/Http/TransferFactoryTest.php b/Test/Unit/Gateway/Http/TransferFactoryTest.php
new file mode 100644
index 00000000..6c7229dd
--- /dev/null
+++ b/Test/Unit/Gateway/Http/TransferFactoryTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Nexi\Checkout\Test\Unit\Gateway\Http;
+
+use Magento\Payment\Gateway\Http\TransferBuilder;
+use Magento\Payment\Gateway\Http\TransferInterface;
+use Nexi\Checkout\Gateway\Http\TransferFactory;
+use PHPUnit\Framework\TestCase;
+
+class TransferFactoryTest extends TestCase
+{
+    /**
+     * @var TransferFactory
+     */
+    private $transferFactory;
+
+    /**
+     * @var TransferBuilder|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $transferBuilderMock;
+
+    /**
+     * @var TransferInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $transferMock;
+
+    protected function setUp(): void
+    {
+        $this->transferBuilderMock = $this->createMock(TransferBuilder::class);
+        $this->transferMock = $this->createMock(TransferInterface::class);
+        
+        $this->transferFactory = new TransferFactory($this->transferBuilderMock);
+    }
+
+    /**
+     * Test create method
+     */
+    public function testCreate(): void
+    {
+        // Prepare test data
+        $request = [
+            'nexi_method' => 'testMethod',
+            'body' => ['param1' => 'value1', 'param2' => 'value2']
+        ];
+
+        // Setup expectations for transfer builder
+        $this->transferBuilderMock->expects($this->once())
+            ->method('setBody')
+            ->with($request['body'])
+            ->willReturnSelf();
+        $this->transferBuilderMock->expects($this->once())
+            ->method('setUri')
+            ->with('testMethod')
+            ->willReturnSelf();
+        $this->transferBuilderMock->expects($this->once())
+            ->method('build')
+            ->willReturn($this->transferMock);
+
+        // Execute the method
+        $result = $this->transferFactory->create($request);
+        
+        // Verify the result
+        $this->assertSame($this->transferMock, $result);
+    }
+}
diff --git a/Test/Unit/Gateway/StringSanitizerTest.php b/Test/Unit/Gateway/StringSanitizerTest.php
new file mode 100644
index 00000000..3cd468cc
--- /dev/null
+++ b/Test/Unit/Gateway/StringSanitizerTest.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Nexi\Checkout\Test\Unit\Gateway;
+
+use Nexi\Checkout\Gateway\StringSanitizer;
+use PHPUnit\Framework\TestCase;
+
+class StringSanitizerTest extends TestCase
+{
+    /**
+     * @var StringSanitizer
+     */
+    private $stringSanitizer;
+
+    protected function setUp(): void
+    {
+        $this->stringSanitizer = new StringSanitizer();
+    }
+
+    /**
+     * Test sanitizing strings with special characters
+     *
+     * @dataProvider specialCharactersDataProvider
+     */
+    public function testSanitizeSpecialCharacters(string $input, string $expected): void
+    {
+        $result = $this->stringSanitizer->sanitize($input);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * Test truncating strings that exceed the maximum length
+     *
+     * @dataProvider lengthDataProvider
+     */
+    public function testSanitizeTruncatesLongStrings(string $input, int $maxLength, string $expected): void
+    {
+        $result = $this->stringSanitizer->sanitize($input, $maxLength);
+        $this->assertEquals($expected, $result);
+        $this->assertLessThanOrEqual($maxLength, strlen($result));
+    }
+
+    /**
+     * Test that strings shorter than the maximum length are not modified
+     */
+    public function testSanitizeDoesNotModifyShortStrings(): void
+    {
+        $input = 'This is a normal string with no special characters';
+        $result = $this->stringSanitizer->sanitize($input);
+        $this->assertEquals($input, $result);
+    }
+
+    /**
+     * Data provider for testSanitizeSpecialCharacters
+     *
+     * @return array
+     */
+    public function specialCharactersDataProvider(): array
+    {
+        return [
+            'angle brackets' => ['Test <tag>', 'Test -tag-'],
+            'quotes' => ['Test "quoted" and \'single\'', 'Test -quoted- and -single-'],
+            'ampersand' => ['Test & symbol', 'Test - symbol'],
+            'backslash' => ['Test \\ backslash', 'Test - backslash'],
+            'multiple special chars' => ['<Test & "string" with \'all\' special \\ chars>', '-Test - -string- with -all- special - chars-'],
+        ];
+    }
+
+    /**
+     * Data provider for testSanitizeTruncatesLongStrings
+     *
+     * @return array
+     */
+    public function lengthDataProvider(): array
+    {
+        return [
+            'default max length' => [
+                str_repeat('a', 150),
+                128,
+                str_repeat('a', 128)
+            ],
+            'custom max length' => [
+                str_repeat('b', 50),
+                30,
+                str_repeat('b', 30)
+            ],
+            'exact max length' => [
+                str_repeat('c', 20),
+                20,
+                str_repeat('c', 20)
+            ],
+            'shorter than max length' => [
+                str_repeat('d', 10),
+                20,
+                str_repeat('d', 10)
+            ],
+        ];
+    }
+}
diff --git a/Test/Unit/Model/Webhook/Data/WebhookDataLoaderTest.php b/Test/Unit/Model/Webhook/Data/WebhookDataLoaderTest.php
new file mode 100644
index 00000000..0a43850a
--- /dev/null
+++ b/Test/Unit/Model/Webhook/Data/WebhookDataLoaderTest.php
@@ -0,0 +1,241 @@
+<?php
+
+namespace Nexi\Checkout\Test\Unit\Model\Webhook\Data;
+
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Sales\Api\Data\TransactionInterface;
+use Magento\Sales\Api\Data\TransactionSearchResultInterface;
+use Magento\Sales\Api\TransactionRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use PHPUnit\Framework\TestCase;
+
+class WebhookDataLoaderTest extends TestCase
+{
+    /**
+     * @var SearchCriteriaBuilder|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $searchCriteriaBuilderMock;
+
+    /**
+     * @var TransactionRepositoryInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $transactionRepositoryMock;
+
+    /**
+     * @var WebhookDataLoader
+     */
+    private $webhookDataLoader;
+
+    protected function setUp(): void
+    {
+        $this->searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
+        $this->transactionRepositoryMock = $this->createMock(TransactionRepositoryInterface::class);
+
+        $this->webhookDataLoader = new WebhookDataLoader(
+            $this->searchCriteriaBuilderMock,
+            $this->transactionRepositoryMock
+        );
+    }
+
+    public function testGetTransactionByPaymentIdReturnsTransactionWhenFound(): void
+    {
+        $txnId = 'payment-123';
+        $txnType = TransactionInterface::TYPE_PAYMENT;
+
+        // Mock search criteria
+        $searchCriteriaMock = $this->createMock(SearchCriteria::class);
+        $searchResultMock = $this->createMock(TransactionSearchResultInterface::class);
+        $transactionMock = $this->createMock(TransactionInterface::class);
+
+        // Setup expectations for search criteria builder
+        $this->searchCriteriaBuilderMock->expects($this->exactly(2))
+            ->method('addFilter')
+            ->withConsecutive(
+                ['txn_id', $txnId, 'eq'],
+                ['txn_type', $txnType, 'eq']
+            )
+            ->willReturnSelf();
+        $this->searchCriteriaBuilderMock->expects($this->once())
+            ->method('create')
+            ->willReturn($searchCriteriaMock);
+
+        // Setup expectations for transaction repository
+        $this->transactionRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn($searchResultMock);
+        $searchResultMock->expects($this->once())
+            ->method('getItems')
+            ->willReturn([$transactionMock]);
+
+        // Execute the method
+        $result = $this->webhookDataLoader->getTransactionByPaymentId($txnId, $txnType);
+
+        // Assert result
+        $this->assertSame($transactionMock, $result);
+    }
+
+    public function testGetTransactionByPaymentIdReturnsNullWhenNotFound(): void
+    {
+        $txnId = 'payment-123';
+        $txnType = TransactionInterface::TYPE_PAYMENT;
+
+        // Mock search criteria
+        $searchCriteriaMock = $this->createMock(SearchCriteria::class);
+        $searchResultMock = $this->createMock(TransactionSearchResultInterface::class);
+
+        // Setup expectations for search criteria builder
+        $this->searchCriteriaBuilderMock->expects($this->exactly(2))
+            ->method('addFilter')
+            ->withConsecutive(
+                ['txn_id', $txnId, 'eq'],
+                ['txn_type', $txnType, 'eq']
+            )
+            ->willReturnSelf();
+        $this->searchCriteriaBuilderMock->expects($this->once())
+            ->method('create')
+            ->willReturn($searchCriteriaMock);
+
+        // Setup expectations for transaction repository
+        $this->transactionRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn($searchResultMock);
+        $searchResultMock->expects($this->once())
+            ->method('getItems')
+            ->willReturn([]);
+
+        // Execute the method
+        $result = $this->webhookDataLoader->getTransactionByPaymentId($txnId, $txnType);
+
+        // Assert result
+        $this->assertNull($result);
+    }
+
+    public function testGetTransactionByOrderIdReturnsTransactionWhenFound(): void
+    {
+        $orderId = 123;
+        $txnType = TransactionInterface::TYPE_PAYMENT;
+
+        // Mock search criteria
+        $searchCriteriaMock = $this->createMock(SearchCriteria::class);
+        $searchResultMock = $this->createMock(TransactionSearchResultInterface::class);
+        $transactionMock = $this->createMock(TransactionInterface::class);
+
+        // Setup expectations for search criteria builder
+        $this->searchCriteriaBuilderMock->expects($this->exactly(2))
+            ->method('addFilter')
+            ->withConsecutive(
+                ['order_id', $orderId, 'eq'],
+                ['txn_type', $txnType, 'eq']
+            )
+            ->willReturnSelf();
+        $this->searchCriteriaBuilderMock->expects($this->once())
+            ->method('create')
+            ->willReturn($searchCriteriaMock);
+
+        // Setup expectations for transaction repository
+        $this->transactionRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn($searchResultMock);
+        $searchResultMock->expects($this->once())
+            ->method('getItems')
+            ->willReturn([$transactionMock]);
+
+        // Execute the method
+        $result = $this->webhookDataLoader->getTransactionByOrderId($orderId, $txnType);
+
+        // Assert result
+        $this->assertSame($transactionMock, $result);
+    }
+
+    public function testGetTransactionByOrderIdThrowsExceptionWhenNotFound(): void
+    {
+        $orderId = 123;
+        $txnType = TransactionInterface::TYPE_PAYMENT;
+
+        // Mock search criteria
+        $searchCriteriaMock = $this->createMock(SearchCriteria::class);
+        $searchResultMock = $this->createMock(TransactionSearchResultInterface::class);
+
+        // Setup expectations for search criteria builder
+        $this->searchCriteriaBuilderMock->expects($this->exactly(2))
+            ->method('addFilter')
+            ->withConsecutive(
+                ['order_id', $orderId, 'eq'],
+                ['txn_type', $txnType, 'eq']
+            )
+            ->willReturnSelf();
+        $this->searchCriteriaBuilderMock->expects($this->once())
+            ->method('create')
+            ->willReturn($searchCriteriaMock);
+
+        // Setup expectations for transaction repository
+        $this->transactionRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn($searchResultMock);
+        $searchResultMock->expects($this->once())
+            ->method('getItems')
+            ->willReturn([]);
+
+        // Expect exception
+        $this->expectException(NotFoundException::class);
+        $this->expectExceptionMessage('Transaction not found for payment ID.');
+
+        // Execute the method
+        $this->webhookDataLoader->getTransactionByOrderId($orderId, $txnType);
+    }
+
+    public function testLoadOrderByPaymentId(): void
+    {
+        $paymentId = 'payment-123';
+
+        // Mock transaction and order
+        $transactionMock = $this->getMockBuilder(TransactionInterface::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['getOrder'])
+            ->getMockForAbstractClass();
+        $orderMock = $this->createMock(Order::class);
+
+        // Mock search criteria
+        $searchCriteriaMock = $this->createMock(SearchCriteria::class);
+        $searchResultMock = $this->createMock(TransactionSearchResultInterface::class);
+
+        // Setup expectations for search criteria builder
+        $this->searchCriteriaBuilderMock->expects($this->exactly(2))
+            ->method('addFilter')
+            ->withConsecutive(
+                ['txn_id', $paymentId, 'eq'],
+                ['txn_type', TransactionInterface::TYPE_PAYMENT, 'eq']
+            )
+            ->willReturnSelf();
+        $this->searchCriteriaBuilderMock->expects($this->once())
+            ->method('create')
+            ->willReturn($searchCriteriaMock);
+
+        // Setup expectations for transaction repository
+        $this->transactionRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn($searchResultMock);
+        $searchResultMock->expects($this->once())
+            ->method('getItems')
+            ->willReturn([$transactionMock]);
+
+        // Setup expectations for transaction
+        $transactionMock->expects($this->once())
+            ->method('getOrder')
+            ->willReturn($orderMock);
+
+        // Execute the method
+        $result = $this->webhookDataLoader->loadOrderByPaymentId($paymentId);
+
+        // Assert result
+        $this->assertSame($orderMock, $result);
+    }
+}
diff --git a/Test/Unit/Model/Webhook/PaymentCancelCreatedTest.php b/Test/Unit/Model/Webhook/PaymentCancelCreatedTest.php
new file mode 100644
index 00000000..8df36c26
--- /dev/null
+++ b/Test/Unit/Model/Webhook/PaymentCancelCreatedTest.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Nexi\Checkout\Test\Unit\Model\Webhook;
+
+use Magento\Sales\Model\Order;
+use Nexi\Checkout\Model\Order\Comment;
+use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use Nexi\Checkout\Model\Webhook\PaymentCancelCreated;
+use NexiCheckout\Model\Webhook\Data\CancelCreatedData;
+use NexiCheckout\Model\Webhook\WebhookInterface;
+use PHPUnit\Framework\TestCase;
+
+class PaymentCancelCreatedTest extends TestCase
+{
+    /**
+     * @var WebhookDataLoader|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookDataLoaderMock;
+
+    /**
+     * @var Comment|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var WebhookInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookMock;
+
+    /**
+     * @var CancelCreatedData|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $cancelCreatedDataMock;
+
+    /**
+     * @var PaymentCancelCreated
+     */
+    private $paymentCancelCreated;
+
+    protected function setUp(): void
+    {
+        $this->webhookDataLoaderMock = $this->createMock(WebhookDataLoader::class);
+        $this->commentMock = $this->createMock(Comment::class);
+        $this->webhookMock = $this->createMock(WebhookInterface::class);
+        $this->cancelCreatedDataMock = $this->createMock(CancelCreatedData::class);
+
+        $this->paymentCancelCreated = new PaymentCancelCreated(
+            $this->webhookDataLoaderMock,
+            $this->commentMock
+        );
+    }
+
+    public function testProcessWebhookSuccessfully(): void
+    {
+        $paymentId = 'payment-123';
+
+        // Mock webhook data
+        $this->cancelCreatedDataMock->expects($this->exactly(2))
+            ->method('getPaymentId')
+            ->willReturn($paymentId);
+
+        // Mock webhook
+        $this->webhookMock->expects($this->exactly(2))
+            ->method('getData')
+            ->willReturn($this->cancelCreatedDataMock);
+
+        // Mock order
+        $orderMock = $this->createMock(Order::class);
+
+        // Setup expectations
+        $this->webhookDataLoaderMock->expects($this->once())
+            ->method('loadOrderByPaymentId')
+            ->with($paymentId)
+            ->willReturn($orderMock);
+
+        $this->commentMock->expects($this->once())
+            ->method('saveComment')
+            ->with(
+                __('Webhook Received. Payment cancel created for payment ID: %1', $paymentId),
+                $orderMock
+            );
+
+        // Execute the method
+        $this->paymentCancelCreated->processWebhook($this->webhookMock);
+    }
+}
diff --git a/Test/Unit/Model/Webhook/PaymentCancelFailedTest.php b/Test/Unit/Model/Webhook/PaymentCancelFailedTest.php
new file mode 100644
index 00000000..7de0ebec
--- /dev/null
+++ b/Test/Unit/Model/Webhook/PaymentCancelFailedTest.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Nexi\Checkout\Test\Unit\Model\Webhook;
+
+use Magento\Sales\Model\Order;
+use Nexi\Checkout\Model\Order\Comment;
+use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use Nexi\Checkout\Model\Webhook\PaymentCancelFailed;
+use NexiCheckout\Model\Webhook\Data\CancelFailedData;
+use NexiCheckout\Model\Webhook\WebhookInterface;
+use PHPUnit\Framework\TestCase;
+
+class PaymentCancelFailedTest extends TestCase
+{
+    /**
+     * @var WebhookDataLoader|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookDataLoaderMock;
+
+    /**
+     * @var Comment|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var WebhookInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookMock;
+
+    /**
+     * @var CancelFailedData|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $cancelFailedDataMock;
+
+    /**
+     * @var PaymentCancelFailed
+     */
+    private $paymentCancelFailed;
+
+    protected function setUp(): void
+    {
+        $this->webhookDataLoaderMock = $this->createMock(WebhookDataLoader::class);
+        $this->commentMock = $this->createMock(Comment::class);
+        $this->webhookMock = $this->createMock(WebhookInterface::class);
+        $this->cancelFailedDataMock = $this->createMock(CancelFailedData::class);
+
+        $this->paymentCancelFailed = new PaymentCancelFailed(
+            $this->webhookDataLoaderMock,
+            $this->commentMock
+        );
+    }
+
+    public function testProcessWebhookSuccessfully(): void
+    {
+        $paymentId = 'payment-123';
+
+        // Mock webhook data
+        $this->cancelFailedDataMock->expects($this->exactly(2))
+            ->method('getPaymentId')
+            ->willReturn($paymentId);
+
+        // Mock webhook
+        $this->webhookMock->expects($this->exactly(2))
+            ->method('getData')
+            ->willReturn($this->cancelFailedDataMock);
+
+        // Mock order
+        $orderMock = $this->createMock(Order::class);
+
+        // Setup expectations
+        $this->webhookDataLoaderMock->expects($this->once())
+            ->method('loadOrderByPaymentId')
+            ->with($paymentId)
+            ->willReturn($orderMock);
+
+        $this->commentMock->expects($this->once())
+            ->method('saveComment')
+            ->with(
+                __('Webhook Received. Payment cancel failed for payment ID: %1', $paymentId),
+                $orderMock
+            );
+
+        // Execute the method
+        $this->paymentCancelFailed->processWebhook($this->webhookMock);
+    }
+}
diff --git a/Test/Unit/Model/Webhook/PaymentChargeCreatedTest.php b/Test/Unit/Model/Webhook/PaymentChargeCreatedTest.php
new file mode 100644
index 00000000..356ce683
--- /dev/null
+++ b/Test/Unit/Model/Webhook/PaymentChargeCreatedTest.php
@@ -0,0 +1,214 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Test\Unit\Model\Webhook;
+
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+use Magento\Sales\Api\Data\TransactionInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Invoice;
+use Nexi\Checkout\Gateway\AmountConverter;
+use Nexi\Checkout\Model\Order\Comment;
+use Nexi\Checkout\Model\Transaction\Builder;
+use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use Nexi\Checkout\Model\Webhook\PaymentChargeCreated;
+use Nexi\Checkout\Setup\Patch\Data\AddPaymentAuthorizedOrderStatus;
+use NexiCheckout\Model\Webhook\ChargeCreated;
+use NexiCheckout\Model\Webhook\Data\Amount;
+use NexiCheckout\Model\Webhook\Data\ChargeCreatedData;
+use NexiCheckout\Model\Webhook\EventNameEnum;
+use PHPUnit\Framework\TestCase;
+
+class PaymentChargeCreatedTest extends TestCase
+{
+    /**
+     * @var OrderRepositoryInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $orderRepositoryMock;
+
+    /**
+     * @var WebhookDataLoader|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookDataLoaderMock;
+
+    /**
+     * @var Builder|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $transactionBuilderMock;
+
+    /**
+     * @var Comment|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var PaymentChargeCreated
+     */
+    private $paymentChargeCreated;
+
+    /**
+     * @var AmountConverter|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $amountConverterMock;
+
+    /**
+     * @var ChargeCreated|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookMock;
+
+    /**
+     * @var ChargeCreatedData|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $chargeCreatedDataMock;
+
+    /**
+     * @var Amount|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $amountMock;
+
+    protected function setUp(): void
+    {
+        $this->orderRepositoryMock = $this->createMock(OrderRepositoryInterface::class);
+        $this->webhookDataLoaderMock = $this->createMock(WebhookDataLoader::class);
+        $this->transactionBuilderMock = $this->createMock(Builder::class);
+        $this->commentMock = $this->createMock(Comment::class);
+        $this->amountConverterMock = $this->createMock(AmountConverter::class);
+        $this->webhookMock = $this->createMock(ChargeCreated::class);
+        $this->chargeCreatedDataMock = $this->createMock(ChargeCreatedData::class);
+        $this->amountMock = $this->createMock(Amount::class);
+
+        $this->paymentChargeCreated = new PaymentChargeCreated(
+            $this->orderRepositoryMock,
+            $this->webhookDataLoaderMock,
+            $this->transactionBuilderMock,
+            $this->commentMock,
+            $this->amountConverterMock
+        );
+    }
+
+    public function testProcessWebhookWithFullCharge(): void
+    {
+        $paymentId = 'payment-123';
+        $chargeId = 'charge-123';
+        $amountValue = 10000; // 100.00 in cents
+        $currency = 'USD';
+
+        // Mock webhook data
+        $this->amountMock->expects($this->atLeastOnce())
+            ->method('getAmount')
+            ->willReturn($amountValue);
+        $this->amountMock->method('getCurrency')
+            ->willReturn($currency);
+
+        $this->chargeCreatedDataMock->expects($this->atLeastOnce())
+            ->method('getPaymentId')
+            ->willReturn($paymentId);
+        $this->chargeCreatedDataMock->expects($this->atLeastOnce())
+            ->method('getChargeId')
+            ->willReturn($chargeId);
+        $this->chargeCreatedDataMock->expects($this->atLeastOnce())
+            ->method('getAmount')
+            ->willReturn($this->amountMock);
+
+        // Mock webhook
+        $this->webhookMock->expects($this->atLeastOnce())
+            ->method('getData')
+            ->willReturn($this->chargeCreatedDataMock);
+
+        // Mock order and payment
+        $orderMock = $this->createMock(Order::class);
+        $paymentMock = $this->getMockBuilder(OrderPaymentInterface::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['addTransactionCommentsToOrder'])
+            ->getMockForAbstractClass();
+        $invoiceMock = $this->createMock(Invoice::class);
+
+        // Mock transactions
+        $reservationTransactionMock = $this->createMock(TransactionInterface::class);
+        $chargeTransactionMock = $this->createMock(TransactionInterface::class);
+
+        // Setup expectations for loadOrderByPaymentId
+        $this->webhookDataLoaderMock->expects($this->once())
+            ->method('loadOrderByPaymentId')
+            ->with($paymentId)
+            ->willReturn($orderMock);
+
+        // Setup expectations for saveComment
+        $this->commentMock->expects($this->once())
+            ->method('saveComment')
+            ->with(
+                __(
+                    'Webhook Received. Payment charge created for payment ID: %1<br/>Charge ID: %2<br/>Amount: %3 %4.',
+                    $paymentId,
+                    $chargeId,
+                    number_format($amountValue / 100, 2, '.', ''),
+                    $currency
+                ),
+                $orderMock
+            );
+
+        // Setup expectations for getTransactionByOrderId
+        $this->webhookDataLoaderMock->expects($this->once())
+            ->method('getTransactionByOrderId')
+            ->with($this->anything(), TransactionInterface::TYPE_AUTH)
+            ->willReturn($reservationTransactionMock);
+
+        // Setup expectations for getTransactionByPaymentId
+        $this->webhookDataLoaderMock->expects($this->once())
+            ->method('getTransactionByPaymentId')
+            ->with($chargeId, TransactionInterface::TYPE_CAPTURE)
+            ->willReturn(null);
+
+        // Setup expectations for transaction builder
+        $this->transactionBuilderMock->expects($this->once())
+            ->method('build')
+            ->with(
+                $chargeId,
+                $orderMock,
+                $this->anything(),
+                TransactionInterface::TYPE_CAPTURE
+            )
+            ->willReturn($chargeTransactionMock);
+
+        // Setup expectations for transaction
+        $reservationTransactionMock->expects($this->once())
+            ->method('getTransactionId')
+            ->willReturn('txn-123');
+        $reservationTransactionMock->expects($this->once())
+            ->method('getTxnId')
+            ->willReturn('txn-123');
+        $chargeTransactionMock->expects($this->once())
+            ->method('setParentId')
+            ->with('txn-123')
+            ->willReturnSelf();
+        $chargeTransactionMock->expects($this->once())
+            ->method('setParentTxnId')
+            ->with('txn-123')
+            ->willReturnSelf();
+
+        // Setup expectations for isFullCharge
+        $orderMock->expects($this->once())
+            ->method('getGrandTotal')
+            ->willReturn(100.00);
+
+        // Setup expectations for order state update
+        $orderMock->expects($this->once())
+            ->method('setState')
+            ->with(Order::STATE_PROCESSING)
+            ->willReturnSelf();
+        $orderMock->expects($this->once())
+            ->method('setStatus')
+            ->with(Order::STATE_PROCESSING)
+            ->willReturnSelf();
+
+        // Setup expectations for order save
+        $this->orderRepositoryMock->expects($this->once())
+            ->method('save')
+            ->with($orderMock);
+
+        // Execute the method
+        $this->paymentChargeCreated->processWebhook($this->webhookMock);
+    }
+}
diff --git a/Test/Unit/Model/Webhook/PaymentChargeFailedTest.php b/Test/Unit/Model/Webhook/PaymentChargeFailedTest.php
new file mode 100644
index 00000000..596c4f81
--- /dev/null
+++ b/Test/Unit/Model/Webhook/PaymentChargeFailedTest.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Nexi\Checkout\Test\Unit\Model\Webhook;
+
+use Magento\Sales\Model\Order;
+use Nexi\Checkout\Model\Order\Comment;
+use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use Nexi\Checkout\Model\Webhook\PaymentChargeFailed;
+use NexiCheckout\Model\Webhook\Data\ChargeFailedData;
+use NexiCheckout\Model\Webhook\WebhookInterface;
+use PHPUnit\Framework\TestCase;
+
+class PaymentChargeFailedTest extends TestCase
+{
+    /**
+     * @var WebhookDataLoader|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookDataLoaderMock;
+
+    /**
+     * @var Comment|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var WebhookInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookMock;
+
+    /**
+     * @var ChargeFailedData|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $chargeFailedDataMock;
+
+    /**
+     * @var PaymentChargeFailed
+     */
+    private $paymentChargeFailed;
+
+    protected function setUp(): void
+    {
+        $this->webhookDataLoaderMock = $this->createMock(WebhookDataLoader::class);
+        $this->commentMock = $this->createMock(Comment::class);
+        $this->webhookMock = $this->createMock(WebhookInterface::class);
+        $this->chargeFailedDataMock = $this->createMock(ChargeFailedData::class);
+
+        $this->paymentChargeFailed = new PaymentChargeFailed(
+            $this->webhookDataLoaderMock,
+            $this->commentMock
+        );
+    }
+
+    public function testProcessWebhookSuccessfully(): void
+    {
+        $paymentId = 'payment-123';
+
+        // Mock webhook data
+        $this->chargeFailedDataMock->expects($this->once())
+            ->method('getPaymentId')
+            ->willReturn($paymentId);
+
+        // Mock webhook
+        $this->webhookMock->expects($this->once())
+            ->method('getData')
+            ->willReturn($this->chargeFailedDataMock);
+
+        // Mock order
+        $orderMock = $this->createMock(Order::class);
+
+        // Setup expectations
+        $this->webhookDataLoaderMock->expects($this->once())
+            ->method('loadOrderByPaymentId')
+            ->with($paymentId)
+            ->willReturn($orderMock);
+
+        $this->commentMock->expects($this->once())
+            ->method('saveComment')
+            ->with(
+                __('Webhook Received. Payment charge failed for payment ID: %1', $paymentId),
+                $orderMock
+            );
+
+        // Execute the method
+        $this->paymentChargeFailed->processWebhook($this->webhookMock);
+    }
+}
diff --git a/Test/Unit/Model/Webhook/PaymentCreatedTest.php b/Test/Unit/Model/Webhook/PaymentCreatedTest.php
new file mode 100644
index 00000000..232e2aaf
--- /dev/null
+++ b/Test/Unit/Model/Webhook/PaymentCreatedTest.php
@@ -0,0 +1,489 @@
+<?php
+
+namespace Nexi\Checkout\Test\Unit\Model\Webhook;
+
+use Magento\Reports\Model\ResourceModel\Order\Collection as OrderCollection;
+use Magento\Reports\Model\ResourceModel\Order\CollectionFactory as OrderCollectionFactory;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+use Magento\Sales\Api\Data\TransactionInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Sales\Model\ResourceModel\Order\Payment\Collection as PaymentCollection;
+use Magento\Sales\Model\ResourceModel\Order\Payment\CollectionFactory as PaymentCollectionFactory;
+use Nexi\Checkout\Model\Order\Comment;
+use Nexi\Checkout\Model\Transaction\Builder;
+use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use Nexi\Checkout\Model\Webhook\PaymentCreated;
+use NexiCheckout\Model\Webhook\Data\Amount;
+use NexiCheckout\Model\Webhook\Data\Order as NexiOrder;
+use NexiCheckout\Model\Webhook\Data\PaymentCreatedData;
+use NexiCheckout\Model\Webhook\WebhookInterface;
+use PHPUnit\Framework\TestCase;
+
+class PaymentCreatedTest extends TestCase
+{
+    /**
+     * @var Builder|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $transactionBuilderMock;
+
+    /**
+     * @var OrderCollectionFactory|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $orderCollectionFactoryMock;
+
+    /**
+     * @var WebhookDataLoader|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookDataLoaderMock;
+
+    /**
+     * @var OrderRepositoryInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $orderRepositoryMock;
+
+    /**
+     * @var PaymentCollectionFactory|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $paymentCollectionFactoryMock;
+
+    /**
+     * @var Comment|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var WebhookInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookMock;
+
+    /**
+     * @var PaymentCreatedData|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $paymentCreatedDataMock;
+
+    /**
+     * @var NexiOrder|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $nexiOrderMock;
+
+    /**
+     * @var Amount|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $amountMock;
+
+    /**
+     * @var PaymentCreated
+     */
+    private $paymentCreated;
+
+    protected function setUp(): void
+    {
+        $this->transactionBuilderMock       = $this->createMock(Builder::class);
+        $this->orderCollectionFactoryMock   = $this->getMockForNonExistingClass(
+            'Magento\Reports\Model\ResourceModel\Order\CollectionFactory',
+            ['create']
+        );
+        $this->webhookDataLoaderMock        = $this->createMock(WebhookDataLoader::class);
+        $this->orderRepositoryMock          = $this->createMock(OrderRepositoryInterface::class);
+        $this->paymentCollectionFactoryMock = $this->getMockForNonExistingClass(
+            'Magento\Sales\Model\ResourceModel\Order\Payment\CollectionFactory',
+            ['create']
+        );
+        $this->commentMock                  = $this->createMock(Comment::class);
+        $this->webhookMock                  = $this->createMock(WebhookInterface::class);
+        $this->paymentCreatedDataMock       = $this->createMock(PaymentCreatedData::class);
+        $this->nexiOrderMock                = $this->createMock(NexiOrder::class);
+        $this->amountMock                   = $this->createMock(Amount::class);
+
+        $this->paymentCreated = new PaymentCreated(
+            $this->transactionBuilderMock,
+            $this->orderCollectionFactoryMock,
+            $this->webhookDataLoaderMock,
+            $this->orderRepositoryMock,
+            $this->paymentCollectionFactoryMock,
+            $this->commentMock
+        );
+    }
+
+    /**
+     * Create a mock for a non-existing class
+     *
+     * @param string $className The name of the class to mock
+     * @param array|null $methods The methods to mock (optional)
+     *
+     * @return \PHPUnit\Framework\MockObject\MockObject The mock object
+     */
+    private function getMockForNonExistingClass(string $className, array $methods = null)
+    {
+        $builder = $this->getMockBuilder($className)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning()
+            ->allowMockingUnknownTypes();
+
+        if ($methods !== null) {
+            $builder->setMethods($methods);
+        }
+
+        return $builder->getMock();
+    }
+
+    public function testProcessWebhookWithOrderReferenceAndExistingTransaction(): void
+    {
+        $paymentId      = 'payment-123';
+        $orderReference = '000000123';
+        $amountValue    = 10000;
+        $currency       = 'EUR';
+
+        // Mock amount
+        $this->amountMock->expects($this->any())
+            ->method('getAmount')
+            ->willReturn($amountValue);
+        $this->amountMock->expects($this->any())
+            ->method('getCurrency')
+            ->willReturn($currency);
+
+        // Mock order
+        $this->nexiOrderMock->expects($this->any())
+            ->method('getReference')
+            ->willReturn($orderReference);
+        $this->nexiOrderMock->expects($this->any())
+            ->method('getAmount')
+            ->willReturn($this->amountMock);
+        $this->nexiOrderMock->expects($this->any())
+            ->method('getOrderItems')
+            ->willReturn([]);
+
+        // Mock payment created data
+        $this->paymentCreatedDataMock->expects($this->any())
+            ->method('getPaymentId')
+            ->willReturn($paymentId);
+        $this->paymentCreatedDataMock->expects($this->any())
+            ->method('getOrder')
+            ->willReturn($this->nexiOrderMock);
+
+        // Mock webhook
+        $this->webhookMock->expects($this->any())
+            ->method('getData')
+            ->willReturn($this->paymentCreatedDataMock);
+
+        // Mock order and collection
+        $orderMock           = $this->createMock(Order::class);
+        $orderCollectionMock = $this->createMock(OrderCollection::class);
+
+        // Mock transaction
+        $transactionMock = $this->createMock(TransactionInterface::class);
+
+        // Setup expectations for getTransactionByPaymentId
+        $this->webhookDataLoaderMock->expects($this->once())
+            ->method('getTransactionByPaymentId')
+            ->with($paymentId)
+            ->willReturn($transactionMock);
+
+        // Setup expectations for order collection
+        $this->orderCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($orderCollectionMock);
+        $orderCollectionMock->expects($this->once())
+            ->method('addFieldToFilter')
+            ->with('increment_id', $orderReference)
+            ->willReturnSelf();
+        $orderCollectionMock->expects($this->once())
+            ->method('getFirstItem')
+            ->willReturn($orderMock);
+
+        // Execute the method
+        $this->paymentCreated->processWebhook($this->webhookMock);
+    }
+
+    public function testProcessWebhookWithoutOrderReferenceAndExistingTransaction(): void
+    {
+        $paymentId      = 'payment-123';
+        $amountValue    = 10000;
+        $currency       = 'EUR';
+
+        // Mock amount
+        $this->amountMock->expects($this->any())
+            ->method('getAmount')
+            ->willReturn($amountValue);
+        $this->amountMock->expects($this->any())
+            ->method('getCurrency')
+            ->willReturn($currency);
+
+        // Mock order
+        $this->nexiOrderMock->expects($this->any())
+            ->method('getReference')
+            ->willReturn(null);
+        $this->nexiOrderMock->expects($this->any())
+            ->method('getAmount')
+            ->willReturn($this->amountMock);
+        $this->nexiOrderMock->expects($this->any())
+            ->method('getOrderItems')
+            ->willReturn([]);
+
+        // Mock payment created data
+        $this->paymentCreatedDataMock->expects($this->any())
+            ->method('getPaymentId')
+            ->willReturn($paymentId);
+        $this->paymentCreatedDataMock->expects($this->any())
+            ->method('getOrder')
+            ->willReturn($this->nexiOrderMock);
+
+        // Mock webhook
+        $this->webhookMock->expects($this->any())
+            ->method('getData')
+            ->willReturn($this->paymentCreatedDataMock);
+
+        // Mock order, payment, and collections
+        $orderMock             = $this->createMock(Order::class);
+        $paymentMock           = $this->createMock(Payment::class);
+        $paymentCollectionMock = $this->createMock(PaymentCollection::class);
+        $orderCollectionMock   = $this->createMock(OrderCollection::class);
+
+        // Mock transaction
+        $transactionMock = $this->createMock(TransactionInterface::class);
+
+        // Setup expectations for getTransactionByPaymentId
+        $this->webhookDataLoaderMock->expects($this->once())
+            ->method('getTransactionByPaymentId')
+            ->with($paymentId)
+            ->willReturn($transactionMock);
+
+        // Setup expectations for payment collection
+        $this->paymentCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($paymentCollectionMock);
+        $paymentCollectionMock->expects($this->once())
+            ->method('addFieldToFilter')
+            ->with('last_trans_id', $paymentId)
+            ->willReturnSelf();
+        $paymentCollectionMock->expects($this->once())
+            ->method('getFirstItem')
+            ->willReturn($paymentMock);
+        $paymentMock->expects($this->once())
+            ->method('getParentId')
+            ->willReturn(1);
+
+        // Setup expectations for order collection
+        $this->orderCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($orderCollectionMock);
+        $orderCollectionMock->expects($this->once())
+            ->method('addFieldToFilter')
+            ->with('entity_id', 1)
+            ->willReturnSelf();
+        $orderCollectionMock->expects($this->once())
+            ->method('getFirstItem')
+            ->willReturn($orderMock);
+
+        $orderMock->method('getId')->willReturn(1);
+
+        // Execute the method
+        $this->paymentCreated->processWebhook($this->webhookMock);
+    }
+
+    public function testProcessWebhookWithOrderReferenceAndNoTransaction(): void
+    {
+        $paymentId      = 'payment-123';
+        $orderReference = '000000123';
+        $amountValue    = 10000;
+        $currency       = 'EUR';
+
+        // Mock amount
+        $this->amountMock->expects($this->any())
+            ->method('getAmount')
+            ->willReturn($amountValue);
+        $this->amountMock->expects($this->any())
+            ->method('getCurrency')
+            ->willReturn($currency);
+
+        // Mock order
+        $this->nexiOrderMock->expects($this->any())
+            ->method('getReference')
+            ->willReturn($orderReference);
+        $this->nexiOrderMock->expects($this->any())
+            ->method('getAmount')
+            ->willReturn($this->amountMock);
+        $this->nexiOrderMock->expects($this->any())
+            ->method('getOrderItems')
+            ->willReturn([]);
+
+        // Mock payment created data
+        $this->paymentCreatedDataMock->expects($this->any())
+            ->method('getPaymentId')
+            ->willReturn($paymentId);
+        $this->paymentCreatedDataMock->expects($this->any())
+            ->method('getOrder')
+            ->willReturn($this->nexiOrderMock);
+
+        // Mock webhook
+        $this->webhookMock->expects($this->any())
+            ->method('getData')
+            ->willReturn($this->paymentCreatedDataMock);
+
+        // Mock order, payment, and collections
+        $orderMock           = $this->createMock(Order::class);
+        $paymentMock         = $this->getMockBuilder(OrderPaymentInterface::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['addTransactionCommentsToOrder'])
+            ->getMockForAbstractClass();
+        $orderCollectionMock = $this->createMock(OrderCollection::class);
+
+        // Mock transaction
+        $transactionMock = $this->createMock(TransactionInterface::class);
+
+        // Setup expectations for getTransactionByPaymentId
+        $this->webhookDataLoaderMock->expects($this->once())
+            ->method('getTransactionByPaymentId')
+            ->with($paymentId)
+            ->willReturn(null);
+
+        // Setup expectations for order collection
+        $this->orderCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($orderCollectionMock);
+        $orderCollectionMock->expects($this->once())
+            ->method('addFieldToFilter')
+            ->with('increment_id', $orderReference)
+            ->willReturnSelf();
+        $orderCollectionMock->expects($this->once())
+            ->method('getFirstItem')
+            ->willReturn($orderMock);
+
+        // Setup expectations for saveComment
+        $this->commentMock->expects($this->once())
+            ->method('saveComment')
+            ->with(
+                __(
+                    'Webhook Received. Payment created for Payment ID: %1'
+                    . '<br />Amount: %2 %3.',
+                    $paymentId,
+                    number_format($amountValue / 100, 2, '.', ''),
+                    $currency
+                ),
+                $orderMock
+            );
+
+        // Setup expectations for order state
+        $orderMock->expects($this->once())
+            ->method('getState')
+            ->willReturn(Order::STATE_NEW);
+        $orderMock->expects($this->once())
+            ->method('setState')
+            ->with(Order::STATE_PENDING_PAYMENT)
+            ->willReturnSelf();
+        $orderMock->expects($this->once())
+            ->method('setStatus')
+            ->with(Order::STATE_PENDING_PAYMENT)
+            ->willReturnSelf();
+
+        // Setup expectations for transaction builder
+        $this->transactionBuilderMock->expects($this->once())
+            ->method('build')
+            ->with(
+                $paymentId,
+                $orderMock,
+                ['payment_id' => $paymentId],
+                TransactionInterface::TYPE_PAYMENT
+            )
+            ->willReturn($transactionMock);
+
+        // Setup expectations for order save
+        $this->orderRepositoryMock->expects($this->once())
+            ->method('save')
+            ->with($orderMock);
+
+        // Execute the method
+        $this->paymentCreated->processWebhook($this->webhookMock);
+    }
+
+    public function testProcessWebhookWithNoTransactionAndOrderNotInNewState(): void
+    {
+        $paymentId      = 'payment-123';
+        $orderReference = '000000123';
+        $amountValue    = 10000;
+        $currency       = 'EUR';
+
+        // Mock amount
+        $this->amountMock->expects($this->any())
+            ->method('getAmount')
+            ->willReturn($amountValue);
+        $this->amountMock->expects($this->any())
+            ->method('getCurrency')
+            ->willReturn($currency);
+
+        // Mock order
+        $this->nexiOrderMock->expects($this->any())
+            ->method('getReference')
+            ->willReturn($orderReference);
+        $this->nexiOrderMock->expects($this->any())
+            ->method('getAmount')
+            ->willReturn($this->amountMock);
+        $this->nexiOrderMock->expects($this->any())
+            ->method('getOrderItems')
+            ->willReturn([]);
+
+        // Mock payment created data
+        $this->paymentCreatedDataMock->expects($this->any())
+            ->method('getPaymentId')
+            ->willReturn($paymentId);
+        $this->paymentCreatedDataMock->expects($this->any())
+            ->method('getOrder')
+            ->willReturn($this->nexiOrderMock);
+
+        // Mock webhook
+        $this->webhookMock->expects($this->any())
+            ->method('getData')
+            ->willReturn($this->paymentCreatedDataMock);
+
+        // Mock order and collection
+        $orderMock           = $this->createMock(Order::class);
+        $orderCollectionMock = $this->createMock(OrderCollection::class);
+
+        // Setup expectations for getTransactionByPaymentId
+        $this->webhookDataLoaderMock->expects($this->once())
+            ->method('getTransactionByPaymentId')
+            ->with($paymentId)
+            ->willReturn(null);
+
+        // Setup expectations for order collection
+        $this->orderCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($orderCollectionMock);
+        $orderCollectionMock->expects($this->once())
+            ->method('addFieldToFilter')
+            ->with('increment_id', $orderReference)
+            ->willReturnSelf();
+        $orderCollectionMock->expects($this->once())
+            ->method('getFirstItem')
+            ->willReturn($orderMock);
+
+        // Setup expectations for saveComment
+        $this->commentMock->expects($this->once())
+            ->method('saveComment')
+            ->with(
+                __(
+                    'Webhook Received. Payment created for Payment ID: %1'
+                    . '<br />Amount: %2 %3.',
+                    $paymentId,
+                    number_format($amountValue / 100, 2, '.', ''),
+                    $currency
+                ),
+                $orderMock
+            );
+
+        // Setup expectations for order state
+        $orderMock->expects($this->once())
+            ->method('getState')
+            ->willReturn(Order::STATE_PROCESSING);
+
+        // No transaction should be created
+        $this->transactionBuilderMock->expects($this->never())
+            ->method('build');
+
+        // Execute the method
+        $this->paymentCreated->processWebhook($this->webhookMock);
+    }
+}
diff --git a/Test/Unit/Model/Webhook/PaymentRefundCompletedTest.php b/Test/Unit/Model/Webhook/PaymentRefundCompletedTest.php
new file mode 100644
index 00000000..6a61e217
--- /dev/null
+++ b/Test/Unit/Model/Webhook/PaymentRefundCompletedTest.php
@@ -0,0 +1,213 @@
+<?php
+
+namespace Nexi\Checkout\Test\Unit\Model\Webhook;
+
+use Magento\Sales\Api\CreditmemoManagementInterface;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+use Magento\Sales\Api\Data\TransactionInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Creditmemo;
+use Magento\Sales\Model\Order\CreditmemoFactory;
+use Nexi\Checkout\Gateway\AmountConverter;
+use Nexi\Checkout\Model\Order\Comment;
+use Nexi\Checkout\Model\Transaction\Builder;
+use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use Nexi\Checkout\Model\Webhook\PaymentRefundCompleted;
+use NexiCheckout\Model\Webhook\Data\Amount;
+use NexiCheckout\Model\Webhook\Data\RefundCompletedData;
+use NexiCheckout\Model\Webhook\RefundCompleted;
+use NexiCheckout\Model\Webhook\WebhookInterface;
+use PHPUnit\Framework\TestCase;
+
+class PaymentRefundCompletedTest extends TestCase
+{
+    /**
+     * @var WebhookDataLoader|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookDataLoaderMock;
+
+    /**
+     * @var Builder|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $transactionBuilderMock;
+
+    /**
+     * @var OrderRepositoryInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $orderRepositoryMock;
+
+    /**
+     * @var CreditmemoFactory|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $creditmemoFactoryMock;
+
+    /**
+     * @var CreditmemoManagementInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $creditmemoManagementMock;
+
+    /**
+     * @var AmountConverter|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $amountConverterMock;
+
+    /**
+     * @var Comment|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var WebhookInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookMock;
+
+    /**
+     * @var RefundCompletedData|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $refundCompletedDataMock;
+
+    /**
+     * @var Amount|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $amountMock;
+
+    /**
+     * @var PaymentRefundCompleted
+     */
+    private $paymentRefundCompleted;
+
+    protected function setUp(): void
+    {
+        $this->webhookDataLoaderMock    = $this->createMock(WebhookDataLoader::class);
+        $this->transactionBuilderMock   = $this->createMock(Builder::class);
+        $this->orderRepositoryMock      = $this->createMock(OrderRepositoryInterface::class);
+        $this->creditmemoFactoryMock    = $this->createMock(CreditmemoFactory::class);
+        $this->creditmemoManagementMock = $this->createMock(CreditmemoManagementInterface::class);
+        $this->amountConverterMock      = $this->createMock(AmountConverter::class);
+        $this->commentMock              = $this->createMock(Comment::class);
+        $this->webhookMock              = $this->createMock(RefundCompleted::class);
+        $this->refundCompletedDataMock  = $this->createMock(RefundCompletedData::class);
+        $this->amountMock               = $this->createMock(Amount::class);
+
+        $this->paymentRefundCompleted = new PaymentRefundCompleted(
+            $this->webhookDataLoaderMock,
+            $this->transactionBuilderMock,
+            $this->orderRepositoryMock,
+            $this->creditmemoFactoryMock,
+            $this->creditmemoManagementMock,
+            $this->amountConverterMock,
+            $this->commentMock
+        );
+    }
+
+    public function testProcessWebhookWithFullRefund(): void
+    {
+        $paymentId = 'payment-123';
+        $refundId  = 'refund-123';
+        $amountValue = 10000; // 100.00 in cents
+        $currency = 'USD';
+
+        // Mock amount
+        $this->amountMock->expects($this->any())
+            ->method('getAmount')
+            ->willReturn($amountValue);
+        $this->amountMock->expects($this->any())
+            ->method('getCurrency')
+            ->willReturn($currency);
+
+        // Mock refund completed data
+        $this->refundCompletedDataMock->expects($this->any())
+            ->method('getPaymentId')
+            ->willReturn($paymentId);
+        $this->refundCompletedDataMock->expects($this->any())
+            ->method('getRefundId')
+            ->willReturn($refundId);
+        $this->refundCompletedDataMock->expects($this->any())
+            ->method('getAmount')
+            ->willReturn($this->amountMock);
+
+        // Mock webhook
+        $this->webhookMock->expects($this->any())
+            ->method('getData')
+            ->willReturn($this->refundCompletedDataMock);
+
+        // Mock order and payment
+        $orderMock      = $this->createMock(Order::class);
+        $orderMock->method('canCreditmemo')->willReturn(true);
+        $paymentMock    = $this->getMockBuilder(OrderPaymentInterface::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['addTransactionCommentsToOrder', 'addTransaction'])
+            ->getMockForAbstractClass();
+        $creditmemoMock = $this->createMock(Creditmemo::class);
+
+        // Mock transaction
+        $refundTransactionMock = $this->createMock(TransactionInterface::class);
+
+        // Setup expectations for loadOrderByPaymentId
+        $this->webhookDataLoaderMock->expects($this->once())
+            ->method('loadOrderByPaymentId')
+            ->with($paymentId)
+            ->willReturn($orderMock);
+
+        // Setup expectations for transaction builder
+        $this->transactionBuilderMock->expects($this->once())
+            ->method('build')
+            ->with(
+                $refundId,
+                $orderMock,
+                ['payment_id' => $paymentId],
+                TransactionInterface::TYPE_REFUND
+            )
+            ->willReturn($refundTransactionMock);
+
+        // Setup expectations for transaction
+        $refundTransactionMock->expects($this->once())
+            ->method('setParentTxnId')
+            ->with($paymentId)
+            ->willReturnSelf();
+        $refundTransactionMock->expects($this->once())
+            ->method('setAdditionalInformation')
+            ->with('details', $this->anything())
+            ->willReturnSelf();
+
+        // Setup expectations for isFullRefund
+        $orderMock->expects($this->once())
+            ->method('getGrandTotal')
+            ->willReturn(100.00);
+        $this->amountConverterMock->expects($this->once())
+            ->method('convertToNexiAmount')
+            ->with(100.00)
+            ->willReturn(10000);
+
+        // Setup expectations for processFullRefund
+        $this->creditmemoFactoryMock->expects($this->once())
+            ->method('createByOrder')
+            ->with($orderMock)
+            ->willReturn($creditmemoMock);
+        $creditmemoMock->expects($this->once())
+            ->method('setTransactionId')
+            ->with($refundId)
+            ->willReturnSelf();
+        $this->creditmemoManagementMock->expects($this->once())
+            ->method('refund')
+            ->with($creditmemoMock);
+
+        // Setup expectations for payment
+        $orderMock->expects($this->atLeastOnce())
+            ->method('getPayment')
+            ->willReturn($paymentMock);
+
+        $orderMock->expects($this->atLeastOnce())
+            ->method('getTotalRefunded')
+            ->willReturn(0.00);
+
+        // Setup expectations for order save
+        $this->orderRepositoryMock->expects($this->once())
+            ->method('save')
+            ->with($orderMock);
+
+        // Execute the method
+        $this->paymentRefundCompleted->processWebhook($this->webhookMock);
+    }
+}
diff --git a/Test/Unit/Model/Webhook/PaymentRefundFailedTest.php b/Test/Unit/Model/Webhook/PaymentRefundFailedTest.php
new file mode 100644
index 00000000..e50e5154
--- /dev/null
+++ b/Test/Unit/Model/Webhook/PaymentRefundFailedTest.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Nexi\Checkout\Test\Unit\Model\Webhook;
+
+use Magento\Sales\Model\Order;
+use Nexi\Checkout\Model\Order\Comment;
+use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use Nexi\Checkout\Model\Webhook\PaymentRefundFailed;
+use NexiCheckout\Model\Webhook\Data\RefundFailedData;
+use NexiCheckout\Model\Webhook\RefundFailed;
+use NexiCheckout\Model\Webhook\WebhookInterface;
+use PHPUnit\Framework\TestCase;
+
+class PaymentRefundFailedTest extends TestCase
+{
+    /**
+     * @var WebhookDataLoader|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookDataLoaderMock;
+
+    /**
+     * @var Comment|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var WebhookInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookMock;
+
+    /**
+     * @var RefundFailedData|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $refundFailedDataMock;
+
+    /**
+     * @var PaymentRefundFailed
+     */
+    private $paymentRefundFailed;
+
+    protected function setUp(): void
+    {
+        $this->webhookDataLoaderMock = $this->createMock(WebhookDataLoader::class);
+        $this->commentMock = $this->createMock(Comment::class);
+        $this->webhookMock = $this->createMock(RefundFailed::class);
+        $this->refundFailedDataMock = $this->createMock(RefundFailedData::class);
+
+        $this->paymentRefundFailed = new PaymentRefundFailed(
+            $this->webhookDataLoaderMock,
+            $this->commentMock
+        );
+    }
+
+    public function testProcessWebhookSuccessfully(): void
+    {
+        $paymentId = 'payment-123';
+
+        // Mock webhook data
+        $this->refundFailedDataMock->expects($this->once())
+            ->method('getPaymentId')
+            ->willReturn($paymentId);
+
+        // Mock webhook
+        $this->webhookMock->expects($this->once())
+            ->method('getData')
+            ->willReturn($this->refundFailedDataMock);
+
+        // Mock order
+        $orderMock = $this->createMock(Order::class);
+
+        // Setup expectations
+        $this->webhookDataLoaderMock->expects($this->once())
+            ->method('loadOrderByPaymentId')
+            ->with($paymentId)
+            ->willReturn($orderMock);
+
+        $this->commentMock->expects($this->once())
+            ->method('saveComment')
+            ->with(
+                __('Webhook Received. Payment refund failed for payment ID: %1', $paymentId),
+                $orderMock
+            );
+
+        // Execute the method
+        $this->paymentRefundFailed->processWebhook($this->webhookMock);
+    }
+}
diff --git a/Test/Unit/Model/Webhook/PaymentReservationCreatedTest.php b/Test/Unit/Model/Webhook/PaymentReservationCreatedTest.php
new file mode 100644
index 00000000..fb6eae4f
--- /dev/null
+++ b/Test/Unit/Model/Webhook/PaymentReservationCreatedTest.php
@@ -0,0 +1,242 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Test\Unit\Model\Webhook;
+
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Sales\Api\Data\TransactionInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
+use Nexi\Checkout\Model\Order\Comment;
+use Nexi\Checkout\Model\SubscriptionManagement;
+use Nexi\Checkout\Model\Transaction\Builder;
+use Nexi\Checkout\Model\Webhook\Data\WebhookDataLoader;
+use Nexi\Checkout\Model\Webhook\PaymentReservationCreated;
+use Nexi\Checkout\Setup\Patch\Data\AddPaymentAuthorizedOrderStatus;
+use NexiCheckout\Model\Webhook\Data\Amount;
+use NexiCheckout\Model\Webhook\Data\ReservationCreatedData;
+use NexiCheckout\Model\Webhook\ReservationCreated;
+use NexiCheckout\Model\Webhook\WebhookInterface;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+class PaymentReservationCreatedTest extends TestCase
+{
+    /**
+     * @var OrderRepositoryInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $orderRepositoryMock;
+
+    /**
+     * @var WebhookDataLoader|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookDataLoaderMock;
+
+    /**
+     * @var Builder|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $transactionBuilderMock;
+
+    /**
+     * @var PaymentReservationCreated
+     */
+    private $paymentReservationCreated;
+
+    /**
+     * @var Comment|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $commentMock;
+
+    /**
+     * @var SubscriptionManagement|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $subscriptionManagement;
+
+    /**
+     * @var WebhookInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $webhookMock;
+
+    /**
+     * @var ReservationCreatedData|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $reservationCreatedDataMock;
+
+    /**
+     * @var Amount|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $amountMock;
+
+    /**
+     * @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $loggerMock;
+
+    protected function setUp(): void
+    {
+        $this->orderRepositoryMock = $this->createMock(OrderRepositoryInterface::class);
+        $this->webhookDataLoaderMock = $this->createMock(WebhookDataLoader::class);
+        $this->transactionBuilderMock = $this->createMock(Builder::class);
+        $this->commentMock = $this->createMock(Comment::class);
+        $this->subscriptionManagement = $this->createMock(SubscriptionManagement::class);
+        $this->webhookMock = $this->createMock(ReservationCreated::class);
+        $this->reservationCreatedDataMock = $this->createMock(ReservationCreatedData::class);
+        $this->amountMock = $this->createMock(Amount::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+
+        $this->paymentReservationCreated = new PaymentReservationCreated(
+            $this->orderRepositoryMock,
+            $this->webhookDataLoaderMock,
+            $this->transactionBuilderMock,
+            $this->commentMock,
+            $this->subscriptionManagement,
+            $this->loggerMock
+        );
+    }
+
+    public function testProcessWebhookSuccessfully(): void
+    {
+        $webhookId = 'webhook-123';
+        $paymentId = 'payment-123';
+        $rawAmount = 1300;
+        $formattedAmount = 13.00;
+        $currency = 'EUR';
+
+        // Mock amount
+        $this->amountMock->expects($this->any())
+            ->method('getAmount')
+            ->willReturn($rawAmount);
+        $this->amountMock->expects($this->any())
+            ->method('getCurrency')
+            ->willReturn($currency);
+
+        // Mock reservation created data
+        $this->reservationCreatedDataMock->expects($this->any())
+            ->method('getPaymentId')
+            ->willReturn($paymentId);
+        $this->reservationCreatedDataMock->expects($this->any())
+            ->method('getAmount')
+            ->willReturn($this->amountMock);
+        $this->reservationCreatedDataMock->expects($this->any())
+            ->method('getPaymentMethod')
+            ->willReturn('card');
+        $this->reservationCreatedDataMock->expects($this->any())
+            ->method('getPaymentType')
+            ->willReturn('VISA');
+
+        // Mock webhook
+        $this->webhookMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($webhookId);
+        $this->webhookMock->expects($this->any())
+            ->method('getData')
+            ->willReturn($this->reservationCreatedDataMock);
+
+        // Mock order and payment
+        $orderMock = $this->createMock(Order::class);
+        $paymentMock = $this->createMock(Payment::class);
+
+        // Mock reservation transaction
+        $reservationTransactionMock =  $this->getMockBuilder(TransactionInterface::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['getOrder'])
+            ->getMockForAbstractClass();
+
+        // Setup expectations
+        $this->webhookDataLoaderMock
+            ->method('getTransactionByPaymentId')
+            ->willReturnMap([
+                [$webhookId, TransactionInterface::TYPE_AUTH, null],
+                [$paymentId, TransactionInterface::TYPE_PAYMENT, $reservationTransactionMock]
+            ]);
+
+        $reservationTransactionMock->expects($this->once())
+            ->method('getOrder')
+            ->willReturn($orderMock);
+
+        $orderMock->expects($this->once())
+            ->method('setState')
+            ->with(Order::STATE_PENDING_PAYMENT)
+            ->willReturnSelf();
+
+        $orderMock->expects($this->once())
+            ->method('setStatus')
+            ->with(AddPaymentAuthorizedOrderStatus::STATUS_NEXI_AUTHORIZED)
+            ->willReturnSelf();
+
+        $this->transactionBuilderMock->expects($this->once())
+            ->method('build')
+            ->with(
+                $webhookId,
+                $orderMock,
+                ['payment_id' => $paymentId],
+                TransactionInterface::TYPE_AUTH
+            )
+            ->willReturn($reservationTransactionMock);
+
+        $reservationTransactionMock->expects($this->once())
+            ->method('setIsClosed')
+            ->with(0)
+            ->willReturnSelf();
+
+        $reservationTransactionMock->expects($this->once())
+            ->method('setParentTxnId')
+            ->with($paymentId)
+            ->willReturnSelf();
+
+        $reservationTransactionMock->expects($this->once())
+            ->method('setParentId')
+            ->willReturnSelf();
+
+        $orderMock->method('getPayment')
+            ->willReturn($paymentMock);
+
+        $paymentMock->expects($this->once())
+            ->method('formatAmount')
+            ->with($rawAmount / 100, true)
+            ->willReturn($formattedAmount);
+
+        $paymentMock->expects($this->once())
+            ->method('setBaseAmountAuthorized')
+            ->with($formattedAmount)
+            ->willReturnSelf();
+
+        $this->orderRepositoryMock->expects($this->once())
+            ->method('save')
+            ->with($orderMock);
+
+        // Execute the method
+        $this->paymentReservationCreated->processWebhook($this->webhookMock);
+    }
+
+    public function testProcessWebhookThrowsExceptionWhenTransactionNotFound(): void
+    {
+        $webhookId = 'webhook-123';
+        $paymentId = 'payment-123';
+
+        // Mock reservation created data
+        $this->reservationCreatedDataMock->expects($this->any())
+            ->method('getPaymentId')
+            ->willReturn($paymentId);
+
+        // Mock webhook
+        $this->webhookMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($webhookId);
+        $this->webhookMock->expects($this->any())
+            ->method('getData')
+            ->willReturn($this->reservationCreatedDataMock);
+
+        $this->webhookDataLoaderMock
+            ->method('getTransactionByPaymentId')
+            ->with($paymentId, TransactionInterface::TYPE_PAYMENT)
+            ->willReturn(null);
+
+        $this->expectException(NotFoundException::class);
+        $this->expectExceptionMessage('Payment transaction not found for payment-123.');
+
+        // Execute the method
+        $this->paymentReservationCreated->processWebhook($this->webhookMock);
+    }
+}
diff --git a/Test/Unit/TransactionBuilderTest.php b/Test/Unit/TransactionBuilderTest.php
new file mode 100644
index 00000000..6606d63d
--- /dev/null
+++ b/Test/Unit/TransactionBuilderTest.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Nexi\Checkout\Test\Unit\Model\Transaction;
+
+use Magento\Sales\Api\Data\TransactionInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface;
+use Nexi\Checkout\Gateway\Config\Config;
+use Nexi\Checkout\Model\Transaction\Builder;
+use PHPUnit\Framework\TestCase;
+
+class TransactionBuilderTest extends TestCase
+{
+    private $transactionBuilderMock;
+    private $configMock;
+    private $builder;
+
+    protected function setUp(): void
+    {
+        $this->transactionBuilderMock = $this->createMock(BuilderInterface::class);
+        $this->configMock = $this->createMock(Config::class);
+        $this->builder = new Builder($this->transactionBuilderMock, $this->configMock);
+    }
+
+    public function testBuildTransactionSuccessfully()
+    {
+        $transactionId = '12345';
+        $order = $this->createMock(Order::class);
+        $transactionData = ['key' => 'value'];
+        $action = 'capture';
+
+        $order->method('getPayment')->willReturn($this->createMock(Order\Payment::class));
+        $this->transactionBuilderMock->method('setOrder')->willReturnSelf();
+        $this->transactionBuilderMock->method('setPayment')->willReturnSelf();
+        $this->transactionBuilderMock->method('setTransactionId')->willReturnSelf();
+        $this->transactionBuilderMock->method('setAdditionalInformation')->willReturnSelf();
+        $this->transactionBuilderMock->method('setFailSafe')->willReturnSelf();
+        $this->transactionBuilderMock->method('setMessage')->willReturnSelf();
+        $this->transactionBuilderMock->method('build')->willReturn($this->createMock(TransactionInterface::class));
+
+        $result = $this->builder->build($transactionId, $order, $transactionData, $action);
+
+        $this->assertInstanceOf(TransactionInterface::class, $result);
+    }
+
+    public function testBuildTransactionWithNullAction()
+    {
+        $transactionId = '12345';
+        $order = $this->createMock(Order::class);
+        $transactionData = ['key' => 'value'];
+        $action = null;
+
+        $order->method('getPayment')->willReturn($this->createMock(Order\Payment::class));
+        $this->transactionBuilderMock->method('setOrder')->willReturnSelf();
+        $this->transactionBuilderMock->method('setPayment')->willReturnSelf();
+        $this->transactionBuilderMock->method('setTransactionId')->willReturnSelf();
+        $this->transactionBuilderMock->method('setAdditionalInformation')->willReturnSelf();
+        $this->transactionBuilderMock->method('setFailSafe')->willReturnSelf();
+        $this->transactionBuilderMock->method('setMessage')->willReturnSelf();
+        $this->transactionBuilderMock->method('build')->willReturn($this->createMock(TransactionInterface::class));
+
+        $this->configMock->method('getPaymentAction')->willReturn('authorize');
+
+        $result = $this->builder->build($transactionId, $order, $transactionData, $action);
+
+        $this->assertInstanceOf(TransactionInterface::class, $result);
+    }
+
+    public function testBuildTransactionWithNullTransactionData()
+    {
+        $transactionId = '12345';
+        $order = $this->createMock(Order::class);
+        $transactionData = null;
+        $action = 'capture';
+
+        $order->method('getPayment')->willReturn($this->createMock(Order\Payment::class));
+        $this->transactionBuilderMock->method('setOrder')->willReturnSelf();
+        $this->transactionBuilderMock->method('setPayment')->willReturnSelf();
+        $this->transactionBuilderMock->method('setTransactionId')->willReturnSelf();
+        $this->transactionBuilderMock->method('setAdditionalInformation')->willReturnSelf();
+        $this->transactionBuilderMock->method('setFailSafe')->willReturnSelf();
+        $this->transactionBuilderMock->method('setMessage')->willReturnSelf();
+        $this->transactionBuilderMock->method('build')->willReturn($this->createMock(TransactionInterface::class));
+
+        $result = $this->builder->build($transactionId, $order, $transactionData, $action);
+
+        $this->assertInstanceOf(TransactionInterface::class, $result);
+    }
+}
diff --git a/Ui/Component/Listing/Column/SubscriptionAction.php b/Ui/Component/Listing/Column/SubscriptionAction.php
new file mode 100644
index 00000000..c44ef0fe
--- /dev/null
+++ b/Ui/Component/Listing/Column/SubscriptionAction.php
@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Ui\Component\Listing\Column;
+
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\Listing\Columns\Column;
+
+class SubscriptionAction extends Column
+{
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * Constructor
+     *
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param UrlInterface $urlBuilder
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        UrlInterface $urlBuilder,
+        array $components = [],
+        array $data = []
+    ) {
+        $this->urlBuilder = $urlBuilder;
+        parent::__construct($context, $uiComponentFactory, $components, $data);
+    }
+
+    /**
+     * Prepare Theme Data Source
+     *
+     * @param array $dataSource
+     * @return array
+     */
+    public function prepareDataSource(array $dataSource) : array
+    {
+        if (isset($dataSource['data']['items'])) {
+            foreach ($dataSource['data']['items'] as & $item) {
+                $indexField = $this->getData('config/indexField') ?: 'entity_id';
+                if (isset($item[$indexField])) {
+                    $viewUrlPath = $this->getData('config/viewUrlPath') ?: '#';
+                    $urlEntityParamName = $this->getData('config/urlEntityParamName') ?: 'id';
+                    $item[$this->getData('name')] = [
+                        'view' => [
+                            'href' => $this->urlBuilder->getUrl(
+                                $viewUrlPath,
+                                [
+                                    $urlEntityParamName => $item[$indexField]
+                                ]
+                            ),
+                            'label' => __('View'),
+                        ]
+                    ];
+                    $item[$this->getData('name')]['view_order'] = [
+                        'href' => $this->urlBuilder->getUrl(
+                            'sales/order/view',
+                            [
+                                'order_id' => $item['last_order_id']
+                            ]
+                        ),
+                        'label' => __('View last Order'),
+                    ];
+                }
+            }
+        }
+
+        return $dataSource;
+    }
+}
diff --git a/Ui/DataProvider/SubscriptionDataProvider.php b/Ui/DataProvider/SubscriptionDataProvider.php
new file mode 100644
index 00000000..0e9bd1ce
--- /dev/null
+++ b/Ui/DataProvider/SubscriptionDataProvider.php
@@ -0,0 +1,92 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Ui\DataProvider;
+
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Magento\Ui\DataProvider\AbstractDataProvider;
+use Nexi\Checkout\Model\ResourceModel\Subscription\Collection;
+use Nexi\Checkout\Model\ResourceModel\Subscription\CollectionFactory;
+
+class SubscriptionDataProvider extends AbstractDataProvider
+{
+    /** @var CollectionFactory */
+    private $collectionFactory;
+
+    /**
+     * @param string $name
+     * @param string $primaryFieldName
+     * @param string $requestFieldName
+     * @param CollectionFactory $collectionFactory
+     * @param array $meta
+     * @param array $data
+     */
+    public function __construct(
+        string $name,
+        string $primaryFieldName,
+        string $requestFieldName,
+        CollectionFactory $collectionFactory,
+        array $meta = [],
+        array $data = []
+    ) {
+        parent::__construct(
+            $name,
+            $primaryFieldName,
+            $requestFieldName,
+            $meta,
+            $data
+        );
+
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * @return array
+     */
+    public function getData()
+    {
+        $collection = $this->getCollection();
+
+        return $collection->toArray();
+    }
+
+    /**
+     * @param Filter $filter
+     * @return mixed|void
+     */
+    public function addFilter(Filter $filter)
+    {
+        if ($filter->getField() == 'entity_id') {
+            $filter->setField('main_table.entity_id');
+        }
+
+        parent::addFilter($filter);
+    }
+
+    /**
+     * @return AbstractCollection|Collection
+     */
+    public function getCollection()
+    {
+        if (!$this->collection) {
+            $this->collection = $this->collectionFactory->create();
+            $this->collection->getSelect()
+                ->join(
+                    ['cu' => 'customer_entity'],
+                    'main_table.customer_id = cu.entity_id',
+                    ['cu.email']
+                )->join(
+                    ['sublink' => 'nexi_subscription_link'],
+                    'main_table.entity_id = sublink.subscription_id',
+                    ['last_order_id' => 'MAX(sublink.order_id)']
+                )->join(
+                    ['profile' => 'recurring_payment_profiles'],
+                    'main_table.recurring_profile_id = profile.profile_id',
+                    ['profile_name' => 'profile.name']
+                )->group('main_table.entity_id');
+        }
+
+        return $this->collection;
+    }
+}
diff --git a/Ui/DataProvider/SubscriptionForm.php b/Ui/DataProvider/SubscriptionForm.php
new file mode 100644
index 00000000..bca17576
--- /dev/null
+++ b/Ui/DataProvider/SubscriptionForm.php
@@ -0,0 +1,140 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Ui\DataProvider;
+
+use Magento\Backend\Model\Url;
+use Magento\Framework\Api\Filter;
+use Magento\Ui\DataProvider\AbstractDataProvider;
+use Nexi\Checkout\Model\ResourceModel\Subscription\Collection;
+use Nexi\Checkout\Model\ResourceModel\Subscription\CollectionFactory;
+use Nexi\Checkout\Model\Subscription;
+
+class SubscriptionForm extends AbstractDataProvider
+{
+    /**
+     * @var array
+     */
+    private $loadedData;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var Url
+     */
+    private $url;
+
+    /**
+     * @param string $name
+     * @param string $primaryFieldName
+     * @param string $requestFieldName
+     * @param CollectionFactory $collectionFactory
+     * @param Url $url
+     * @param array $meta
+     * @param array $data
+     */
+    public function __construct(
+        string $name,
+        string $primaryFieldName,
+        string $requestFieldName,
+        CollectionFactory $collectionFactory,
+        Url $url,
+        array $meta = [],
+        array $data = []
+    ) {
+        parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
+        $this->collectionFactory = $collectionFactory;
+        $this->url = $url;
+    }
+
+    /**
+     * @return array
+     */
+    public function getData()
+    {
+        if (isset($this->loadedData)) {
+            return $this->loadedData;
+        }
+
+        $this->loadedData = [];
+        foreach ($this->getCollection() as $subscription) {
+            $this->prepareLinks($subscription);
+            $this->loadedData[$subscription->getId()] = $subscription->getData();
+        }
+
+        return $this->loadedData;
+    }
+
+    /**
+     * @param Filter $filter
+     * @return mixed|void
+     */
+    public function addFilter(Filter $filter)
+    {
+        if ($filter->getField() == 'entity_id') {
+            $filter->setField('main_table.entity_id');
+        }
+
+        parent::addFilter($filter); // TODO: Change the autogenerated stub
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getCollection()
+    {
+        if (!$this->collection) {
+            $this->collection = $this->collectionFactory->create();
+            $this->joinProfilesToCollection();
+        }
+
+        return $this->collection;
+    }
+
+    /**
+     * @param Subscription $subscription
+     */
+    private function prepareLinks($subscription)
+    {
+        $subscription->setData(
+            'profile_link',
+            $this->createLinkData(
+                'subscriptions/profile/edit',
+                ['id' => $subscription->getRecurringProfileId()],
+                $subscription->getProfileName()
+            )
+        );
+    }
+
+    /**
+     * @return void
+     */
+    private function joinProfilesToCollection()
+    {
+        $this->collection->join(
+            ['rpp' => 'recurring_payment_profiles'],
+            'main_table.recurring_profile_id = rpp.profile_id',
+            ['profile_name' => 'name']
+        );
+    }
+
+    /**
+     * @param string $path
+     * @param array $params
+     * @param string $linkText
+     * @return array
+     */
+    private function createLinkData(string $path, array $params, string $linkText)
+    {
+        return [
+            'link_text' => $linkText,
+            'link' => $this->url->getUrl(
+                $path,
+                $params
+            )
+        ];
+    }
+}
diff --git a/Ui/DataProvider/SubscriptionProfile.php b/Ui/DataProvider/SubscriptionProfile.php
new file mode 100644
index 00000000..5ef8f602
--- /dev/null
+++ b/Ui/DataProvider/SubscriptionProfile.php
@@ -0,0 +1,59 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Ui\DataProvider;
+
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Magento\Ui\DataProvider\AbstractDataProvider;
+use Nexi\Checkout\Model\ResourceModel\Subscription\Profile\Collection;
+use Nexi\Checkout\Model\ResourceModel\Subscription\Profile\CollectionFactory;
+
+class SubscriptionProfile extends AbstractDataProvider
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param string $name
+     * @param string $primaryFieldName
+     * @param string $requestFieldName
+     * @param CollectionFactory $collectionFactory
+     * @param array $meta
+     * @param array $data
+     */
+    public function __construct(
+        string $name,
+        string $primaryFieldName,
+        string $requestFieldName,
+        CollectionFactory $collectionFactory,
+        array $meta = [],
+        array $data = []
+    ) {
+        parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * @return array
+     */
+    public function getData()
+    {
+        $collection = $this->getCollection();
+
+        return $collection->toArray();
+    }
+
+    /**
+     * @return AbstractCollection|Collection
+     */
+    public function getCollection()
+    {
+        if (!$this->collection) {
+            $this->collection = $this->collectionFactory->create();
+        }
+
+        return $this->collection;
+    }
+}
diff --git a/Ui/DataProvider/SubscriptionProfileForm.php b/Ui/DataProvider/SubscriptionProfileForm.php
new file mode 100644
index 00000000..3405a134
--- /dev/null
+++ b/Ui/DataProvider/SubscriptionProfileForm.php
@@ -0,0 +1,104 @@
+<?php
+declare(strict_types=1);
+
+namespace Nexi\Checkout\Ui\DataProvider;
+
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Ui\DataProvider\AbstractDataProvider;
+use Nexi\Checkout\Model\ResourceModel\Subscription\Profile\Collection;
+use Nexi\Checkout\Model\ResourceModel\Subscription\Profile\CollectionFactory;
+
+class SubscriptionProfileForm extends AbstractDataProvider
+{
+    /** @var array */
+    private $loadedData;
+
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var array|bool|float|int|string|null
+     */
+    private $schedule;
+
+    /**
+     * @param string $name
+     * @param string $primaryFieldName
+     * @param string $requestFieldName
+     * @param CollectionFactory $collectionFactory
+     * @param SerializerInterface $serializer
+     * @param array $meta
+     * @param array $data
+     */
+    public function __construct(
+        string $name,
+        string $primaryFieldName,
+        string $requestFieldName,
+        CollectionFactory $collectionFactory,
+        SerializerInterface $serializer,
+        array $meta = [],
+        array $data = []
+    ) {
+        parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
+        $this->collectionFactory = $collectionFactory;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * @return array
+     */
+    public function getData()
+    {
+        if (isset($this->loadedData)) {
+            return $this->loadedData;
+        }
+
+        $this->loadedData = [];
+        foreach ($this->getCollection() as $recurringProfile) {
+            $recurringProfile->setData('interval_period', $this->parseSchedule('interval', $recurringProfile));
+            $recurringProfile->setData('interval_unit', $this->parseSchedule('unit', $recurringProfile));
+            $this->loadedData[$recurringProfile->getId()] = $recurringProfile->getData();
+        }
+
+        return $this->loadedData;
+    }
+
+    /**
+     * @return AbstractCollection|Collection
+     */
+    public function getCollection()
+    {
+        if (!$this->collection) {
+            $this->collection = $this->collectionFactory->create();
+        }
+
+        return $this->collection;
+    }
+
+    /**
+     * @param string $value
+     * @param $recurringProfile
+     * @return mixed|string|null
+     */
+    private function parseSchedule(string $value, $recurringProfile)
+    {
+        if (!$this->schedule) {
+            try {
+                $this->schedule = $this->serializer->unserialize($recurringProfile->getSchedule());
+            } catch (\InvalidArgumentException $e) {
+                $this->schedule = [];
+            }
+        }
+
+        return $this->schedule[$value] ?? null;
+    }
+}
diff --git a/composer.json b/composer.json
index 1af20453..eaddb542 100644
--- a/composer.json
+++ b/composer.json
@@ -3,10 +3,11 @@
     "description": "Nets Easy Checkout",
     "require": {
         "php": "^8.0",
-        "nexi-checkout/php-payment-sdk": "^0.4.1",
+        "nexi-checkout/php-payment-sdk": "^0.8.1",
         "magento/framework": ">=102.0.0",
         "ext-curl": "*",
-        "giggsey/libphonenumber-for-php-lite": "^9.0.5"
+        "giggsey/libphonenumber-for-php-lite": "^9.0.5",
+        "nesbot/carbon": "^2.57.0 || ^3.0"
     },
     "require-dev": {
         "magento/magento-coding-standard": "*",
diff --git a/etc/acl.xml b/etc/acl.xml
new file mode 100644
index 00000000..8a5e4743
--- /dev/null
+++ b/etc/acl.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Sales::sales">
+                    <resource id="Nexi_Checkout::recurring_payment"
+                              title="Nexi: Recurring Payment" translate="title"/>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
new file mode 100644
index 00000000..2a06a788
--- /dev/null
+++ b/etc/adminhtml/di.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Sales\Model\ResourceModel\Order\Grid\Collection">
+        <plugin name="RecurringToOrderGrid" type="Nexi\Checkout\Plugin\RecurringToOrderGrid" />
+    </type>
+
+    <!-- hide subscription_schedule attribute on product edit page for disable Recurring Payment configuration -->
+    <virtualType name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Pool">
+        <arguments>
+            <argument name="modifiers" xsi:type="array">
+                <item name="recurringPaymentSchedule" xsi:type="array">
+                    <item name="class" xsi:type="string">Nexi\Checkout\Model\Ui\DataProvider\Product\Form\Modifier\Attributes</item>
+                    <item name="sortOrder" xsi:type="number">1000</item>
+                </item>
+            </argument>
+        </arguments>
+    </virtualType>
+
+    <type name="Magento\Sales\Model\ResourceModel\Order\Grid\Collection">
+        <plugin name="RecurringToOrderGrid" type="Nexi\Checkout\Plugin\RecurringToOrderGrid" />
+    </type>
+</config>
diff --git a/etc/adminhtml/menu.xml b/etc/adminhtml/menu.xml
new file mode 100644
index 00000000..4d1d23b8
--- /dev/null
+++ b/etc/adminhtml/menu.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
+    <menu>
+        <add id="Nexi_Checkout::subscriptions_section"
+             title="Subscriptions"
+             translate="title"
+             module="Nexi_Checkout"
+             parent="Magento_Sales::sales"
+             sortOrder="250"
+             dependsOnModule="Nexi_Checkout"
+             resource="Nexi_Checkout::subscriptions"
+             dependsOnConfig="nexi/subscriptions/active_subscriptions"
+        />
+        <add id="Nexi_Checkout::subscriptions"
+             title="Subscriptions"
+             translate="title"
+             module="Nexi_Checkout"
+             parent="Nexi_Checkout::subscriptions_section"
+             sortOrder="251"
+             dependsOnModule="Nexi_Checkout"
+             action="subscriptions/subscription"
+             resource="Nexi_Checkout::subscriptions"
+        />
+        <add id="Nexi_Checkout::subscription_profile"
+             title="Profiles"
+             translate="title"
+             module="Nexi_Checkout"
+             parent="Nexi_Checkout::subscriptions_section"
+             sortOrder="252"
+             dependsOnModule="Nexi_Checkout"
+             action="subscriptions/profile"
+             resource="Nexi_Checkout::subscriptions"
+        />
+    </menu>
+</config>
diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml
index 7d76a081..cef2cb5d 100644
--- a/etc/adminhtml/routes.xml
+++ b/etc/adminhtml/routes.xml
@@ -10,5 +10,8 @@
         <route id="nexi" frontName="nexi">
             <module name="Nexi_Checkout" />
         </route>
+        <route id="subscriptions" frontName="subscriptions">
+            <module name="Nexi_Checkout" />
+        </route>
     </router>
 </config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 2f040556..7dc827bb 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -10,52 +10,101 @@
                     <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1">
+                <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Title</label>
                     <validate>required-entry</validate>
+                    <depends>
+                        <field id="active">1</field>
+                    </depends>
                 </field>
-                <field id="nexi_api_test_connect_wizard" translate="button_label" sortOrder="68" showInDefault="1"
-                       showInWebsite="0" showInStore="0">
-                    <label/>
-                    <button_label>Test Connection</button_label>
-                    <frontend_model>Nexi\Checkout\Block\Adminhtml\System\Config\TestConnection</frontend_model>
+                <field id="environment" translate="label" type="select" sortOrder="29" showInDefault="1"
+                       showInWebsite="1">
+                    <label>Environment</label>
+                    <source_model>Nexi\Checkout\Model\Config\Source\Environment</source_model>
+                    <depends>
+                        <field id="active">1</field>
+                    </depends>
                 </field>
                 <field id="secret_key" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
                     <label>Secret Key</label>
                     <validate>required-entry</validate>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <depends>
+                        <field id="active">1</field>
+                        <field id="environment">live</field>
+                    </depends>
                 </field>
                 <field id="checkout_key" translate="label" type="obscure" sortOrder="31" showInDefault="1"
                        showInWebsite="1">
                     <label>Checkout Key</label>
                     <validate>required-entry</validate>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <depends>
+                        <field id="active">1</field>
+                        <field id="environment">live</field>
+                    </depends>
                 </field>
                 <field id="test_secret_key" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
                     <label>Test Secret Key</label>
+                    <validate>required-entry</validate>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <depends>
+                        <field id="active">1</field>
+                        <field id="environment">test</field>
+                    </depends>
                 </field>
                 <field id="test_checkout_key" translate="label" type="obscure" sortOrder="31" showInDefault="1"
                        showInWebsite="1">
                     <label>Test Checkout Key</label>
+                    <validate>required-entry</validate>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <depends>
+                        <field id="active">1</field>
+                        <field id="environment">test</field>
+                    </depends>
+                </field>
+                <field id="pay_type_splitting" translate="label" type="select" sortOrder="32" showInDefault="1"
+                       showInWebsite="1" showInStore="1">
+                    <label>payType Splitting</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <depends>
+                        <field id="active">1</field>
+                    </depends>
+                </field>
+                <field id="pay_type_options" translate="label" type="multiselect" sortOrder="33" showInDefault="1"
+                       showInWebsite="1" showInStore="1">
+                    <label>Payment Methods</label>
+                    <source_model>Nexi\Checkout\Model\Config\Source\PayTypeOptions</source_model>
+                    <comment>Select the payment methods you want to enable.</comment>
+                    <depends>
+                        <field id="pay_type_splitting">1</field>
+                    </depends>
                 </field>
                 <field id="webshop_terms_and_conditions_url" translate="label" type="text" sortOrder="40"
-                       showInDefault="1" showInWebsite="1">
+                       showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Webshop Terms and Conditions URL</label>
                     <validate>required-entry</validate>
                     <comment>add URL to your Webshop Terms and Conditions site.</comment>
+                    <depends>
+                        <field id="active">1</field>
+                    </depends>
                 </field>
                 <field id="payment_terms_and_conditions_url" translate="label" type="text" sortOrder="41"
-                       showInDefault="1" showInWebsite="1">
+                       showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Payment Terms and Conditions URL</label>
                     <validate>required-entry</validate>
                     <comment>add URL to your payment Terms and Conditions site.</comment>
+                    <depends>
+                        <field id="active">1</field>
+                    </depends>
                 </field>
                 <field id="integration_type" translate="label" type="select" sortOrder="50" showInDefault="1"
                        showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Integration type</label>
                     <source_model>Nexi\Checkout\Model\Config\Source\IntegrationType</source_model>
+                    <depends>
+                        <field id="active">1</field>
+                    </depends>
                 </field>
                 <field id="is_auto_capture" translate="label" type="select" sortOrder="5" showInDefault="1"
                        showInWebsite="1" canRestore="1">
@@ -64,17 +113,68 @@
                     <comment>If set to "Yes", the transaction will be charged automatically after the
                         reservation has been accepted.
                     </comment>
+                    <depends>
+                        <field id="active">1</field>
+                    </depends>
                 </field>
                 <field id="order_status" translate="label" type="select" sortOrder="51" showInDefault="1"
-                       showInWebsite="1">
+                       showInWebsite="1" showInStore="1">
                     <label>New Order Status</label>
-                    <source_model>Magento\Sales\Model\Config\Source\Order\Status\NewStatus</source_model>
+                    <source_model>Nexi\Checkout\Model\Config\Source\Order\NewStatus</source_model>
+                    <depends>
+                        <field id="active">1</field>
+                    </depends>
                 </field>
-                <field id="environment" translate="label" type="select" sortOrder="33" showInDefault="1"
-                       showInWebsite="1">
-                    <label>Environment</label>
-                    <source_model>Nexi\Checkout\Model\Config\Source\Environment</source_model>
+                <field id="nexi_api_test_connect_wizard" translate="button_label" sortOrder="68" showInDefault="1"
+                       showInWebsite="1" showInStore="1">
+                    <label/>
+                    <button_label>Test Connection</button_label>
+                    <frontend_model>Nexi\Checkout\Block\Adminhtml\System\Config\TestConnection</frontend_model>
+                    <depends>
+                        <field id="active">1</field>
+                    </depends>
                 </field>
+                <group id="subscriptions" translate="label" sortOrder="800" showInDefault="1" showInStore="0" showInWebsite="1">
+                    <label>Nexi: Subscriptions</label>
+                    <field id="active_subscriptions" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1"
+                           showInStore="0" canRestore="1">
+                        <config_path>nexi/subscriptions/active_subscriptions</config_path>
+                        <label>Enabled Subscriptions</label>
+                        <comment>Activating subscriptions feature</comment>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    </field>
+                    <field id="notify_cron_schedule" translate="label comment" sortOrder="10" type="text"
+                           showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                        <label>Subscriptions email notification schedule</label>
+                        <depends>
+                            <field id="active_subscriptions">1</field>
+                        </depends>
+                    </field>
+                    <field id="bill_cron_schedule" translate="label comment" sortOrder="20" type="text"
+                           showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                        <label>Subscriptions email billing schedule</label>
+                        <depends>
+                            <field id="active_subscriptions">1</field>
+                        </depends>
+                    </field>
+                    <field id="warning_period" translate="label comment" sortOrder="30" type="text"
+                           showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                        <label>Alert email advance period</label>
+                        <comment>Controls the amount of days between notifying customer about upcoming payment and billing the payment</comment>
+                        <validate>validate-digit validate-range range-0-30</validate>
+                        <depends>
+                            <field id="active_subscriptions">1</field>
+                        </depends>
+                    </field>
+                    <field id="force_weekdays" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1"
+                           showInStore="0" canRestore="1">
+                        <label>Force billing date to be on weekday (monday-friday)</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        <depends>
+                            <field id="active_subscriptions">1</field>
+                        </depends>
+                    </field>
+                </group>
             </group>
         </section>
     </system>
diff --git a/etc/catalog_attributes.xml b/etc/catalog_attributes.xml
new file mode 100644
index 00000000..945392b7
--- /dev/null
+++ b/etc/catalog_attributes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Catalog:etc/catalog_attributes.xsd">
+    <group name="quote_item">
+        <attribute name="subscription_schedule"/>
+    </group>
+</config>
diff --git a/etc/config.xml b/etc/config.xml
index 7f3953c8..2e8634c2 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -4,6 +4,7 @@
             <nexi>
                 <model>NexiFacade</model>
                 <title>Nexi Payments</title>
+                <logo>https://www.nexi.de/content/dam/nexide/img/nexi-de-test/logos/nexi-logos/NEXI_RGB_Colore.png</logo>
                 <payment_action>authorize_capture</payment_action>
                 <active>0</active>
                 <is_gateway>0</is_gateway>
@@ -13,9 +14,7 @@
                 <can_initialize>1</can_initialize>
                 <can_capture>1</can_capture>
                 <can_capture_partial>1</can_capture_partial>
-                <can_authorize_vault>1</can_authorize_vault>
-                <can_capture_vault>1</can_capture_vault>
-                <can_use_internal>1</can_use_internal>
+                <can_use_internal>0</can_use_internal>
                 <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
                 <can_refund>1</can_refund>
                 <can_void>1</can_void>
@@ -40,6 +39,15 @@
                 <test_checkout_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <webhook_secret backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <integration_type>HostedPaymentPage</integration_type>
+                <pay_type_splitting>0</pay_type_splitting>
+                <subscriptions>
+                    <active_subscriptions>0</active_subscriptions>
+                    <notify_cron_schedule>0 1 * * *</notify_cron_schedule>
+                    <bill_cron_schedule>15 3 * * *</bill_cron_schedule>
+                    <email_template>subscription_email_template</email_template>
+                    <warning_period>7</warning_period>
+                    <force_weekdays>0</force_weekdays>
+                </subscriptions>
             </nexi>
         </payment>
     </default>
diff --git a/etc/crontab.xml b/etc/crontab.xml
new file mode 100644
index 00000000..5ad6a979
--- /dev/null
+++ b/etc/crontab.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+
+<config>
+    <group id="checkout_finland">
+        <job name="subscriptions_bill" instance="Nexi\Checkout\Cron\SubscriptionBill" method="execute">
+            <config_path>sales/subscriptions/bill_cron_schedule</config_path>
+        </job>
+        <job name="subscriptions_notify" instance="Nexi\Checkout\Cron\SubscriptionNotify" method="execute">
+            <config_path>sales/subscriptions/notify_cron_schedule</config_path>
+        </job>
+    </group>
+</config>
diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
new file mode 100644
index 00000000..44df0335
--- /dev/null
+++ b/etc/csp_whitelist.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp/etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="script-src">
+            <values>
+                <value id="dibspayment" type="host">*.dibspayment.eu</value>
+            </values>
+        </policy>
+        <policy id="style-src">
+            <values>
+                <value id="dibspayment" type="host">*.dibspayment.eu</value>
+            </values>
+        </policy>
+        <policy id="connect-src">
+            <values>
+                <value id="dibspayment" type="host">*.dibspayment.eu</value>
+            </values>
+        </policy>
+        <policy id="img-src">
+            <values>
+                <value id="dibspayment" type="host">*.dibspayment.eu</value>
+            </values>
+        </policy>
+        <policy id="frame-src">
+            <values>
+                <value id="dibspayment" type="host">*.dibspayment.eu</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/etc/db_schema.xml b/etc/db_schema.xml
new file mode 100644
index 00000000..a9a10d87
--- /dev/null
+++ b/etc/db_schema.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="nexi_subscriptions" resource="default" engine="innodb" comment="Recurring payment table">
+        <column xsi:type="int" name="entity_id" unsigned="false" nullable="false" identity="true" comment="Entity Id" />
+        <column xsi:type="int" name="customer_id" unsigned="true" nullable="false" identity="false" comment="Customer Id" />
+        <column xsi:type="varchar" name="status" nullable="true" length="32" comment="Status"/>
+        <column xsi:type="datetime" name="next_order_date" on_update="false" nullable="false"
+                comment="date when order is going to be processed"/>
+        <column xsi:type="int" name="recurring_profile_id" unsigned="false" nullable="false" identity="false"
+                comment="Which profile is this payment using"/>
+        <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
+                comment="Updated At"/>
+        <column xsi:type="smallint" name="repeat_count_left" unsigned="true" nullable="true" identity="false"
+                comment="How many times a new recurring order will be made"/>
+        <column xsi:type="smallint" name="retry_count" unsigned="true" nullable="true" identity="false"
+                comment="How many times payment will be attempted on this order if failure occurred."/>
+        <column xsi:type="varchar" name="nexi_subscription_id" nullable="true" length="32"
+                comment="Nexi Subscription ID."/>
+
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="entity_id"/>
+        </constraint>
+
+        <!-- foreign keys -->
+        <constraint xsi:type="foreign" referenceId="NEXI_SUBSCRIPTIONS_PROFILE_ID_RECURRING_PAYMENT_PROFILES_PROFILE_ID" table="nexi_subscriptions"
+                    column="recurring_profile_id" referenceTable="recurring_payment_profiles" referenceColumn="profile_id"
+                    onDelete="NO ACTION"/>
+        <constraint xsi:type="foreign" referenceId="NEXI_SUBSCRIPTIONS_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID" table="nexi_subscriptions"
+                    column="customer_id" referenceTable="customer_entity" referenceColumn="entity_id"
+                    onDelete="CASCADE"/>
+
+        <!-- indexes -->
+        <index referenceId="NEXI_SUBSCRIPTIONS_STATUS" indexType="btree">
+            <column name="status"/>
+        </index>
+    </table>
+    <table name="recurring_payment_profiles" resource="default" engine="innodb" comment="Stores recurring payment profiles">
+        <column xsi:type="int" name="profile_id" unsigned="false" nullable="false" identity="true" comment="Entity Id" />
+        <column xsi:type="varchar" name="name" nullable="false" comment="Profile Name" />
+        <column xsi:type="varchar" name="description" nullable="true" comment="Profile Description" />
+        <column xsi:type="varchar" name="schedule" nullable="false" comment="Profile Schedule" />
+
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="profile_id"/>
+        </constraint>
+    </table>
+    <table name="nexi_subscription_link" resource="default" engine="innodb" comment="Nexi subscription payment link to order">
+        <column xsi:type="int" name="link_id" unsigned="true" nullable="false" identity="true" comment="Link Id" />
+        <column xsi:type="int" name="order_id" unsigned="true" nullable="false" comment="Order Id" />
+        <column xsi:type="int" name="subscription_id" nullable="true" comment="Subcription Id" />
+
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="link_id"/>
+        </constraint>
+
+        <!-- foreign keys -->
+        <constraint xsi:type="foreign" referenceId="NEXI_SUBSCRIPTION_LINK_ORDER_ID_SALES_ORDER_ENTITY_ID" table="nexi_subscription_link"
+                    column="order_id" referenceTable="sales_order" referenceColumn="entity_id"
+                    onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="NEXI_SUBSCRIPTION_LINK_SUBSCRIPTION_ID_NEXI_SUBSCRIPTIONS_ENTITY_ID" table="nexi_subscription_link"
+                    column="subscription_id" referenceTable="nexi_subscriptions" referenceColumn="entity_id"
+                    onDelete="CASCADE"/>
+
+        <constraint xsi:type="unique" referenceId="NEXI_SUBSCRIPTION_LINK_ORDER_ID_SUBSCRIPTION_ID">
+            <column name="order_id"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/etc/db_schema_whitelist.json b/etc/db_schema_whitelist.json
new file mode 100644
index 00000000..ed6cd226
--- /dev/null
+++ b/etc/db_schema_whitelist.json
@@ -0,0 +1,49 @@
+{
+    "nexi_subscriptions": {
+        "column": {
+            "entity_id": true,
+            "status": true,
+            "next_order_date": true,
+            "recurring_profile_id": true,
+            "updated_at": true,
+            "end_date": true,
+            "repeat_count_left": true,
+            "retry_count": true,
+            "customer_id": true
+        },
+        "index": {
+            "NEXI_SUBSCRIPTIONS_STATUS": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "FK_8D8B31C8FA705FDDF495326B9267594D": true,
+            "FK_C52FB2CF53BB599FD4BAF601615C36C6": true,
+            "NEXI_SUBSCRIPTIONS_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID": true,
+            "FK_A3A41A8A2917DB96EB7845EE6B4A46B6": true
+        }
+    },
+    "recurring_payment_profiles": {
+        "column": {
+            "profile_id": true,
+            "name": true,
+            "description": true,
+            "schedule": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    },
+    "nexi_subscription_link": {
+        "column": {
+            "link_id": true,
+            "order_id": true,
+            "subscription_id": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "NEXI_SUBSCRIPTION_LINK_ORDER_ID_SALES_ORDER_ENTITY_ID": true,
+            "FK_86F57A98A67516BAAF65D6F8B80F2C0D": true,
+            "NEXI_SUBSCRIPTION_LINK_ORDER_ID_SUBSCRIPTION_ID": true
+        }
+    }
+}
diff --git a/etc/di.xml b/etc/di.xml
index efc36cba..aea6e163 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -6,7 +6,7 @@
         <arguments>
             <argument name="code" xsi:type="const">Nexi\Checkout\Gateway\Config\Config::CODE</argument>
             <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
-            <argument name="infoBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Nexi\Checkout\Block\Info\Nexi</argument>
             <argument name="valueHandlerPool" xsi:type="object">NexiValueHandlerPool</argument>
             <argument name="validatorPool" xsi:type="object">Magento\Payment\Gateway\Validator\ValidatorPool</argument>
             <argument name="commandPool" xsi:type="object">NexiCommandPool</argument>
@@ -65,8 +65,14 @@
             <argument name="commands" xsi:type="array">
                 <item name="create_payment" xsi:type="string">NexiCommandCreatePayment</item>
                 <item name="initialize" xsi:type="string">Nexi\Checkout\Gateway\Command\Initialize</item>
+                <item name="retrieve" xsi:type="string">NexiCommandRetrieve</item>
                 <item name="capture" xsi:type="string">NexiCommandCapture</item>
                 <item name="refund" xsi:type="string">NexiCommandRefund</item>
+                <item name="update_order" xsi:type="string">NexiCommandUpdateOrder</item>
+                <item name="update_reference" xsi:type="string">NexiCommandUpdateReference</item>
+                <item name="subscription_charge" xsi:type="string">NexiCommandSubscriptionCharge</item>
+                <item name="void" xsi:type="string">NexiCommandVoid</item>
+                <item name="cancel" xsi:type="string">NexiCommandVoid</item>
             </argument>
         </arguments>
     </virtualType>
@@ -77,6 +83,27 @@
             <argument name="transferFactory" xsi:type="object">Nexi\Checkout\Gateway\Http\TransferFactory</argument>
             <argument name="client" xsi:type="object">Nexi\Checkout\Gateway\Http\Client</argument>
             <argument name="handler" xsi:type="object">Nexi\Checkout\Gateway\Handler\CreatePayment</argument>
+            <argument name="logger" xsi:type="object">NexiVirtualLogger</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NexiCommandRetrieve" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Nexi\Checkout\Gateway\Request\RetrieveRequestBuilder</argument>
+            <argument name="transferFactory" xsi:type="object">Nexi\Checkout\Gateway\Http\TransferFactory</argument>
+            <argument name="client" xsi:type="object">Nexi\Checkout\Gateway\Http\Client</argument>
+            <argument name="handler" xsi:type="object">Nexi\Checkout\Gateway\Handler\Retrieve
+            </argument>
+            <argument name="logger" xsi:type="object">NexiVirtualLogger</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NexiCommandUpdateOrder" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Nexi\Checkout\Gateway\Request\UpdateOrderRequestBuilder</argument>
+            <argument name="transferFactory" xsi:type="object">Nexi\Checkout\Gateway\Http\TransferFactory</argument>
+            <argument name="client" xsi:type="object">Nexi\Checkout\Gateway\Http\Client</argument>
+            <argument name="logger" xsi:type="object">NexiVirtualLogger</argument>
         </arguments>
     </virtualType>
 
@@ -86,6 +113,7 @@
             <argument name="transferFactory" xsi:type="object">Nexi\Checkout\Gateway\Http\TransferFactory</argument>
             <argument name="client" xsi:type="object">Nexi\Checkout\Gateway\Http\Client</argument>
             <argument name="handler" xsi:type="object">Nexi\Checkout\Gateway\Handler\Capture</argument>
+            <argument name="logger" xsi:type="object">NexiVirtualLogger</argument>
         </arguments>
     </virtualType>
 
@@ -95,6 +123,35 @@
             <argument name="transferFactory" xsi:type="object">Nexi\Checkout\Gateway\Http\TransferFactory</argument>
             <argument name="client" xsi:type="object">Nexi\Checkout\Gateway\Http\Client</argument>
             <argument name="handler" xsi:type="object">Nexi\Checkout\Gateway\Handler\RefundCharge</argument>
+            <argument name="logger" xsi:type="object">NexiVirtualLogger</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NexiCommandUpdateReference" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Nexi\Checkout\Gateway\Request\UpdateReferenceRequestBuilder</argument>
+            <argument name="transferFactory" xsi:type="object">Nexi\Checkout\Gateway\Http\TransferFactory</argument>
+            <argument name="client" xsi:type="object">Nexi\Checkout\Gateway\Http\Client</argument>
+            <argument name="logger" xsi:type="object">NexiVirtualLogger</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NexiCommandSubscriptionCharge" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Nexi\Checkout\Gateway\Request\SubscriptionChargeRequestBuilder</argument>
+            <argument name="transferFactory" xsi:type="object">Nexi\Checkout\Gateway\Http\TransferFactory</argument>
+            <argument name="client" xsi:type="object">Nexi\Checkout\Gateway\Http\Client</argument>
+            <argument name="handler" xsi:type="object">Nexi\Checkout\Gateway\Handler\SubscriptionCharge</argument>
+            <argument name="logger" xsi:type="object">NexiVirtualLogger</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="NexiCommandVoid" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Nexi\Checkout\Gateway\Request\VoidRequestBuilder</argument>
+            <argument name="transferFactory" xsi:type="object">Nexi\Checkout\Gateway\Http\TransferFactory</argument>
+            <argument name="client" xsi:type="object">Nexi\Checkout\Gateway\Http\Client</argument>
+            <argument name="logger" xsi:type="object">NexiVirtualLogger</argument>
         </arguments>
     </virtualType>
 
@@ -146,7 +203,7 @@
         </arguments>
     </type>
 
-    <type name="\Nexi\Checkout\Controller\Hpp\CancelAction">
+    <type name="Nexi\Checkout\Controller\Hpp\CancelAction">
         <arguments>
             <argument name="logger" xsi:type="object">NexiVirtualLogger</argument>
             <argument name="checkoutSession" xsi:type="object">Magento\Checkout\Model\Session\Proxy</argument>
@@ -181,6 +238,9 @@
         </arguments>
     </type>
 
+    <preference for="Nexi\Checkout\Api\PaymentInitializeInterface" type="Nexi\Checkout\Model\PaymentInitialize"/>
+    <preference for="Nexi\Checkout\Api\PaymentValidateInterface" type="Nexi\Checkout\Model\PaymentValidate"/>
+
     <!-- Webhooks -->
     <type name="Nexi\Checkout\Model\WebhookHandler">
         <arguments>
@@ -202,4 +262,101 @@
             <argument name="logger" xsi:type="object">NexiVirtualLogger</argument>
         </arguments>
     </type>
+    <type name="Nexi\Checkout\Model\Receipt\ProcessService">
+        <arguments>
+            <argument name="logger" xsi:type="object">NexiVirtualLogger</argument>
+        </arguments>
+    </type>
+    <type name="Nexi\Checkout\Model\Receipt\LoadService">
+        <arguments>
+            <argument name="logger" xsi:type="object">NexiVirtualLogger</argument>
+        </arguments>
+    </type>
+    <type name="Nexi\Checkout\Block\Info\Nexi">
+        <arguments>
+            <argument name="logger" xsi:type="object">NexiVirtualLogger</argument>
+        </arguments>
+    </type>
+    <type name="Nexi\Checkout\Model\PaymentInitialize">
+        <arguments>
+            <argument name="checkoutSession" xsi:type="object">Magento\Checkout\Model\Session\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Quote\Model\Quote\Payment\ToOrderPayment">
+        <plugin name="Nexi_Checkout::quote_to_order_save_last_txn_id"
+                type="Nexi\Checkout\Plugin\QouteToOrder\ProcessTransactionId"
+                sortOrder="100"/>
+    </type>
+    <type name="Magento\Quote\Observer\SubmitObserver">
+        <plugin name="Nexi_Checkout::set_can_send_email_flag"
+                type="Nexi\Checkout\Plugin\SendEmailPlugin"
+                sortOrder="100"/>
+    </type>
+
+    <!-- Subscriptions -->
+    <type name="Magento\Framework\Console\CommandListInterface">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="subscription_bill" xsi:type="object">Nexi\Checkout\Console\Command\Bill
+                </item>
+                <item name="subscription_notify" xsi:type="object">Nexi\Checkout\Console\Command\Notify
+                </item>
+            </argument>
+        </arguments>
+    </type>
+
+    <preference for="Nexi\Checkout\Api\SubscriptionRepositoryInterface"
+                type="Nexi\Checkout\Model\SubscriptionRepository"/>
+    <preference for="Nexi\Checkout\Api\Data\SubscriptionInterface"
+                type="Nexi\Checkout\Model\Subscription"/>
+    <preference for="Nexi\Checkout\Api\Data\SubscriptionSearchResultInterface"
+                type="Nexi\Checkout\Model\ResourceModel\Subscription\Collection"/>
+    <preference for="Nexi\Checkout\Api\SubscriptionProfileRepositoryInterface"
+                type="Nexi\Checkout\Model\Subscription\ProfileRepository"/>
+    <preference for="Nexi\Checkout\Api\Data\SubscriptionProfileInterface"
+                type="Nexi\Checkout\Model\Subscription\Profile"/>
+    <preference for="Nexi\Checkout\Api\Data\SubscriptionProfileSearchResultInterface"
+                type="Nexi\Checkout\Model\ResourceModel\Subscription\Profile\Collection"/>
+    <preference for="Nexi\Checkout\Api\SubscriptionLinkRepositoryInterface"
+                type="Nexi\Checkout\Model\Subscription\SubscriptionLinkRepository"/>
+    <preference for="Nexi\Checkout\Api\Data\SubscriptionLinkInterface"
+                type="Nexi\Checkout\Model\Subscription\SubscriptionLink"/>
+    <preference for="Nexi\Checkout\Api\Data\SubscriptionLinkSearchResultInterface"
+                type="Nexi\Checkout\Model\ResourceModel\Subscription\SubscriptionLink\Collection"/>
+    <preference for="Nexi\Checkout\Api\SubscriptionManagementInterface"
+                type="Nexi\Checkout\Model\SubscriptionManagement"/>
+
+    <type name="\Nexi\Checkout\Model\Subscription\OrderCloner">
+        <arguments>
+            <argument name="quoteSession" xsi:type="object">Magento\Backend\Model\Session\Quote\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="\Magento\Quote\Model\Quote">
+        <plugin name="prevent_different_scheduled_cart"
+                type="Nexi\Checkout\Plugin\PreventDifferentScheduledCart"/>
+    </type>
+    <type name="Nexi\Checkout\Observer\ReactivateQuoteObserver">
+        <arguments>
+            <argument name="session" xsi:type="object">Magento\Checkout\Model\Session\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Nexi\Checkout\Model\PaymentValidate">
+        <arguments>
+            <argument name="session" xsi:type="object">Magento\Checkout\Model\Session\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Checkout\Model\Session">
+        <plugin name="Nexi_Checkout::checkout_session_plugin"
+                type="Nexi\Checkout\Plugin\CheckoutSession"
+                sortOrder="100"/>
+    </type>
+    <type name="Magento\Sales\Model\Order\Payment">
+        <plugin name="nexi_disable_invoice_void"
+                type="Nexi\Checkout\Plugin\DisableVoidAfterCapturePlugin" />
+    </type>
+    <type name="Magento\Quote\Model\Quote\Payment">
+        <plugin name="Nexi_Checkout::magento_quote_model_payment"
+                type="Nexi\Checkout\Plugin\PaymentData"
+                sortOrder="100"/>
+    </type>
 </config>
diff --git a/etc/events.xml b/etc/events.xml
new file mode 100644
index 00000000..e6ea4b1b
--- /dev/null
+++ b/etc/events.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="sales_order_place_before">
+        <observer name="validate_cart_before_order_place"
+                  instance="Nexi\Checkout\Observer\ScheduledCartValidation"/>
+    </event>
+    <event name="sales_order_place_after">
+        <!-- Add Reference Number - increment id - to the Nexi payment after order is placed - Embedded only -->
+        <observer name="Nexi_Checkout::update_order_reference" instance="Nexi\Checkout\Observer\UpdateOrderReference"/>
+    </event>
+    <event name="checkout_submit_all_after">
+        <observer name="Nexi_Checkout::revoke_cart_for_embedded_checkout" instance="Nexi\Checkout\Observer\ReactivateQuoteObserver"/>
+    </event>
+</config>
diff --git a/etc/extension_attributes.xml b/etc/extension_attributes.xml
new file mode 100644
index 00000000..80cf8c6f
--- /dev/null
+++ b/etc/extension_attributes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
+    <extension_attributes for="Magento\Quote\Api\Data\PaymentInterface">
+        <!-- This is needed to provide type hint to serializer -->
+        <attribute code="subselection" type="string" />
+    </extension_attributes>
+</config>
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index c1d044c3..8a4d3477 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -5,10 +5,15 @@
     <type name="Magento\Checkout\Model\CompositeConfigProvider">
         <arguments>
             <argument name="configProviders" xsi:type="array">
-                <item name="nexi_config_provider"
-                      xsi:type="object">Nexi\Checkout\Model\Ui\ConfigProvider</item>
+                <item name="nexi_config_provider" xsi:type="object">Nexi\Checkout\Model\Ui\ConfigProvider</item>
+                <item name="subscription_schedule_config_provider" xsi:type="object">Nexi\Checkout\Model\Subscription\TotalConfigProvider</item>
             </argument>
         </arguments>
     </type>
 
+    <!-- include selected payment method into payment method data on order page   -->
+    <type name="Magento\Sales\Block\Order\Info">
+        <plugin name="OrderCustomerViewInfo" type="Nexi\Checkout\Plugin\Order\Data\PaymentMethodCustomerOrderInfo" />
+    </type>
+
 </config>
diff --git a/etc/payment.xml b/etc/payment.xml
old mode 100755
new mode 100644
diff --git a/etc/webapi.xml b/etc/webapi.xml
index 3fa88589..07c834ac 100644
--- a/etc/webapi.xml
+++ b/etc/webapi.xml
@@ -2,4 +2,28 @@
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Webapi:etc/webapi.xsd">
 
+    <route url="/V1/nexi/guest-carts/:cartId/payment-initialize" method="POST">
+        <service class="Nexi\Checkout\Api\PaymentInitializeInterface" method="initialize"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/nexi/carts/mine/payment-initialize" method="POST">
+        <service class="Nexi\Checkout\Api\PaymentInitializeInterface" method="initialize"/>
+        <resources>
+            <resource ref="self"/>
+        </resources>
+    </route>
+    <route url="/V1/nexi/guest-carts/:cartId/payment-validate" method="POST">
+        <service class="Nexi\Checkout\Api\PaymentValidateInterface" method="validate"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+    <route url="/V1/nexi/carts/mine/payment-validate" method="POST">
+        <service class="Nexi\Checkout\Api\PaymentValidateInterface" method="validate"/>
+        <resources>
+            <resource ref="self"/>
+        </resources>
+    </route>
 </routes>
diff --git a/i18n/en_US.csv b/i18n/en_US.csv
new file mode 100755
index 00000000..eef3ad19
--- /dev/null
+++ b/i18n/en_US.csv
@@ -0,0 +1,4 @@
+
+"Card for subscription changed successfully","Card for subscription changed successfully"
+"The subscription doesn't belong to the customer", "The subscription doesn't belong to the customer"
+"The card has active subscriptions","The card has an active subscriptions"
diff --git a/i18n/fi_FI.csv b/i18n/fi_FI.csv
new file mode 100644
index 00000000..d241fcde
--- /dev/null
+++ b/i18n/fi_FI.csv
@@ -0,0 +1,16 @@
+"You have subscribed for recurring order from %store_name.","Olet tehnyt toistuvan tilauksen verkkokaupassamme."
+"If you want to cancel your recurring order <a href="%account_url">log into your account</a>.", "Jos haluat peruutta toistuvan tilauksen <a href="%account_url">kirjaudu käyttäjätilillesi</a>."
+"Should the recurring payment fail, we will add %warning_period days to your order, so that you can update your payment details.", "Jos automaattinen uusinta epäonnistuu, tilaukseesi lisätään x päivää lisäaikaa, jotta ehdit päivittää maksutietosi."
+"Recurring payment stopped successfully","Tilaus pysäytettiin onnistuneesti"
+"Can't add product with different payment schedule","Tuotetta ei voi lisätä eri maksuaikataululla"
+"Recurring Payment","Toistuvat maksut"
+"Recurring total","Toistuvat maksut yhteensä"
+"Recurring payment purchases require using a saved card.","Toistuvat tilaukset vaativat tallennetun luottokortin maksuja varten"
+"Subscription couldn't be canceled","Tilausta ei voitu peruuttaa"
+"Subscription has been canceled correctly","Tilaus on peruutettu"
+"Subscription is closed","Tilaus on suljettu"
+"Subscription orders can't be shown","Tilaustilauksia ei voida näyttää"
+"The subscription doesn't belong to the customer", "Tilaus ei kuulu asiakkaalle"
+"The card has active subscriptions","Kortilla on aktiivisia tilauksia"
+"My Subscriptions","Toistuvat tilaukseni"
+"Subscription Total","Toistuvan tilauksen yhteensä"
diff --git a/view/adminhtml/layout/subscription_view_index.xml b/view/adminhtml/layout/subscription_view_index.xml
new file mode 100644
index 00000000..67037c56
--- /dev/null
+++ b/view/adminhtml/layout/subscription_view_index.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <css src="Nexi_Checkout::css/subscription.css"/>
+    </head>
+    <update handle="styles"/>
+    <update handle="editor"/>
+    <body>
+        <referenceContainer name="content">
+            <uiComponent name="subscription_view"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/adminhtml/layout/subscriptions_profile_edit.xml b/view/adminhtml/layout/subscriptions_profile_edit.xml
new file mode 100755
index 00000000..a01f23a2
--- /dev/null
+++ b/view/adminhtml/layout/subscriptions_profile_edit.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="styles"/>
+    <update handle="editor"/>
+    <body>
+        <referenceContainer name="content">
+            <uiComponent name="subscription_profile_edit"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/adminhtml/layout/subscriptions_profile_index.xml b/view/adminhtml/layout/subscriptions_profile_index.xml
new file mode 100644
index 00000000..35c6092d
--- /dev/null
+++ b/view/adminhtml/layout/subscriptions_profile_index.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="content">
+            <uiComponent name="subscription_profile_listing"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/adminhtml/layout/subscriptions_subscription_index.xml b/view/adminhtml/layout/subscriptions_subscription_index.xml
new file mode 100644
index 00000000..cd7df27d
--- /dev/null
+++ b/view/adminhtml/layout/subscriptions_subscription_index.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="content">
+            <uiComponent name="subscriptions_listing"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/adminhtml/layout/subscriptions_subscription_view.xml b/view/adminhtml/layout/subscriptions_subscription_view.xml
new file mode 100644
index 00000000..1d77b782
--- /dev/null
+++ b/view/adminhtml/layout/subscriptions_subscription_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <css src="Nexi_Checkout::css/subscription.css"/>
+    </head>
+    <update handle="styles"/>
+    <update handle="editor"/>
+    <body>
+        <referenceContainer name="content">
+            <uiComponent name="subscriptions_view"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/adminhtml/templates/info/checkout.phtml b/view/adminhtml/templates/info/checkout.phtml
new file mode 100644
index 00000000..3030ad6f
--- /dev/null
+++ b/view/adminhtml/templates/info/checkout.phtml
@@ -0,0 +1,30 @@
+<?php
+
+use Nexi\Checkout\Block\Info\Nexi;
+
+/** @var $block Nexi */
+/** @var $escaper \Magento\Framework\Escaper */
+?>
+
+<?= $block->getChildHtml() ?>
+<table class="admin__table-secondary order-information-table">
+    <tbody>
+        <tr>
+            <th><?= $escaper->escapeHtml(__('Payment Provider')) ?></th>
+            <td><img alt="Nexi Logo" style="width: 65px; height: 25px; background-color: white; "
+                     src="<?= $escaper->escapeHtml($block->getLogo() ? $block->getLogo() : ''); ?>"/></td>
+        </tr>
+        <tr>
+            <th><?= $escaper->escapeHtml(__('Payment Method')) ?></th>
+            <td><?= $escaper->escapeHtml(
+                $block->getSelectedPaymentMethodData()[Nexi::SELECTED_PATMENT_METHOD] ?? ''
+            ) ?></td>
+        </tr>
+        <tr>
+            <th><?= $escaper->escapeHtml(__('Payment Type')) ?></th>
+            <td><?= $escaper->escapeHtml(
+                $block->getSelectedPaymentMethodData()[Nexi::SELECTED_PATMENT_TYPE] ?? ''
+            ) ?></td>
+        </tr>
+    </tbody>
+</table>
diff --git a/view/adminhtml/ui_component/sales_order_grid.xml b/view/adminhtml/ui_component/sales_order_grid.xml
new file mode 100644
index 00000000..28973de4
--- /dev/null
+++ b/view/adminhtml/ui_component/sales_order_grid.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <columns name="sales_order_columns">
+        <column name="recurring_status">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="filter" xsi:type="string">text</item>
+                    <item name="label" xsi:type="string" translate="true">Recurring Payment Status</item>
+                </item>
+            </argument>
+            <settings>
+                <visible>false</visible>
+            </settings>
+        </column>
+        <column name="customer_id">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="filter" xsi:type="string">text</item>
+                    <item name="label" xsi:type="string" translate="true">Recurring Customer Id</item>
+                </item>
+            </argument>
+            <settings>
+                <visible>false</visible>
+            </settings>
+        </column>
+        <column name="subscription_id">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="filter" xsi:type="string">text</item>
+                    <item name="label" xsi:type="string" translate="true">Recurring Payment ID</item>
+                </item>
+            </argument>
+            <settings>
+                <visible>false</visible>
+            </settings>
+        </column>
+        <column name="recurring_profile">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="filter" xsi:type="string">text</item>
+                    <item name="label" xsi:type="string" translate="true">Recurring Payment Profile</item>
+                </item>
+            </argument>
+            <settings>
+                <visible>false</visible>
+            </settings>
+        </column>
+    </columns>
+</listing>
diff --git a/view/adminhtml/ui_component/subscription_profile_edit.xml b/view/adminhtml/ui_component/subscription_profile_edit.xml
new file mode 100644
index 00000000..50e03462
--- /dev/null
+++ b/view/adminhtml/ui_component/subscription_profile_edit.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">subscription_profile_edit.subscription_profile_data_source</item>
+            <item name="deps" xsi:type="string">subscription_profile_edit.subscription_profile_data_source</item>
+        </item>
+        <item name="label" xsi:type="string" translate="true">Edit profile</item>
+        <item name="template" xsi:type="string">templates/form/collapsible</item>
+
+        <item name="buttons" xsi:type="array">
+            <item name="back" xsi:type="string">Nexi\Checkout\Block\Adminhtml\Subscription\Edit\BackButton</item>
+            <item name="delete" xsi:type="string">\Nexi\Checkout\Block\Adminhtml\Subscription\Edit\DeleteButton</item>
+            <item name="save" xsi:type="string">Nexi\Checkout\Block\Adminhtml\Subscription\Edit\SaveButton</item>
+        </item>
+
+        <item name="config" xsi:type="array">
+            <item name="dataScope" xsi:type="string">data</item>
+            <item name="namespace" xsi:type="string">subscription_profile_edit</item>
+        </item>
+    </argument>
+
+    <dataSource name="subscription_profile_data_source">
+        <argument name="data" xsi:type="array">
+            <item name="js_config" xsi:type="array">
+                <item name="component" xsi:type="string">Magento_Ui/js/form/provider</item>
+            </item>
+        </argument>
+        <settings>
+            <submitUrl path="*/*/save" />
+        </settings>
+        <dataProvider class="Nexi\Checkout\Ui\DataProvider\SubscriptionProfileForm" name="subscription_profile_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>profile_id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+
+    <fieldset name="columns">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="label" xsi:type="string" translate="true">Subscription</item>
+            </item>
+        </argument>
+
+        <!-- This field represents form id and is hidden -->
+        <field name="profile_id">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="visible" xsi:type="boolean">false</item>
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="formElement" xsi:type="string">input</item>
+                </item>
+            </argument>
+        </field>
+
+        <field name="name">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string">Name</item>
+                    <item name="visible" xsi:type="boolean">true</item>
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="formElement" xsi:type="string">input</item>
+                </item>
+            </argument>
+            <settings>
+                <validation>
+                    <rule xsi:type="boolean" name="required-entry">true</rule>
+                    <rule xsi:type="number" name="min_text_length">3</rule>
+                </validation>
+            </settings>
+        </field>
+
+        <field name="description">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string">Description</item>
+                    <item name="visible" xsi:type="boolean">true</item>
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="formElement" xsi:type="string">textarea</item>
+                </item>
+            </argument>
+        </field>
+
+        <field name="interval_period">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string">Schedule triggered every X</item>
+                    <item name="visible" xsi:type="boolean">true</item>
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="formElement" xsi:type="string">input</item>
+                </item>
+            </argument>
+            <settings>
+                <validation>
+                    <rule xsi:type="boolean" name="required-entry">true</rule>
+                    <rule name="validate-digits" xsi:type="boolean">true</rule>
+                </validation>
+            </settings>
+        </field>
+
+        <field name="interval_unit" formElement="select">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string">Schedule time measured in</item>
+                    <item name="visible" xsi:type="boolean">true</item>
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="formElement" xsi:type="string">select</item>
+                </item>
+            </argument>
+            <settings>
+                <validation>
+                    <rule xsi:type="boolean" name="required-entry">true</rule>
+                </validation>
+            </settings>
+            <formElements>
+                <select>
+                    <settings>
+                        <options class="Nexi\Checkout\Model\OptionSource\IntervalUnits" />
+                        <caption translate="true">-- Please Select --</caption>
+                    </settings>
+                </select>
+            </formElements>
+        </field>
+    </fieldset>
+</form>
diff --git a/view/adminhtml/ui_component/subscription_profile_listing.xml b/view/adminhtml/ui_component/subscription_profile_listing.xml
new file mode 100644
index 00000000..1b89e3bc
--- /dev/null
+++ b/view/adminhtml/ui_component/subscription_profile_listing.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">subscription_profile_listing.subscription_profile_listing_data_source
+            </item>
+            <item name="deps" xsi:type="string">subscription_profile_listing.subscription_profile_listing_data_source</item>
+        </item>
+        <item name="spinner" xsi:type="string">subscription_profile_columns</item>
+    </argument>
+    <settings>
+        <buttons>
+            <button name="add">
+                <url path="*/*/edit"/>
+                <class>primary</class>
+                <label translate="true">Add New Profile</label>
+            </button>
+        </buttons>
+    </settings>
+    <dataSource name="subscription_profile_listing_data_source">
+        <argument name="dataProvider" xsi:type="configurableObject">
+            <argument name="class" xsi:type="string">Nexi\Checkout\Ui\DataProvider\SubscriptionProfile</argument>
+            <argument name="name" xsi:type="string">subscription_profile_listing_data_source</argument>
+            <argument name="primaryFieldName" xsi:type="string">profile_id</argument>
+            <argument name="requestFieldName" xsi:type="string">profile_id</argument>
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="update_url" xsi:type="url" path="mui/index/render"/>
+                    <item name="storageConfig" xsi:type="array">
+                        <item name="indexField" xsi:type="string">profile_id</item>
+                    </item>
+                </item>
+            </argument>
+        </argument>
+        <argument name="data" xsi:type="array">
+            <item name="js_config" xsi:type="array">
+                <item name="component" xsi:type="string">Magento_Ui/js/grid/provider</item>
+            </item>
+        </argument>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <bookmark name="bookmarks"/>
+        <columnsControls name="columns_controls"/>
+        <massaction name="listing_massaction">
+            <argument name="data" xsi:type="array">
+                <item name="data" xsi:type="array">
+                    <item name="selectProvider" xsi:type="string">
+                        subscription_profile_listing.subscription_profile_listing.subscription_profile_columns.ids
+                    </item>
+                    <item name="displayArea" xsi:type="string">bottom</item>
+                    <item name="component" xsi:type="string">Magento_Ui/js/grid/tree-massactions</item>
+                    <item name="indexField" xsi:type="string">profile_id</item>
+                </item>
+            </argument>
+            <action name="delete">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="type" xsi:type="string">delete</item>
+                        <item name="label" xsi:type="string" translate="true">Delete</item>
+                        <item name="url" xsi:type="url"
+                              path="*/*/massDelete"/>
+                        <item name="confirm" xsi:type="array">
+                            <item name="title" xsi:type="string" translate="true">Delete items</item>
+                            <item name="message" xsi:type="string" translate="true">Are you sure you want to delete
+                                selected items?
+                            </item>
+                        </item>
+                    </item>
+                </argument>
+            </action>
+        </massaction>
+        <filters name="listing_filters">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="templates" xsi:type="array">
+                        <item name="filters" xsi:type="array">
+                            <item name="select" xsi:type="array">
+                                <item name="component" xsi:type="string">Magento_Ui/js/form/element/ui-select</item>
+                                <item name="template" xsi:type="string">ui/grid/filters/elements/ui-select</item>
+                            </item>
+                        </item>
+                    </item>
+                </item>
+            </argument>
+        </filters>
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="subscription_profile_columns">
+        <settings>
+            <childDefaults>
+                <param name="fieldAction" xsi:type="array">
+                    <item name="provider" xsi:type="string">
+                        subscription_profile_listing.subscription_profile_listing.subscription_profile_columns.actions
+                    </item>
+                    <item name="target" xsi:type="string">applyAction</item>
+                    <item name="params" xsi:type="array">
+                        <item name="0" xsi:type="string">edit</item>
+                        <item name="1" xsi:type="string">${ $.$data.rowIndex }</item>
+                    </item>
+                </param>
+            </childDefaults>
+        </settings>
+        <selectionsColumn name="ids">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="indexField" xsi:type="string">profile_id</item>
+                </item>
+            </argument>
+        </selectionsColumn>
+        <column name="profile_id">
+            <settings>
+                <filter>textRange</filter>
+                <label translate="true">ID</label>
+                <resizeDefaultWidth>25</resizeDefaultWidth>
+            </settings>
+        </column>
+        <column name="name">
+            <settings>
+                <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/text</bodyTmpl>
+                <label translate="true">Name</label>
+            </settings>
+        </column>
+        <column name="description">
+            <settings>
+                <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/text</bodyTmpl>
+                <label translate="true">Description</label>
+            </settings>
+        </column>
+        <column name="schedule">
+            <settings>
+                <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/text</bodyTmpl>
+                <label translate="true">Schedule</label>
+            </settings>
+        </column>
+        <actionsColumn name="actions" class="Magento\Theme\Ui\Component\Listing\Column\ViewAction" sortOrder="50">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="viewUrlPath" xsi:type="string">subscriptions/profile/edit</item>
+                    <item name="urlEntityParamName" xsi:type="string">id</item>
+                </item>
+            </argument>
+            <settings>
+                <indexField>profile_id</indexField>
+            </settings>
+        </actionsColumn>
+    </columns>
+</listing>
diff --git a/view/adminhtml/ui_component/subscriptions_listing.xml b/view/adminhtml/ui_component/subscriptions_listing.xml
new file mode 100644
index 00000000..ea86911a
--- /dev/null
+++ b/view/adminhtml/ui_component/subscriptions_listing.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">subscriptions_listing.subscriptions_listing_data_source</item>
+            <item name="deps" xsi:type="string">subscriptions_listing.subscriptions_listing_data_source</item>
+        </item>
+        <item name="spinner" xsi:type="string">subscriptions_columns</item>
+    </argument>
+    <dataSource name="subscriptions_listing_data_source">
+        <argument name="dataProvider" xsi:type="configurableObject">
+            <argument name="class" xsi:type="string">Nexi\Checkout\Ui\DataProvider\SubscriptionDataProvider</argument>
+            <argument name="name" xsi:type="string">subscriptions_listing_data_source</argument>
+            <argument name="primaryFieldName" xsi:type="string">entity_id</argument>
+            <argument name="requestFieldName" xsi:type="string">entity_id</argument>
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="update_url" xsi:type="url" path="mui/index/render"/>
+                    <item name="storageConfig" xsi:type="array">
+                        <item name="indexField" xsi:type="string">entity_id</item>
+                    </item>
+                </item>
+            </argument>
+        </argument>
+        <argument name="data" xsi:type="array">
+            <item name="js_config" xsi:type="array">
+                <item name="component" xsi:type="string">Magento_Ui/js/grid/provider</item>
+            </item>
+        </argument>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <bookmark name="bookmarks"/>
+        <columnsControls name="columns_controls"/>
+        <massaction name="listing_massaction">
+            <argument name="data" xsi:type="array">
+                <item name="data" xsi:type="array">
+                    <item name="selectProvider" xsi:type="string">subscriptions_listing.subscriptions_listing.subscriptions_columns.ids</item>
+                    <item name="displayArea" xsi:type="string">bottom</item>
+                    <item name="component" xsi:type="string">Magento_Ui/js/grid/tree-massactions</item>
+                    <item name="indexField" xsi:type="string">entity_id</item>
+                </item>
+            </argument>
+            <action name="delete">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="type" xsi:type="string">delete</item>
+                        <item name="label" xsi:type="string" translate="true">Delete</item>
+                        <item name="url" xsi:type="url" path="*/*/massDelete"/>
+                        <item name="confirm" xsi:type="array">
+                            <item name="title" xsi:type="string" translate="true">Delete items</item>
+                            <item name="message" xsi:type="string" translate="true">Are you sure you want to delete selected items?</item>
+                        </item>
+                    </item>
+                </argument>
+            </action>
+        </massaction>
+        <filters name="listing_filters">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="templates" xsi:type="array">
+                        <item name="filters" xsi:type="array">
+                            <item name="select" xsi:type="array">
+                                <item name="component" xsi:type="string">Magento_Ui/js/form/element/ui-select</item>
+                                <item name="template" xsi:type="string">ui/grid/filters/elements/ui-select</item>
+                            </item>
+                        </item>
+                    </item>
+                </item>
+            </argument>
+        </filters>
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="subscriptions_columns">
+        <settings>
+            <childDefaults>
+                <param name="fieldAction" xsi:type="array">
+                    <item name="provider" xsi:type="string">subscriptions_listing.subscriptions_listing.subscriptions_columns.actions</item>
+                    <item name="target" xsi:type="string">applyAction</item>
+                    <item name="params" xsi:type="array">
+                        <item name="0" xsi:type="string">view</item>
+                        <item name="1" xsi:type="string">${ $.$data.rowIndex }</item>
+                    </item>
+                </param>
+            </childDefaults>
+        </settings>
+        <selectionsColumn name="ids">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="indexField" xsi:type="string">entity_id</item>
+                </item>
+            </argument>
+        </selectionsColumn>
+        <column name="entity_id">
+            <settings>
+                <filter>textRange</filter>
+                <label translate="true">ID</label>
+                <resizeDefaultWidth>25</resizeDefaultWidth>
+            </settings>
+        </column>
+        <column name="status">
+            <settings>
+                <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/text</bodyTmpl>
+                <label translate="true">Status</label>
+            </settings>
+        </column>
+        <column name="next_order_date" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date">
+            <settings>
+                <filter>dateRange</filter>
+                <dataType>date</dataType>
+                <label translate="true">Next order date</label>
+            </settings>
+        </column>
+        <column name="recurring_profile_id">
+            <settings>
+                <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/text</bodyTmpl>
+                <label translate="true">Profile id</label>
+                <visible>false</visible>
+            </settings>
+        </column>
+        <column name="profile_name">
+            <settings>
+                <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/text</bodyTmpl>
+                <label translate="true">Profile Name</label>
+            </settings>
+        </column>
+        <column name="last_order_id">
+            <settings>
+                <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/text</bodyTmpl>
+                <label translate="true">Last Order id</label>
+            </settings>
+        </column>
+        <column name="updated_at" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date">
+            <settings>
+                <filter>dateRange</filter>
+                <dataType>date</dataType>
+                <label translate="true">Updated at</label>
+                <visible>false</visible>
+            </settings>
+        </column>
+        <column name="end_date" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date">
+            <settings>
+                <filter>dateRange</filter>
+                <dataType>date</dataType>
+                <label translate="true">End date</label>
+                <visible>false</visible>
+            </settings>
+        </column>
+        <column name="repeat_count_left">
+            <settings>
+                <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/text</bodyTmpl>
+                <label translate="true">Repeats left</label>
+                <visible>false</visible>
+            </settings>
+        </column>
+        <column name="retry_count">
+            <settings>
+                <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/text</bodyTmpl>
+                <label translate="true">Retries left</label>
+                <visible>false</visible>
+            </settings>
+        </column>
+        <column name="email">
+            <settings>
+                <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/text</bodyTmpl>
+                <label translate="true">Customer Email</label>
+            </settings>
+        </column>
+        <actionsColumn name="actions" class="Nexi\Checkout\Ui\Component\Listing\Column\SubscriptionAction" sortOrder="50">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="viewUrlPath" xsi:type="string">subscriptions/subscription/view</item>
+                    <item name="urlEntityParamName" xsi:type="string">id</item>
+                </item>
+            </argument>
+            <settings>
+                <indexField>entity_id</indexField>
+            </settings>
+        </actionsColumn>
+    </columns>
+</listing>
diff --git a/view/adminhtml/ui_component/subscriptions_view.xml b/view/adminhtml/ui_component/subscriptions_view.xml
new file mode 100644
index 00000000..0993374e
--- /dev/null
+++ b/view/adminhtml/ui_component/subscriptions_view.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">subscriptions_view.subscription_data_source</item>
+            <item name="deps" xsi:type="string">subscriptions_view.subscription_data_source</item>
+        </item>
+        <item name="label" xsi:type="string" translate="true">Sample Form</item>
+        <item name="template" xsi:type="string">templates/form/collapsible</item>
+
+        <item name="buttons" xsi:type="array">
+            <item name="back" xsi:type="string">Nexi\Checkout\Block\Adminhtml\Subscription\Edit\BackButton</item>
+            <item name="delete" xsi:type="string">Nexi\Checkout\Block\Adminhtml\Subscription\Edit\DeleteButton</item>
+            <item name="stop" xsi:type="string">Nexi\Checkout\Block\Adminhtml\Subscription\Edit\StopButton</item>
+            <item name="save" xsi:type="string">Nexi\Checkout\Block\Adminhtml\Subscription\Edit\SaveButton</item>
+        </item>
+
+        <item name="config" xsi:type="array">
+            <item name="dataScope" xsi:type="string">data</item>
+            <item name="namespace" xsi:type="string">subscriptions_view</item>
+        </item>
+    </argument>
+
+    <dataSource name="subscription_data_source">
+        <argument name="data" xsi:type="array">
+            <item name="js_config" xsi:type="array">
+                <item name="component" xsi:type="string">Magento_Ui/js/form/provider</item>
+            </item>
+        </argument>
+        <settings>
+            <submitUrl path="*/*/save" />
+        </settings>
+        <dataProvider class="Nexi\Checkout\Ui\DataProvider\SubscriptionForm" name="subscription_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>entity_id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+
+    <fieldset name="columns">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="label" xsi:type="string" translate="true">Subscription</item>
+            </item>
+        </argument>
+
+        <!-- This field represents form id and is hidden -->
+        <field name="entity_id">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="visible" xsi:type="boolean">false</item>
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="formElement" xsi:type="string">input</item>
+                </item>
+            </argument>
+        </field>
+
+        <field name="status" formElement="select">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string">Status</item>
+                    <item name="visible" xsi:type="boolean">true</item>
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="formElement" xsi:type="string">select</item>
+                    <item name="disabled" xsi:type="boolean">true</item>
+                </item>
+            </argument>
+            <settings>
+                <validation>
+                    <rule xsi:type="boolean" name="required-entry">true</rule>
+                </validation>
+            </settings>
+            <formElements>
+                <select>
+                    <settings>
+                        <options class="Nexi\Checkout\Model\OptionSource\SubscriptionStatus" />
+                    </settings>
+                </select>
+            </formElements>
+        </field>
+
+        <field name="next_order_date">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string">Next order date</item>
+                    <item name="visible" xsi:type="boolean">true</item>
+                    <item name="disabled" xsi:type="boolean">true</item>
+                    <item name="dataType" xsi:type="string">date</item>
+                    <item name="formElement" xsi:type="string">date</item>
+                </item>
+            </argument>
+        </field>
+
+        <field name="profile_id">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string">profile</item>
+                    <item name="visible" xsi:type="boolean">false</item>
+                    <item name="disabled" xsi:type="boolean">true</item>
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="formElement" xsi:type="string">input</item>
+                </item>
+            </argument>
+        </field>
+
+        <field name="profile_link">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="template" xsi:type="string">ui/form/field</item>
+                    <item name="elementTmpl" xsi:type="string">Nexi_Checkout/form/element/link</item>
+                    <item name="label" xsi:type="string">Profile</item>
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="disabled" xsi:type="boolean">true</item>
+                    <item name="formElement" xsi:type="string">input</item>
+                </item>
+            </argument>
+        </field>
+
+        <field name="repeat_count_left">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string">Payments remaining</item>
+                    <item name="visible" xsi:type="boolean">true</item>
+                    <item name="required" xsi:type="boolean">true</item>
+                    <item name="disabled" xsi:type="boolean">true</item>
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="formElement" xsi:type="string">input</item>
+                </item>
+            </argument>
+        </field>
+
+        <field name="end_date">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string">Final order date</item>
+                    <item name="visible" xsi:type="boolean">true</item>
+                    <item name="disabled" xsi:type="boolean">true</item>
+                    <item name="dataType" xsi:type="string">date</item>
+                    <item name="formElement" xsi:type="string">date</item>
+                </item>
+            </argument>
+        </field>
+
+        <field name="retry_count">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string">Failure retries left</item>
+                    <item name="visible" xsi:type="boolean">true</item>
+                    <item name="disabled" xsi:type="boolean">false</item>
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="formElement" xsi:type="string">input</item>
+                </item>
+            </argument>
+        </field>
+    </fieldset>
+</form>
diff --git a/view/adminhtml/web/css/subscription.css b/view/adminhtml/web/css/subscription.css
new file mode 100644
index 00000000..9b07c726
--- /dev/null
+++ b/view/adminhtml/web/css/subscription.css
@@ -0,0 +1,8 @@
+.recurring-order-link {
+    display: inline-block;
+    padding-top: 8px;
+}
+
+.form-inline .admin__fieldset > .admin__field {
+    margin-bottom: 22px;
+}
diff --git a/view/adminhtml/web/template/form/element/link.html b/view/adminhtml/web/template/form/element/link.html
new file mode 100644
index 00000000..7355f386
--- /dev/null
+++ b/view/adminhtml/web/template/form/element/link.html
@@ -0,0 +1 @@
+<a class="recurring-order-link" data-bind="{attr: {href : value().link}, text: value().link_text}">View</a>
diff --git a/view/frontend/email/recurring_new.html b/view/frontend/email/recurring_new.html
new file mode 100644
index 00000000..35c7583b
--- /dev/null
+++ b/view/frontend/email/recurring_new.html
@@ -0,0 +1,95 @@
+<!--@subject {{trans "Your order will be renewed in %warning_period days" warning_period=$warning_period}} @-->
+<!--@vars {
+"var formattedBillingAddress|raw":"Billing Address",
+"var order_data.email_customer_note|escape|nl2br":"Email Order Note",
+"var order.increment_id":"Order Id",
+"layout handle=\"sales_email_order_items\" order=$order area=\"frontend\"":"Order Items Grid",
+"var payment_html|raw":"Payment Details",
+"var formattedShippingAddress|raw":"Shipping Address",
+"var order.shipping_description":"Shipping Description",
+"var shipping_msg":"Shipping message",
+"var created_at_formatted":"Order Created At (datetime)",
+"var store.frontend_name":"Store Frontend Name",
+"var store_phone":"Store Phone",
+"var store_email":"Store Email",
+"var store_hours":"Store Hours",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.is_not_virtual":"Order Type",
+"var order":"Order",
+"var order_id": "Order DB Id",
+"var order_data.customer_name":"Customer Name"
+"var warning_period: "Advance warning in days before order renewal"
+} @-->
+
+{{template config_path="design/email/header_template"}}
+
+<table>
+    <tr class="email-intro">
+        <td>
+            <p class="greeting">{{trans "%customer_name," customer_name=$order_data.customer_name}}</p>
+            <p>
+                {{trans "You have subscribed for recurring order from %store_name." store_name=$store.frontend_name}}
+                {{trans "Please note that your order will be automatically renewed in %warning_period days." warning_period=$warning_period}}
+            </p>
+            <p>
+                {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
+                {{trans 'If you want to cancel your recurring order <a href="%account_url">log into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
+                {{trans 'Should the recurring payment fail, we will add %warning_period days to your order, so that you can update your payment details.' warning_period=$warning_period}}
+                {{depend store_hours}}
+                {{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours |raw}}
+                {{/depend}}
+            </p>
+        </td>
+    </tr>
+    <tr class="email-summary">
+        <td>
+            <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_id=$order.increment_id |raw}}</h1>
+            <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$created_at_formatted |raw}}</p>
+        </td>
+    </tr>
+    <tr class="email-information">
+        <td>
+            {{depend order_data.email_customer_note}}
+            <table class="message-info">
+                <tr>
+                    <td>
+                        {{var order_data.email_customer_note|escape|nl2br}}
+                    </td>
+                </tr>
+            </table>
+            {{/depend}}
+            <table class="order-details">
+                <tr>
+                    <td class="address-details">
+                        <h3>{{trans "Billing Info"}}</h3>
+                        <p>{{var formattedBillingAddress|raw}}</p>
+                    </td>
+                    {{depend order_data.is_not_virtual}}
+                    <td class="address-details">
+                        <h3>{{trans "Shipping Info"}}</h3>
+                        <p>{{var formattedShippingAddress|raw}}</p>
+                    </td>
+                    {{/depend}}
+                </tr>
+                <tr>
+                    <td class="method-info">
+                        <h3>{{trans "Payment Method"}}</h3>
+                        {{var payment_html|raw}}
+                    </td>
+                    {{depend order_data.is_not_virtual}}
+                    <td class="method-info">
+                        <h3>{{trans "Shipping Method"}}</h3>
+                        <p>{{var order.shipping_description}}</p>
+                        {{if shipping_msg}}
+                        <p>{{var shipping_msg}}</p>
+                        {{/if}}
+                    </td>
+                    {{/depend}}
+                </tr>
+            </table>
+            {{layout handle="sales_email_order_items" order_id=$order_id area="frontend"}}
+        </td>
+    </tr>
+</table>
+
+{{template config_path="design/email/footer_template"}}
diff --git a/view/frontend/email/restore_order_notification.html b/view/frontend/email/restore_order_notification.html
new file mode 100644
index 00000000..155235aa
--- /dev/null
+++ b/view/frontend/email/restore_order_notification.html
@@ -0,0 +1,27 @@
+<!--@subject {{trans "Restore a canceled order"}} @-->
+<!--@vars {
+"var order.increment":"order increment",
+"var order.url":"order adminurl"
+} @-->
+
+{{template config_path="design/email/header_template"}}
+
+<h3>{{trans "Hello"}}</h3>
+<h3>
+    {{trans
+        'Restore order <a href="%order_url">%order_increment</a>'
+
+        order_url=$order.url
+        order_increment=$order.increment
+    |raw}}
+</h3>
+<p>
+    {{trans
+        "The payment for the order %order_increment has been completed while the order was in canceled state.
+        Please navigate to your Magento orders, select the order in question, and click restore order. Note the stock."
+
+        order_increment=$order.increment
+    |raw}}
+</p>
+
+{{template config_path="design/email/footer_template"}}
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
index 023f2cf0..69bde7e6 100644
--- a/view/frontend/layout/checkout_index_index.xml
+++ b/view/frontend/layout/checkout_index_index.xml
@@ -8,6 +8,27 @@
                     <item name="components" xsi:type="array">
                         <item name="checkout" xsi:type="array">
                             <item name="children" xsi:type="array">
+                                <item name="sidebar" xsi:type="array">
+                                    <item name="children" xsi:type="array">
+                                        <item name="summary" xsi:type="array">
+                                            <item name="children" xsi:type="array">
+                                                <item name="totals" xsi:type="array">
+                                                    <item name="children" xsi:type="array">
+                                                        <item name="itemsBefore" xsi:type="array">
+                                                            <item name="component" xsi:type="string">uiComponent</item>
+                                                            <item name="sortOrder" xsi:type="string">35</item>
+                                                            <item name="children" xsi:type="array">
+                                                                <item name="recurring_totals" xsi:type="array">
+                                                                    <item name="component" xsi:type="string">Nexi_Checkout/js/view/checkout/summary/recurring_total</item>
+                                                                </item>
+                                                            </item>
+                                                        </item>
+                                                    </item>
+                                                </item>
+                                            </item>
+                                        </item>
+                                    </item>
+                                </item>
                                 <item name="steps" xsi:type="array">
                                     <item name="children" xsi:type="array">
                                         <item name="billing-step" xsi:type="array">
@@ -17,11 +38,11 @@
                                                         <item name="renders" xsi:type="array">
                                                             <!-- merge payment method renders here -->
                                                             <item name="children" xsi:type="array">
-                                                                <item name="offline-payments" xsi:type="array">
+                                                                <item name="nexi" xsi:type="array">
                                                                     <item name="component" xsi:type="string">Nexi_Checkout/js/view/payment/nexi-payment</item>
                                                                     <item name="methods" xsi:type="array">
                                                                         <item name="nexi" xsi:type="array">
-                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">false</item>
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
                                                                     </item>
                                                                 </item>
diff --git a/view/frontend/layout/checkout_onepage_success.xml b/view/frontend/layout/checkout_onepage_success.xml
new file mode 100644
index 00000000..6872092a
--- /dev/null
+++ b/view/frontend/layout/checkout_onepage_success.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="content">
+            <block class="Magento\Framework\View\Element\Template" name="nexi.checkout.success.minicart.update" template="Nexi_Checkout::success/minicart-update.phtml"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/frontend/layout/customer_account.xml b/view/frontend/layout/customer_account.xml
new file mode 100644
index 00000000..50fa262e
--- /dev/null
+++ b/view/frontend/layout/customer_account.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="customer_account_navigation">
+            <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-subscriptions-link" ifconfig='nexi/subscriptions/active_subscriptions'>
+                <arguments>
+                    <argument name="path" xsi:type="string">nexi/order/payments</argument>
+                    <argument name="label" xsi:type="string" translate="true">My Subscriptions</argument>
+                    <argument name="sortOrder" xsi:type="number">229</argument>
+                </arguments>
+            </block>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/view/frontend/layout/nexi_order_payments.xml b/view/frontend/layout/nexi_order_payments.xml
new file mode 100644
index 00000000..99204301
--- /dev/null
+++ b/view/frontend/layout/nexi_order_payments.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="customer_account"/>
+    <head>
+        <css src="Nexi_Checkout::css/subscription.css"/>
+    </head>
+    <body>
+        <referenceContainer name="content">
+            <block class="Nexi\Checkout\Block\Order\Payments" name="nexi.order.payments" cacheable="false" template="Nexi_Checkout::order/payments.phtml" />
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/frontend/layout/sales_order_printinvoice.xml b/view/frontend/layout/sales_order_printinvoice.xml
new file mode 100644
index 00000000..cefe2d28
--- /dev/null
+++ b/view/frontend/layout/sales_order_printinvoice.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="sales.order.print.invoice" class="Nexi\Checkout\Block\Order\Print\InvoicePrint" />
+    </body>
+</page>
diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
new file mode 100644
index 00000000..d8aa54d5
--- /dev/null
+++ b/view/frontend/requirejs-config.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright © Nexi. All rights reserved.
+ */
+var config = {
+    map: {
+        '*': {
+            'Magento_Checkout/js/model/shipping-save-processor/default': 'Nexi_Checkout/js/model/shipping-save-processor/default',
+            'nexi-success-page': 'Nexi_Checkout/js/success-page'
+        },
+    },
+    config: {
+        mixins: {
+            'Magento_Checkout/js/checkout-data': {
+                'Nexi_Checkout/js/model/checkout-data-ext': true
+            }
+        }
+    }
+};
diff --git a/view/frontend/templates/order/payments.phtml b/view/frontend/templates/order/payments.phtml
new file mode 100644
index 00000000..a6de1f4d
--- /dev/null
+++ b/view/frontend/templates/order/payments.phtml
@@ -0,0 +1,117 @@
+<?php
+
+/** @var \Nexi\Checkout\Block\Order\Payments $block */
+/** @var \Magento\Framework\Escaper $escaper */
+?>
+<?php $recurringPayments = $block->getCustomerSubscriptions() ?>
+<?php $closedSubscriptions = $block->getCustomerClosedSubscriptions() ?>
+<?php if ($block->isSubscriptionsEnabled()): ?>
+    <?php if ($recurringPayments && count($recurringPayments)): ?>
+        <div class="table-wrapper subscriptions-history">
+            <table class="data table table-order-items history" id="my-subscriptions-table">
+                <caption class="table-caption"><?= $escaper->escapeHtml(__('Subscriptions')) ?></caption>
+                <thead>
+                <tr>
+                    <th scope="col" class="col id"><?= $escaper->escapeHtml(__('Next order date')) ?></th>
+                    <th scope="col" class="col date"><?= $escaper->escapeHtml(__('Status')) ?></th>
+                    <th scope="col" class="col total"><?= $escaper->escapeHtml(__('Recurring payment profile')) ?></th>
+                    <th scope="col" class="col actions"><?= $escaper->escapeHtml(__('Grand total')) ?></th>
+                    <th scope="col" class="col actions"><?= $escaper->escapeHtml(__('Action')) ?></th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php foreach ($recurringPayments as $recurringPayment): ?>
+                    <tr>
+                        <td data-th="<?= $escaper->escapeHtml(__('Next Order Date')) ?>"
+                            class="col id"><?= $escaper->escapeHtml($block->validateDate($recurringPayment->getNextOrderDate())) ?></td>
+                        <td data-th="<?= $escaper->escapeHtml(__('Status')) ?>" class="col date"><?= /* @noEscape */
+                            $escaper->escapeHtml($block->getRecurringPaymentStatusName($recurringPayment->getStatus())) ?></td>
+                        <td data-th="<?= $escaper->escapeHtml(__('Recurring Payment Profile')) ?>"
+                            class="col total"><?= /* @noEscape */
+                            $escaper->escapeHtml($recurringPayment->getName()) ?></td>
+                        <td data-th="<?= $escaper->escapeHtml(__('Grand total')) ?>"
+                            class="col status"><?= $escaper->escapeHtml($block->getCurrentCurrency()) . $escaper->escapeHtml($recurringPayment->getBaseGrandTotal()) ?></td>
+                        <td data-th="<?= $escaper->escapeHtml(__('Actions')) ?>" class="col actions">
+                            <div class="customer-subscription-action">
+                                <button
+                                        data-mage-init='{"dropdown":{}}'
+                                        data-toggle="dropdown"
+                                        data-action="customer-menu-toggle">
+                                    <span><?= $escaper->escapeHtml(__('Action')) ?> &#8744;</span>
+                                </button>
+                                <ul data-target="dropdown" class="dropdown-options">
+                                    <li>
+                                        <a href="<?= $escaper->escapeUrl($block->getViewUrl($recurringPayment)) ?>"
+                                           class="action view">
+                                            <span><?= $escaper->escapeHtml(__('View Order')) ?></span>
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a href="<?= $escaper->escapeHtml($block->getStopPaymentUrl($recurringPayment)) ?>"
+                                           class="action order stop-payment-confirmation">
+                                            <span><?= $escaper->escapeHtml(__('Stop subscription')) ?></span>
+                                        </a>
+                                    </li>
+                                </ul>
+                            </div>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+                </tbody>
+            </table>
+        </div>
+        <?php if ($block->getPagerHtml()) : ?>
+            <div class="order-products-toolbar toolbar bottom"><?= $block->getPagerHtml() ?></div>
+        <?php endif ?>
+    <?php else : ?>
+        <div class="message info empty"><span><?= $escaper->escapeHtml($block->getEmptyRecurringPaymentsMessage()) ?></span>
+        </div>
+    <?php endif ?>
+
+    <?php if ($closedSubscriptions && count($closedSubscriptions)) : ?>
+        <h2><?= $escaper->escapeHtml(__('Canceled subscriptions')) ?></h2>
+        <div class="table-wrapper subscription-canceled">
+            <table class="data table table-order-items history" id="my-closed-subscriptions-table">
+                <caption class="table-caption"><?= $escaper->escapeHtml(__('Canceled subscriptions')) ?></caption>
+                <thead>
+                <tr>
+                    <th scope="col" class="col id"><?= $escaper->escapeHtml(__('Next order date')) ?></th>
+                    <th scope="col" class="col date"><?= $escaper->escapeHtml(__('Status')) ?></th>
+                    <th scope="col" class="col total"><?= $escaper->escapeHtml(__('Recurring payment profile')) ?></th>
+                    <th scope="col" class="col actions"><?= $escaper->escapeHtml(__('Grand total')) ?></th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php foreach ($closedSubscriptions as $closedSubscription) : ?>
+                    <tr>
+                        <td data-th="<?= $escaper->escapeHtml(__('Next Order Date')) ?>"
+                            class="col id"><?= $escaper->escapeHtml($block->validateDate($closedSubscription->getNextOrderDate())) ?></td>
+                        <td data-th="<?= $escaper->escapeHtml(__('Status')) ?>" class="col date"><?= /* @noEscape */
+                            $escaper->escapeHtml($block->getRecurringPaymentStatusName($closedSubscription->getStatus())) ?></td>
+                        <td data-th="<?= $escaper->escapeHtml(__('Recurring Payment Profile')) ?>"
+                            class="col total"><?= /* @noEscape */
+                            $escaper->escapeHtml($closedSubscription->getName()) ?></td>
+                        <td data-th="<?= $escaper->escapeHtml(__('Grand total')) ?>"
+                            class="col status"><?= $escaper->escapeHtml($closedSubscription->getBaseGrandTotal()) ?></td>
+                        <td data-th="<?= $escaper->escapeHtml(__('Actions')) ?>" class="col actions">
+                            <a href="<?= $escaper->escapeUrl($block->getViewUrl($closedSubscription)) ?>" class="action view">
+                                <span><?= $escaper->escapeHtml(__('View Order')) ?></span>
+                            </a>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+                </tbody>
+            </table>
+        </div>
+    <?php endif; ?>
+<?php endif; ?>
+
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Nexi_Checkout/js/payments": {
+                "previousError": "<?= /* @noEscape */ $block->getPreviousError() ?>"
+            }
+        }
+    }
+</script>
diff --git a/view/frontend/templates/success/minicart-update.phtml b/view/frontend/templates/success/minicart-update.phtml
new file mode 100644
index 00000000..610530a3
--- /dev/null
+++ b/view/frontend/templates/success/minicart-update.phtml
@@ -0,0 +1,7 @@
+<script type="text/x-magento-init">
+{
+    "*": {
+        "Nexi_Checkout/js/success-page": {}
+    }
+}
+</script>
diff --git a/view/frontend/web/css/source/_module.less b/view/frontend/web/css/source/_module.less
new file mode 100644
index 00000000..6e5a4501
--- /dev/null
+++ b/view/frontend/web/css/source/_module.less
@@ -0,0 +1,21 @@
+.checkout-payment-method {
+    .payment-method-subselection {
+
+        .subselection-label-container {
+            padding: 6px 0;
+
+            .with-icon {
+                display: inline-flex;
+
+                .subselection-label {
+                    align-content: center;
+                }
+
+                .subselection-icon {
+                    height: 48px;
+                    padding: 0 10px;
+                }
+            }
+        }
+    }
+}
diff --git a/view/frontend/web/css/subscription.css b/view/frontend/web/css/subscription.css
new file mode 100644
index 00000000..79463e58
--- /dev/null
+++ b/view/frontend/web/css/subscription.css
@@ -0,0 +1,100 @@
+.customer-subscription-action {
+    display: inline-block;
+    position: relative;
+}
+
+.customer-subscription-action.active {
+    overflow: visible;
+}
+
+.customer-subscription-action::before,
+.customer-subscription-action::after {
+    content: '';
+    display: table;
+}
+
+.customer-subscription-action ul::after {
+    right: 9px;
+    top: -14px;
+}
+
+.customer-subscription-action ul::after {
+    border: 7px solid;
+    border-top-color: currentcolor;
+    border-right-color: currentcolor;
+    border-bottom-color: currentcolor;
+    border-left-color: currentcolor;
+    border-color: transparent transparent #bbbbbb transparent;
+    z-index: 98;
+}
+
+.customer-subscription-action ul::before, .customer-subscription-action ul::after {
+    border-bottom-style: solid;
+    content: '';
+    display: block;
+    height: 0;
+    position: absolute;
+    width: 0;
+}
+
+.customer-subscription-action ul::before {
+    right: 10px;
+    top: -12px;
+}
+
+.customer-subscription-action ul::before {
+    border: 6px solid;
+    border-top-color: currentcolor;
+    border-right-color: currentcolor;
+    border-bottom-color: currentcolor;
+    border-left-color: currentcolor;
+    border-color: transparent transparent #ffffff transparent;
+    z-index: 99;
+}
+
+.customer-subscription-action.active ul {
+    display: block;
+}
+
+.customer-subscription-action ul {
+    margin: 0;
+    padding: 0;
+    list-style: none none;
+    background: #ffffff;
+    border: 1px solid #bbbbbb;
+    margin-top: 4px;
+    min-width: 100%;
+    z-index: 101;
+    box-sizing: border-box;
+    display: none;
+    position: absolute;
+    top: 100%;
+    right: 0;
+    box-shadow: 0 3px 3px rgba(0, 0, 0, 0.15);
+}
+
+.customer-subscription-action ul li {
+    margin: 0;
+    padding: 0;
+}
+
+.customer-subscription-action ul {
+    list-style: none none;
+}
+
+.customer-subscription-action li a:visited {
+    color: #333333;
+}
+
+.customer-subscription-action li a {
+    color: #333333;
+    text-decoration: none;
+    display: block;
+    line-height: 1.4;
+    padding: 8px;
+}
+
+.customer-subscription-action ul li:hover {
+    background: #e8e8e8;
+    cursor: pointer;
+}
diff --git a/view/frontend/web/images/applepay.png b/view/frontend/web/images/applepay.png
new file mode 100644
index 00000000..bb7e857d
Binary files /dev/null and b/view/frontend/web/images/applepay.png differ
diff --git a/view/frontend/web/images/googlepay.png b/view/frontend/web/images/googlepay.png
new file mode 100644
index 00000000..54f2ef26
Binary files /dev/null and b/view/frontend/web/images/googlepay.png differ
diff --git a/view/frontend/web/images/klarna.png b/view/frontend/web/images/klarna.png
new file mode 100644
index 00000000..c2d7131b
Binary files /dev/null and b/view/frontend/web/images/klarna.png differ
diff --git a/view/frontend/web/images/mobilepay.png b/view/frontend/web/images/mobilepay.png
new file mode 100644
index 00000000..4aaf02c8
Binary files /dev/null and b/view/frontend/web/images/mobilepay.png differ
diff --git a/view/frontend/web/images/nexi-cards.png b/view/frontend/web/images/nexi-cards.png
new file mode 100644
index 00000000..b07081bc
Binary files /dev/null and b/view/frontend/web/images/nexi-cards.png differ
diff --git a/view/frontend/web/images/paypal.png b/view/frontend/web/images/paypal.png
new file mode 100644
index 00000000..c88ced59
Binary files /dev/null and b/view/frontend/web/images/paypal.png differ
diff --git a/view/frontend/web/images/ratepay.png b/view/frontend/web/images/ratepay.png
new file mode 100644
index 00000000..270ee3ae
Binary files /dev/null and b/view/frontend/web/images/ratepay.png differ
diff --git a/view/frontend/web/images/sofort.png b/view/frontend/web/images/sofort.png
new file mode 100644
index 00000000..e0c807e4
Binary files /dev/null and b/view/frontend/web/images/sofort.png differ
diff --git a/view/frontend/web/images/swish.png b/view/frontend/web/images/swish.png
new file mode 100644
index 00000000..e02875a7
Binary files /dev/null and b/view/frontend/web/images/swish.png differ
diff --git a/view/frontend/web/images/trustly.png b/view/frontend/web/images/trustly.png
new file mode 100644
index 00000000..bd356653
Binary files /dev/null and b/view/frontend/web/images/trustly.png differ
diff --git a/view/frontend/web/images/vipps.png b/view/frontend/web/images/vipps.png
new file mode 100644
index 00000000..8e3d375e
Binary files /dev/null and b/view/frontend/web/images/vipps.png differ
diff --git a/view/frontend/web/js/model/checkout-data-ext.js b/view/frontend/web/js/model/checkout-data-ext.js
new file mode 100644
index 00000000..2db2e9da
--- /dev/null
+++ b/view/frontend/web/js/model/checkout-data-ext.js
@@ -0,0 +1,52 @@
+define([
+    'Magento_Customer/js/customer-data'
+], function (
+    storage
+) {
+    'use strict';
+
+    return function (checkoutData) {
+
+        var cacheKey = 'checkout-data',
+
+            /**
+             * @param {Object} data
+             */
+            saveData = function (data) {
+                storage.set(cacheKey, data);
+            },
+
+            /**
+             * @return {Object}
+             */
+            getData = function () {
+                //Makes sure that checkout storage is initiated (any method can be used)
+                checkoutData.getSelectedShippingAddress();
+
+                return storage.get(cacheKey)();
+            };
+
+        /**
+         * Save the pickup address in persistence storage
+         *
+         * @param {Object} data
+         */
+        checkoutData.setNexiSubselection = function (data) {
+            var obj = getData();
+
+            obj.nexiSubselection = data;
+            saveData(obj);
+        };
+
+        /**
+         * Get the pickup address from persistence storage
+         *
+         * @return {*}
+         */
+        checkoutData.getNexiSubselection = function () {
+            return getData().nexiSubselection || null;
+        };
+
+        return checkoutData;
+    };
+});
diff --git a/view/frontend/web/js/model/shipping-save-processor/default.js b/view/frontend/web/js/model/shipping-save-processor/default.js
new file mode 100644
index 00000000..c5251564
--- /dev/null
+++ b/view/frontend/web/js/model/shipping-save-processor/default.js
@@ -0,0 +1,75 @@
+/**
+ * Copyright © Nexi. All rights reserved.
+ */
+define([
+    'ko',
+    'Magento_Checkout/js/model/quote',
+    'Magento_Checkout/js/model/resource-url-manager',
+    'mage/storage',
+    'Magento_Checkout/js/model/payment-service',
+    'Magento_Checkout/js/model/payment/method-converter',
+    'Magento_Checkout/js/model/error-processor',
+    'Magento_Checkout/js/model/full-screen-loader',
+    'Magento_Checkout/js/action/select-billing-address',
+    'Magento_Checkout/js/model/shipping-save-processor/payload-extender'
+], function (
+    ko,
+    quote,
+    resourceUrlManager,
+    storage,
+    paymentService,
+    methodConverter,
+    errorProcessor,
+    fullScreenLoader,
+    selectBillingAddressAction,
+    payloadExtender
+) {
+    'use strict';
+
+    return {
+        /**
+         * @return {jQuery.Deferred}
+         */
+        saveShippingInformation: function () {
+            var payload;
+
+            if (!quote.billingAddress() && quote.shippingAddress().canUseForBilling()) {
+                selectBillingAddressAction(quote.shippingAddress());
+            }
+
+            payload = {
+                addressInformation: {
+                    'shipping_address': quote.shippingAddress(),
+                    'billing_address': quote.billingAddress(),
+                    'shipping_method_code': quote.shippingMethod()['method_code'],
+                    'shipping_carrier_code': quote.shippingMethod()['carrier_code']
+                }
+            };
+
+            // Add email to shipping address if available
+            if (quote.guestEmail) {
+                payload.addressInformation.shipping_address.email = quote.guestEmail;
+            }
+
+            payloadExtender(payload);
+
+            fullScreenLoader.startLoader();
+
+            return storage.post(
+                resourceUrlManager.getUrlForSetShippingInformation(quote),
+                JSON.stringify(payload)
+            ).done(
+                function (response) {
+                    quote.setTotals(response.totals);
+                    paymentService.setPaymentMethods(methodConverter(response['payment_methods']));
+                    fullScreenLoader.stopLoader();
+                }
+            ).fail(
+                function (response) {
+                    errorProcessor.process(response);
+                    fullScreenLoader.stopLoader();
+                }
+            );
+        }
+    };
+});
diff --git a/view/frontend/web/js/sdk/loader.js b/view/frontend/web/js/sdk/loader.js
new file mode 100644
index 00000000..9c5aa56a
--- /dev/null
+++ b/view/frontend/web/js/sdk/loader.js
@@ -0,0 +1,37 @@
+define([
+    'jquery',
+    'Magento_Checkout/js/model/full-screen-loader'
+], function ($, fullScreenLoader) {
+    'use strict';
+
+    return {
+        loadSdk: function (isTestMode) {
+            return new Promise((resolve, reject) => {
+                if (window.Dibs?.Checkout) {
+                    resolve();
+                    return;
+                }
+
+                const sdkUrl = isTestMode
+                    ? 'https://test.checkout.dibspayment.eu/v1/checkout.js?v=1'
+                    : 'https://checkout.dibspayment.eu/v1/checkout.js?v=1';
+
+                fullScreenLoader.startLoader();
+
+                const script = document.createElement('script');
+                script.src = sdkUrl;
+                script.async = true;
+                script.onload = () => {
+                    fullScreenLoader.stopLoader();
+                    resolve();
+                };
+                script.onerror = () => {
+                    fullScreenLoader.stopLoader();
+                    reject(new Error('Failed to load Nexi Checkout SDK'));
+                };
+
+                document.head.appendChild(script);
+            });
+        }
+    };
+});
diff --git a/view/frontend/web/js/success-page.js b/view/frontend/web/js/success-page.js
new file mode 100644
index 00000000..997ed9e3
--- /dev/null
+++ b/view/frontend/web/js/success-page.js
@@ -0,0 +1,12 @@
+define([
+    'jquery',
+    'Magento_Customer/js/customer-data'
+], function ($, customerData) {
+    'use strict';
+
+    return function () {
+        var sections = ['cart'];
+        customerData.invalidate(sections);
+        customerData.reload(sections, true);
+    };
+});
diff --git a/view/frontend/web/js/view/checkout/summary/recurring_total.js b/view/frontend/web/js/view/checkout/summary/recurring_total.js
new file mode 100644
index 00000000..a7d73b1a
--- /dev/null
+++ b/view/frontend/web/js/view/checkout/summary/recurring_total.js
@@ -0,0 +1,42 @@
+define([
+        'jquery',
+        'ko',
+        'uiComponent',
+        'Magento_Checkout/js/model/quote',
+        'Magento_Checkout/js/checkout-data',
+        'Magento_Customer/js/customer-data',
+        'Magento_Checkout/js/model/totals',
+        'Magento_Checkout/js/view/summary/abstract-total',
+        'Magento_Catalog/js/price-utils',
+        'mage/translate'],
+    function($, ko, Component, quote, checkoutData, customerData, totals, abstractTotal, priceUtils, $t){
+
+        return Component.extend({
+            defaults: {
+                displayMode: window.checkoutConfig.reviewShippingDisplayMode,
+                template: 'Nexi_Checkout/checkout/summary/recurring_total'
+            },
+
+            getRecurringTotalsText: function (){
+                return $t('Recurring Payment');
+            },
+
+            isRecurringScheduled: function (){
+                return window.checkoutConfig.isRecurringScheduled;
+            },
+
+            getRecurringSubtotal: function (){
+                return priceUtils.formatPrice(window.checkoutConfig.recurringSubtotal);
+            },
+
+            getRecurringShipping: function (){
+                return priceUtils.formatPrice(totals.totals()['shipping_amount']);
+            },
+
+            getRecurringTotal: function (){
+                return priceUtils.formatPrice(
+                    window.checkoutConfig.recurringSubtotal + totals.totals()['shipping_amount']
+                );
+            }
+        });
+    });
diff --git a/view/frontend/web/js/view/payment/initialize-payment.js b/view/frontend/web/js/view/payment/initialize-payment.js
new file mode 100644
index 00000000..68d9148f
--- /dev/null
+++ b/view/frontend/web/js/view/payment/initialize-payment.js
@@ -0,0 +1,65 @@
+define([
+    "mage/storage",
+    "Magento_Checkout/js/model/url-builder",
+    "Magento_Checkout/js/model/quote",
+    "Magento_Checkout/js/model/full-screen-loader",
+    "Magento_Checkout/js/model/error-processor",
+    "Magento_Customer/js/model/customer",
+], function (
+    storage,
+    urlBuilder,
+    quote,
+    fullScreenLoader,
+    errorProcessor,
+    customer
+) {
+    "use strict";
+
+    return function () {
+        const payload = {
+            cartId: quote.getQuoteId(),
+            paymentMethod: {
+                method: this.getCode(),
+            },
+            integrationType: this.config.integrationType,
+        };
+
+        if (this.config.payTypeSplitting) {
+            payload.paymentMethod.additionalData = {
+                subselection:    this.subselection(),
+            };
+        }
+
+        const serviceUrl = customer.isLoggedIn()
+            ? urlBuilder.createUrl("/nexi/carts/mine/payment-initialize", {})
+            : urlBuilder.createUrl("/nexi/guest-carts/:quoteId/payment-initialize", {
+                quoteId: quote.getQuoteId(),
+            });
+
+        fullScreenLoader.startLoader();
+
+        return new Promise((resolve, reject) => {
+            storage
+                .post(serviceUrl, JSON.stringify(payload))
+                .done(function (response) {
+                    resolve(JSON.parse(response));
+                })
+                .fail(
+                    function (response) {
+                        errorProcessor.process(response, this.messageContainer);
+                        let redirectURL = response.getResponseHeader("errorRedirectAction");
+
+                        if (redirectURL) {
+                            setTimeout(function () {
+                                errorProcessor.redirectTo(redirectURL);
+                            }, 3000);
+                        }
+                        reject(response);
+                    }.bind(this)
+                )
+                .always(function () {
+                    fullScreenLoader.stopLoader();
+                });
+        });
+    };
+});
diff --git a/view/frontend/web/js/view/payment/method-renderer/nexi-method.js b/view/frontend/web/js/view/payment/method-renderer/nexi-method.js
old mode 100755
new mode 100644
index 93ff865d..e31615ba
--- a/view/frontend/web/js/view/payment/method-renderer/nexi-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/nexi-method.js
@@ -13,46 +13,134 @@ define(
         'Magento_Checkout/js/model/url-builder',
         'mage/url',
         'Magento_Checkout/js/model/full-screen-loader',
+        'Magento_Checkout/js/model/error-processor',
         'Magento_Customer/js/model/customer',
         'Magento_Checkout/js/checkout-data',
         'Magento_Checkout/js/model/totals',
         'Magento_Ui/js/model/messageList',
         'mage/translate',
-        'Magento_Ui/js/modal/modal'
+        'Magento_Ui/js/modal/modal',
+        'Nexi_Checkout/js/sdk/loader',
+        'Nexi_Checkout/js/view/payment/initialize-payment',
+        'Nexi_Checkout/js/view/payment/render-embedded',
+        'Nexi_Checkout/js/view/payment/validate',
+        'Magento_Checkout/js/model/payment/place-order-hooks',
     ],
-    function (ko,
-              $,
-              _,
-              storage,
-              Component,
-              placeOrderAction,
-              selectPaymentMethodAction,
-              additionalValidators,
-              quote,
-              getTotalsAction,
-              urlBuilder,
-              url,
-              fullScreenLoader,
-              customer,
-              checkoutData,
-              totals,
-              messageList,
-              $t,
-              modal
+    function (
+        ko,
+        $,
+        _,
+        storage,
+        Component,
+        placeOrderAction,
+        selectPaymentMethodAction,
+        additionalValidators,
+        quote,
+        getTotalsAction,
+        urlBuilder,
+        url,
+        fullScreenLoader,
+        errorProcessor,
+        customer,
+        checkoutData,
+        totals,
+        messageList,
+        $t,
+        modal,
+        sdkLoader,
+        initializeCartPayment,
+        renderEmbeddedCheckout,
+        validatePayment,
+        placeOrderHooks,
     ) {
         'use strict';
 
         return Component.extend({
             defaults: {
-                template: window.checkoutConfig.payment.nexi.integrationType ? 'Nexi_Checkout/payment/nexi-hosted' : 'Nexi_Checkout/payment/nexi-embedded.html',
-                config: window.checkoutConfig.payment.nexi
+                template: window.checkoutConfig.payment.nexi.integrationType == 'HostedPaymentPage'
+                    ? (window.checkoutConfig.payment.nexi.payTypeSplitting
+                        ? 'Nexi_Checkout/payment/nexi-hosted-type-split.html'
+                        : 'Nexi_Checkout/payment/nexi-hosted.html')
+                    : (window.checkoutConfig.payment.nexi.payTypeSplitting
+                        ? 'Nexi_Checkout/payment/nexi-embedded-type-split.html'
+                        : 'Nexi_Checkout/payment/nexi-embedded.html'),
+                config: window.checkoutConfig.payment.nexi,
+                creditCardType: '',
+                creditCardExpYear: '',
+                creditCardExpMonth: '',
+                creditCardNumber: '',
+                creditCardVerificationNumber: '',
+                selectedCardType: null
             },
-            placeOrder: function (data, event) {
-                let placeOrder = placeOrderAction(this.getData(), false, this.messageContainer);
+            payTypeSplitting: ko.observable(window.checkoutConfig.payment.nexi.payTypeSplitting),
+            isEmbedded: ko.observable(false),
+            dibsCheckout: ko.observable(false),
+            isRendering: ko.observable(false),
+            eventsSubscribed: ko.observable(false),
+            subselection: ko.observable(false),
+            initialize: function () {
+                this._super();
+                if (this.config.integrationType === 'EmbeddedCheckout') {
+                    this.isEmbedded(true);
+                }
+                if (this.payTypeSplitting()) {
+                    if (this.isActive()) {
+                        this.subselection(checkoutData.getNexiSubselection() || false);
+                        this.moveContentToSubselection(this.subselection());
+                    }
+                    this.subselection.subscribe(function (newSubselection) {
+                        if (newSubselection) {
+                            this.moveContentToSubselection(newSubselection);
+                            this.selectPaymentMethod();
+                        }
+                        checkoutData.setNexiSubselection(newSubselection);
+                    }, this);
+
+                }
+                if (this.isActive() && this.isEmbedded()) {
+                    this.renderCheckout();
+                }
+
+                quote.paymentMethod.subscribe(function (method) {
+                    this.hideIframeIfNeeded();
+                    this.clearSubselection(method);
+                }, this);
 
-                $.when(placeOrder).done(function (response) {
-                    this.afterPlaceOrder(response);
-                }.bind(this));
+                placeOrderHooks.requestModifiers.push(
+                    function (headers, payload) {
+
+                        if (payload.paymentMethod.extension_attributes === undefined) {
+                            payload.paymentMethod.extension_attributes = {};
+                        }
+                        payload.paymentMethod.extension_attributes.subselection = this.subselection();
+                    }.bind(this)
+                );
+            },
+            afterRender: function () {
+                if (this.isActive()) {
+                    this.moveContentToSubselection(this.subselection());
+                }
+            },
+            moveContentToSubselection: function (subselection) {
+                const contentElement = document.getElementById("nexi-content");
+                const placeholderElement = document.getElementById("nexi-content-" + subselection);
+                if (contentElement && placeholderElement) {
+                    if (subselection) {
+                        placeholderElement.appendChild(contentElement);
+                    } else {
+                        const originalContainer = document.getElementById("nexi-original-container");
+                        if (originalContainer) {
+                            originalContainer.appendChild(contentElement);
+                        }
+                    }
+                }
+            },
+            isActive: function () {
+                return this.getCode() === this.isChecked();
+            },
+            async placeOrder(data, event) {
+                const response = await placeOrderAction(this.getData(), false, this.messageContainer);
+                this.afterPlaceOrder(response);
             },
             afterPlaceOrder: function (response) {
                 if (this.isHosted()) {
@@ -62,9 +150,125 @@ define(
                     }
                 }
             },
+            async renderCheckout() {
+                this.subscribeToEvents();
+                quote.totals.subscribe(async function (quote) {
+                    if (!this.isActive()) {
+                        return;
+                    }
+                    await renderEmbeddedCheckout.call(this);
+                    this.subscribeToEvents();
+                }, this);
+            },
+            clearNexiCheckout() {
+                if (this.dibsCheckout()) {
+                    this.dibsCheckout().cleanup();
+                }
+                if (document.getElementById("nexi-checkout-container")) {
+                    document.getElementById("nexi-checkout-container").innerHTML = "";
+                }
+            },
+            selectPaymentMethod: function () {
+                this.clearNexiCheckout();
+                this._super();
+                checkoutData.setNexiSubselection(this.subselection());
+                if (this.isEmbedded()) {
+                    this.renderCheckout();
+                }
+                return true;
+            },
+
+            subscribeToEvents: function () {
+                if (this.dibsCheckout()) {
+                    // If events are already subscribed to this instance, don't subscribe again
+                    if (this.eventsSubscribed() === true) {
+                        return;
+                    }
+
+                    // Store a reference to the current dibsCheckout instance to ensure we're subscribing to the right one
+                    const currentDibsCheckout = this.dibsCheckout();
+
+                    currentDibsCheckout.on(
+                        "payment-completed",
+                        async function () {
+                            window.location.href = url.build("checkout/onepage/success");
+                        }.bind(this)
+                    );
+
+                    currentDibsCheckout.on(
+                        "pay-initialized",
+                        async function (paymentId) {
+                            try {
+                                const validationResult = await validatePayment.call(this);
+                                if (!validationResult.success) {
+                                    console.error("Payment validation failed. paymentId:", paymentId);
+                                    window.location.reload();
+                                }
+
+                                await this.placeOrder(); // Ensure the order is placed before proceeding
+
+                                // Trigger Dibs processing only after the order is placed
+                                // Use the same instance reference to send the event
+                                currentDibsCheckout.send("payment-order-finalized", true);
+                            } catch (error) {
+                                console.error("Error during payment initialization:", error);
+                                window.location.reload();
+                            }
+                        }.bind(this)
+                    );
+
+                    currentDibsCheckout.on(
+                        "payment-cancelled",
+                        async function (paymentId) {
+                            fullScreenLoader.stopLoader();
+                        }.bind(this)
+                    );
+
+                    this.eventsSubscribed(true);
+                }
+            },
             isHosted: function () {
                 return this.config.integrationType === 'HostedPaymentPage';
             },
+            hideIframeIfNeeded: function () {
+                const method = quote.paymentMethod();
+                const container = document.getElementById("nexi-checkout-container");
+                if (!container) {
+                    return;
+                }
+
+                if (!method || method.method !== this.getCode()) {
+                    container.style.display = "none";
+                } else {
+                    container.style.display = "block";
+                }
+            },
+            getData: function () {
+                return {
+                    method: this.getCode(),
+                    additional_data: {
+                        integrationType: this.config.integrationType,
+                        paymentMethod: this.config.paymentMethod,
+                        subselection: this.subselection(),
+                    }
+                };
+            },
+            clearSubselection(method) {
+                if (method && method.method !== this.getCode()) {
+                    this.subselection(false);
+                }
+            },
+            getSubselections: function () {
+                if (this.config.payTypeSplitting && this.config.subselections) {
+                    return this.config.subselections.map(function (subselection) {
+                        return {
+                            value: subselection.value,
+                            label: subselection.label,
+                        };
+                    }, this);
+                }
+                return [];
+            }
         });
     }
 );
diff --git a/view/frontend/web/js/view/payment/nexi-payment.js b/view/frontend/web/js/view/payment/nexi-payment.js
old mode 100755
new mode 100644
index a462d1b0..f8073aa1
--- a/view/frontend/web/js/view/payment/nexi-payment.js
+++ b/view/frontend/web/js/view/payment/nexi-payment.js
@@ -16,6 +16,7 @@ define(
                 component: 'Nexi_Checkout/js/view/payment/method-renderer/nexi-method'
             }
         );
+
         return Component.extend({});
     }
 );
diff --git a/view/frontend/web/js/view/payment/render-embedded.js b/view/frontend/web/js/view/payment/render-embedded.js
new file mode 100644
index 00000000..fce2bea8
--- /dev/null
+++ b/view/frontend/web/js/view/payment/render-embedded.js
@@ -0,0 +1,59 @@
+define([
+    "Nexi_Checkout/js/sdk/loader",
+    "Nexi_Checkout/js/view/payment/initialize-payment",
+    "Nexi_Checkout/js/view/payment/validate",
+    "mage/url",
+    'Magento_Checkout/js/model/quote',
+], function (sdkLoader, initializePayment, validatePayment, url, quote) {
+    "use strict";
+
+    // Define the rendering function
+    return async function () {
+        if (this.isRendering()) {
+            console.log("Rendering already in progress. Skipping this call.");
+            return;
+        }
+
+        let selectedPaymentMethod = quote.paymentMethod();
+        if (!selectedPaymentMethod || selectedPaymentMethod.method !== "nexi") {
+            console.log("Selected payment method is not Nexi. Skipping rendering.");
+            return;
+        }
+
+        this.isRendering(true);
+        try {
+            await sdkLoader.loadSdk(this.config.environment === "test");
+
+            if (this.dibsCheckout()) {
+                this.dibsCheckout().cleanup();
+            }
+
+            // Clear the container before rendering
+            if (document.getElementById("nexi-checkout-container")) {
+                document.getElementById("nexi-checkout-container").innerHTML = "";
+            }
+
+            const response = await initializePayment.call(this)
+
+            if (response.paymentId) {
+                let checkoutOptions = {
+                    checkoutKey: response.checkoutKey,
+                    paymentId: response.paymentId,
+                    containerId: "nexi-checkout-container",
+                    language: response.locale || "en-GB"
+                };
+                const newDibsCheckout = new Dibs.Checkout(checkoutOptions);
+                this.dibsCheckout(newDibsCheckout);
+
+                // Reset eventsSubscribed flag to ensure events are subscribed to the new instance
+                this.eventsSubscribed(false);
+
+                console.log("Nexi Checkout SDK loaded successfully. paymentId: ", response.paymentId);
+            }
+        } catch (error) {
+            console.error("Error loading Nexi SDK or initializing payment:", error);
+        } finally {
+            this.isRendering(false);
+        }
+    }
+});
diff --git a/view/frontend/web/js/view/payment/validate.js b/view/frontend/web/js/view/payment/validate.js
new file mode 100644
index 00000000..9b3e7dcc
--- /dev/null
+++ b/view/frontend/web/js/view/payment/validate.js
@@ -0,0 +1,56 @@
+define([
+    "mage/storage",
+    "Magento_Checkout/js/model/url-builder",
+    "Magento_Checkout/js/model/quote",
+    "Magento_Checkout/js/model/full-screen-loader",
+    "Magento_Checkout/js/model/error-processor",
+    "Magento_Customer/js/model/customer",
+], function (
+    storage,
+    urlBuilder,
+    quote,
+    fullScreenLoader,
+    errorProcessor,
+    customer
+) {
+    "use strict";
+
+    return function () {
+        const payload = {
+            cartId: quote.getQuoteId(),
+            paymentId: this.dibsCheckout().options.paymentId
+        };
+
+        const serviceUrl = customer.isLoggedIn()
+            ? urlBuilder.createUrl("/nexi/carts/mine/payment-validate", {})
+            : urlBuilder.createUrl("/nexi/guest-carts/:quoteId/payment-validate", {
+                quoteId: quote.getQuoteId()
+            });
+
+        fullScreenLoader.startLoader();
+
+        return new Promise((resolve, reject) => {
+            storage
+                .post(serviceUrl, JSON.stringify(payload))
+                .done(function (response) {
+                    resolve(JSON.parse(response));
+                })
+                .fail(
+                    function (response) {
+                        errorProcessor.process(response, this.messageContainer);
+                        let redirectURL = response.getResponseHeader("errorRedirectAction");
+
+                        if (redirectURL) {
+                            setTimeout(function () {
+                                errorProcessor.redirectTo(redirectURL);
+                            }, 3000);
+                        }
+                        reject(response);
+                    }.bind(this)
+                )
+                .always(function () {
+                    fullScreenLoader.stopLoader();
+                });
+        });
+    };
+});
diff --git a/view/frontend/web/template/checkout/summary/recurring_total.html b/view/frontend/web/template/checkout/summary/recurring_total.html
new file mode 100644
index 00000000..166bbb89
--- /dev/null
+++ b/view/frontend/web/template/checkout/summary/recurring_total.html
@@ -0,0 +1,15 @@
+<!-- ko if: isRecurringScheduled() -->
+<tr class="totals recurring">
+    <th class="mark" scope="row">
+        <span class="label" data-bind="text: getRecurringTotalsText()"></span>
+        <span class="value" data-bind="text: $t('Subtotal')"></span>
+        <span class="value" data-bind="text: $t('Shipping')"></span>
+        <span class="value" data-bind="text: $t('Subscription Total')"></span>
+    </th>
+    <td class="amount recurring-amount">
+        <p class="price recurring-price" data-bind="text: getRecurringSubtotal()"></p>
+        <p class="price recurring-price" data-bind="text: getRecurringShipping()"></p>
+        <p class="price recurring-price" data-bind="text: getRecurringTotal()"></p>
+    </td>
+</tr>
+<!-- /ko -->
diff --git a/view/frontend/web/template/payment/nexi-embedded-type-split.html b/view/frontend/web/template/payment/nexi-embedded-type-split.html
new file mode 100644
index 00000000..f19b323a
--- /dev/null
+++ b/view/frontend/web/template/payment/nexi-embedded-type-split.html
@@ -0,0 +1,42 @@
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-nexi">
+        <div class="payment-method-subselection">
+            <!-- ko foreach: getSubselections() -->
+            <div class="payment-method-title field choice subselection-label-container">
+                <input type="radio"
+                       name="payment[method][subselection]"
+                       class="radio"
+                       data-bind="attr: {'id': value},
+                          value: value,
+                          checked: $parent.subselection"
+                />
+                <label data-bind="attr: {'for': value}" class="label with-icon">
+                    <span class="subselection-label" data-bind="text: label"></span>
+                <img class="subselection-icon"
+                     data-bind="attr: { src: $parent.config.methodIcons[value] || $parent.config.methodIcons['default'] }"/>
+                </label>
+
+            </div>
+            <div class="subselection-content-placeholder" data-bind="attr: {id: 'nexi-content-' + value}"></div>
+            <!--/ko-->
+        </div>
+
+        <div class="payment-method-content" id="nexi-content">
+            <!-- ko foreach: getRegion('messages') -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+            <div class="payment-method-billing-address">
+                <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+                <!--/ko-->
+            </div>
+            <div class="checkout-agreements-block">
+                <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+                <!--/ko-->
+            </div>
+            <div id="nexi-checkout-container" data-bind="afterRender: afterRender()"></div>
+        </div>
+
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/nexi-embedded.html b/view/frontend/web/template/payment/nexi-embedded.html
index 21e4ae90..fbf4eaab 100644
--- a/view/frontend/web/template/payment/nexi-embedded.html
+++ b/view/frontend/web/template/payment/nexi-embedded.html
@@ -1,5 +1,3 @@
-<!-- todo: this is only template placeholder to implement with the embedded case -->
-
 <div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
     <div class="payment-method-title field choice">
         <input type="radio"
@@ -8,29 +6,22 @@
                data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
         <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
     </div>
-    <div class="payment-method-content">
+
+    <div class="payment-method-content" id="nexi-content">
         <!-- ko foreach: getRegion('messages') -->
         <!-- ko template: getTemplate() --><!-- /ko -->
         <!--/ko-->
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
         <div class="checkout-agreements-block">
             <!-- ko foreach: $parent.getRegion('before-place-order') -->
                 <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
         </div>
-        <div class="actions-toolbar">
-            <div class="primary">
-                <button class="action primary checkout"
-                        type="submit"
-                        data-bind="
-                        click: placeOrder,
-                        attr: {title: $t('Place Order')},
-                        css: {disabled: !isPlaceOrderActionAllowed()},
-                        enable: (getCode() == isChecked())
-                        "
-                        disabled>
-                    <span data-bind="i18n: 'Place Order'"></span>
-                </button>
-            </div>
-        </div>
     </div>
+
+    <div id="nexi-checkout-container"></div>
 </div>
diff --git a/view/frontend/web/template/payment/nexi-hosted-type-split.html b/view/frontend/web/template/payment/nexi-hosted-type-split.html
new file mode 100644
index 00000000..6eaf23e0
--- /dev/null
+++ b/view/frontend/web/template/payment/nexi-hosted-type-split.html
@@ -0,0 +1,57 @@
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-nexi">
+        <div class="payment-method-subselection">
+            <!-- ko foreach: getSubselections() -->
+            <div class="payment-method-title field choice subselection-label-container">
+                <input type="radio"
+                       name="payment[method][subselection]"
+                       class="radio"
+                       data-bind="attr: {'id': value},
+                          value: value,
+                          checked: $parent.subselection"
+                />
+                <label data-bind="attr: {'for': value}" class="label with-icon">
+                    <span class="subselection-label" data-bind="text: label"></span>
+                    <img class="subselection-icon"
+                         data-bind="attr: { src: $parent.config.methodIcons[value] || $parent.config.methodIcons['default'] }"/>
+                </label>
+
+            </div>
+            <div class="subselection-content-placeholder" data-bind="attr: {id: 'nexi-content-' + value}"></div>
+            <!--/ko-->
+        </div>
+
+        <div class="payment-method-content" id="nexi-content">
+            <!-- ko foreach: getRegion('messages') -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+
+            <div class="payment-method-billing-address">
+                <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+                <!--/ko-->
+            </div>
+
+            <div class="checkout-agreements-block">
+                <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+                <!--/ko-->
+            </div>
+            <div class="actions-toolbar">
+                <div class="primary">
+                    <button class="action primary checkout"
+                            type="submit"
+                            data-bind="
+                            click: placeOrder,
+                            attr: {title: $t('Place Order')},
+                            css: {disabled: !isPlaceOrderActionAllowed()},
+                            enable: (getCode() == isChecked())
+                            "
+                            disabled>
+                        <span data-bind="i18n: 'Place Order', afterRender: afterRender()"></span>
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/view/frontend/web/template/payment/nexi-hosted.html b/view/frontend/web/template/payment/nexi-hosted.html
index b20743a3..a6a7a383 100644
--- a/view/frontend/web/template/payment/nexi-hosted.html
+++ b/view/frontend/web/template/payment/nexi-hosted.html
@@ -4,15 +4,24 @@
                name="payment[method]"
                class="radio"
                data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+
         <label data-bind="attr: {'for': getCode()}" class="label"><span data-bind="text: getTitle()"></span></label>
     </div>
-    <div class="payment-method-content">
+
+    <div class="payment-method-content" id="nexi-content">
         <!-- ko foreach: getRegion('messages') -->
         <!-- ko template: getTemplate() --><!-- /ko -->
         <!--/ko-->
+
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+
         <div class="checkout-agreements-block">
             <!-- ko foreach: $parent.getRegion('before-place-order') -->
-                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
         </div>
         <div class="actions-toolbar">
@@ -20,11 +29,11 @@
                 <button class="action primary checkout"
                         type="submit"
                         data-bind="
-                        click: placeOrder,
-                        attr: {title: $t('Place Order')},
-                        css: {disabled: !isPlaceOrderActionAllowed()},
-                        enable: (getCode() == isChecked())
-                        "
+                            click: placeOrder,
+                            attr: {title: $t('Place Order')},
+                            css: {disabled: !isPlaceOrderActionAllowed()},
+                            enable: (getCode() == isChecked())
+                            "
                         disabled>
                     <span data-bind="i18n: 'Place Order'"></span>
                 </button>