diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index a8b8afe..ee4f1e3 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,41 +1,41 @@
 Manifest-Version: 1.0
-Export-Package: alice.tuprolog.clausestore;uses:="org.hypergraphdb.que
- ry,alice.tuprolog.lib,org.hypergraphdb,org.hypergraphdb.atom,alice.tu
- prolog,org.hypergraphdb.util,alice.util",alice.tuprolog.hgdb;uses:="a
- lice.tuprolog.clausestore,alice.tuprolog.lib,org.hypergraphdb.app.man
- agement,org.hypergraphdb.handle,org.hypergraphdb.util,org.hypergraphd
- b.type,org.hypergraphdb.query,org.hypergraphdb.indexing,org.hypergrap
- hdb.atom,org.hypergraphdb,alice.tuprolog,org.hypergraphdb.transaction
- ",alice.tuprolog.lib;uses:="alice.tuprolog.clausestore,org.hypergraph
- db,alice.tuprolog,alice.util",alice.tuprologx.runtime.tcp;uses:="alic
- e.tuprolog",alice.util.jedit;uses:="javax.swing.undo,javax.swing.text
- ,javax.swing.event,javax.swing",alice.tuprologx.ide;uses:="javax.swin
- g.event,javax.swing.text,alice.util.jedit,alice.util.thinlet,javax.sw
- ing.undo,alice.tuprolog.event,alice.tuprolog,javax.swing.filechooser,
- javax.swing,alice.util",alice.util.thinlet,alice.tuprolog.event;uses:
- ="alice.tuprolog",alice.tuprologx.runtime.corba;uses:="org.omg.CORBA,
- org.omg.CosNaming,alice.tuprolog,org.omg.CORBA.portable",alice.tuprol
- og;uses:="alice.tuprolog.clausestore,alice.tuprolog.event,alice.util"
- ,alice.tuprologx.runtime.rmi;uses:="alice.tuprolog",alice.tuprologx;u
- ses:="alice.tuprolog.event,alice.tuprolog,javax.script,javax.swing",a
- lice.util
-Built-By: borislav
-Build-Jdk: 1.7.0_75
-Bundle-Version: 1.4.0.SNAPSHOT
-Tool: Bnd-0.0.238
-Bundle-Name: HyperGraphDB Prolog
-Bnd-LastModified: 1487465719668
-Created-By: Apache Maven Bundle Plugin
+Bnd-LastModified: 1633978162645
+Build-Jdk: 11.0.2
+Built-By: Gary
 Bundle-ManifestVersion: 2
+Bundle-Name: HyperGraphDB Prolog
 Bundle-SymbolicName: org.hypergraphdb-hgdbprolog;singleton:=true
