Added arithmetic/logical/relational expression support