added support for boolean expressions