diff --git a/spec/CommandProvider/PutItemToCartCommandProviderSpec.php b/spec/CommandProvider/PutItemToCartCommandProviderSpec.php
new file mode 100644
index 000000000..fe8aeafb0
--- /dev/null
+++ b/spec/CommandProvider/PutItemToCartCommandProviderSpec.php
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+namespace spec\Sylius\ShopApiPlugin\CommandProvider;
+
+use PhpSpec\ObjectBehavior;
+use Sylius\ShopApiPlugin\CommandProvider\CommandProviderInterface;
+use Sylius\ShopApiPlugin\Request\Cart\PutOptionBasedConfigurableItemToCartRequest;
+use Sylius\ShopApiPlugin\Request\Cart\PutSimpleItemToCartRequest;
+use Sylius\ShopApiPlugin\Request\Cart\PutVariantBasedConfigurableItemToCartRequest;
+use Symfony\Component\HttpFoundation\ParameterBag;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Validator\ConstraintViolationListInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+final class PutItemToCartCommandProviderSpec extends ObjectBehavior
+{
+    function let(ValidatorInterface $validator): void
+    {
+        $this->beConstructedWith($validator);
+    }
+
+    function it_implements_command_provider_interface(): void
+    {
+        $this->shouldHaveType(CommandProviderInterface::class);
+    }
+
+    function it_validates_put_simple_item_to_cart_request(
+        ValidatorInterface $validator,
+        Request $httpRequest,
+        ConstraintViolationListInterface $constraintViolationList
+    ): void {
+        $httpRequest->attributes = new ParameterBag(['token' => 'ORDERTOKEN']);
+        $httpRequest->request = new ParameterBag([
+            'productCode' => 'HACKTOBERFEST_TSHIRT_CODE',
+            'quantity' => 4,
+        ]);
+
+        $validator
+            ->validate(PutSimpleItemToCartRequest::fromHttpRequest($httpRequest->getWrappedObject()))
+            ->willReturn($constraintViolationList)
+        ;
+
+        $this->validate($httpRequest)->shouldReturn($constraintViolationList);
+    }
+
+    function it_validates_put_variant_based_configurable_item_to_cart_request(
+        ValidatorInterface $validator,
+        Request $httpRequest,
+        ConstraintViolationListInterface $constraintViolationList
+    ): void {
+        $httpRequest->attributes = new ParameterBag(['token' => 'ORDERTOKEN']);
+        $httpRequest->request = new ParameterBag([
+            'productCode' => 'HACKTOBERFEST_TSHIRT_CODE',
+            'variantCode' => 'LARGE_HACKTOBERFEST_TSHIRT_CODE',
+            'quantity' => 4,
+        ]);
+
+        $validator
+            ->validate(PutVariantBasedConfigurableItemToCartRequest::fromHttpRequest($httpRequest->getWrappedObject()))
+            ->willReturn($constraintViolationList)
+        ;
+
+        $this->validate($httpRequest)->shouldReturn($constraintViolationList);
+    }
+
+    function it_validates_put_option_based_configurable_item_to_cart_request(
+        ValidatorInterface $validator,
+        Request $httpRequest,
+        ConstraintViolationListInterface $constraintViolationList
+    ): void {
+        $httpRequest->attributes = new ParameterBag(['token' => 'ORDERTOKEN']);
+        $httpRequest->request = new ParameterBag([
+            'productCode' => 'HACKTOBERFEST_TSHIRT_CODE',
+            'options' => ['LARGE_CODE'],
+            'quantity' => 4,
+        ]);
+
+        $validator
+            ->validate(PutOptionBasedConfigurableItemToCartRequest::fromHttpRequest($httpRequest->getWrappedObject()))
+            ->willReturn($constraintViolationList)
+        ;
+
+        $this->validate($httpRequest)->shouldReturn($constraintViolationList);
+    }
+}
diff --git a/src/Command/Cart/AddCoupon.php b/src/Command/Cart/AddCoupon.php
index e0396c991..946101541 100644
--- a/src/Command/Cart/AddCoupon.php
+++ b/src/Command/Cart/AddCoupon.php
@@ -4,7 +4,9 @@
 
 namespace Sylius\ShopApiPlugin\Command\Cart;
 
