Add more flexibility for Cypher queries creation