Updated core to be more in line with Neo4j 2.x functionality