Add the updated code for handling Neo4jDB. Still buggy!!!