Adding Cypher support