More compatibility code fro Cypher