Change usage of "condition" to "clause" to match with cypher docs terminology.  Also add WITH clause support