Fixed IfThenElse and added support for Boolean exp