diff --git a/src/main/resources/META-INF/dql.xml b/src/main/resources/META-INF/dql.xml
new file mode 100644
index 000000000..15e8f501d
--- /dev/null
+++ b/src/main/resources/META-INF/dql.xml
@@ -0,0 +1,2 @@
+<idea-plugin url="https://www.jetbrains.com/idea">
+</idea-plugin>
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index b8388dc8e..17425bd52 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -630,9 +630,9 @@
     <depends>org.jetbrains.plugins.yaml</depends>
     <depends>de.espend.idea.php.annotation</depends>
 
-    <depends optional="true">com.jetbrains.php.dql</depends>
-    <depends optional="true">de.espend.idea.php.toolbox</depends>
-    <depends optional="true" config-file="deployment-aware.xml">com.jetbrains.plugins.webDeployment</depends>
+    <depends config-file="dql.xml" optional="true" >com.jetbrains.php.dql</depends>
+    <depends config-file="toolbox.xml" optional="true" >de.espend.idea.php.toolbox</depends>
+    <depends config-file="deployment-aware.xml" optional="true" >com.jetbrains.plugins.webDeployment</depends>
     <depends config-file="pay.xml">com.jetbrains.php</depends>
 
     <extensions defaultExtensionNs="de.espend.idea.php.annotation">
@@ -651,19 +651,6 @@
         <PhpAnnotationCompletionProvider implementation="fr.adrienbrault.idea.symfony2plugin.translation.annotation.ConstraintMessageAnnotationReferences"/>
     </extensions>
 
-    <extensions defaultExtensionNs="de.espend.idea.php.toolbox.extension">
-        <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.ServiceToolboxProvider"/>
-        <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.RoutesToolboxProvider"/>
-        <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.TwigToolboxProvider"/>
-        <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.TranslationDomainToolboxProvider"/>
-        <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.ServiceParameterToolboxProvider"/>
-        <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.DoctrineModelProvider"/>
-        <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.ControllerToolboxProvider"/>
-
-        <PhpToolboxTargetLocator implementation="fr.adrienbrault.idea.symfony2plugin.external.locator.TwigFileToolboxTargetLocator"/>
-        <PhpToolboxTargetLocator implementation="fr.adrienbrault.idea.symfony2plugin.external.locator.BundleFileToolboxTargetLocator"/>
-    </extensions>
-
     <actions>
 
         <action id="Symfony.Menu" class="fr.adrienbrault.idea.symfony2plugin.action.SymfonyContainerServiceBuilder">
diff --git a/src/main/resources/META-INF/toolbox.xml b/src/main/resources/META-INF/toolbox.xml
new file mode 100644
index 000000000..18bfbfbfe
--- /dev/null
+++ b/src/main/resources/META-INF/toolbox.xml
@@ -0,0 +1,14 @@
+<idea-plugin url="https://www.jetbrains.com/idea">
+    <extensions defaultExtensionNs="de.espend.idea.php.toolbox.extension">
+        <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.ServiceToolboxProvider"/>
+        <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.RoutesToolboxProvider"/>
+        <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.TwigToolboxProvider"/>
+        <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.TranslationDomainToolboxProvider"/>
+        <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.ServiceParameterToolboxProvider"/>
+        <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.DoctrineModelProvider"/>
+        <PhpToolboxProviderInterface implementation="fr.adrienbrault.idea.symfony2plugin.external.toolbox.provider.ControllerToolboxProvider"/>
+
+        <PhpToolboxTargetLocator implementation="fr.adrienbrault.idea.symfony2plugin.external.locator.TwigFileToolboxTargetLocator"/>
+        <PhpToolboxTargetLocator implementation="fr.adrienbrault.idea.symfony2plugin.external.locator.BundleFileToolboxTargetLocator"/>
+    </extensions>
+</idea-plugin>