diff --git a/resharper/src/CSharp/Daemon/ConstructorElementProblemAnalyzer.cs b/resharper/src/CSharp/Daemon/ConstructorElementProblemAnalyzer.cs
index b7837a8..815a960 100644
--- a/resharper/src/CSharp/Daemon/ConstructorElementProblemAnalyzer.cs
+++ b/resharper/src/CSharp/Daemon/ConstructorElementProblemAnalyzer.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using JetBrains.Application.Parts;
 using JetBrains.ReSharper.Feature.Services.Daemon;
 using JetBrains.ReSharper.Plugins.Godot.ProjectModel;
 using JetBrains.ReSharper.Psi.Modules;
@@ -12,7 +13,7 @@ namespace JetBrains.ReSharper.Plugins.Godot.CSharp.Daemon
     /// <summary>
     /// Analyzes classes that derives from Godot.GodotObject
     /// </summary>
-    [ElementProblemAnalyzer(typeof(IClassDeclaration), HighlightingTypes = new[] {typeof(MissingParameterlessConstructor)})]
+    [ElementProblemAnalyzer(Instantiation.DemandAnyThreadUnsafe, typeof(IClassDeclaration), HighlightingTypes = new[] {typeof(MissingParameterlessConstructor)})]
     public class ConstructorElementProblemAnalyzer : ElementProblemAnalyzer<IClassDeclaration>
     {
         protected override void Run(IClassDeclaration element, ElementProblemAnalyzerData data, IHighlightingConsumer consumer)
diff --git a/resharper/src/UsageStatistics/GodotProjectTechnologyProvider.cs b/resharper/src/UsageStatistics/GodotProjectTechnologyProvider.cs
index 6357c2c..509a62a 100644
--- a/resharper/src/UsageStatistics/GodotProjectTechnologyProvider.cs
+++ b/resharper/src/UsageStatistics/GodotProjectTechnologyProvider.cs
@@ -6,7 +6,7 @@
 
 namespace JetBrains.ReSharper.Plugins.Godot.UsageStatistics
 {
-    [SolutionComponent(InstantiationEx.LegacyDefault)]
+    [SolutionComponent(Instantiation.DemandAnyThreadUnsafe)]
     public class GodotProjectTechnologyProvider : IProjectTechnologyProvider
     {
         public IEnumerable<string> GetProjectTechnology(IProject project)
@@ -19,7 +19,7 @@ public IEnumerable<string> GetProjectTechnology(IProject project)
         }
     }
     
-    [SolutionComponent(InstantiationEx.LegacyDefault)]
+    [SolutionComponent(Instantiation.DemandAnyThreadUnsafe)]
     public class GodotSolutionTechnologyProvider : ISolutionTechnologyProvider
     {
         public IEnumerable<string> GetSolutionTechnology(ISolution solution)