Modified to use Neo4J 2x indexing