diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle b/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle
index e43a157c5da..166bc1c0e44 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle
@@ -160,7 +160,6 @@ allprojects {
         implementation.exclude module:'stax-api'
         implementation.exclude module:'groovy-xml'
         implementation.exclude module:'groovy-templates'
-        implementation.exclude module:'jna'
         cucumberRuntime {
             extendsFrom testImplementation
         }
@@ -242,6 +241,7 @@ dependencies {
     implementation group: 'jaxen', name: 'jaxen', version: '1.2.0'
 
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.22")
+    implementation 'net.java.dev.jna:jna:5.12.1'
     testImplementation 'io.cucumber:cucumber-java:7.0.0'
     testImplementation 'io.cucumber:cucumber-junit:7.0.0'
     testImplementation 'org.assertj:assertj-core:3.19.0'
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/projects/HDInsightModuleBuilder.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/projects/HDInsightModuleBuilder.java
index 8b516179cb8..cb48014548c 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/projects/HDInsightModuleBuilder.java
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/projects/HDInsightModuleBuilder.java
@@ -130,7 +130,7 @@ public void moduleCreated(@NotNull Module module) {
             case MAVEN:
                 new MavenProjectGenerator(module, this.selectedTemplate.getTemplateType(), sparkVersion)
                         .generate()
-                        .done(mavenProject -> {
+                        .onSuccess(mavenProject -> {
                             if (getSelectedTemplate() != null && artifactPackagingFactory != null &&
                                     getSelectedTemplate().getTemplateType() == HDInsightTemplatesType.ScalaFailureTaskDebugSample) {
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/AzureActionsListener.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/AzureActionsListener.java
index 3fc5a4e29bd..0e26ea0167c 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/AzureActionsListener.java
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/AzureActionsListener.java
@@ -12,6 +12,7 @@
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.actionSystem.IdeActions;
+import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.microsoft.applicationinsights.core.dependencies.apachecommons.lang3.exception.ExceptionUtils;
 import com.microsoft.azure.cosmosspark.CosmosSparkClusterOpsCtrl;
@@ -127,6 +128,7 @@ public class AzureActionsListener implements AppLifecycleListener, PluginCompone
     @AzureOperation(name = "platform/common.init_plugin")
     public void appFrameCreated(@NotNull List<String> commandLineArgs) {
         try {
+            System.setProperty("jna.noclasspath", "false");
             DefaultLoader.setPluginComponent(this);
             DefaultLoader.setUiHelper(new UIHelperImpl());
             DefaultLoader.setIdeHelper(new IDEHelperImpl());