Use complex-expression in place of expression

This will allow for the use of relational operations in expressions
Add relational operations