diff --git a/DependencyInjection/TranslationExtension.php b/DependencyInjection/TranslationExtension.php
index a9cae860..da1a6514 100644
--- a/DependencyInjection/TranslationExtension.php
+++ b/DependencyInjection/TranslationExtension.php
@@ -20,10 +20,6 @@
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpKernel\Kernel;
 use Translation\Bundle\Model\Configuration as ConfigurationModel;
-use Translation\Extractor\Visitor\Twig\TranslationBlock;
-use Translation\Extractor\Visitor\Twig\TranslationFilter;
-use Translation\Extractor\Visitor\Twig\Twig2TranslationBlock;
-use Translation\Extractor\Visitor\Twig\Twig2TranslationFilter;
 
 /**
  * This is the class that loads and manages your bundle configuration.
@@ -48,14 +44,6 @@ public function load(array $configs, ContainerBuilder $container)
         $container->getDefinition('php_translation.extractor.php.visitor.FormTypeChoices')
             ->addMethodCall('setSymfonyMajorVersion', [Kernel::MAJOR_VERSION]);
 
-        if (version_compare(\Twig_Environment::VERSION, 2) === -1) {
-            $container->setParameter('php_translation.extractor.twig.visitor.translation_block.class', TranslationBlock::class);
-            $container->setParameter('php_translation.extractor.twig.visitor.translation_filter.class', TranslationFilter::class);
-        } else {
-            $container->setParameter('php_translation.extractor.twig.visitor.translation_block.class', Twig2TranslationBlock::class);
-            $container->setParameter('php_translation.extractor.twig.visitor.translation_filter.class', Twig2TranslationFilter::class);
-        }
-
         $container->setParameter('php_translation.locales', $config['locales']);
         $container->setParameter('php_translation.default_locale', isset($config['default_locale']) ? $config['default_locale'] : $container->getParameter('kernel.default_locale'));
         $this->handleConfigNode($container, $config);
diff --git a/Resources/config/extractors.yml b/Resources/config/extractors.yml
index ecc59c2f..0f8fd41d 100644
--- a/Resources/config/extractors.yml
+++ b/Resources/config/extractors.yml
@@ -52,12 +52,8 @@ services:
       - { name: 'php_translation.visitor', type: 'php' }
 
   # Twig Visitors:
-  php_translation.extractor.twig.visitor.translation_block:
-    class: '%php_translation.extractor.twig.visitor.translation_block.class%'
-    tags:
-      - { name: 'php_translation.visitor', type: 'twig' }
-
-  php_translation.extractor.twig.visitor.translation_filter:
-    class: '%php_translation.extractor.twig.visitor.translation_filter.class%'
+  php_translation.extractor.twig.visitor.twig:
+    class: Translation\Extractor\Visitor\Twig\Twig2Visitor
+    factory: [Translation\Extractor\Visitor\Twig\TwigVisitor, create]
     tags:
       - { name: 'php_translation.visitor', type: 'twig' }
diff --git a/composer.json b/composer.json
index f0f369ca..85fd6d13 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
 
         "php-translation/common": "^0.2.1",
         "php-translation/symfony-storage": "^0.2.1",
-        "php-translation/extractor": "^1.0"
+        "php-translation/extractor": "^1.1.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.5 || ^5.4",