Upgrade for use with neo4j 1.9.5