diff --git a/DesktopNeo4j/manifest.mf b/DesktopNeo4j/manifest.mf
index ccc16a5b48..50a6010324 100644
--- a/DesktopNeo4j/manifest.mf
+++ b/DesktopNeo4j/manifest.mf
@@ -1,7 +1,7 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module: org.gephi.desktop.neo4j
-OpenIDE-Module-Layer: org/gephi/desktop/neo4j/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/gephi/desktop/neo4j/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0.2
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.gephi.desktop.neo4j
+OpenIDE-Module-Layer: org/gephi/desktop/neo4j/layer.xml
+OpenIDE-Module-Localizing-Bundle: org/gephi/desktop/neo4j/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0.2
+
diff --git a/DesktopNeo4j/nbproject/project.properties b/DesktopNeo4j/nbproject/project.properties
index 6dc0cd9f37..750190125a 100644
--- a/DesktopNeo4j/nbproject/project.properties
+++ b/DesktopNeo4j/nbproject/project.properties
@@ -1,5 +1,5 @@
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-license.file=../agpl-3.0.txt
-nbm.module.author=Gephi.org
-nbm.needs.restart=true
+javac.source=1.7
+javac.compilerargs=-Xlint -Xlint:-serial
+license.file=../agpl-3.0.txt
+nbm.module.author=Gephi.org
+nbm.needs.restart=true
diff --git a/DesktopNeo4j/src/org/gephi/desktop/neo4j/Neo4jMenuAction.java b/DesktopNeo4j/src/org/gephi/desktop/neo4j/Neo4jMenuAction.java
index 187b66fafc..d09ed36705 100644
--- a/DesktopNeo4j/src/org/gephi/desktop/neo4j/Neo4jMenuAction.java
+++ b/DesktopNeo4j/src/org/gephi/desktop/neo4j/Neo4jMenuAction.java
@@ -34,6 +34,8 @@ License, or (at your option) any later version.
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
+import java.util.Arrays;
+import java.util.Collection;
 import javax.swing.AbstractAction;
 import javax.swing.JFileChooser;
 import javax.swing.JMenu;
@@ -56,6 +58,7 @@ License, or (at your option) any later version.
 import org.gephi.utils.longtask.spi.LongTask;
 import org.gephi.visualization.VizController;
 import org.neo4j.graphdb.GraphDatabaseService;
+import org.neo4j.kernel.StoreLockException;
 import org.netbeans.validation.api.ui.ValidationPanel;
 import org.openide.DialogDescriptor;
 import org.openide.DialogDisplayer;
@@ -180,14 +183,21 @@ private static void initProject() {
         }
     }
 
