Update backward compatibility for Cypher