diff --git a/src/DependencyInjection/PayseraApiExtension.php b/src/DependencyInjection/PayseraApiExtension.php
index 1eee814..0fec0aa 100644
--- a/src/DependencyInjection/PayseraApiExtension.php
+++ b/src/DependencyInjection/PayseraApiExtension.php
@@ -23,6 +23,13 @@ public function load(array $configs, ContainerBuilder $container)
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.xml');
 
+        $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config/services'));
+        if (class_exists(\Symfony\Bundle\FrameworkBundle\Routing\AttributeRouteControllerLoader::class)) {
+            $loader->load('annotations.xml');
+        } else {
+            $loader->load('annotations_legacy.xml');
+        }
+
         $container->setParameter('paysera_api.locales', $config['locales']);
         if (count($config['locales']) === 0) {
             $container->removeDefinition('paysera_api.listener.locale');
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index bb957b9..d282980 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -5,7 +5,6 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <imports>
-        <import resource="services/annotations.xml"/>
         <import resource="services/listeners.xml"/>
         <import resource="services/normalizers.xml"/>
         <import resource="services/pagination.xml"/>
diff --git a/src/Resources/config/services/annotations.xml b/src/Resources/config/services/annotations.xml
index 7efac14..bfd252d 100644
--- a/src/Resources/config/services/annotations.xml
+++ b/src/Resources/config/services/annotations.xml
@@ -5,18 +5,6 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
 
-        <service decorates="routing.loader.annotation"
-                 parent="routing.loader.annotation"
-                 id="paysera_api.annotations.loader"
-                 class="Paysera\Bundle\ApiBundle\Service\Annotation\RoutingAnnotationLoader">
-            <call method="setRequestHelper">
-                <argument type="service" id="paysera_api.rest_request_helper"/>
-            </call>
-            <call method="setRestRequestOptionsBuilder">
-                <argument type="service" id="paysera_api.annotations.options_builder"/>
-            </call>
-        </service>
-
         <service decorates="routing.loader.attribute"
                  parent="routing.loader.attribute"
                  id="paysera_api.loader.attribute"
diff --git a/src/Resources/config/services/annotations_legacy.xml b/src/Resources/config/services/annotations_legacy.xml
new file mode 100644
index 0000000..06531f1
--- /dev/null
+++ b/src/Resources/config/services/annotations_legacy.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+
+        <service decorates="routing.loader.annotation"
+                 parent="routing.loader.annotation"
+                 id="paysera_api.annotations.loader"
+                 class="Paysera\Bundle\ApiBundle\Service\Annotation\RoutingAnnotationLoader">
+            <call method="setRequestHelper">
+                <argument type="service" id="paysera_api.rest_request_helper"/>
+            </call>
+            <call method="setRestRequestOptionsBuilder">
+                <argument type="service" id="paysera_api.annotations.options_builder"/>
+            </call>
+        </service>
+
+        <service id="paysera_api.annotations.options_builder"
+                class="Paysera\Bundle\ApiBundle\Service\Annotation\RestRequestOptionsBuilder">
+            <argument type="service" id="paysera_api.rest_request_options_validator"/>
+        </service>
+    </services>
+</container>