Improved boolean expressions support