Add support for logical operators (AND/OR)