added support for more binary operators in guards