Add support for logical operators