Add support for logical operator (AND/OR)