-    private static void handleLocalDatabaseError(Exception e) {
+    private static void handleLocalDatabaseError(Exception e, GraphDatabaseService db) {
         String errorMessage = null;
 
-        if (e.getClass() == Neo4jStoreAlreadyInUseException.class)
+        Collection<Class> inUseExceptions = Arrays.<Class>asList(Neo4jStoreAlreadyInUseException.class,StoreLockException.class);
+        if (inUseExceptions.contains(e.getClass()) || inUseExceptions.contains(e.getCause().getClass()))
             errorMessage = NbBundle.getMessage(Neo4jMenuAction.class, "CTL_Neo4j_DatabaseStorageAlreadyInUse");
 
         NotifyDescriptor notifyDescriptor = new NotifyDescriptor.Message(errorMessage, JOptionPane.WARNING_MESSAGE);
         DialogDisplayer.getDefault().notify(notifyDescriptor);
+
+        try {
+            if (db!=null) db.shutdown();
+        } catch(Exception ex) {
+            // ignore
+        }
     }
 
     private static class FullImportMenuAction extends AbstractAction {
@@ -213,12 +223,16 @@ public void actionPerformed(ActionEvent e) {
                 NbPreferences.forModule(Neo4jMenuAction.class).put(IMPORT_LAST_PATH, neo4jDirectory.getParentFile().getAbsolutePath());
             }
 
-            GraphDatabaseService tempGraphDB;
+            GraphDatabaseService tempGraphDB = null;
             try {
                 tempGraphDB = Neo4jUtils.localDatabase(neo4jDirectory);
             }
             catch (Neo4jStoreAlreadyInUseException storeInUseException) {
-                handleLocalDatabaseError(storeInUseException);
+                handleLocalDatabaseError(storeInUseException,tempGraphDB);
+                return;
+            }
+            catch (RuntimeException exception) {
+                handleLocalDatabaseError(exception,tempGraphDB);
                 return;
             }
 
@@ -306,12 +320,12 @@ public void actionPerformed(ActionEvent e) {
                 NbPreferences.forModule(Neo4jMenuAction.class).put(IMPORT_LAST_PATH, neo4jDirectory.getParentFile().getAbsolutePath());
             }
 
-            GraphDatabaseService tempGraphDB;
+            GraphDatabaseService tempGraphDB = null;
             try {
                 tempGraphDB = Neo4jUtils.localDatabase(neo4jDirectory);
             }
             catch (Neo4jStoreAlreadyInUseException storeInUseException) {
-                handleLocalDatabaseError(storeInUseException);
+                handleLocalDatabaseError(storeInUseException,tempGraphDB);
                 return;
             }
 
@@ -407,12 +421,12 @@ public void actionPerformed(ActionEvent e) {
 
                         @Override
                         public void run() {
-                            GraphDatabaseService tempGraphDB;
+                            GraphDatabaseService tempGraphDB = null;
                             try {
                                 tempGraphDB = Neo4jUtils.localDatabase(neo4jDirectory);
                             }
                             catch (Neo4jStoreAlreadyInUseException storeInUseException) {
-                                handleLocalDatabaseError(storeInUseException);
+                                handleLocalDatabaseError(storeInUseException,tempGraphDB);
                                 return;
                             }
 
diff --git a/DesktopNeo4j/src/org/gephi/desktop/neo4j/ui/util/Neo4jUtils.java b/DesktopNeo4j/src/org/gephi/desktop/neo4j/ui/util/Neo4jUtils.java
index b8c5fffd92..baba0e697b 100644
--- a/DesktopNeo4j/src/org/gephi/desktop/neo4j/ui/util/Neo4jUtils.java
+++ b/DesktopNeo4j/src/org/gephi/desktop/neo4j/ui/util/Neo4jUtils.java
@@ -26,7 +26,7 @@ License, or (at your option) any later version.
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.TransactionFailureException;
-import org.neo4j.kernel.EmbeddedGraphDatabase;
+import org.neo4j.graphdb.factory.GraphDatabaseFactory;
 
 /**
  *
@@ -40,7 +40,10 @@ private Neo4jUtils() {
     public static GraphDatabaseService localDatabase(File neo4jDirectory) throws Neo4jStoreAlreadyInUseException {
 
         try {
-            return new EmbeddedGraphDatabase(neo4jDirectory.getAbsolutePath());
+            return new GraphDatabaseFactory()
+                    .newEmbeddedDatabaseBuilder(neo4jDirectory.getAbsolutePath())
+                    .setConfig("allow_store_upgrade","true")
+                    .newGraphDatabase();
         }
         catch (TransactionFailureException e) {
             if (e.getCause() instanceof IllegalStateException)
diff --git a/Neo4jPlugin/manifest.mf b/Neo4jPlugin/manifest.mf
index abcdd82f4b..e108eed5be 100644
--- a/Neo4jPlugin/manifest.mf
+++ b/Neo4jPlugin/manifest.mf
@@ -1,6 +1,6 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module: org.gephi.neo4j.plugin
-OpenIDE-Module-Localizing-Bundle: org/gephi/neo4j/plugin/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0.3
-
+Manifest-Version: 1.0
+AutoUpdate-Show-In-Client: false
+OpenIDE-Module: org.gephi.neo4j.plugin
+OpenIDE-Module-Localizing-Bundle: org/gephi/neo4j/plugin/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0.3
+
diff --git a/Neo4jPlugin/nbproject/project.properties b/Neo4jPlugin/nbproject/project.properties
index 6dc0cd9f37..750190125a 100644
--- a/Neo4jPlugin/nbproject/project.properties
+++ b/Neo4jPlugin/nbproject/project.properties
@@ -1,5 +1,5 @@
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-license.file=../agpl-3.0.txt
-nbm.module.author=Gephi.org
-nbm.needs.restart=true
+javac.source=1.7
+javac.compilerargs=-Xlint -Xlint:-serial
+license.file=../agpl-3.0.txt
+nbm.module.author=Gephi.org
+nbm.needs.restart=true
diff --git a/Neo4jPlugin/src/org/gephi/neo4j/plugin/impl/GraphModelImportConverter.java b/Neo4jPlugin/src/org/gephi/neo4j/plugin/impl/GraphModelImportConverter.java
index 726d9c0f2c..012de2996e 100644
--- a/Neo4jPlugin/src/org/gephi/neo4j/plugin/impl/GraphModelImportConverter.java
+++ b/Neo4jPlugin/src/org/gephi/neo4j/plugin/impl/GraphModelImportConverter.java
@@ -41,9 +41,10 @@ License, or (at your option) any later version.
 import org.gephi.project.api.WorkspaceListener;
 import org.gephi.project.api.WorkspaceProvider;
 import org.neo4j.graphdb.GraphDatabaseService;
+import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
-import org.neo4j.jmx.Primitives;
-import org.neo4j.management.Neo4jManager;
+import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.impl.core.NodeManager;
 import org.openide.util.Lookup;
 
 /**
@@ -264,9 +265,8 @@ public static class Neo4jGraphModel {
 
         public Neo4jGraphModel(GraphDatabaseService graphDb) {
             this.graphDb = graphDb;
-
-            int numberOfNeo4jNodeIds = (int) Neo4jManager.get().getPrimitivesBean().getNumberOfNodeIdsInUse();
-
+            NodeManager nodeManager = ((GraphDatabaseAPI)graphDb).getDependencyResolver().resolveDependency(NodeManager.class);
+            int numberOfNeo4jNodeIds = (int) nodeManager.getNumberOfIdsInUse(Node.class);
             this.neo4jToGephiNodeMap = new TLongIntHashMap(numberOfNeo4jNodeIds, 1f);
             this.gephiToNeo4jNodeMap = new TIntLongHashMap(numberOfNeo4jNodeIds, 1f);
         }
diff --git a/Neo4jPlugin/src/org/gephi/neo4j/plugin/impl/Neo4jDelegateProviderImpl.java b/Neo4jPlugin/src/org/gephi/neo4j/plugin/impl/Neo4jDelegateProviderImpl.java
index c60f278e8c..1df2697607 100644
--- a/Neo4jPlugin/src/org/gephi/neo4j/plugin/impl/Neo4jDelegateProviderImpl.java
+++ b/Neo4jPlugin/src/org/gephi/neo4j/plugin/impl/Neo4jDelegateProviderImpl.java
@@ -28,6 +28,7 @@ License, or (at your option) any later version.
 import org.gephi.data.properties.PropertiesColumn;
 import org.neo4j.graphdb.DynamicRelationshipType;
 import org.neo4j.graphdb.GraphDatabaseService;
+import org.neo4j.graphdb.Transaction;
 
 
 /**
@@ -57,8 +58,14 @@ public String storageEngineName() {
     @Override
     public Object getNodeAttributeValue(Long delegateId, AttributeColumn attributeColumn) {
         GraphDatabaseService graphDB = GraphModelImportConverter.getGraphDBForCurrentWorkspace();
-
-        return graphDB.getNodeById(delegateId).getProperty(attributeColumn.getId());
+        Transaction tx = graphDB.beginTx();
+        try {
+            final Object value = graphDB.getNodeById(delegateId).getProperty(attributeColumn.getId());
+            tx.success();
+            return value;
+        } finally {
+            tx.close();
+        }
     }
 
     @Override
@@ -69,14 +76,26 @@ public void setNodeAttributeValue(Long delegateId, AttributeColumn attributeColu
 
         GraphDatabaseService graphDB = GraphModelImportConverter.getGraphDBForCurrentWorkspace();
         
-        graphDB.getNodeById(delegateId).setProperty(attributeColumn.getId(), nodeValue);
+        Transaction tx = graphDB.beginTx();
+        try {
+            graphDB.getNodeById(delegateId).setProperty(attributeColumn.getId(), nodeValue);
+            tx.success();
+        } finally {
+            tx.close();
+        }
     }
 
     @Override
     public void deleteNodeAttributeValue(Long delegateId, AttributeColumn attributeColumn) {
         GraphDatabaseService graphDB = GraphModelImportConverter.getGraphDBForCurrentWorkspace();
 
-        graphDB.getNodeById(delegateId).removeProperty(attributeColumn.getId());
+        Transaction tx = graphDB.beginTx();
+        try {
+            graphDB.getNodeById(delegateId).removeProperty(attributeColumn.getId());
+            tx.success();
+        } finally {
+            tx.close();
+        }
     }
 
 
@@ -84,10 +103,18 @@ public void deleteNodeAttributeValue(Long delegateId, AttributeColumn attributeC
     public Object getEdgeAttributeValue(Long delegateId, AttributeColumn attributeColumn) {
         GraphDatabaseService graphDB = GraphModelImportConverter.getGraphDBForCurrentWorkspace();
 
-        if (attributeColumn.getId().equals(PropertiesColumn.NEO4J_RELATIONSHIP_TYPE.getId()))
-            return graphDB.getRelationshipById(delegateId).getType().name();
-        else
-            return graphDB.getRelationshipById(delegateId).getProperty(attributeColumn.getId());
+        Transaction tx = graphDB.beginTx();
+        try {
+            Object value;
+            if (attributeColumn.getId().equals(PropertiesColumn.NEO4J_RELATIONSHIP_TYPE.getId()))
+                value = graphDB.getRelationshipById(delegateId).getType().name();
+            else
+                value = graphDB.getRelationshipById(delegateId).getProperty(attributeColumn.getId());
+            tx.success();
+            return value;
+        } finally {
+            tx.close();
+        }
     }
 
     @Override
@@ -98,14 +125,26 @@ public void setEdgeAttributeValue(Long delegateId, AttributeColumn attributeColu
 
         GraphDatabaseService graphDB = GraphModelImportConverter.getGraphDBForCurrentWorkspace();
 
-        graphDB.getRelationshipById(delegateId).setProperty(attributeColumn.getId(), edgeValue);
+        Transaction tx = graphDB.beginTx();
+        try {
+            graphDB.getRelationshipById(delegateId).setProperty(attributeColumn.getId(), edgeValue);
+            tx.success();
+        } finally {
+            tx.close();
+        }
     }
 
     @Override
     public void deleteEdgeAttributeValue(Long delegateId, AttributeColumn attributeColumn) {
         GraphDatabaseService graphDB = GraphModelImportConverter.getGraphDBForCurrentWorkspace();
 
-        graphDB.getRelationshipById(delegateId).removeProperty(attributeColumn.getId());
+        Transaction tx = graphDB.beginTx();
+        try {
+            graphDB.getRelationshipById(delegateId).removeProperty(attributeColumn.getId());
+            tx.success();
+        } finally {
+            tx.close();
+        }
     }
 
     public GraphItemDelegateFactoryProvider<Long> graphItemDelegateFactoryProvider() {
@@ -138,32 +177,58 @@ public static Neo4jGraphItemDelegateFactoryProviderImpl getInstance() {
         public Long createNode() {
             GraphDatabaseService graphDB = GraphModelImportConverter.getGraphDBForCurrentWorkspace();
 
-            return graphDB.createNode().getId();
+            Transaction tx = graphDB.beginTx();
+            try {
+                long id = graphDB.createNode().getId();
+                tx.success();
+                return id;
+            } finally {
+                tx.close();
+            }
         }
 
         @Override
         public void deleteNode(Long nodeId) {
             GraphDatabaseService graphDB = GraphModelImportConverter.getGraphDBForCurrentWorkspace();
 
-            graphDB.getNodeById(nodeId).delete();
+            Transaction tx = graphDB.beginTx();
+            try {
+                graphDB.getNodeById(nodeId).delete();
+                tx.success();
+            } finally {
+                tx.close();
+            }
         }
 
         @Override
         public Long createEdge(Long startNodeId, Long endNodeId) {
             GraphDatabaseService graphDB = GraphModelImportConverter.getGraphDBForCurrentWorkspace();
 
-            org.neo4j.graphdb.Node startNode = graphDB.getNodeById(startNodeId);
-            org.neo4j.graphdb.Node endNode   = graphDB.getNodeById(endNodeId);
-
-            return startNode.createRelationshipTo(endNode,
-                                                  DynamicRelationshipType.withName(DEFAULT_RELATIONSHIP_TYPE_NAME)).getId();
+            Transaction tx = graphDB.beginTx();
+            try {
+                org.neo4j.graphdb.Node startNode = graphDB.getNodeById(startNodeId);
+                org.neo4j.graphdb.Node endNode   = graphDB.getNodeById(endNodeId);
+
+                long id = startNode.createRelationshipTo(endNode,
+                                                      DynamicRelationshipType.withName(DEFAULT_RELATIONSHIP_TYPE_NAME)).getId();
+                tx.success();
+                return id;
+            } finally {
+                tx.close();
+            }
         }
 
         @Override
         public void deleteEdge(Long edgeId) {
             GraphDatabaseService graphDB = GraphModelImportConverter.getGraphDBForCurrentWorkspace();
 
-            graphDB.getRelationshipById(edgeId).delete();
+            Transaction tx = graphDB.beginTx();
+            try {
+                graphDB.getRelationshipById(edgeId).delete();
+                tx.success();
+            } finally {
+                tx.close();
+            }
         }
     }
 }
diff --git a/Neo4jPlugin/src/org/gephi/neo4j/plugin/impl/Neo4jImporterImpl.java b/Neo4jPlugin/src/org/gephi/neo4j/plugin/impl/Neo4jImporterImpl.java
index 07be6848af..23165c6d9b 100644
--- a/Neo4jPlugin/src/org/gephi/neo4j/plugin/impl/Neo4jImporterImpl.java
+++ b/Neo4jPlugin/src/org/gephi/neo4j/plugin/impl/Neo4jImporterImpl.java
@@ -38,7 +38,6 @@ License, or (at your option) any later version.
 import org.neo4j.graphdb.traversal.Evaluators;
 import org.neo4j.graphdb.traversal.TraversalDescription;
 import org.neo4j.graphdb.traversal.Traverser;
-import org.neo4j.kernel.Traversal;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
@@ -105,7 +104,7 @@ public void importDatabase(GraphDatabaseService graphDB, long startNodeId, Trave
         NodeReturnFilter nodeReturnFilter = null;
 
         if (startNodeId != NO_START_NODE) {
-            TraversalDescription traversalDescription = Traversal.description();
+            TraversalDescription traversalDescription = graphDB.traversalDescription();
 
             traversalDescription = order.update(traversalDescription);
 
@@ -137,7 +136,7 @@ private void doImport(GraphDatabaseService graphDB, Traverser traverser, NodeRet
             importGraph(graphDB, traverser, nodeReturnFilter);
             transaction.success();
         } finally {
-            transaction.finish();
+            transaction.close();
         }
 
         Progress.finish(progressTicket);
diff --git a/Neo4jWrapper/build.xml b/Neo4jWrapper/build.xml
index 4830ad951e..7dd7535e32 100644
--- a/Neo4jWrapper/build.xml
+++ b/Neo4jWrapper/build.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.gephi.lib.neo4j" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.gephi.lib.neo4j.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
+<!-- for some information on what you could do (e.g. targets to override). -->
+<!-- If you delete this file and reopen the project it will be recreated. -->
+<project name="org.gephi.lib.neo4j" default="netbeans" basedir=".">
+    <description>Builds, tests, and runs the project org.gephi.lib.neo4j.</description>
+    <import file="nbproject/build-impl.xml"/>
+</project>
diff --git a/Neo4jWrapper/manifest.mf b/Neo4jWrapper/manifest.mf
index f622cd5c3b..c916b372e6 100644
--- a/Neo4jWrapper/manifest.mf
+++ b/Neo4jWrapper/manifest.mf
@@ -1,5 +1,5 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.gephi.lib.neo4j
-OpenIDE-Module-Localizing-Bundle: org/gephi/lib/neo4j/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.5
-
+Manifest-Version: 1.0
+OpenIDE-Module: org.gephi.lib.neo4j
+OpenIDE-Module-Localizing-Bundle: org/gephi/lib/neo4j/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.5
+
diff --git a/Neo4jWrapper/nbproject/build-impl.xml b/Neo4jWrapper/nbproject/build-impl.xml
index e9c54d7e22..2e661d6708 100644
--- a/Neo4jWrapper/nbproject/build-impl.xml
+++ b/Neo4jWrapper/nbproject/build-impl.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.gephi.lib.neo4j-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+-->
+<project name="org.gephi.lib.neo4j-impl" basedir="..">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <property file="nbproject/private/suite-private.properties"/>
+    <property file="nbproject/suite.properties"/>
+    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
+    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
+    <property file="${suite.dir}/nbproject/platform.properties"/>
+    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="name"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{name}" value="${@{value}}"/>
+        </sequential>
+    </macrodef>
+    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="property"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{property}" value="@{value}"/>
+        </sequential>
+    </macrodef>
+    <property file="${user.properties.file}"/>
+    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
+        <condition>
+            <not>
+                <contains string="${cluster.path.evaluated}" substring="platform"/>
+            </not>
+        </condition>
+    </fail>
+    <import file="${harness.dir}/build.xml"/>
+</project>
diff --git a/Neo4jWrapper/nbproject/genfiles.properties b/Neo4jWrapper/nbproject/genfiles.properties
index d3ed9dc63b..9d01ccecd4 100644
--- a/Neo4jWrapper/nbproject/genfiles.properties
+++ b/Neo4jWrapper/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=e0c5ea51
-build.xml.script.CRC32=39b61f62
-build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=e0c5ea51
-nbproject/build-impl.xml.script.CRC32=db29d8c2
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
+build.xml.data.CRC32=8eae2f35
+build.xml.script.CRC32=39b61f62
+build.xml.stylesheet.CRC32=a56c6a5b@2.62.1
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=8eae2f35
+nbproject/build-impl.xml.script.CRC32=db29d8c2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.62.1
diff --git a/Neo4jWrapper/nbproject/project.properties b/Neo4jWrapper/nbproject/project.properties
index e6d17ad69b..0bbceee54e 100644
--- a/Neo4jWrapper/nbproject/project.properties
+++ b/Neo4jWrapper/nbproject/project.properties
@@ -1,6 +1,8 @@
-
-file.reference.geronimo-jta_1.1_spec-1.1.1.jar=release/modules/ext/geronimo-jta_1.1_spec-1.1.1.jar
-is.autoload=true
-license.file=agpl-3.0.txt
-nbm.homepage=http://neo4j.org
-nbm.module.author=Neo Technology
+
+file.reference.geronimo-jta_1.1_spec-1.1.1.jar=release/modules/ext/geronimo-jta_1.1_spec-1.1.1.jar
+file.reference.neo4j-kernel-2.0.1.jar=release/modules/ext/neo4j-kernel-2.0.1.jar
+is.autoload=true
+javac.source=1.7
+license.file=agpl-3.0.txt
+nbm.homepage=http://neo4j.org
+nbm.module.author=Neo Technology
diff --git a/Neo4jWrapper/nbproject/project.xml b/Neo4jWrapper/nbproject/project.xml
index ec6be0c8ef..aea9243fa3 100644
--- a/Neo4jWrapper/nbproject/project.xml
+++ b/Neo4jWrapper/nbproject/project.xml
@@ -1,65 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.gephi.lib.neo4j</code-name-base>
-            <suite-component/>
-            <module-dependencies/>
-            <public-packages>
-                <package>org.neo4j.ext.udc</package>
-                <package>org.neo4j.ext.udc.impl</package>
-                <package>org.neo4j.ext.udc.impl.osgi</package>
-                <package>org.neo4j.graphdb</package>
-                <package>org.neo4j.graphdb.event</package>
-                <package>org.neo4j.graphdb.index</package>
-                <package>org.neo4j.graphdb.traversal</package>
-                <package>org.neo4j.helpers</package>
-                <package>org.neo4j.helpers.collection</package>
-                <package>org.neo4j.jmx</package>
-                <package>org.neo4j.jmx.impl</package>
-                <package>org.neo4j.kernel</package>
-                <package>org.neo4j.kernel.impl</package>
-                <package>org.neo4j.kernel.impl.annotations</package>
-                <package>org.neo4j.kernel.impl.batchinsert</package>
-                <package>org.neo4j.kernel.impl.cache</package>
-                <package>org.neo4j.kernel.impl.core</package>
-                <package>org.neo4j.kernel.impl.index</package>
-                <package>org.neo4j.kernel.impl.nioneo.store</package>
-                <package>org.neo4j.kernel.impl.nioneo.xa</package>
-                <package>org.neo4j.kernel.impl.osgi</package>
-                <package>org.neo4j.kernel.impl.persistence</package>
-                <package>org.neo4j.kernel.impl.storemigration</package>
-                <package>org.neo4j.kernel.impl.storemigration.legacystore</package>
-                <package>org.neo4j.kernel.impl.storemigration.monitoring</package>
-                <package>org.neo4j.kernel.impl.transaction</package>
-                <package>org.neo4j.kernel.impl.transaction.xaframework</package>
-                <package>org.neo4j.kernel.impl.traversal</package>
-                <package>org.neo4j.kernel.impl.util</package>
-                <package>org.neo4j.management</package>
-                <package>org.neo4j.management.impl</package>
-                <package>org.neo4j.management.impl.jconsole</package>
-            </public-packages>
-            <class-path-extension>
-                <runtime-relative-path>ext/neo4j-management-1.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/neo4j-management-1.5.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/neo4j-jmx-1.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/neo4j-jmx-1.5.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/neo4j-kernel-1.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/neo4j-kernel-1.5.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/neo4j-udc-1.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/neo4j-udc-1.5.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/geronimo-jta_1.1_spec-1.1.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/geronimo-jta_1.1_spec-1.1.1.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+            <code-name-base>org.gephi.lib.neo4j</code-name-base>
+            <suite-component/>
+            <module-dependencies/>
+            <public-packages>
+                <package>org.neo4j.graphdb</package>
+                <package>org.neo4j.graphdb.config</package>
+                <package>org.neo4j.graphdb.event</package>
+                <package>org.neo4j.graphdb.factory</package>
+                <package>org.neo4j.graphdb.index</package>
+                <package>org.neo4j.graphdb.schema</package>
+                <package>org.neo4j.graphdb.traversal</package>
+                <package>org.neo4j.helpers</package>
+                <package>org.neo4j.helpers.collection</package>
+                <package>org.neo4j.kernel</package>
+                <package>org.neo4j.kernel.api</package>
+                <package>org.neo4j.kernel.api.constraints</package>
+                <package>org.neo4j.kernel.api.direct</package>
+                <package>org.neo4j.kernel.api.exceptions</package>
+                <package>org.neo4j.kernel.api.exceptions.index</package>
+                <package>org.neo4j.kernel.api.exceptions.schema</package>
+                <package>org.neo4j.kernel.api.index</package>
+                <package>org.neo4j.kernel.api.index.util</package>
+                <package>org.neo4j.kernel.api.labelscan</package>
+                <package>org.neo4j.kernel.configuration</package>
+                <package>org.neo4j.kernel.extension</package>
+                <package>org.neo4j.kernel.impl</package>
+                <package>org.neo4j.kernel.impl.annotations</package>
+                <package>org.neo4j.kernel.impl.api</package>
+                <package>org.neo4j.kernel.impl.cache</package>
+                <package>org.neo4j.kernel.impl.core</package>
+                <package>org.neo4j.kernel.impl.index</package>
+                <package>org.neo4j.kernel.impl.nioneo.store</package>
+                <package>org.neo4j.kernel.impl.nioneo.xa</package>
+                <package>org.neo4j.kernel.impl.persistence</package>
+                <package>org.neo4j.kernel.impl.storemigration</package>
+                <package>org.neo4j.kernel.impl.storemigration.legacystore</package>
+                <package>org.neo4j.kernel.impl.storemigration.monitoring</package>
+                <package>org.neo4j.kernel.impl.transaction</package>
+                <package>org.neo4j.kernel.impl.transaction.xaframework</package>
+                <package>org.neo4j.kernel.impl.traversal</package>
+                <package>org.neo4j.kernel.impl.util</package>
+            </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/neo4j-kernel-2.0.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/neo4j-kernel-2.0.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/geronimo-jta_1.1_spec-1.1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/geronimo-jta_1.1_spec-1.1.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/neo4j-lucene-index-2.0.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/neo4j-lucene-index-2.0.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/lucene-core-3.6.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/lucene-core-3.6.2.jar</binary-origin>
+            </class-path-extension>
+        </data>
+    </configuration>
+</project>
diff --git a/Neo4jWrapper/release/modules/ext/lucene-core-3.6.2.jar b/Neo4jWrapper/release/modules/ext/lucene-core-3.6.2.jar
new file mode 100644
index 0000000000..cc374b7071
Binary files /dev/null and b/Neo4jWrapper/release/modules/ext/lucene-core-3.6.2.jar differ
diff --git a/Neo4jWrapper/release/modules/ext/neo4j-jmx-1.5.jar b/Neo4jWrapper/release/modules/ext/neo4j-jmx-1.5.jar
deleted file mode 100644
index deb203b3c3..0000000000
Binary files a/Neo4jWrapper/release/modules/ext/neo4j-jmx-1.5.jar and /dev/null differ
diff --git a/Neo4jWrapper/release/modules/ext/neo4j-kernel-1.5.jar b/Neo4jWrapper/release/modules/ext/neo4j-kernel-1.5.jar
deleted file mode 100644
index 9aa9d98d68..0000000000
Binary files a/Neo4jWrapper/release/modules/ext/neo4j-kernel-1.5.jar and /dev/null differ
diff --git a/Neo4jWrapper/release/modules/ext/neo4j-kernel-2.0.1.jar b/Neo4jWrapper/release/modules/ext/neo4j-kernel-2.0.1.jar
new file mode 100644
index 0000000000..b33f4b9b88
Binary files /dev/null and b/Neo4jWrapper/release/modules/ext/neo4j-kernel-2.0.1.jar differ
diff --git a/Neo4jWrapper/release/modules/ext/neo4j-lucene-index-2.0.1.jar b/Neo4jWrapper/release/modules/ext/neo4j-lucene-index-2.0.1.jar
new file mode 100644
index 0000000000..ed16549edc
Binary files /dev/null and b/Neo4jWrapper/release/modules/ext/neo4j-lucene-index-2.0.1.jar differ
diff --git a/Neo4jWrapper/release/modules/ext/neo4j-management-1.5.jar b/Neo4jWrapper/release/modules/ext/neo4j-management-1.5.jar
deleted file mode 100644
index ae513d8711..0000000000
Binary files a/Neo4jWrapper/release/modules/ext/neo4j-management-1.5.jar and /dev/null differ
diff --git a/Neo4jWrapper/release/modules/ext/neo4j-udc-1.5.jar b/Neo4jWrapper/release/modules/ext/neo4j-udc-1.5.jar
deleted file mode 100644
index ee821509da..0000000000
Binary files a/Neo4jWrapper/release/modules/ext/neo4j-udc-1.5.jar and /dev/null differ
diff --git a/Neo4jWrapper/src/org/gephi/lib/neo4j/Bundle.properties b/Neo4jWrapper/src/org/gephi/lib/neo4j/Bundle.properties
index d236294ec6..77b2bc7f9c 100644
--- a/Neo4jWrapper/src/org/gephi/lib/neo4j/Bundle.properties
+++ b/Neo4jWrapper/src/org/gephi/lib/neo4j/Bundle.properties
@@ -1,5 +1,5 @@
 OpenIDE-Module-Display-Category=Libraries
 OpenIDE-Module-Long-Description=\
-    Neo4j Version 1.5
+    Neo4j Version 2.0.1
 OpenIDE-Module-Name=Neo4j Wrapper
 OpenIDE-Module-Short-Description=Neo4j Graph Database
diff --git a/README.md b/README.md
index ccd91bb520..179b02f4eb 100644
--- a/README.md
+++ b/README.md
@@ -52,8 +52,8 @@ When you successfully tested your plugin, it's time to create a release. Verify
 - Right-click on the project and select '''Package As''' and then '''NMBs'''.
 - Go to the '''build''' folder and find the created '''plugin-release.zip''' file. Individual NBM files (one per each module) are packaged in this zip.
 
-Now you can publish you plugin on the [**Gephi Plugin portal**](http://gephi.org/plugins).
+Now you can publish you plugin on the [**Gephi Plugin portal**](https://marketplace.gephi.org/).
 
 ## Plugins Portal
 
-Our [**wiki**](http://wiki.gephi.org/index.php/Plugins_portal) contains a good list of tutorials to code plugins. Also checkout the [Bootcamp](https://github.com/gephi/gephi-plugins-bootcamp) for real examples.
\ No newline at end of file
+Our [**wiki**](http://wiki.gephi.org/index.php/Plugins_portal) contains a good list of tutorials to code plugins. Also checkout the [Bootcamp](https://github.com/gephi/gephi-plugins-bootcamp) for real examples.
diff --git a/nbproject/platform.properties b/nbproject/platform.properties
index 5b11de4481..0efeb32a98 100644
--- a/nbproject/platform.properties
+++ b/nbproject/platform.properties
@@ -1,3 +1,4 @@
+branding.token=gephi
 suite.dir=${basedir}
 platform.version = 7.2.1
 gephi.version = 0.8.2
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 1d47cda389..d28c956d90 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,18 +1,18 @@
-project.org.gephi.desktop.neo4j=DesktopNeo4j
-project.org.gephi.lib.neo4j=Neo4jWrapper
-project.org.gephi.neo4j=Neo4jGraphDatabase
-project.org.gephi.neo4j.plugin=Neo4jPlugin
-auxiliary.org-netbeans-modules-apisupport-installer.license-type=no
-auxiliary.org-netbeans-modules-apisupport-installer.os-linux=false
-auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=false
-auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false
-auxiliary.org-netbeans-modules-apisupport-installer.os-windows=false
-auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=false
-run.args.extra=-J-Xms256m -J-Xmx1000m -J-Dsun.java2d.noddraw=true -J-Dsun.awt.noerasebackground=true
-app.name=gephi
-branding.token=${app.name}
-modules=\
-    ${project.org.gephi.lib.neo4j}:\
-    ${project.org.gephi.neo4j.plugin}:\
-    ${project.org.gephi.desktop.neo4j}:\
-    ${project.org.gephi.neo4j}
\ No newline at end of file
+auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
+project.org.gephi.desktop.neo4j=DesktopNeo4j
+project.org.gephi.lib.neo4j=Neo4jWrapper
+project.org.gephi.neo4j=Neo4jGraphDatabase
+project.org.gephi.neo4j.plugin=Neo4jPlugin
+auxiliary.org-netbeans-modules-apisupport-installer.license-type=no
+auxiliary.org-netbeans-modules-apisupport-installer.os-linux=false
+auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=false
+auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false
+auxiliary.org-netbeans-modules-apisupport-installer.os-windows=false
+auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=false
+run.args.extra=-J-Xms256m -J-Xmx1000m -J-Dsun.java2d.noddraw=true -J-Dsun.awt.noerasebackground=true
+app.name=${branding.token}
+modules=\
+    ${project.org.gephi.lib.neo4j}:\
+    ${project.org.gephi.neo4j.plugin}:\
+    ${project.org.gephi.desktop.neo4j}:\
+    ${project.org.gephi.neo4j}