Adding support for more Cypher statements, improvements to PropertyExtractor.