diff --git a/DependencyInjection/TranslationExtension.php b/DependencyInjection/TranslationExtension.php
index b99de650..b0a81411 100644
--- a/DependencyInjection/TranslationExtension.php
+++ b/DependencyInjection/TranslationExtension.php
@@ -17,6 +17,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\Kernel;
 use Translation\Bundle\Service\StorageService;
 
 /**
@@ -38,6 +39,10 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('services.yml');
         $loader->load('extractors.yml');
 
+        // Add major version to extractor
+        $container->getDefinition('php_translation.extractor.php.visitor.FormTypeChoices')
+            ->addMethodCall('setSymfonyMajorVersion', [Kernel::MAJOR_VERSION]);
+
         $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'));
 
diff --git a/Resources/config/extractors.yml b/Resources/config/extractors.yml
index 67548c1a..2f8ad462 100644
--- a/Resources/config/extractors.yml
+++ b/Resources/config/extractors.yml
@@ -10,24 +10,48 @@ services:
     tags:
       - { name: 'php_translation.extractor', type: 'twig' }
 
-  # Visitors:
+  # PHP Visitors:
   php_translation.extractor.php.visitor.ContainerAwareTrans:
     class: Translation\Extractor\Visitor\Php\Symfony\ContainerAwareTrans
     tags:
       - { name: 'php_translation.visitor', type: 'php' }
+
   php_translation.extractor.php.visitor.ContainerAwareTransChoice:
     class: Translation\Extractor\Visitor\Php\Symfony\ContainerAwareTransChoice
     tags:
       - { name: 'php_translation.visitor', type: 'php' }
+
   php_translation.extractor.php.visitor.FlashMessage:
     class: Translation\Extractor\Visitor\Php\Symfony\FlashMessage
     tags:
       - { name: 'php_translation.visitor', type: 'php' }
 
+  php_translation.extractor.php.visitor.FormTypeChoices:
+    class: Translation\Extractor\Visitor\Php\Symfony\FormTypeChoices
+    tags:
+      - { name: 'php_translation.visitor', type: 'php' }
+
+  php_translation.extractor.php.visitor.FormTypeLabelExplicit:
+    class: Translation\Extractor\Visitor\Php\Symfony\FormTypeLabelExplicit
+    tags:
+      - { name: 'php_translation.visitor', type: 'php' }
+
+  php_translation.extractor.php.visitor.FormTypeLabelImplicit:
+    class: Translation\Extractor\Visitor\Php\Symfony\FormTypeLabelImplicit
+    tags:
+      - { name: 'php_translation.visitor', type: 'php' }
+
+  php_translation.extractor.php.visitor.FormTypePlaceholder:
+    class: Translation\Extractor\Visitor\Php\Symfony\FormTypePlaceholder
+    tags:
+      - { name: 'php_translation.visitor', type: 'php' }
+
+  # Twig Visitors:
   php_translation.extractor.twig.visitor.translation_block:
     class: Translation\Extractor\Visitor\Twig\TranslationBlock
     tags:
       - { name: 'php_translation.visitor', type: 'twig' }
+
   php_translation.extractor.twig.visitor.translation_filter:
     class: Translation\Extractor\Visitor\Twig\TranslationFilter
     tags:
diff --git a/composer.json b/composer.json
index 2fdc33f8..5588b32e 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
         "symfony/finder": "^2.7 || ^3.0",
 
         "php-translation/common": "^0.1",
-        "php-translation/extractor": "^0.1"
+        "php-translation/extractor": "^0.1.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.5 || ^5.4",