diff --git a/build.gradle b/build.gradle
index 25fdc2a3..f1cb2fc2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,8 +17,8 @@ subprojects {
 
     apply plugin: 'org.jetbrains.intellij'
     intellij {
-        version ideaVersion
-        plugins = ['copyright', 'java']
+        version project.property("ideaVersion")
+        plugins = ['copyright', 'java', 'org.intellij.scala:2020.3.19']
         downloadSources Boolean.valueOf(sources)
         sameSinceUntilBuild Boolean.valueOf(isEAP)
     }
diff --git a/gradle.properties b/gradle.properties
index e3cd463f..5e9a9e03 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-ideaVersion = IC-2020.3.1
+ideaVersion = 2020.3.1
 sources = true
 isEAP = false
 
diff --git a/thrift/src/main/java/com/intellij/plugins/thrift/structure/ThriftStructureViewModel.java b/thrift/src/main/java/com/intellij/plugins/thrift/structure/ThriftStructureViewModel.java
index 22fa3eab..8560b2bc 100644
--- a/thrift/src/main/java/com/intellij/plugins/thrift/structure/ThriftStructureViewModel.java
+++ b/thrift/src/main/java/com/intellij/plugins/thrift/structure/ThriftStructureViewModel.java
@@ -19,7 +19,6 @@
 import com.intellij.ide.structureView.StructureViewModel;
 import com.intellij.ide.structureView.StructureViewModelBase;
 import com.intellij.ide.structureView.StructureViewTreeElement;
-import com.intellij.ide.structureView.impl.java.VisibilitySorter;
 import com.intellij.ide.util.treeView.smartTree.*;
 import com.intellij.plugins.thrift.lang.psi.ThriftDeclaration;
 import com.intellij.plugins.thrift.lang.psi.ThriftSubDeclaration;
@@ -36,7 +35,7 @@
 public class ThriftStructureViewModel extends StructureViewModelBase implements StructureViewModel.ElementInfoProvider {
   public ThriftStructureViewModel(@NotNull PsiFile psiFile) {
     super(psiFile, new ThriftStructureViewElement(psiFile));
-    withSorters(Sorter.ALPHA_SORTER, VisibilitySorter.INSTANCE);
+    withSorters(Sorter.ALPHA_SORTER);
     withSuitableClasses(ThriftDeclaration.class);
   }
 
diff --git a/thrift/src/main/resources/META-INF/plugin.xml b/thrift/src/main/resources/META-INF/plugin.xml
index abd9fe24..75321565 100644
--- a/thrift/src/main/resources/META-INF/plugin.xml
+++ b/thrift/src/main/resources/META-INF/plugin.xml
@@ -120,6 +120,8 @@
   <depends>com.intellij.modules.vcs</depends>
   <depends>com.intellij.modules.xml</depends>
   <depends>com.intellij.modules.xdebugger</depends>
+  <depends optional="true" config-file="withJava.xml">com.intellij.modules.java</depends>
+  <depends optional="true" config-file="withScala.xml">org.intellij.scala</depends>
 
   <application-components>
     <!-- Add your application components here -->
@@ -187,9 +189,7 @@
 
     <frameworkSupport implementation="com.intellij.plugins.thrift.config.facet.ThriftFacetSupportProvider"/>
     <facetType implementation="com.intellij.plugins.thrift.config.facet.ThriftFacetType"/>
-    <compileServer.plugin classpath="thrift-jps.jar;commons-io-2.4.jar"/>
-    <codeInsight.lineMarkerProvider language="Scala" implementationClass="com.intellij.plugins.thrift.editor.GoToThriftDefinitionMarkerProvider"/>
-    <codeInsight.lineMarkerProvider language="JAVA" implementationClass="com.intellij.plugins.thrift.editor.GoToThriftDefinitionMarkerProvider"/>
+    <compileServer.plugin classpath="thrift-jps.jar" />
   </extensions>
 
   <actions>
diff --git a/thrift/src/main/resources/META-INF/withJava.xml b/thrift/src/main/resources/META-INF/withJava.xml
new file mode 100644
index 00000000..7a759968
--- /dev/null
+++ b/thrift/src/main/resources/META-INF/withJava.xml
@@ -0,0 +1,6 @@
+<idea-plugin>
+    <extensions defaultExtensionNs="com.intellij">
+        <codeInsight.lineMarkerProvider language="JAVA"
+                                        implementationClass="com.intellij.plugins.thrift.editor.GoToThriftDefinitionMarkerProvider"/>
+    </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/thrift/src/main/resources/META-INF/withScala.xml b/thrift/src/main/resources/META-INF/withScala.xml
new file mode 100644
index 00000000..0e5e91de
--- /dev/null
+++ b/thrift/src/main/resources/META-INF/withScala.xml
@@ -0,0 +1,6 @@
+<idea-plugin>
+    <extensions defaultExtensionNs="com.intellij">
+        <codeInsight.lineMarkerProvider language="Scala"
+                                        implementationClass="com.intellij.plugins.thrift.editor.GoToThriftDefinitionMarkerProvider"/>
+    </extensions>
+</idea-plugin>
\ No newline at end of file