diff --git a/.phpstorm.meta.php/di-autocomplete.php b/.phpstorm.meta.php/di-autocomplete.php
new file mode 100644
index 000000000..881c3ba83
--- /dev/null
+++ b/.phpstorm.meta.php/di-autocomplete.php
@@ -0,0 +1,6 @@
+<?php
+
+namespace PHPSTORM_META {
+    override(\Magento\Framework\ObjectManagerInterface::get(0), map(['' => '@']));
+    override(\Magento\Framework\ObjectManagerInterface::create(0), map(['' => '@']));
+}
\ No newline at end of file
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
index 585b5dd23..f7a0124e1 100644
--- a/META-INF/plugin.xml
+++ b/META-INF/plugin.xml
@@ -99,11 +99,12 @@
 
         <directoryProjectConfigurator implementation="com.magento.idea.magento2plugin.project.ProjectDetector"/>
 
+        <libraryRoot id=".phpstorm.meta.php" path="/.phpstorm.meta.php/" runtime="false"/>
+
         <localInspection language="PHP" groupPath="PHP"
                          shortName="PluginInspection" displayName="Inspection for the Plugin declaration"
                          groupName="Magento"                                 enabledByDefault="true" level="ERROR"
                          implementationClass="com.magento.idea.magento2plugin.inspections.php.PluginInspection"/>
-
     </extensions>
 
     <application-components>