AI-581 - introduced  boolean expression support