Add more kinds of expressions
Add verify() method to Query