-Import-Package: alice.tuprolog,alice.tuprolog.clausestore,alice.tuprol
- og.event,alice.tuprolog.hgdb,alice.tuprolog.lib,alice.tuprologx,alice
- .tuprologx.ide,alice.tuprologx.runtime.corba,alice.tuprologx.runtime.
- rmi,alice.tuprologx.runtime.tcp,alice.util,alice.util.jedit,alice.uti
- l.thinlet,javax.script,javax.swing,javax.swing.event,javax.swing.file
- chooser,javax.swing.text,javax.swing.undo,org.hypergraphdb,org.hyperg
- raphdb.app.management,org.hypergraphdb.atom,org.hypergraphdb.handle,o
- rg.hypergraphdb.indexing,org.hypergraphdb.query,org.hypergraphdb.tran
- saction,org.hypergraphdb.type,org.hypergraphdb.util,org.omg.CORBA,org
- .omg.CORBA.portable,org.omg.CosNaming
-
+Bundle-Version: 2.0.0.SNAPSHOT
+Created-By: Apache Maven Bundle Plugin
+Export-Package: alice.tuprolog;uses:="alice.tuprolog.event";version="2.0
+ .0.SNAPSHOT",alice.tuprolog.clausestore;uses:="alice.tuprolog,alice.tup
+ rolog.lib,org.hypergraphdb,org.hypergraphdb.atom,org.hypergraphdb.query
+ ";version="2.0.0.SNAPSHOT",alice.tuprolog.event;uses:="alice.tuprolog";
+ version="2.0.0.SNAPSHOT",alice.tuprolog.hgdb;uses:="alice.tuprolog,alic
+ e.tuprolog.clausestore,org.hypergraphdb,org.hypergraphdb.app.management
+ ,org.hypergraphdb.query,org.hypergraphdb.type";version="2.0.0.SNAPSHOT"
+ ,alice.tuprolog.lib;uses:="alice.tuprolog";version="2.0.0.SNAPSHOT",ali
+ ce.tuprologx;uses:="alice.tuprolog,javax.script,javax.swing";version="2
+ .0.0.SNAPSHOT",alice.tuprologx.ide;uses:="alice.tuprolog,alice.tuprolog
+ .event,alice.util,alice.util.jedit,alice.util.thinlet,javax.swing,javax
+ .swing.text";version="2.0.0.SNAPSHOT",alice.tuprologx.runtime.corba;use
+ s:="alice.tuprolog,org.omg.CORBA,org.omg.CORBA.portable";version="2.0.0
+ .SNAPSHOT",alice.tuprologx.runtime.rmi;uses:="alice.tuprolog";version="
+ 2.0.0.SNAPSHOT",alice.tuprologx.runtime.tcp;uses:="alice.tuprolog";vers
+ ion="2.0.0.SNAPSHOT",alice.util;version="2.0.0.SNAPSHOT",alice.util.jed
+ it;uses:="javax.swing,javax.swing.event,javax.swing.text,javax.swing.un
+ do";version="2.0.0.SNAPSHOT",alice.util.thinlet;version="2.0.0.SNAPSHOT
+ "
+Import-Package: alice.tuprolog,alice.tuprolog.clausestore,alice.tuprolog
+ .event,alice.tuprolog.lib,alice.util,alice.util.jedit,alice.util.thinle
+ t,javax.script,javax.swing,javax.swing.event,javax.swing.filechooser,ja
+ vax.swing.text,javax.swing.undo,org.hypergraphdb;version="[2.0,3)",org.
+ hypergraphdb.app.management;version="[2.0,3)",org.hypergraphdb.atom;ver
+ sion="[2.0,3)",org.hypergraphdb.handle;version="[2.0,3)",org.hypergraph
+ db.indexing;version="[2.0,3)",org.hypergraphdb.query;version="[2.0,3)",
+ org.hypergraphdb.transaction;version="[2.0,3)",org.hypergraphdb.type;ve
+ rsion="[2.0,3)",org.hypergraphdb.util;version="[2.0,3)",org.omg.CORBA;v
+ ersion="[1.0,2)",org.omg.CORBA.portable;version="[1.0,2)",org.omg.CosNa
+ ming;version="[1.0,2)"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=11))"
+Tool: Bnd-4.2.0.201903051501
diff --git a/pom.xml b/pom.xml
index 83f887e..4f066ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,15 +11,17 @@
   <packaging>${packageit}</packaging>   
   <artifactId>hgdbprolog</artifactId>
   <groupId>org.hypergraphdb</groupId>
-  <version>1.4-SNAPSHOT</version>
+  <version>2.0-SNAPSHOT</version>
   <name>HyperGraphDB Prolog</name>
 
+	<!--
   <distributionManagement>
     <repository>
       <id>hypergraphdb-repository</id>
       <url>scp://hypergraphdb.org/var/www/hypergraphdb.org/maven</url>
     </repository>
   </distributionManagement>
+  -->
   <repositories>
     <repository>
       <id>hypergraphdb</id>
@@ -33,11 +35,11 @@
 	  <artifactId>hgdb</artifactId>
 	  <version>${version}</version>
 	</dependency>	
-	<dependency>
-	  <groupId>org.hypergraphdb</groupId>
-	  <artifactId>hgdbmanagement</artifactId>
-	  <version>${version}</version>
-	</dependency>
+	  <dependency>
+	  <groupId>org.glassfish.corba</groupId>
+	  <artifactId>glassfish-corba-omgapi</artifactId>
+	  <version>4.2.2</version>
+	  </dependency>
   </dependencies>
   
   <build>
@@ -51,6 +53,15 @@
     </extensions>
     
    <plugins>
+	  <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-compiler-plugin</artifactId>
+		<version>3.8.1</version>
+		<configuration>
+		  <source>11</source>
+		  <target>11</target>
+		</configuration>    		
+	  </plugin>
      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -63,7 +74,7 @@
     <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.0</version>
+        <version>4.2.1</version>
         <extensions>true</extensions>
         <configuration>
  		  <manifestLocation>META-INF</manifestLocation>