diff --git a/pom.xml b/pom.xml
index 1c16b16..3e331ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,12 @@
             <artifactId>javaee-web-api</artifactId>
             <version>7.0</version>
             <scope>provided</scope>
-        </dependency>        
+        </dependency>      
+        <dependency>
+            <groupId>org.openjdk.nashorn</groupId>
+            <artifactId>nashorn-core</artifactId>
+            <version>15.4</version>
+        </dependency>  
     </dependencies>    
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/org/semanticwb/datamanager/DataExtractorBase.java b/src/main/java/org/semanticwb/datamanager/DataExtractorBase.java
index 5fa6912..276d34a 100644
--- a/src/main/java/org/semanticwb/datamanager/DataExtractorBase.java
+++ b/src/main/java/org/semanticwb/datamanager/DataExtractorBase.java
@@ -7,7 +7,7 @@
 package org.semanticwb.datamanager;
 
 import java.io.IOException;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
 import org.semanticwb.datamanager.script.ScriptObject;
 
 /**
diff --git a/src/main/java/org/semanticwb/datamanager/DataExtractorBaseImp.java b/src/main/java/org/semanticwb/datamanager/DataExtractorBaseImp.java
index 67d902f..8592ac3 100644
--- a/src/main/java/org/semanticwb/datamanager/DataExtractorBaseImp.java
+++ b/src/main/java/org/semanticwb/datamanager/DataExtractorBaseImp.java
@@ -12,7 +12,7 @@
 import java.util.TimerTask;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
 import org.semanticwb.datamanager.extractors.ScriptExtractor;
 import org.semanticwb.datamanager.script.ScriptObject;
 
diff --git a/src/main/java/org/semanticwb/datamanager/DataUtils.java b/src/main/java/org/semanticwb/datamanager/DataUtils.java
index fc450db..2780ee4 100644
--- a/src/main/java/org/semanticwb/datamanager/DataUtils.java
+++ b/src/main/java/org/semanticwb/datamanager/DataUtils.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.TimeZone;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
 import org.semanticwb.datamanager.script.ScriptObject;
 import org.semanticwb.datamanager.utils.SimpleDateFormatTS;
 
@@ -231,10 +231,10 @@ public static String encodeSHA(String str)
      */
     public static Object toData(Object obj)
     {
-        if(obj instanceof jdk.nashorn.internal.objects.NativeArray)
+        if(obj instanceof org.openjdk.nashorn.internal.objects.NativeArray)
         {
             //System.out.print(value);
-            jdk.nashorn.internal.objects.NativeArray narr=(jdk.nashorn.internal.objects.NativeArray)obj;
+            org.openjdk.nashorn.internal.objects.NativeArray narr=(org.openjdk.nashorn.internal.objects.NativeArray)obj;
             Object arr[]=narr.asObjectArray();
             DataList list=new DataList();
             for(int x=0;x<arr.length;x++)
diff --git a/src/main/java/org/semanticwb/datamanager/SWBBaseScriptEngine.java b/src/main/java/org/semanticwb/datamanager/SWBBaseScriptEngine.java
index 90a0cb6..c61e789 100644
--- a/src/main/java/org/semanticwb/datamanager/SWBBaseScriptEngine.java
+++ b/src/main/java/org/semanticwb/datamanager/SWBBaseScriptEngine.java
@@ -581,7 +581,7 @@ protected DataObject invokeDataProcessors(SWBScriptEngine userengine, String dat
                         {
                             obj=(DataObject)r.getValue();
                         }
-                    }catch(jdk.nashorn.internal.runtime.ECMAException ecma)
+                    }catch(org.openjdk.nashorn.internal.runtime.ECMAException ecma)
                     {
                         throw ecma;
                     }catch(Throwable e)
diff --git a/src/main/java/org/semanticwb/datamanager/SWBDataSource.java b/src/main/java/org/semanticwb/datamanager/SWBDataSource.java
index da7496b..c2a0d0e 100644
--- a/src/main/java/org/semanticwb/datamanager/SWBDataSource.java
+++ b/src/main/java/org/semanticwb/datamanager/SWBDataSource.java
@@ -173,7 +173,7 @@ public DataObjectIterator find(DataObject json) throws IOException
      * @return
      * @throws IOException
      */
-    public DataObjectIterator find(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
+    public DataObjectIterator find(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
     {        
         return find(DataUtils.toDataObject(json));
     }  
@@ -211,7 +211,7 @@ public DataObject mapByNumId(DataObject json) throws IOException
      * @return
      * @throws IOException
      */
-    public DataObject mapByNumId(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
+    public DataObject mapByNumId(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
     {        
         return mapByNumId(DataUtils.toDataObject(json));
     } 
@@ -243,7 +243,7 @@ public DataObject mapById(DataObject json) throws IOException
      * @return
      * @throws IOException
      */
-    public DataObject mapById(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
+    public DataObject mapById(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
     {        
         return mapByField(DataUtils.toDataObject(json),"_id");
     }     
@@ -284,7 +284,7 @@ public DataObject mapByField(DataObject json, String field) throws IOException
      * @return
      * @throws IOException
      */
-    public DataObject mapByField(jdk.nashorn.api.scripting.ScriptObjectMirror json, String field) throws IOException
+    public DataObject mapByField(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json, String field) throws IOException
     {        
         return mapByField(DataUtils.toDataObject(json),field);
     }     
@@ -317,7 +317,7 @@ public DataObject fetch(DataObject json) throws IOException
      * @return
      * @throws IOException
      */
-    public DataObject fetch(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
+    public DataObject fetch(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
     {        
         return fetch(DataUtils.toDataObject(json));
     }
@@ -349,7 +349,7 @@ public DataObject aggregate(DataObject json) throws IOException
      * @return
      * @throws IOException
      */
-    public DataObject aggregate(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
+    public DataObject aggregate(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
     {        
         return aggregate(DataUtils.toDataObject(json));
     }    
@@ -375,7 +375,7 @@ public DataObject addObj(DataObject obj) throws IOException
      * @return
      * @throws IOException
      */
-    public DataObject addObj(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
+    public DataObject addObj(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
     {        
         return addObj(DataUtils.toDataObject(json));
     }
@@ -401,7 +401,7 @@ public DataObject updateObj(DataObject obj) throws IOException
      * @return
      * @throws IOException
      */
-    public DataObject updateObj(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
+    public DataObject updateObj(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
     {        
         return updateObj(DataUtils.toDataObject(json));
     }
@@ -427,7 +427,7 @@ public DataObject removeObj(DataObject obj) throws IOException
      * @return
      * @throws IOException
      */
-    public DataObject removeObj(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
+    public DataObject removeObj(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
     {        
         return removeObj(DataUtils.toDataObject(json));
     }    
@@ -644,7 +644,7 @@ public DataObject update(DataObject json) throws IOException
      * @return
      * @throws IOException
      */
-    public DataObject update(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
+    public DataObject update(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
     {        
         return update(DataUtils.toDataObject(json));
     }
@@ -682,7 +682,7 @@ public DataObject add(DataObject json) throws IOException
      * @return
      * @throws IOException
      */
-    public DataObject add(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
+    public DataObject add(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
     {        
         return add(DataUtils.toDataObject(json));
     }
@@ -837,7 +837,7 @@ public DataObject remove(DataObject json) throws IOException
      * @return
      * @throws IOException
      */
-    public DataObject remove(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
+    public DataObject remove(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
     {        
         return remove(DataUtils.toDataObject(json));
     }
@@ -949,7 +949,7 @@ public DataObject validate(DataObject json) throws IOException
      * @return
      * @throws IOException
      */
-    public DataObject validate(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
+    public DataObject validate(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
     {        
         return validate(DataUtils.toDataObject(json));
     }
diff --git a/src/main/java/org/semanticwb/datamanager/script/ScriptObject.java b/src/main/java/org/semanticwb/datamanager/script/ScriptObject.java
index 8031e92..f06b4d5 100644
--- a/src/main/java/org/semanticwb/datamanager/script/ScriptObject.java
+++ b/src/main/java/org/semanticwb/datamanager/script/ScriptObject.java
@@ -10,7 +10,7 @@
 import java.util.Set;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
+import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
 import org.semanticwb.datamanager.DataList;
 import org.semanticwb.datamanager.DataMgr;
 import org.semanticwb.datamanager.DataObject;