Improved Neo4j persistance