diff --git a/framework/freedomotic-core/src/main/java/com/freedomotic/things/ThingFactory.java b/framework/freedomotic-core/src/main/java/com/freedomotic/things/ThingFactory.java
index 22cc21d36..8330a094c 100644
--- a/framework/freedomotic-core/src/main/java/com/freedomotic/things/ThingFactory.java
+++ b/framework/freedomotic-core/src/main/java/com/freedomotic/things/ThingFactory.java
@@ -57,7 +57,8 @@ public EnvObjectLogic create(EnvObject pojo) throws RepositoryException {
         }
 
         try {
-            URLClassLoader classLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
+            //URLClassLoader classLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
+            ClassLoader classLoader =  ClassLoader.getSystemClassLoader();
             Class<?> clazz = classLoader.loadClass(pojo.getHierarchy()); //eg: com.freedomotic.things.impl.ElectricDevice
             EnvObjectLogic logic = null;
             try {
diff --git a/framework/freedomotic-model/pom.xml b/framework/freedomotic-model/pom.xml
index b920071bd..05ef24912 100644
--- a/framework/freedomotic-model/pom.xml
+++ b/framework/freedomotic-model/pom.xml
@@ -89,4 +89,23 @@
         </plugins>
     </pluginManagement>
     </build>
+    <profiles>
+    <profile>
+      <activation>
+        <jdk>11</jdk>
+      </activation>
+
+      <dependencies>
+        <dependency>
+          <!--
+            JAXB was removed from java SDK on JEP 320
+            http://openjdk.java.net/jeps/320
+           -->
+          <groupId>org.glassfish.jaxb</groupId>
+          <artifactId>jaxb-runtime</artifactId>
+          <version>2.4.0-b180830.0438</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>