diff --git a/java/execution/impl/src/com/intellij/execution/CommonJavaRunConfigurationParameters.java b/java/execution/impl/src/com/intellij/execution/CommonJavaRunConfigurationParameters.java
index 522ba0afcf7b..0dcab3fb782a 100644
--- a/java/execution/impl/src/com/intellij/execution/CommonJavaRunConfigurationParameters.java
+++ b/java/execution/impl/src/com/intellij/execution/CommonJavaRunConfigurationParameters.java
@@ -7,7 +7,7 @@ import com.intellij.execution.configurations.ConfigurationWithAlternativeJre;
 import org.jetbrains.annotations.Nullable;
 
 public interface CommonJavaRunConfigurationParameters extends CommonProgramRunConfigurationParameters, ConfigurationWithAlternativeJre {
-  void setVMParameters(String value);
+  void setVMParameters(@Nullable String value);
 
   String getVMParameters();
 
diff --git a/java/execution/impl/src/com/intellij/execution/application/AbstractApplicationConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/application/AbstractApplicationConfigurationProducer.java
index a998aabcd1c0..cf99154d83d1 100644
--- a/java/execution/impl/src/com/intellij/execution/application/AbstractApplicationConfigurationProducer.java
+++ b/java/execution/impl/src/com/intellij/execution/application/AbstractApplicationConfigurationProducer.java
@@ -79,7 +79,7 @@ public abstract class AbstractApplicationConfigurationProducer<T extends Applica
   public boolean isConfigurationFromContext(T appConfiguration, ConfigurationContext context) {
     final PsiElement location = context.getPsiLocation();
     final PsiClass aClass = ApplicationConfigurationType.getMainClass(location);
-    if (aClass != null && Comparing.equal(JavaExecutionUtil.getRuntimeQualifiedName(aClass), appConfiguration.getOptions().getMainClassName())) {
+    if (aClass != null && Comparing.equal(JavaExecutionUtil.getRuntimeQualifiedName(aClass), appConfiguration.getMainClassName())) {
       final PsiMethod method = PsiTreeUtil.getParentOfType(location, PsiMethod.class, false);
       if (method != null && TestFrameworks.getInstance().isTestMethod(method)) {
         return false;
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
index 40dcf4c76e3c..61c37bb6407b 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
@@ -71,7 +71,7 @@ public class ApplicationConfigurable extends SettingsEditor<ApplicationConfigura
     configuration.setMainClassName(aClass != null ? JavaExecutionUtil.getRuntimeQualifiedName(aClass) : className);
     configuration.setAlternativeJrePath(myJrePathEditor.getJrePathOrName());
     configuration.setAlternativeJrePathEnabled(myJrePathEditor.isAlternativeJreSelected());
-    configuration.getOptions().setSwingInspectorEnabled((myVersionDetector.isJre50Configured(configuration) || myVersionDetector.isModuleJre50Configured(configuration)) && myShowSwingInspectorCheckbox.isSelected());
+    configuration.setSwingInspectorEnabled((myVersionDetector.isJre50Configured(configuration) || myVersionDetector.isModuleJre50Configured(configuration)) && myShowSwingInspectorCheckbox.isSelected());
     configuration.setShortenCommandLine((ShortenCommandLine)myShortenClasspathModeCombo.getComponent().getSelectedItem());
     configuration.setIncludeProvidedScope(myIncludeProvidedDeps.getComponent().isSelected());
 
@@ -82,9 +82,8 @@ public class ApplicationConfigurable extends SettingsEditor<ApplicationConfigura
     myCommonProgramParameters.reset(configuration);
     myModuleSelector.reset(configuration);
 
-    ApplicationConfigurationOptions options = configuration.getOptions();
-    getMainClassField().setText(options.getMainClassName() != null ? options.getMainClassName().replaceAll("\\$", "\\.") : "");
-    myJrePathEditor.setPathOrName(options.getAlternativeJrePath(), options.isAlternativeJrePathEnabled());
+    getMainClassField().setText(configuration.getMainClassName() != null ? configuration.getMainClassName().replaceAll("\\$", "\\.") : "");
+    myJrePathEditor.setPathOrName(configuration.getAlternativeJrePath(), configuration.isAlternativeJrePathEnabled());
     myShortenClasspathModeCombo.getComponent().setSelectedItem(configuration.getShortenCommandLine());
     myIncludeProvidedDeps.getComponent().setSelected(configuration.isProvidedScopeIncluded());
 
@@ -94,7 +93,7 @@ public class ApplicationConfigurable extends SettingsEditor<ApplicationConfigura
   private void updateShowSwingInspector(final ApplicationConfiguration configuration) {
     if (myVersionDetector.isJre50Configured(configuration) || myVersionDetector.isModuleJre50Configured(configuration)) {
       myShowSwingInspectorCheckbox.setEnabled(true);
-      myShowSwingInspectorCheckbox.setSelected(configuration.getOptions().isSwingInspectorEnabled());
+      myShowSwingInspectorCheckbox.setSelected(configuration.isSwingInspectorEnabled());
       myShowSwingInspectorCheckbox.setText(ExecutionBundle.message("show.swing.inspector"));
     }
     else {
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
index efa0035ce8a9..c1561cc7d1a0 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
@@ -62,8 +62,11 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     super(name, new JavaRunConfigurationModule(project, true), factory);
   }
 
+  /**
+   * Because we have to keep backward compatibility, never use `getOptions()` to get or set values - use only designated getters/setters.
+   */
   @Override
-  public ApplicationConfigurationOptions getOptions() {
+  protected ApplicationConfigurationOptions getOptions() {
     return (ApplicationConfigurationOptions)super.getOptions();
   }
 
@@ -73,7 +76,7 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
   }
 
   @Override
-  public void setMainClass(final PsiClass psiClass) {
+  public void setMainClass(@NotNull PsiClass psiClass) {
     final Module originalModule = getConfigurationModule().getModule();
     setMainClassName(JavaExecutionUtil.getRuntimeQualifiedName(psiClass));
     setModule(JavaExecutionUtil.findModule(psiClass));
@@ -113,7 +116,8 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
 
   @Nullable
   public String getMainClassName() {
-    return getOptions().getMainClassName();
+    //noinspection deprecation
+    return MAIN_CLASS_NAME;
   }
 
   @Override
@@ -130,30 +134,30 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     if (getMainClassName() == null) {
       return null;
     }
-    return ProgramRunnerUtil.shortenName(JavaExecutionUtil.getShortClassName(getOptions().getMainClassName()), 6) + ".main()";
+    return ProgramRunnerUtil.shortenName(JavaExecutionUtil.getShortClassName(getMainClassName()), 6) + ".main()";
   }
 
   @Override
   public void setMainClassName(@Nullable String qualifiedName) {
-    getOptions().setMainClassName(qualifiedName);
     //noinspection deprecation
     MAIN_CLASS_NAME = qualifiedName;
+    getOptions().setMainClassName(qualifiedName);
   }
 
   @Override
   public void checkConfiguration() throws RuntimeConfigurationException {
     JavaParametersUtil.checkAlternativeJRE(this);
     final JavaRunConfigurationModule configurationModule = getConfigurationModule();
-    final PsiClass psiClass = configurationModule.checkModuleAndClassName(getOptions().getMainClassName(), ExecutionBundle.message("no.main.class.specified.error.text"));
+    final PsiClass psiClass = configurationModule.checkModuleAndClassName(getMainClassName(), ExecutionBundle.message("no.main.class.specified.error.text"));
     if (!PsiMethodUtil.hasMainMethod(psiClass)) {
-      throw new RuntimeConfigurationWarning(ExecutionBundle.message("main.method.not.found.in.class.error.message", getOptions().getMainClassName()));
+      throw new RuntimeConfigurationWarning(ExecutionBundle.message("main.method.not.found.in.class.error.message", getMainClassName()));
     }
     ProgramParametersUtil.checkWorkingDirectoryExist(this, getProject(), configurationModule.getModule());
     JavaRunConfigurationExtensionManager.checkConfigurationIsValid(this);
   }
 
   @Override
-  public void setVMParameters(String value) {
+  public void setVMParameters(@Nullable String value) {
     getOptions().setVmParameters(value);
   }
 
@@ -163,23 +167,30 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
   }
 
   @Override
-  public void setProgramParameters(String value) {
+  public void setProgramParameters(@Nullable String value) {
+    //noinspection deprecation
+    PROGRAM_PARAMETERS = value;
     getOptions().setProgramParameters(value);
   }
 
   @Override
   public String getProgramParameters() {
-    return getOptions().getProgramParameters();
+    //noinspection deprecation
+    return PROGRAM_PARAMETERS;
   }
 
   @Override
-  public void setWorkingDirectory(String value) {
-    getOptions().setWorkingDirectory(ExternalizablePath.urlValue(value));
+  public void setWorkingDirectory(@Nullable String value) {
+    String normalizedValue = ExternalizablePath.urlValue(value);
+    //noinspection deprecation
+    WORKING_DIRECTORY = normalizedValue;
+    getOptions().setWorkingDirectory(normalizedValue);
   }
 
   @Override
   public String getWorkingDirectory() {
-    return ExternalizablePath.localPathValue(getOptions().getWorkingDirectory());
+    //noinspection deprecation
+    return ExternalizablePath.localPathValue(WORKING_DIRECTORY);
   }
 
   @Override
@@ -207,7 +218,7 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
   @Override
   @Nullable
   public String getRunClass() {
-    return getOptions().getMainClassName();
+    return getMainClassName();
   }
 
   @Override
@@ -218,7 +229,8 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
 
   @Override
   public boolean isAlternativeJrePathEnabled() {
-    return getOptions().isAlternativeJrePathEnabled();
+    //noinspection deprecation
+    return ALTERNATIVE_JRE_PATH_ENABLED;
   }
 
   @Override
@@ -231,7 +243,8 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
   @Nullable
   @Override
   public String getAlternativeJrePath() {
-    return getOptions().getAlternativeJrePath();
+    //noinspection deprecation
+    return ALTERNATIVE_JRE_PATH;
   }
 
   @Override
@@ -251,7 +264,7 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
 
   @Override
   public Collection<Module> getValidModules() {
-    return JavaRunConfigurationModule.getModulesForClass(getProject(), getOptions().getMainClassName());
+    return JavaRunConfigurationModule.getModulesForClass(getProject(), getMainClassName());
   }
 
   @SuppressWarnings("deprecation")
@@ -259,9 +272,6 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
   public void readExternal(@NotNull final Element element) {
     super.readExternal(element);
 
-    JavaRunConfigurationExtensionManager.getInstance().readExternal(this, element);
-    setShortenCommandLine(ShortenCommandLine.readShortenClasspathMethod(element));
-
     ApplicationConfigurationOptions options = getOptions();
     MAIN_CLASS_NAME = options.getMainClassName();
     PROGRAM_PARAMETERS = options.getProgramParameters();
@@ -269,6 +279,9 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     ALTERNATIVE_JRE_PATH = options.getAlternativeJrePath();
     ALTERNATIVE_JRE_PATH_ENABLED = options.isAlternativeJrePathEnabled();
     ENABLE_SWING_INSPECTOR = options.isSwingInspectorEnabled();
+
+    JavaRunConfigurationExtensionManager.getInstance().readExternal(this, element);
+    setShortenCommandLine(ShortenCommandLine.readShortenClasspathMethod(element));
   }
 
   @Override
@@ -290,6 +303,17 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     myShortenCommandLine = mode;
   }
 
+  public boolean isSwingInspectorEnabled() {
+    //noinspection deprecation
+    return ENABLE_SWING_INSPECTOR;
+  }
+
+  public void setSwingInspectorEnabled(boolean value) {
+    //noinspection deprecation
+    ENABLE_SWING_INSPECTOR = value;
+    getOptions().setSwingInspectorEnabled(value);
+  }
+
   public static class JavaApplicationCommandLineState<T extends ApplicationConfiguration> extends BaseJavaApplicationCommandLineState<T> {
     public JavaApplicationCommandLineState(@NotNull final T configuration, final ExecutionEnvironment environment) {
       super(environment, configuration);
@@ -302,11 +326,10 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
       params.setShortenCommandLine(configuration.getShortenCommandLine(), configuration.getProject());
 
       final JavaRunConfigurationModule module = myConfiguration.getConfigurationModule();
-      ApplicationConfigurationOptions options = myConfiguration.getOptions();
-      final String jreHome = options.isAlternativeJrePathEnabled() ? options.getAlternativeJrePath() : null;
+      final String jreHome = myConfiguration.isAlternativeJrePathEnabled() ? myConfiguration.getAlternativeJrePath() : null;
       if (module.getModule() != null) {
         DumbService.getInstance(module.getProject()).runWithAlternativeResolveEnabled(() -> {
-          int classPathType = JavaParametersUtil.getClasspathType(module, options.getMainClassName(), false, myConfiguration.isProvidedScopeIncluded());
+          int classPathType = JavaParametersUtil.getClasspathType(module, myConfiguration.getMainClassName(), false, myConfiguration.isProvidedScopeIncluded());
           JavaParametersUtil.configureModule(module, params, classPathType, jreHome);
         });
       }
@@ -314,7 +337,7 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
         JavaParametersUtil.configureProject(module.getProject(), params, JavaParameters.JDK_AND_CLASSES_AND_TESTS, jreHome);
       }
 
-      params.setMainClass(options.getMainClassName());
+      params.setMainClass(myConfiguration.getMainClassName());
 
       setupJavaParameters(params);
 
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationOptions.kt b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationOptions.kt
index 6c43629e658e..6c4dc65aa99a 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationOptions.kt
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationOptions.kt
@@ -10,10 +10,10 @@ import java.util.*
 
 open class ApplicationConfigurationOptions : JvmConfigurationOptions() {
   @get:OptionTag("PROGRAM_PARAMETERS")
-  var programParameters by string()
+  open var programParameters by string()
 
   @get:OptionTag("WORKING_DIRECTORY")
-  var workingDirectory by string()
+  open var workingDirectory by string()
 
   @get:OptionTag("INCLUDE_PROVIDED_SCOPE")
   var includeProvidedScope by property(false)
diff --git a/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfiguration.java b/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfiguration.java
index ed1b5eba36a1..872b5252c9c2 100644
--- a/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfiguration.java
@@ -128,7 +128,7 @@ public class JarApplicationConfiguration extends LocatableConfigurationBase impl
   }
 
   @Override
-  public void setVMParameters(String value) {
+  public void setVMParameters(@Nullable String value) {
     myBean.VM_PARAMETERS = value;
   }
 
diff --git a/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java b/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java
index c18a90af6e07..59f9545b3b52 100644
--- a/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java
+++ b/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java
@@ -4,7 +4,6 @@
 package com.intellij.execution.scratch;
 
 import com.intellij.application.options.ModulesComboBox;
-import com.intellij.execution.application.ApplicationConfigurationOptions;
 import com.intellij.execution.ui.CommonJavaParametersPanel;
 import com.intellij.execution.ui.ConfigurationModuleSelector;
 import com.intellij.execution.ui.DefaultJreSelector;
@@ -125,9 +124,8 @@ public class JavaScratchConfigurable extends SettingsEditor<JavaScratchConfigura
     myCommonProgramParameters.reset(configuration);
     myModuleSelector.reset(configuration);
 
-    ApplicationConfigurationOptions options = configuration.getOptions();
-    myMainClass.getComponent().setText(options.getMainClassName() != null ? options.getMainClassName().replaceAll("\\$", "\\.") : "");
-    myJrePathEditor.setPathOrName(options.getAlternativeJrePath(), options.isAlternativeJrePathEnabled());
+    myMainClass.getComponent().setText(configuration.getMainClassName() != null ? configuration.getMainClassName().replaceAll("\\$", "\\.") : "");
+    myJrePathEditor.setPathOrName(configuration.getAlternativeJrePath(), configuration.isAlternativeJrePathEnabled());
     setVFileToEditor(configuration.getScratchVirtualFile());
   }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfiguration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfiguration.java
index 9c3ffe4c15cf..f8969df792f1 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfiguration.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfiguration.java
@@ -55,7 +55,7 @@ public abstract class MvcRunConfiguration extends ModuleBasedConfiguration<RunCo
   }
 
   @Override
-  public void setVMParameters(String vmParams) {
+  public void setVMParameters(@Nullable String vmParams) {
     this.vmParams = vmParams;
   }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
index 762cb64b97a8..b165cebe1555 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
@@ -315,7 +315,7 @@ public class GroovyScriptRunConfiguration extends ModuleBasedConfiguration<RunCo
   }
 
   @Override
-  public void setVMParameters(String value) {
+  public void setVMParameters(@Nullable String value) {
     vmParams = value;
   }
 
diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
index 06ebd98d7a7d..1a360147ee63 100644
--- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
+++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
@@ -38,6 +38,7 @@ import com.intellij.util.ArrayUtil;
 import org.jdom.Element;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
@@ -211,7 +212,7 @@ public class JUnitConfiguration extends JavaTestConfigurationBase {
   }
 
   @Override
-  public void setVMParameters(String value) {
+  public void setVMParameters(@Nullable String value) {
     myData.setVMParameters(value);
   }
 
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
index f8231ff69d23..436b6fba0b3f 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
@@ -134,7 +134,7 @@ public class TestNGConfiguration extends JavaTestConfigurationBase {
     return testObject != null ? testObject.getActionName() : null;
   }
 
-  public void setVMParameters(String value) {
+  public void setVMParameters(@Nullable String value) {
     data.setVMParameters(value);
   }
 
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java
index aa221179b3c6..d32f5bec0163 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java
@@ -110,7 +110,7 @@ public class CreateSnapShotAction extends AnAction {
       if (config.getConfiguration() instanceof ApplicationConfiguration) {
         ApplicationConfiguration appConfig = (ApplicationConfiguration) config.getConfiguration();
         appConfigurations.add(config);
-        if (appConfig.getOptions().isSwingInspectorEnabled()) {
+        if (appConfig.isSwingInspectorEnabled()) {
           SnapShooterConfigurationSettings settings = SnapShooterConfigurationSettings.get(appConfig);
           snapshotConfiguration = config;
           if (settings.getLastPort() > 0) {
@@ -280,7 +280,7 @@ public class CreateSnapShotAction extends AnAction {
       if (rc < 0) return null;
       snapshotConfiguration = configurations.get(rc);
     }
-    ((ApplicationConfiguration) snapshotConfiguration.getConfiguration()).getOptions().setSwingInspectorEnabled(true);
+    ((ApplicationConfiguration)snapshotConfiguration.getConfiguration()).setSwingInspectorEnabled(true);
     return snapshotConfiguration;
   }
 
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterConfigurationExtension.java b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterConfigurationExtension.java
index 52914d08ab10..90fd57f6c731 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterConfigurationExtension.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterConfigurationExtension.java
@@ -7,7 +7,6 @@ package com.intellij.uiDesigner.snapShooter;
 import com.intellij.designer.DesignerEditorPanelFacade;
 import com.intellij.execution.RunConfigurationExtension;
 import com.intellij.execution.application.ApplicationConfiguration;
-import com.intellij.execution.application.ApplicationConfigurationOptions;
 import com.intellij.execution.configurations.JavaParameters;
 import com.intellij.execution.configurations.RunConfigurationBase;
 import com.intellij.execution.configurations.RunnerSettings;
@@ -42,20 +41,19 @@ public class SnapShooterConfigurationExtension extends RunConfigurationExtension
     if (!isApplicableFor(configuration)) {
       return;
     }
-    ApplicationConfiguration appConfiguration = (ApplicationConfiguration) configuration;
+    ApplicationConfiguration appConfiguration = (ApplicationConfiguration)configuration;
     SnapShooterConfigurationSettings settings = appConfiguration.getUserData(SnapShooterConfigurationSettings.SNAP_SHOOTER_KEY);
     if (settings == null) {
       settings = new SnapShooterConfigurationSettings();
       appConfiguration.putUserData(SnapShooterConfigurationSettings.SNAP_SHOOTER_KEY, settings);
     }
-    ApplicationConfigurationOptions options = appConfiguration.getOptions();
-    boolean swingInspectorEnabled = options.isSwingInspectorEnabled();
+    boolean swingInspectorEnabled = appConfiguration.isSwingInspectorEnabled();
     if (swingInspectorEnabled) {
       settings.setLastPort(NetUtils.tryToFindAvailableSocketPort());
     }
 
     if (swingInspectorEnabled && settings.getLastPort() != -1) {
-      params.getProgramParametersList().prepend(options.getMainClassName());
+      params.getProgramParametersList().prepend(appConfiguration.getMainClassName());
       params.getProgramParametersList().prepend(Integer.toString(settings.getLastPort()));
       // add +1 because idea_rt.jar will be added as the last entry to the classpath
       params.getProgramParametersList().prepend(Integer.toString(params.getClassPath().getPathList().size() + 1));