Added support for Boolean logic