-class AddCoupon
+use Sylius\ShopApiPlugin\Command\CommandInterface;
+
+class AddCoupon implements CommandInterface
 {
     /** @var string */
     protected $orderToken;
diff --git a/src/Command/Cart/AddressOrder.php b/src/Command/Cart/AddressOrder.php
index f4885289c..079bf91e0 100644
--- a/src/Command/Cart/AddressOrder.php
+++ b/src/Command/Cart/AddressOrder.php
@@ -4,9 +4,10 @@
 
 namespace Sylius\ShopApiPlugin\Command\Cart;
 
+use Sylius\ShopApiPlugin\Command\CommandInterface;
 use Sylius\ShopApiPlugin\Model\Address;
 
-class AddressOrder
+class AddressOrder implements CommandInterface
 {
     /** @var string */
     protected $orderToken;
diff --git a/src/Command/Cart/ChangeItemQuantity.php b/src/Command/Cart/ChangeItemQuantity.php
index ba3dccc0f..0e4738179 100644
--- a/src/Command/Cart/ChangeItemQuantity.php
+++ b/src/Command/Cart/ChangeItemQuantity.php
@@ -4,9 +4,10 @@
 
 namespace Sylius\ShopApiPlugin\Command\Cart;
 
+use Sylius\ShopApiPlugin\Command\CommandInterface;
 use Webmozart\Assert\Assert;
 
-class ChangeItemQuantity
+class ChangeItemQuantity implements CommandInterface
 {
     /** @var string */
     protected $orderToken;
diff --git a/src/Command/Cart/ChoosePaymentMethod.php b/src/Command/Cart/ChoosePaymentMethod.php
index 1a0da1ebf..e9cc019d4 100644
--- a/src/Command/Cart/ChoosePaymentMethod.php
+++ b/src/Command/Cart/ChoosePaymentMethod.php
@@ -4,7 +4,9 @@
 
 namespace Sylius\ShopApiPlugin\Command\Cart;
 
-class ChoosePaymentMethod
+use Sylius\ShopApiPlugin\Command\CommandInterface;
+
+class ChoosePaymentMethod implements CommandInterface
 {
     /** @var mixed */
     protected $paymentIdentifier;
diff --git a/src/Command/Cart/ChooseShippingMethod.php b/src/Command/Cart/ChooseShippingMethod.php
index e4a056a81..8a4d41561 100644
--- a/src/Command/Cart/ChooseShippingMethod.php
+++ b/src/Command/Cart/ChooseShippingMethod.php
@@ -4,7 +4,9 @@
 
 namespace Sylius\ShopApiPlugin\Command\Cart;
 
-class ChooseShippingMethod
+use Sylius\ShopApiPlugin\Command\CommandInterface;
+
+class ChooseShippingMethod implements CommandInterface
 {
     /** @var mixed */
     protected $shipmentIdentifier;
diff --git a/src/Command/Cart/CompleteOrder.php b/src/Command/Cart/CompleteOrder.php
index dda566d2e..934e1d4ed 100644
--- a/src/Command/Cart/CompleteOrder.php
+++ b/src/Command/Cart/CompleteOrder.php
@@ -4,7 +4,9 @@
 
 namespace Sylius\ShopApiPlugin\Command\Cart;
 
-class CompleteOrder
+use Sylius\ShopApiPlugin\Command\CommandInterface;
+
+class CompleteOrder implements CommandInterface
 {
     /** @var string */
     protected $orderToken;
diff --git a/src/Command/Cart/PutOptionBasedConfigurableItemToCart.php b/src/Command/Cart/PutOptionBasedConfigurableItemToCart.php
index c897ba2cb..5f83c860e 100644
--- a/src/Command/Cart/PutOptionBasedConfigurableItemToCart.php
+++ b/src/Command/Cart/PutOptionBasedConfigurableItemToCart.php
@@ -4,9 +4,10 @@
 
 namespace Sylius\ShopApiPlugin\Command\Cart;
 
+use Sylius\ShopApiPlugin\Command\CommandInterface;
 use Webmozart\Assert\Assert;
 
-class PutOptionBasedConfigurableItemToCart
+class PutOptionBasedConfigurableItemToCart implements CommandInterface
 {
     /** @var string */
     protected $orderToken;
diff --git a/src/Command/Cart/PutSimpleItemToCart.php b/src/Command/Cart/PutSimpleItemToCart.php
index 271567e1e..ab4a573f6 100644
--- a/src/Command/Cart/PutSimpleItemToCart.php
+++ b/src/Command/Cart/PutSimpleItemToCart.php
@@ -4,9 +4,10 @@
 
 namespace Sylius\ShopApiPlugin\Command\Cart;
 
+use Sylius\ShopApiPlugin\Command\CommandInterface;
 use Webmozart\Assert\Assert;
 
-class PutSimpleItemToCart
+class PutSimpleItemToCart implements CommandInterface
 {
     /** @var string */
     protected $orderToken;
diff --git a/src/Command/Cart/PutVariantBasedConfigurableItemToCart.php b/src/Command/Cart/PutVariantBasedConfigurableItemToCart.php
index 605d9e3a1..b31ec8638 100644
--- a/src/Command/Cart/PutVariantBasedConfigurableItemToCart.php
+++ b/src/Command/Cart/PutVariantBasedConfigurableItemToCart.php
@@ -4,9 +4,10 @@
 
 namespace Sylius\ShopApiPlugin\Command\Cart;
 
+use Sylius\ShopApiPlugin\Command\CommandInterface;
 use Webmozart\Assert\Assert;
 
-class PutVariantBasedConfigurableItemToCart
+class PutVariantBasedConfigurableItemToCart implements CommandInterface
 {
     /** @var string */
     protected $orderToken;
diff --git a/src/Command/Cart/RemoveCoupon.php b/src/Command/Cart/RemoveCoupon.php
index 9a476766c..f9ee0059b 100644
--- a/src/Command/Cart/RemoveCoupon.php
+++ b/src/Command/Cart/RemoveCoupon.php
@@ -4,7 +4,9 @@
 
 namespace Sylius\ShopApiPlugin\Command\Cart;
 
-class RemoveCoupon
+use Sylius\ShopApiPlugin\Command\CommandInterface;
+
+class RemoveCoupon implements CommandInterface
 {
     /** @var string */
     protected $orderToken;
diff --git a/src/Command/Cart/RemoveItemFromCart.php b/src/Command/Cart/RemoveItemFromCart.php
index 2367ae53c..f2bc5842f 100644
--- a/src/Command/Cart/RemoveItemFromCart.php
+++ b/src/Command/Cart/RemoveItemFromCart.php
@@ -4,7 +4,9 @@
 
 namespace Sylius\ShopApiPlugin\Command\Cart;
 
-class RemoveItemFromCart
+use Sylius\ShopApiPlugin\Command\CommandInterface;
+
+class RemoveItemFromCart implements CommandInterface
 {
     /** @var string */
     protected $orderToken;
diff --git a/src/CommandProvider/PutItemToCartCommandProvider.php b/src/CommandProvider/PutItemToCartCommandProvider.php
new file mode 100644
index 000000000..73274a36e
--- /dev/null
+++ b/src/CommandProvider/PutItemToCartCommandProvider.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\ShopApiPlugin\CommandProvider;
+
+use Sylius\ShopApiPlugin\Command\CommandInterface;
+use Sylius\ShopApiPlugin\Request\Cart\PutOptionBasedConfigurableItemToCartRequest;
+use Sylius\ShopApiPlugin\Request\Cart\PutSimpleItemToCartRequest;
+use Sylius\ShopApiPlugin\Request\Cart\PutVariantBasedConfigurableItemToCartRequest;
+use Sylius\ShopApiPlugin\Request\RequestInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Validator\ConstraintViolationListInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+final class PutItemToCartCommandProvider implements CommandProviderInterface
+{
+    /** @var ValidatorInterface */
+    private $validator;
+
+    public function __construct(ValidatorInterface $validator)
+    {
+        $this->validator = $validator;
+    }
+
+    public function validate(Request $httpRequest): ConstraintViolationListInterface
+    {
+        return $this->validator->validate($this->transformHttpRequest($httpRequest));
+    }
+
+    public function getCommand(Request $httpRequest): CommandInterface
+    {
+        return $this->transformHttpRequest($httpRequest)->getCommand();
+    }
+
+    private function transformHttpRequest(Request $httpRequest): RequestInterface
+    {
+        $hasVariantCode = $httpRequest->request->has('variantCode');
+        $hasOptionCode = $httpRequest->request->has('options');
+
+        if (!$hasVariantCode && !$hasOptionCode) {
+            return PutSimpleItemToCartRequest::fromHttpRequest($httpRequest);
+        }
+
+        if ($hasVariantCode && !$hasOptionCode) {
+            return PutVariantBasedConfigurableItemToCartRequest::fromHttpRequest($httpRequest);
+        }
+
+        if (!$hasVariantCode && $hasOptionCode) {
+            return PutOptionBasedConfigurableItemToCartRequest::fromHttpRequest($httpRequest);
+        }
+
+        throw new NotFoundHttpException('Variant not found for given configuration');
+    }
+}
diff --git a/src/Controller/Cart/AddCouponAction.php b/src/Controller/Cart/AddCouponAction.php
index 17fa9bb32..6a9e0b98a 100644
--- a/src/Controller/Cart/AddCouponAction.php
+++ b/src/Controller/Cart/AddCouponAction.php
@@ -6,14 +6,14 @@
 
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
+use Sylius\ShopApiPlugin\Command\Cart\AddCoupon;
+use Sylius\ShopApiPlugin\CommandProvider\CommandProviderInterface;
 use Sylius\ShopApiPlugin\Factory\ValidationErrorViewFactoryInterface;
-use Sylius\ShopApiPlugin\Request\Cart\AddCouponRequest;
 use Sylius\ShopApiPlugin\ViewRepository\Cart\CartViewRepositoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 final class AddCouponAction
 {
@@ -23,49 +23,51 @@ final class AddCouponAction
     /** @var MessageBusInterface */
     private $bus;
 
-    /** @var ValidatorInterface */
-    private $validator;
-
     /** @var ValidationErrorViewFactoryInterface */
     private $validationErrorViewFactory;
 
     /** @var CartViewRepositoryInterface */
     private $cartQuery;
 
+    /** @var CommandProviderInterface */
+    private $addCouponCommandProvider;
+
     public function __construct(
         ViewHandlerInterface $viewHandler,
         MessageBusInterface $bus,
-        ValidatorInterface $validator,
         ValidationErrorViewFactoryInterface $validationErrorViewFactory,
-        CartViewRepositoryInterface $cartQuery
+        CartViewRepositoryInterface $cartQuery,
+        CommandProviderInterface $addCouponCommandProvider
     ) {
         $this->viewHandler = $viewHandler;
         $this->bus = $bus;
-        $this->validator = $validator;
         $this->validationErrorViewFactory = $validationErrorViewFactory;
         $this->cartQuery = $cartQuery;
+        $this->addCouponCommandProvider = $addCouponCommandProvider;
     }
 
     public function __invoke(Request $request): Response
     {
-        $addCouponRequest = new AddCouponRequest($request);
-
-        $validationResults = $this->validator->validate($addCouponRequest);
+        $validationResults = $this->addCouponCommandProvider->validate($request);
+        if (0 !== count($validationResults)) {
+            return $this->viewHandler->handle(View::create(
+                $this->validationErrorViewFactory->create($validationResults),
+                Response::HTTP_BAD_REQUEST
+            ));
+        }
 
-        if (0 === count($validationResults)) {
-            $addCouponCommand = $addCouponRequest->getCommand();
+        /** @var AddCoupon $addCouponCommand */
+        $addCouponCommand = $this->addCouponCommandProvider->getCommand($request);
 
-            $this->bus->dispatch($addCouponCommand);
+        $this->bus->dispatch($addCouponCommand);
 
-            try {
-                return $this->viewHandler->handle(
-                    View::create($this->cartQuery->getOneByToken($addCouponCommand->orderToken()), Response::HTTP_OK)
-                );
-            } catch (\InvalidArgumentException $exception) {
-                throw new BadRequestHttpException($exception->getMessage());
-            }
+        try {
+            return $this->viewHandler->handle(View::create(
+                $this->cartQuery->getOneByToken($addCouponCommand->orderToken()),
+                Response::HTTP_OK
+            ));
+        } catch (\InvalidArgumentException $exception) {
+            throw new BadRequestHttpException($exception->getMessage());
         }
-
-        return $this->viewHandler->handle(View::create($this->validationErrorViewFactory->create($validationResults), Response::HTTP_BAD_REQUEST));
     }
 }
diff --git a/src/Controller/Cart/ChangeItemQuantityAction.php b/src/Controller/Cart/ChangeItemQuantityAction.php
index 38bab58a3..6b915d403 100644
--- a/src/Controller/Cart/ChangeItemQuantityAction.php
+++ b/src/Controller/Cart/ChangeItemQuantityAction.php
@@ -6,14 +6,14 @@
 
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
+use Sylius\ShopApiPlugin\Command\Cart\ChangeItemQuantity;
+use Sylius\ShopApiPlugin\CommandProvider\CommandProviderInterface;
 use Sylius\ShopApiPlugin\Factory\ValidationErrorViewFactoryInterface;
-use Sylius\ShopApiPlugin\Request\Cart\ChangeItemQuantityRequest;
 use Sylius\ShopApiPlugin\ViewRepository\Cart\CartViewRepositoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 final class ChangeItemQuantityAction
 {
@@ -23,40 +23,41 @@ final class ChangeItemQuantityAction
     /** @var MessageBusInterface */
     private $bus;
 
-    /** @var ValidatorInterface */
-    private $validator;
-
     /** @var ValidationErrorViewFactoryInterface */
     private $validationErrorViewFactory;
 
     /** @var CartViewRepositoryInterface */
     private $cartQuery;
 
+    /** @var CommandProviderInterface */
+    private $changeItemQuantityCommandProvider;
+
     public function __construct(
         ViewHandlerInterface $viewHandler,
         MessageBusInterface $bus,
-        ValidatorInterface $validator,
         ValidationErrorViewFactoryInterface $validationErrorViewFactory,
-        CartViewRepositoryInterface $cartQuery
+        CartViewRepositoryInterface $cartQuery,
+        CommandProviderInterface $changeItemQuantityCommandProvider
     ) {
         $this->viewHandler = $viewHandler;
         $this->bus = $bus;
-        $this->validator = $validator;
         $this->validationErrorViewFactory = $validationErrorViewFactory;
         $this->cartQuery = $cartQuery;
+        $this->changeItemQuantityCommandProvider = $changeItemQuantityCommandProvider;
     }
 
     public function __invoke(Request $request): Response
     {
-        $changeItemQuantityRequest = new ChangeItemQuantityRequest($request);
-
-        $validationResults = $this->validator->validate($changeItemQuantityRequest);
-
+        $validationResults = $this->changeItemQuantityCommandProvider->validate($request);
         if (0 !== count($validationResults)) {
-            return $this->viewHandler->handle(View::create($this->validationErrorViewFactory->create($validationResults), Response::HTTP_BAD_REQUEST));
+            return $this->viewHandler->handle(View::create(
+                $this->validationErrorViewFactory->create($validationResults),
+                Response::HTTP_BAD_REQUEST
+            ));
         }
 
-        $changeItemQuantityCommand = $changeItemQuantityRequest->getCommand();
+        /** @var ChangeItemQuantity $changeItemQuantityCommand */
+        $changeItemQuantityCommand = $this->changeItemQuantityCommandProvider->getCommand($request);
 
         $this->bus->dispatch($changeItemQuantityCommand);
 
diff --git a/src/Controller/Cart/EstimateShippingCostAction.php b/src/Controller/Cart/EstimateShippingCostAction.php
index 4b5b29ff5..c08c06190 100644
--- a/src/Controller/Cart/EstimateShippingCostAction.php
+++ b/src/Controller/Cart/EstimateShippingCostAction.php
@@ -50,7 +50,6 @@ public function __invoke(Request $request): Response
         $estimateShippingCostRequest = new EstimateShippingCostRequest($request);
 
         $validationResults = $this->validator->validate($estimateShippingCostRequest);
-
         if (0 !== count($validationResults)) {
             return $this->viewHandler->handle(
                 View::create(
diff --git a/src/Controller/Cart/PutItemToCartAction.php b/src/Controller/Cart/PutItemToCartAction.php
index f9a8aa5c9..b05d20316 100644
--- a/src/Controller/Cart/PutItemToCartAction.php
+++ b/src/Controller/Cart/PutItemToCartAction.php
@@ -6,18 +6,17 @@
 
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
+use Sylius\ShopApiPlugin\Command\Cart\PutOptionBasedConfigurableItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutVariantBasedConfigurableItemToCart;
+use Sylius\ShopApiPlugin\CommandProvider\CommandProviderInterface;
 use Sylius\ShopApiPlugin\Factory\ValidationErrorViewFactoryInterface;
 use Sylius\ShopApiPlugin\Normalizer\RequestCartTokenNormalizerInterface;
-use Sylius\ShopApiPlugin\Request\Cart\PutOptionBasedConfigurableItemToCartRequest;
-use Sylius\ShopApiPlugin\Request\Cart\PutSimpleItemToCartRequest;
-use Sylius\ShopApiPlugin\Request\Cart\PutVariantBasedConfigurableItemToCartRequest;
 use Sylius\ShopApiPlugin\ViewRepository\Cart\CartViewRepositoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 final class PutItemToCartAction
 {
@@ -27,9 +26,6 @@ final class PutItemToCartAction
     /** @var MessageBusInterface */
     private $bus;
 
-    /** @var ValidatorInterface */
-    private $validator;
-
     /** @var ValidationErrorViewFactoryInterface */
     private $validationErrorViewFactory;
 
@@ -39,20 +35,23 @@ final class PutItemToCartAction
     /** @var RequestCartTokenNormalizerInterface */
     private $requestCartTokenNormalizer;
 
+    /** @var CommandProviderInterface */
+    private $putItemToCartCommandProvider;
+
     public function __construct(
         ViewHandlerInterface $viewHandler,
         MessageBusInterface $bus,
-        ValidatorInterface $validator,
         ValidationErrorViewFactoryInterface $validationErrorViewFactory,
         CartViewRepositoryInterface $cartQuery,
-        RequestCartTokenNormalizerInterface $requestCartTokenNormalizer
+        RequestCartTokenNormalizerInterface $requestCartTokenNormalizer,
+        CommandProviderInterface $putItemToCartCommandProvider
     ) {
         $this->viewHandler = $viewHandler;
         $this->bus = $bus;
-        $this->validator = $validator;
         $this->validationErrorViewFactory = $validationErrorViewFactory;
         $this->cartQuery = $cartQuery;
         $this->requestCartTokenNormalizer = $requestCartTokenNormalizer;
+        $this->putItemToCartCommandProvider = $putItemToCartCommandProvider;
     }
 
     public function __invoke(Request $request): Response
@@ -63,48 +62,25 @@ public function __invoke(Request $request): Response
             throw new BadRequestHttpException($exception->getMessage());
         }
 
-        $commandRequest = $this->provideCommandRequest($request);
-
-        $validationResults = $this->validator->validate($commandRequest);
-
+        $validationResults = $this->putItemToCartCommandProvider->validate($request);
         if (0 !== count($validationResults)) {
-            return $this->viewHandler->handle(
-                View::create($this->validationErrorViewFactory->create($validationResults),
-                    Response::HTTP_BAD_REQUEST
-                )
-            );
+            return $this->viewHandler->handle(View::create(
+                $this->validationErrorViewFactory->create($validationResults),
+                Response::HTTP_BAD_REQUEST
+            ));
         }
 
-        $command = $commandRequest->getCommand();
+        /** @var PutOptionBasedConfigurableItemToCart|PutSimpleItemToCart|PutVariantBasedConfigurableItemToCart $command */
+        $command = $this->putItemToCartCommandProvider->getCommand($request);
         $this->bus->dispatch($command);
 
         try {
-            return $this->viewHandler->handle(
-                View::create($this->cartQuery->getOneByToken($command->orderToken()), Response::HTTP_CREATED)
-            );
+            return $this->viewHandler->handle(View::create(
+                $this->cartQuery->getOneByToken($command->orderToken()),
+                Response::HTTP_CREATED
+            ));
         } catch (\InvalidArgumentException $exception) {
             throw new BadRequestHttpException($exception->getMessage());
         }
     }
-
-    /** @return PutOptionBasedConfigurableItemToCartRequest|PutSimpleItemToCartRequest|PutVariantBasedConfigurableItemToCartRequest */
-    private function provideCommandRequest(Request $request)
-    {
-        $hasVariantCode = $request->request->has('variantCode');
-        $hasOptionCode = $request->request->has('options');
-
-        if (!$hasVariantCode && !$hasOptionCode) {
-            return PutSimpleItemToCartRequest::fromRequest($request);
-        }
-
-        if ($hasVariantCode && !$hasOptionCode) {
-            return PutVariantBasedConfigurableItemToCartRequest::fromRequest($request);
-        }
-
-        if (!$hasVariantCode && $hasOptionCode) {
-            return PutOptionBasedConfigurableItemToCartRequest::fromRequest($request);
-        }
-
-        throw new NotFoundHttpException('Variant not found for given configuration');
-    }
 }
diff --git a/src/Controller/Cart/RemoveCouponAction.php b/src/Controller/Cart/RemoveCouponAction.php
index 41f4fd6d5..8d95b72ec 100644
--- a/src/Controller/Cart/RemoveCouponAction.php
+++ b/src/Controller/Cart/RemoveCouponAction.php
@@ -6,14 +6,14 @@
 
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
+use Sylius\ShopApiPlugin\Command\Cart\RemoveCoupon;
+use Sylius\ShopApiPlugin\CommandProvider\CommandProviderInterface;
 use Sylius\ShopApiPlugin\Factory\ValidationErrorViewFactoryInterface;
-use Sylius\ShopApiPlugin\Request\Cart\RemoveCouponRequest;
 use Sylius\ShopApiPlugin\ViewRepository\Cart\CartViewRepositoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 final class RemoveCouponAction
 {
@@ -23,49 +23,51 @@ final class RemoveCouponAction
     /** @var MessageBusInterface */
     private $bus;
 
-    /** @var ValidatorInterface */
-    private $validator;
-
     /** @var ValidationErrorViewFactoryInterface */
     private $validationErrorViewFactory;
 
     /** @var CartViewRepositoryInterface */
     private $cartQuery;
 
+    /** @var CommandProviderInterface */
+    private $removeCouponCommandProvider;
+
     public function __construct(
         ViewHandlerInterface $viewHandler,
         MessageBusInterface $bus,
-        ValidatorInterface $validator,
         ValidationErrorViewFactoryInterface $validationErrorViewFactory,
-        CartViewRepositoryInterface $cartQuery
+        CartViewRepositoryInterface $cartQuery,
+        CommandProviderInterface $removeCouponCommandProvider
     ) {
         $this->viewHandler = $viewHandler;
         $this->bus = $bus;
-        $this->validator = $validator;
         $this->validationErrorViewFactory = $validationErrorViewFactory;
         $this->cartQuery = $cartQuery;
+        $this->removeCouponCommandProvider = $removeCouponCommandProvider;
     }
 
     public function __invoke(Request $request): Response
     {
-        $removeCouponRequest = new RemoveCouponRequest($request);
-
-        $validationResults = $this->validator->validate($removeCouponRequest);
+        $validationResults = $this->removeCouponCommandProvider->validate($request);
+        if (0 !== count($validationResults)) {
+            return $this->viewHandler->handle(View::create(
+                $this->validationErrorViewFactory->create($validationResults),
+                Response::HTTP_BAD_REQUEST
+            ));
+        }
 
-        if (0 === count($validationResults)) {
-            $removeCouponCommand = $removeCouponRequest->getCommand();
+        /** @var RemoveCoupon $removeCouponCommand */
+        $removeCouponCommand = $this->removeCouponCommandProvider->getCommand($request);
 
-            $this->bus->dispatch($removeCouponCommand);
+        $this->bus->dispatch($removeCouponCommand);
 
-            try {
-                return $this->viewHandler->handle(
-                    View::create($this->cartQuery->getOneByToken($removeCouponCommand->orderToken()), Response::HTTP_OK)
-                );
-            } catch (\InvalidArgumentException $exception) {
-                throw new BadRequestHttpException($exception->getMessage());
-            }
+        try {
+            return $this->viewHandler->handle(View::create(
+                $this->cartQuery->getOneByToken($removeCouponCommand->orderToken()),
+                Response::HTTP_OK
+            ));
+        } catch (\InvalidArgumentException $exception) {
+            throw new BadRequestHttpException($exception->getMessage());
         }
-
-        return $this->viewHandler->handle(View::create($this->validationErrorViewFactory->create($validationResults), Response::HTTP_BAD_REQUEST));
     }
 }
diff --git a/src/Controller/Cart/RemoveItemFromCartAction.php b/src/Controller/Cart/RemoveItemFromCartAction.php
index 952d89b53..46a512f54 100644
--- a/src/Controller/Cart/RemoveItemFromCartAction.php
+++ b/src/Controller/Cart/RemoveItemFromCartAction.php
@@ -6,14 +6,14 @@
 
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
+use Sylius\ShopApiPlugin\Command\Cart\RemoveItemFromCart;
+use Sylius\ShopApiPlugin\CommandProvider\CommandProviderInterface;
 use Sylius\ShopApiPlugin\Factory\ValidationErrorViewFactoryInterface;
-use Sylius\ShopApiPlugin\Request\Cart\RemoveItemFromCartRequest;
 use Sylius\ShopApiPlugin\ViewRepository\Cart\CartViewRepositoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 final class RemoveItemFromCartAction
 {
@@ -23,47 +23,49 @@ final class RemoveItemFromCartAction
     /** @var MessageBusInterface */
     private $bus;
 
-    /** @var ValidatorInterface */
-    private $validator;
-
     /** @var ValidationErrorViewFactoryInterface */
     private $validationErrorViewFactory;
 
     /** @var CartViewRepositoryInterface */
     private $cartQuery;
 
+    /** @var CommandProviderInterface */
+    private $removeItemFromCartCommandProvider;
+
     public function __construct(
         ViewHandlerInterface $viewHandler,
         MessageBusInterface $bus,
-        ValidatorInterface $validator,
         ValidationErrorViewFactoryInterface $validationErrorViewFactory,
-        CartViewRepositoryInterface $cartQuery
+        CartViewRepositoryInterface $cartQuery,
+        CommandProviderInterface $removeItemFromCartCommandProvider
     ) {
         $this->viewHandler = $viewHandler;
         $this->bus = $bus;
-        $this->validator = $validator;
         $this->validationErrorViewFactory = $validationErrorViewFactory;
         $this->cartQuery = $cartQuery;
+        $this->removeItemFromCartCommandProvider = $removeItemFromCartCommandProvider;
     }
 
     public function __invoke(Request $request): Response
     {
-        $removeItemFromCartRequest = new RemoveItemFromCartRequest($request);
-
-        $validationResults = $this->validator->validate($removeItemFromCartRequest);
-
+        $validationResults = $this->removeItemFromCartCommandProvider->validate($request);
         if (0 !== count($validationResults)) {
-            return $this->viewHandler->handle(View::create($this->validationErrorViewFactory->create($validationResults), Response::HTTP_BAD_REQUEST));
+            return $this->viewHandler->handle(View::create(
+                $this->validationErrorViewFactory->create($validationResults),
+                Response::HTTP_BAD_REQUEST
+            ));
         }
 
-        $removeItemFromCartCommand = $removeItemFromCartRequest->getCommand();
+        /** @var RemoveItemFromCart $removeItemFromCartCommand */
+        $removeItemFromCartCommand = $this->removeItemFromCartCommandProvider->getCommand($request);
 
         $this->bus->dispatch($removeItemFromCartCommand);
 
         try {
-            return $this->viewHandler->handle(
-                View::create($this->cartQuery->getOneByToken($removeItemFromCartCommand->orderToken()), Response::HTTP_OK)
-            );
+            return $this->viewHandler->handle(View::create(
+                $this->cartQuery->getOneByToken($removeItemFromCartCommand->orderToken()),
+                Response::HTTP_OK
+            ));
         } catch (\InvalidArgumentException $exception) {
             throw new BadRequestHttpException($exception->getMessage());
         }
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 640ec65e4..7ce400995 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -4,8 +4,12 @@
 
 namespace Sylius\ShopApiPlugin\DependencyInjection;
 
+use Sylius\ShopApiPlugin\Request\Cart\AddCouponRequest;
+use Sylius\ShopApiPlugin\Request\Cart\ChangeItemQuantityRequest;
 use Sylius\ShopApiPlugin\Request\Cart\DropCartRequest;
 use Sylius\ShopApiPlugin\Request\Cart\PickupCartRequest;
+use Sylius\ShopApiPlugin\Request\Cart\RemoveCouponRequest;
+use Sylius\ShopApiPlugin\Request\Cart\RemoveItemFromCartRequest;
 use Sylius\ShopApiPlugin\Request\Product\AddProductReviewByCodeRequest;
 use Sylius\ShopApiPlugin\Request\Product\AddProductReviewBySlugRequest;
 use Sylius\ShopApiPlugin\View;
@@ -87,10 +91,14 @@ private function buildRequestClassesNode(ArrayNodeDefinition $rootNode): void
                 ->arrayNode('request_classes')
                     ->addDefaultsIfNotSet()
                     ->children()
+                        ->scalarNode('add_coupon')->defaultValue(AddCouponRequest::class)->end()
                         ->scalarNode('add_product_review_by_code')->defaultValue(AddProductReviewByCodeRequest::class)->end()
                         ->scalarNode('add_product_review_by_slug')->defaultValue(AddProductReviewBySlugRequest::class)->end()
+                        ->scalarNode('change_item_quantity')->defaultValue(ChangeItemQuantityRequest::class)->end()
                         ->scalarNode('drop_cart')->defaultValue(DropCartRequest::class)->end()
                         ->scalarNode('pickup_cart')->defaultValue(PickupCartRequest::class)->end()
+                        ->scalarNode('remove_coupon')->defaultValue(RemoveCouponRequest::class)->end()
+                        ->scalarNode('remove_item_from_cart')->defaultValue(RemoveItemFromCartRequest::class)->end()
                     ->end()
                 ->end()
             ->end()
diff --git a/src/Request/Cart/AddCouponRequest.php b/src/Request/Cart/AddCouponRequest.php
index ce3db4f81..81141cdce 100644
--- a/src/Request/Cart/AddCouponRequest.php
+++ b/src/Request/Cart/AddCouponRequest.php
@@ -5,9 +5,11 @@
 namespace Sylius\ShopApiPlugin\Request\Cart;
 
 use Sylius\ShopApiPlugin\Command\Cart\AddCoupon;
+use Sylius\ShopApiPlugin\Command\CommandInterface;
+use Sylius\ShopApiPlugin\Request\RequestInterface;
 use Symfony\Component\HttpFoundation\Request;
 
-class AddCouponRequest
+class AddCouponRequest implements RequestInterface
 {
     /** @var string|null */
     protected $token;
@@ -15,13 +17,18 @@ class AddCouponRequest
     /** @var string|null */
     protected $coupon;
 
-    public function __construct(Request $request)
+    private function __construct(Request $request)
     {
         $this->token = $request->attributes->get('token');
         $this->coupon = $request->request->get('coupon');
     }
 
-    public function getCommand(): AddCoupon
+    public static function fromHttpRequest(Request $request): RequestInterface
+    {
+        return new self($request);
+    }
+
+    public function getCommand(): CommandInterface
     {
         return new AddCoupon($this->token, $this->coupon);
     }
diff --git a/src/Request/Cart/ChangeItemQuantityRequest.php b/src/Request/Cart/ChangeItemQuantityRequest.php
index 391e83af6..351ff2654 100644
--- a/src/Request/Cart/ChangeItemQuantityRequest.php
+++ b/src/Request/Cart/ChangeItemQuantityRequest.php
@@ -5,9 +5,11 @@
 namespace Sylius\ShopApiPlugin\Request\Cart;
 
 use Sylius\ShopApiPlugin\Command\Cart\ChangeItemQuantity;
+use Sylius\ShopApiPlugin\Command\CommandInterface;
+use Sylius\ShopApiPlugin\Request\RequestInterface;
 use Symfony\Component\HttpFoundation\Request;
 
-class ChangeItemQuantityRequest
+class ChangeItemQuantityRequest implements RequestInterface
 {
     /** @var string */
     protected $token;
@@ -18,14 +20,19 @@ class ChangeItemQuantityRequest
     /** @var int */
     protected $quantity;
 
-    public function __construct(Request $request)
+    private function __construct(Request $request)
     {
         $this->token = $request->attributes->get('token');
         $this->id = $request->attributes->get('id');
         $this->quantity = $request->request->getInt('quantity');
     }
 
-    public function getCommand(): ChangeItemQuantity
+    public static function fromHttpRequest(Request $request): RequestInterface
+    {
+        return new self($request);
+    }
+
+    public function getCommand(): CommandInterface
     {
         return new ChangeItemQuantity($this->token, $this->id, $this->quantity);
     }
diff --git a/src/Request/Cart/PickupCartRequest.php b/src/Request/Cart/PickupCartRequest.php
index 4be0ab617..603ede3d3 100644
--- a/src/Request/Cart/PickupCartRequest.php
+++ b/src/Request/Cart/PickupCartRequest.php
@@ -19,7 +19,7 @@ class PickupCartRequest implements ChannelBasedRequestInterface
     /** @var string */
     protected $channelCode;
 
-    public function __construct(string $channelCode)
+    private function __construct(string $channelCode)
     {
         $this->token = Uuid::uuid4()->toString();
         $this->channelCode = $channelCode;
diff --git a/src/Request/Cart/PutOptionBasedConfigurableItemToCartRequest.php b/src/Request/Cart/PutOptionBasedConfigurableItemToCartRequest.php
index f2882672e..baa83bbee 100644
--- a/src/Request/Cart/PutOptionBasedConfigurableItemToCartRequest.php
+++ b/src/Request/Cart/PutOptionBasedConfigurableItemToCartRequest.php
@@ -5,9 +5,11 @@
 namespace Sylius\ShopApiPlugin\Request\Cart;
 
 use Sylius\ShopApiPlugin\Command\Cart\PutOptionBasedConfigurableItemToCart;
+use Sylius\ShopApiPlugin\Command\CommandInterface;
+use Sylius\ShopApiPlugin\Request\RequestInterface;
 use Symfony\Component\HttpFoundation\Request;
 
-class PutOptionBasedConfigurableItemToCartRequest
+class PutOptionBasedConfigurableItemToCartRequest implements RequestInterface
 {
     /** @var string */
     protected $token;
@@ -21,7 +23,7 @@ class PutOptionBasedConfigurableItemToCartRequest
     /** @var int */
     protected $quantity;
 
-    private function __construct($token, $productCode, $options, $quantity)
+    private function __construct(?string $token, ?string $productCode, ?array $options, ?int $quantity)
     {
         $this->token = $token;
         $this->productCode = $productCode;
@@ -31,16 +33,31 @@ private function __construct($token, $productCode, $options, $quantity)
 
     public static function fromArray(array $item): self
     {
-        return new self($item['token'] ?? null, $item['productCode'] ?? null, $item['options'] ?? null, $item['quantity'] ?? null);
+        return new self(
+            $item['token'] ?? null,
+            $item['productCode'] ?? null,
+            $item['options'] ?? null,
+            $item['quantity'] ?? null
+        );
     }
 
-    public static function fromRequest(Request $request): self
+    public static function fromHttpRequest(Request $request): RequestInterface
     {
-        return new self($request->attributes->get('token'), $request->request->get('productCode'), $request->request->get('options'), $request->request->getInt('quantity', 1));
+        return new self(
+            $request->attributes->get('token'),
+            $request->request->get('productCode'),
+            $request->request->get('options'),
+            $request->request->getInt('quantity', 1)
+        );
     }
 
-    public function getCommand(): PutOptionBasedConfigurableItemToCart
+    public function getCommand(): CommandInterface
     {
-        return new PutOptionBasedConfigurableItemToCart($this->token, $this->productCode, $this->options, $this->quantity);
+        return new PutOptionBasedConfigurableItemToCart(
+            $this->token,
+            $this->productCode,
+            $this->options,
+            $this->quantity
+        );
     }
 }
diff --git a/src/Request/Cart/PutSimpleItemToCartRequest.php b/src/Request/Cart/PutSimpleItemToCartRequest.php
index 9c4519d11..7ca77b01c 100644
--- a/src/Request/Cart/PutSimpleItemToCartRequest.php
+++ b/src/Request/Cart/PutSimpleItemToCartRequest.php
@@ -5,9 +5,11 @@
 namespace Sylius\ShopApiPlugin\Request\Cart;
 
 use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\CommandInterface;
+use Sylius\ShopApiPlugin\Request\RequestInterface;
 use Symfony\Component\HttpFoundation\Request;
 
-class PutSimpleItemToCartRequest
+class PutSimpleItemToCartRequest implements RequestInterface
 {
     /** @var string */
     protected $token;
@@ -27,15 +29,23 @@ private function __construct($token, $productCode, $quantity)
 
     public static function fromArray(array $item): self
     {
-        return new self($item['token'] ?? null, $item['productCode'] ?? null, $item['quantity'] ?? null);
+        return new self(
+            $item['token'] ?? null,
+            $item['productCode'] ?? null,
+            $item['quantity'] ?? null
+        );
     }
 
-    public static function fromRequest(Request $request): self
+    public static function fromHttpRequest(Request $request): RequestInterface
     {
-        return new self($request->attributes->get('token'), $request->request->get('productCode'), $request->request->getInt('quantity', 1));
+        return new self(
+            $request->attributes->get('token'),
+            $request->request->get('productCode'),
+            $request->request->getInt('quantity', 1)
+        );
     }
 
-    public function getCommand(): PutSimpleItemToCart
+    public function getCommand(): CommandInterface
     {
         return new PutSimpleItemToCart($this->token, $this->productCode, $this->quantity);
     }
diff --git a/src/Request/Cart/PutVariantBasedConfigurableItemToCartRequest.php b/src/Request/Cart/PutVariantBasedConfigurableItemToCartRequest.php
index fad029709..884d5c44d 100644
--- a/src/Request/Cart/PutVariantBasedConfigurableItemToCartRequest.php
+++ b/src/Request/Cart/PutVariantBasedConfigurableItemToCartRequest.php
@@ -5,9 +5,11 @@
 namespace Sylius\ShopApiPlugin\Request\Cart;
 
 use Sylius\ShopApiPlugin\Command\Cart\PutVariantBasedConfigurableItemToCart;
+use Sylius\ShopApiPlugin\Command\CommandInterface;
+use Sylius\ShopApiPlugin\Request\RequestInterface;
 use Symfony\Component\HttpFoundation\Request;
 
-class PutVariantBasedConfigurableItemToCartRequest
+class PutVariantBasedConfigurableItemToCartRequest implements RequestInterface
 {
     /** @var string */
     protected $token;
@@ -31,16 +33,31 @@ private function __construct($token, $productCode, $variantCode, $quantity)
 
     public static function fromArray(array $item): self
     {
-        return new self($item['token'] ?? null, $item['productCode'] ?? null, $item['variantCode'] ?? null, $item['quantity'] ?? null);
+        return new self(
+            $item['token'] ?? null,
+            $item['productCode'] ?? null,
+            $item['variantCode'] ?? null,
+            $item['quantity'] ?? null
+        );
     }
 
-    public static function fromRequest(Request $request): self
+    public static function fromHttpRequest(Request $request): RequestInterface
     {
-        return new self($request->attributes->get('token'), $request->request->get('productCode'), $request->request->get('variantCode'), $request->request->getInt('quantity', 1));
+        return new self(
+            $request->attributes->get('token'),
+            $request->request->get('productCode'),
+            $request->request->get('variantCode'),
+            $request->request->getInt('quantity', 1)
+        );
     }
 
-    public function getCommand(): PutVariantBasedConfigurableItemToCart
+    public function getCommand(): CommandInterface
     {
-        return new PutVariantBasedConfigurableItemToCart($this->token, $this->productCode, $this->variantCode, $this->quantity);
+        return new PutVariantBasedConfigurableItemToCart(
+            $this->token,
+            $this->productCode,
+            $this->variantCode,
+            $this->quantity
+        );
     }
 }
diff --git a/src/Request/Cart/RemoveCouponRequest.php b/src/Request/Cart/RemoveCouponRequest.php
index c27cc0085..22e40fa84 100644
--- a/src/Request/Cart/RemoveCouponRequest.php
+++ b/src/Request/Cart/RemoveCouponRequest.php
@@ -5,19 +5,26 @@
 namespace Sylius\ShopApiPlugin\Request\Cart;
 
 use Sylius\ShopApiPlugin\Command\Cart\RemoveCoupon;
+use Sylius\ShopApiPlugin\Command\CommandInterface;
+use Sylius\ShopApiPlugin\Request\RequestInterface;
 use Symfony\Component\HttpFoundation\Request;
 
-class RemoveCouponRequest
+class RemoveCouponRequest implements RequestInterface
 {
     /** @var string */
     protected $token;
 
-    public function __construct(Request $request)
+    private function __construct(Request $request)
     {
         $this->token = $request->attributes->get('token');
     }
 
-    public function getCommand(): RemoveCoupon
+    public static function fromHttpRequest(Request $request): RequestInterface
+    {
+        return new self($request);
+    }
+
+    public function getCommand(): CommandInterface
     {
         return new RemoveCoupon($this->token);
     }
diff --git a/src/Request/Cart/RemoveItemFromCartRequest.php b/src/Request/Cart/RemoveItemFromCartRequest.php
index 27782bb8d..976d6c550 100644
--- a/src/Request/Cart/RemoveItemFromCartRequest.php
+++ b/src/Request/Cart/RemoveItemFromCartRequest.php
@@ -5,9 +5,11 @@
 namespace Sylius\ShopApiPlugin\Request\Cart;
 
 use Sylius\ShopApiPlugin\Command\Cart\RemoveItemFromCart;
+use Sylius\ShopApiPlugin\Command\CommandInterface;
+use Sylius\ShopApiPlugin\Request\RequestInterface;
 use Symfony\Component\HttpFoundation\Request;
 
-class RemoveItemFromCartRequest
+class RemoveItemFromCartRequest implements RequestInterface
 {
     /** @var string */
     protected $token;
@@ -15,13 +17,18 @@ class RemoveItemFromCartRequest
     /** @var mixed */
     protected $id;
 
-    public function __construct(Request $request)
+    private function __construct(Request $request)
     {
         $this->token = $request->attributes->get('token');
         $this->id = $request->attributes->get('id');
     }
 
-    public function getCommand(): RemoveItemFromCart
+    public static function fromHttpRequest(Request $request): RequestInterface
+    {
+        return new self($request);
+    }
+
+    public function getCommand(): CommandInterface
     {
         return new RemoveItemFromCart($this->token, $this->id);
     }
diff --git a/src/Resources/config/services/actions/cart.xml b/src/Resources/config/services/actions/cart.xml
index 1dc7cdc47..a52b75c5b 100644
--- a/src/Resources/config/services/actions/cart.xml
+++ b/src/Resources/config/services/actions/cart.xml
@@ -4,15 +4,17 @@
     <services>
         <defaults public="true" />
 
-        <service id="sylius.shop_api_plugin.controller.cart.summarize_action"
-                 class="Sylius\ShopApiPlugin\Controller\Cart\SummarizeAction"
+        <service
+            id="sylius.shop_api_plugin.controller.cart.summarize_action"
+            class="Sylius\ShopApiPlugin\Controller\Cart\SummarizeAction"
         >
             <argument type="service" id="sylius.shop_api_plugin.view_repository.cart_view_repository" />
             <argument type="service" id="fos_rest.view_handler" />
         </service>
 
-        <service id="sylius.shop_api_plugin.controller.cart.drop_cart_action"
-                 class="Sylius\ShopApiPlugin\Controller\Cart\DropCartAction"
+        <service
+            id="sylius.shop_api_plugin.controller.cart.drop_cart_action"
+            class="Sylius\ShopApiPlugin\Controller\Cart\DropCartAction"
         >
             <argument type="service" id="fos_rest.view_handler" />
             <argument type="service" id="sylius_shop_api_plugin.command_bus" />
@@ -20,8 +22,10 @@
             <argument type="service" id="sylius.shop_api_plugin.command_provider.drop_cart" />
         </service>
 
-        <service class="Sylius\ShopApiPlugin\Controller\Cart\EstimateShippingCostAction"
-                 id="sylius.shop_api_plugin.controller.cart.estimate_shipping_cost_action">
+        <service
+            id="sylius.shop_api_plugin.controller.cart.estimate_shipping_cost_action"
+            class="Sylius\ShopApiPlugin\Controller\Cart\EstimateShippingCostAction"
+        >
             <argument type="service" id="fos_rest.view_handler" />
             <argument type="service" id="sylius.shop_api_plugin.handler.estimate_shipping_cost_estimator" />
             <argument type="service" id="validator" />
@@ -29,8 +33,9 @@
             <argument type="service" id="sylius.shop_api_plugin.factory.estimated_shipping_cost_view_factory"/>
         </service>
 
-        <service id="sylius.shop_api_plugin.controller.cart.pickup_action"
-                 class="Sylius\ShopApiPlugin\Controller\Cart\PickupCartAction"
+        <service
+            id="sylius.shop_api_plugin.controller.cart.pickup_action"
+            class="Sylius\ShopApiPlugin\Controller\Cart\PickupCartAction"
         >
             <argument type="service" id="fos_rest.view_handler" />
             <argument type="service" id="sylius_shop_api_plugin.command_bus" />
@@ -40,59 +45,65 @@
             <argument type="service" id="sylius.shop_api_plugin.command_provider.pickup_cart" />
         </service>
 
-        <service id="sylius.shop_api_plugin.controller.cart.change_item_quantity_action"
-                 class="Sylius\ShopApiPlugin\Controller\Cart\ChangeItemQuantityAction"
+        <service
+            id="sylius.shop_api_plugin.controller.cart.change_item_quantity_action"
+            class="Sylius\ShopApiPlugin\Controller\Cart\ChangeItemQuantityAction"
         >
             <argument type="service" id="fos_rest.view_handler" />
             <argument type="service" id="sylius_shop_api_plugin.command_bus" />
-            <argument type="service" id="validator" />
             <argument type="service" id="sylius.shop_api_plugin.factory.validation_error_view_factory" />
             <argument type="service" id="sylius.shop_api_plugin.view_repository.cart_view_repository" />
+            <argument type="service" id="sylius.shop_api_plugin.command_provider.change_item_quantity" />
         </service>
 
-        <service id="sylius.shop_api_plugin.controller.cart.remove_item_from_cart_action"
-                 class="Sylius\ShopApiPlugin\Controller\Cart\RemoveItemFromCartAction"
+        <service
+            id="sylius.shop_api_plugin.controller.cart.remove_item_from_cart_action"
+            class="Sylius\ShopApiPlugin\Controller\Cart\RemoveItemFromCartAction"
         >
             <argument type="service" id="fos_rest.view_handler" />
             <argument type="service" id="sylius_shop_api_plugin.command_bus" />
-            <argument type="service" id="validator" />
             <argument type="service" id="sylius.shop_api_plugin.factory.validation_error_view_factory" />
             <argument type="service" id="sylius.shop_api_plugin.view_repository.cart_view_repository" />
+            <argument type="service" id="sylius.shop_api_plugin.command_provider.remove_item_from_cart" />
         </service>
 
-        <service id="sylius.shop_api_plugin.controller.cart.add_coupon_action"
-                 class="Sylius\ShopApiPlugin\Controller\Cart\AddCouponAction"
+        <service
+            id="sylius.shop_api_plugin.controller.cart.add_coupon_action"
+            class="Sylius\ShopApiPlugin\Controller\Cart\AddCouponAction"
         >
             <argument type="service" id="fos_rest.view_handler" />
             <argument type="service" id="sylius_shop_api_plugin.command_bus" />
-            <argument type="service" id="validator" />
             <argument type="service" id="sylius.shop_api_plugin.factory.validation_error_view_factory" />
             <argument type="service" id="sylius.shop_api_plugin.view_repository.cart_view_repository" />
+            <argument type="service" id="sylius.shop_api_plugin.command_provider.add_coupon" />
         </service>
 
-        <service id="sylius.shop_api_plugin.controller.cart.remove_coupon_action"
-                 class="Sylius\ShopApiPlugin\Controller\Cart\RemoveCouponAction"
+        <service
+            id="sylius.shop_api_plugin.controller.cart.remove_coupon_action"
+            class="Sylius\ShopApiPlugin\Controller\Cart\RemoveCouponAction"
         >
             <argument type="service" id="fos_rest.view_handler" />
             <argument type="service" id="sylius_shop_api_plugin.command_bus" />
-            <argument type="service" id="validator" />
             <argument type="service" id="sylius.shop_api_plugin.factory.validation_error_view_factory" />
             <argument type="service" id="sylius.shop_api_plugin.view_repository.cart_view_repository" />
+            <argument type="service" id="sylius.shop_api_plugin.command_provider.remove_coupon" />
         </service>
 
-        <service id="sylius.shop_api_plugin.controller.cart.put_item_to_cart_action"
-                 class="Sylius\ShopApiPlugin\Controller\Cart\PutItemToCartAction"
+        <service
+            id="sylius.shop_api_plugin.controller.cart.put_item_to_cart_action"
+            class="Sylius\ShopApiPlugin\Controller\Cart\PutItemToCartAction"
         >
             <argument type="service" id="fos_rest.view_handler" />
             <argument type="service" id="sylius_shop_api_plugin.command_bus" />
-            <argument type="service" id="validator" />
             <argument type="service" id="sylius.shop_api_plugin.factory.validation_error_view_factory" />
             <argument type="service" id="sylius.shop_api_plugin.view_repository.cart_view_repository" />
             <argument type="service" id="sylius.shop_api_plugin.normalizer.request_cart_token_normalizer" />
+            <argument type="service" id="sylius.shop_api_plugin.command_provider.put_item_to_cart" />
         </service>
 
-        <service id="sylius.shop_api_plugin.controller.cart.put_items_to_cart_action"
-                 class="Sylius\ShopApiPlugin\Controller\Cart\PutItemsToCartAction"
+        <service
+            id="sylius.shop_api_plugin.controller.cart.put_items_to_cart_action"
+            class="Sylius\ShopApiPlugin\Controller\Cart\PutItemsToCartAction"
         >
             <argument type="service" id="fos_rest.view_handler" />
             <argument type="service" id="sylius_shop_api_plugin.command_bus" />
diff --git a/src/Resources/config/services/command_providers/cart.xml b/src/Resources/config/services/command_providers/cart.xml
index 7f9cee064..bc367ef1c 100644
--- a/src/Resources/config/services/command_providers/cart.xml
+++ b/src/Resources/config/services/command_providers/cart.xml
@@ -4,6 +4,22 @@
     <services>
         <defaults public="true" />
 
+        <service
+            id="sylius.shop_api_plugin.command_provider.add_coupon"
+            class="Sylius\ShopApiPlugin\CommandProvider\DefaultCommandProvider"
+        >
+            <argument>%sylius.shop_api.request.add_coupon.class%</argument>
+            <argument type="service" id="validator" />
+        </service>
+
+        <service
+            id="sylius.shop_api_plugin.command_provider.change_item_quantity"
+            class="Sylius\ShopApiPlugin\CommandProvider\DefaultCommandProvider"
+        >
+            <argument>%sylius.shop_api.request.change_item_quantity.class%</argument>
+            <argument type="service" id="validator" />
+        </service>
+
         <service
             id="sylius.shop_api_plugin.command_provider.drop_cart"
             class="Sylius\ShopApiPlugin\CommandProvider\DefaultCommandProvider"
@@ -19,5 +35,28 @@
             <argument>%sylius.shop_api.request.pickup_cart.class%</argument>
             <argument type="service" id="validator" />
         </service>
+
+        <service
+                id="sylius.shop_api_plugin.command_provider.put_item_to_cart"
+                class="Sylius\ShopApiPlugin\CommandProvider\PutItemToCartCommandProvider"
+        >
+            <argument type="service" id="validator" />
+        </service>
+
+        <service
+            id="sylius.shop_api_plugin.command_provider.remove_coupon"
+            class="Sylius\ShopApiPlugin\CommandProvider\DefaultCommandProvider"
+        >
+            <argument>%sylius.shop_api.request.remove_coupon.class%</argument>
+            <argument type="service" id="validator" />
+        </service>
+
+        <service
+            id="sylius.shop_api_plugin.command_provider.remove_item_from_cart"
+            class="Sylius\ShopApiPlugin\CommandProvider\DefaultCommandProvider"
+        >
+            <argument>%sylius.shop_api.request.remove_item_from_cart.class%</argument>
+            <argument type="service" id="validator" />
+        </service>
     </services>
 </container>
diff --git a/tests/Request/AddCouponRequestTest.php b/tests/Request/AddCouponRequestTest.php
index 97400acfa..df6be589e 100644
--- a/tests/Request/AddCouponRequestTest.php
+++ b/tests/Request/AddCouponRequestTest.php
@@ -16,7 +16,7 @@ final class AddCouponRequestTest extends TestCase
      */
     public function it_creates_pickup_cart_command()
     {
-        $pickupCartRequest = new AddCouponRequest(new Request([], ['coupon' => 'SUMMER_SALE'], ['token' => 'ORDERTOKEN']));
+        $pickupCartRequest = AddCouponRequest::fromHttpRequest(new Request([], ['coupon' => 'SUMMER_SALE'], ['token' => 'ORDERTOKEN']));
 
         $this->assertEquals($pickupCartRequest->getCommand(), new AddCoupon('ORDERTOKEN', 'SUMMER_SALE'));
     }
diff --git a/tests/Request/ChangeItemQuantityRequestTest.php b/tests/Request/ChangeItemQuantityRequestTest.php
index 2a5577385..741b2e67a 100644
--- a/tests/Request/ChangeItemQuantityRequestTest.php
+++ b/tests/Request/ChangeItemQuantityRequestTest.php
@@ -16,11 +16,15 @@ final class ChangeItemQuantityRequestTest extends TestCase
      */
     public function it_creates_pickup_cart_command()
     {
-        $changeItemQuantityRequest = new ChangeItemQuantityRequest(new Request([], ['quantity' => 5], [
-            'token' => 'ORDERTOKEN',
-            'id' => 1,
-        ]));
+        $changeItemQuantityRequest = ChangeItemQuantityRequest::fromHttpRequest(new Request(
+            [],
+            ['quantity' => 5],
+            ['token' => 'ORDERTOKEN', 'id' => 1]
+        ));
 
-        $this->assertEquals(new ChangeItemQuantity('ORDERTOKEN', 1, 5), $changeItemQuantityRequest->getCommand());
+        $this->assertEquals(
+            new ChangeItemQuantity('ORDERTOKEN', 1, 5),
+            $changeItemQuantityRequest->getCommand()
+        );
     }
 }
diff --git a/tests/Request/PickupCartRequestTest.php b/tests/Request/PickupCartRequestTest.php
index 4bd9a4359..6698d6360 100644
--- a/tests/Request/PickupCartRequestTest.php
+++ b/tests/Request/PickupCartRequestTest.php
@@ -5,14 +5,19 @@
 namespace Tests\Sylius\ShopApiPlugin\Request;
 
 use PHPUnit\Framework\TestCase;
+use Sylius\Component\Core\Model\Channel;
 use Sylius\ShopApiPlugin\Request\Cart\PickupCartRequest;
+use Symfony\Component\HttpFoundation\Request;
 
 final class PickupCartRequestTest extends TestCase
 {
     /** @test */
     public function it_creates_pickup_cart_command(): void
     {
-        $pickupCartRequest = new PickupCartRequest('WEB_GB');
+        $channel = new Channel();
+        $channel->setCode('WEB_GB');
+
+        $pickupCartRequest = PickupCartRequest::fromHttpRequestAndChannel(new Request(), $channel);
 
         $pickupCartCommand = $pickupCartRequest->getCommand();
 
diff --git a/tests/Request/PutOptionBasedConfigurableItemToCartRequestTest.php b/tests/Request/PutOptionBasedConfigurableItemToCartRequestTest.php
index cc5aa9fbb..8a33d9574 100644
--- a/tests/Request/PutOptionBasedConfigurableItemToCartRequestTest.php
+++ b/tests/Request/PutOptionBasedConfigurableItemToCartRequestTest.php
@@ -16,7 +16,7 @@ final class PutOptionBasedConfigurableItemToCartRequestTest extends TestCase
      */
     public function it_creates_put_simple_item_to_cart_command_from_request()
     {
-        $putConfigurableItemToCartRequest = PutOptionBasedConfigurableItemToCartRequest::fromRequest(new Request([], [
+        $putConfigurableItemToCartRequest = PutOptionBasedConfigurableItemToCartRequest::fromHttpRequest(new Request([], [
             'productCode' => 'HACKTOBERFEST_TSHIRT_CODE',
             'options' => ['LARGE__CODE'],
             'quantity' => 4,
diff --git a/tests/Request/PutSimpleItemToCartRequestTest.php b/tests/Request/PutSimpleItemToCartRequestTest.php
index 6a56cbd3b..e1906e949 100644
--- a/tests/Request/PutSimpleItemToCartRequestTest.php
+++ b/tests/Request/PutSimpleItemToCartRequestTest.php
@@ -16,7 +16,7 @@ final class PutSimpleItemToCartRequestTest extends TestCase
      */
     public function it_creates_put_simple_item_to_cart_command_from_request()
     {
-        $putSimpleItemToCartRequest = PutSimpleItemToCartRequest::fromRequest(new Request([], [
+        $putSimpleItemToCartRequest = PutSimpleItemToCartRequest::fromHttpRequest(new Request([], [
             'productCode' => 'HACKTOBERFEST_TSHIRT_CODE',
             'quantity' => 4,
         ], ['token' => 'ORDERTOKEN']));
diff --git a/tests/Request/PutVariantBasedConfigurableItemToCartRequestTest.php b/tests/Request/PutVariantBasedConfigurableItemToCartRequestTest.php
index 55728636c..9eb53b357 100644
--- a/tests/Request/PutVariantBasedConfigurableItemToCartRequestTest.php
+++ b/tests/Request/PutVariantBasedConfigurableItemToCartRequestTest.php
@@ -16,7 +16,7 @@ final class PutVariantBasedConfigurableItemToCartRequestTest extends TestCase
      */
     public function it_creates_put_simple_item_to_cart_command_from_request()
     {
-        $putConfigurableItemToCartRequest = PutVariantBasedConfigurableItemToCartRequest::fromRequest(new Request([], [
+        $putConfigurableItemToCartRequest = PutVariantBasedConfigurableItemToCartRequest::fromHttpRequest(new Request([], [
             'productCode' => 'HACKTOBERFEST_TSHIRT_CODE',
             'variantCode' => 'LARGE_HACKTOBERFEST_TSHIRT_CODE',
             'quantity' => 4,