diff --git a/src/Sylius/Bundle/CartBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/CartBundle/DependencyInjection/Configuration.php
index 1eb53d30d3..bcbed566ac 100644
--- a/src/Sylius/Bundle/CartBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/CartBundle/DependencyInjection/Configuration.php
@@ -39,8 +39,8 @@ class Configuration implements ConfigurationInterface
             ->children()
                 ->scalarNode('driver')->cannotBeOverwritten()->isRequired()->cannotBeEmpty()->end()
                 ->scalarNode('engine')->defaultValue('twig')->end()
-                ->scalarNode('operator')->cannotBeOverwritten()->isRequired()->cannotBeEmpty()->end()
-                ->scalarNode('resolver')->cannotBeOverwritten()->isRequired()->cannotBeEmpty()->end()
+                ->scalarNode('operator')->defaultValue('sylius_cart.operator.default')->end()
+                ->scalarNode('resolver')->isRequired()->cannotBeEmpty()->end()
                 ->scalarNode('storage')->defaultValue('sylius_cart.storage.session')->end()
             ->end();
 
diff --git a/src/Sylius/Bundle/CartBundle/Resources/config/container/driver/doctrine/orm.xml b/src/Sylius/Bundle/CartBundle/Resources/config/container/driver/doctrine/orm.xml
index 06a2bc73fc..dfa01f74f1 100644
--- a/src/Sylius/Bundle/CartBundle/Resources/config/container/driver/doctrine/orm.xml
+++ b/src/Sylius/Bundle/CartBundle/Resources/config/container/driver/doctrine/orm.xml
@@ -17,15 +17,42 @@
                                http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="sylius_cart.manager.cart.class">Sylius\Bundle\ResourceBundle\Manager\Doctrine\ORM\ResourceManager</parameter>
-        <parameter key="sylius_cart.manager.item.class">Sylius\Bundle\ResourceBundle\Manager\Doctrine\ORM\ResourceManager</parameter>
+        <parameter key="sylius_cart.manager.cart.class">Sylius\Bundle\ResourceBundle\Manager\Doctrine\DoctrineResourceManager</parameter>
+        <parameter key="sylius_cart.repository.cart.class">Sylius\Bundle\ResourceBundle\Repository\Doctrine\ORM\ResourceRepository</parameter>
+        <parameter key="sylius_cart.manager.item.class">Sylius\Bundle\ResourceBundle\Manager\Doctrine\DoctrineResourceManager</parameter>
+        <parameter key="sylius_cart.repository.item.class">Sylius\Bundle\ResourceBundle\Repository\Doctrine\ORM\ResourceRepository</parameter>
     </parameters>
 
     <services>
+        <service id="sylius_cart.doctrine.repository.cart"
+                factory-service="doctrine.orm.default_entity_manager"
+                factory-method="getRepository"
+                class="Doctrine\ORM\EntityRepository"
+                public="false"
+        >
+            <argument>%sylius_cart.model.cart.class%</argument>
+        </service>
+        <service id="sylius_cart.repository.cart" class="%sylius_cart.repository.cart.class%">
+            <argument type="service" id="sylius_cart.doctrine.repository.cart" />
+            <argument>%sylius_cart.model.cart.class%</argument>
+        </service>
         <service id="sylius_cart.manager.cart" class="%sylius_cart.manager.cart.class%">
             <argument type="service" id="doctrine.orm.default_entity_manager" />
             <argument>%sylius_cart.model.cart.class%</argument>
         </service>
+
+        <service id="sylius_cart.doctrine.repository.item"
+                factory-service="doctrine.orm.default_entity_manager"
+                factory-method="getRepository"
+                class="Doctrine\ORM\EntityRepository"
+                public="false"
+        >
+            <argument>%sylius_cart.model.item.class%</argument>
+        </service>
+        <service id="sylius_cart.repository.item" class="%sylius_cart.repository.item.class%">
+            <argument type="service" id="sylius_cart.doctrine.repository.item" />
+            <argument>%sylius_cart.model.cart.class%</argument>
+        </service>
         <service id="sylius_cart.manager.item" class="%sylius_cart.manager.item.class%">
             <argument type="service" id="doctrine.orm.default_entity_manager" />
             <argument>%sylius_cart.model.item.class%</argument>
diff --git a/src/Sylius/Bundle/CartBundle/Resources/config/container/services.xml b/src/Sylius/Bundle/CartBundle/Resources/config/container/services.xml
index d1fed9b863..b91a4a0d63 100644
--- a/src/Sylius/Bundle/CartBundle/Resources/config/container/services.xml
+++ b/src/Sylius/Bundle/CartBundle/Resources/config/container/services.xml
@@ -17,7 +17,7 @@
                                http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="sylius_cart.operator.class">Sylius\Bundle\CartBundle\Operator\CartOperator</parameter>
+        <parameter key="sylius_cart.operator.default.class">Sylius\Bundle\CartBundle\Operator\CartOperator</parameter>
         <parameter key="sylius_cart.storage.session.class">Sylius\Bundle\CartBundle\Storage\SessionCartStorage</parameter>
     </parameters>
 
@@ -37,7 +37,7 @@
             <tag name="form.type" alias="sylius_cart_item" />
         </service>
 
-        <service id="sylius_cart.operator" class="%sylius_cart.operator.class%">
+        <service id="sylius_cart.operator.default" class="%sylius_cart.operator.default.class%">
             <argument type="service" id="sylius_cart.manager.cart" />
         </service>