diff --git a/pom.xml b/pom.xml
index 3caeebc..d401826 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,6 +129,52 @@
         </plugins>
     </build>
 
+    <profiles>
+        <!-- Java 9/10: java.xml.bind is needed -->
+        <profile>
+            <id>Java9</id>
+            <activation>
+                <jdk>[9,10]</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                    <version>2.3.0</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <!-- Java 11+: java.xml.bind and JavaFX -->
+        <profile>
+            <id>Java11+</id>
+            <activation>
+                <jdk>![1.8,9,10]</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                    <version>2.3.0</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.openjfx</groupId>
+                    <artifactId>javafx-controls</artifactId>
+                    <version>11.0.2</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.openjfx</groupId>
+                    <artifactId>javafx-fxml</artifactId>
+                    <version>11.0.2</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.openjfx</groupId>
+                    <artifactId>javafx-web</artifactId>
+                    <version>11.0.2</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+ 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/src/main/java/fxlauncher/Launcher.java b/src/main/java/fxlauncher/Launcher.java
index fc36bd7..390f8b2 100644
--- a/src/main/java/fxlauncher/Launcher.java
+++ b/src/main/java/fxlauncher/Launcher.java
@@ -1,6 +1,19 @@
 package fxlauncher;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.nio.file.Path;
+import java.util.Iterator;
+import java.util.ServiceLoader;
+import java.util.concurrent.CountDownLatch;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.sun.javafx.application.ParametersImpl;
 import com.sun.javafx.application.PlatformImpl;
+
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
@@ -13,18 +26,6 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URI;
-import java.nio.file.Path;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ServiceLoader;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.concurrent.CountDownLatch;
-
 @SuppressWarnings("unchecked")
 public class Launcher extends Application {
     private static final Logger log = Logger.getLogger("Launcher");
@@ -35,7 +36,7 @@ public class Launcher extends Application {
     private UIProvider uiProvider;
     private StackPane root;
 
-    private final AbstractLauncher superLauncher = new AbstractLauncher<Application>() {
+    private final AbstractLauncher<Application> superLauncher = new AbstractLauncher<Application>() {
         @Override
         protected Parameters getParameters() {
             return Launcher.this.getParameters();
@@ -236,10 +237,7 @@ private void initApplication() throws Exception {
 
     private void startApplication() throws Exception {
         if (app != null) {
-            final LauncherParams params = new LauncherParams(getParameters(), superLauncher.getManifest());
-            app.getParameters().getNamed().putAll(params.getNamed());
-            app.getParameters().getRaw().addAll(params.getRaw());
-            app.getParameters().getUnnamed().addAll(params.getUnnamed());
+            ParametersImpl.registerParameters(app, new LauncherParams(getParameters(), superLauncher.getManifest()));
 
             PlatformImpl.setApplicationName(app.getClass());
             superLauncher.setPhase("Application Init");