Add support for logical operator check