adding boolean expression detection