Improve expressions and add more clauses and queries