Updated to support Neo4j 3+