Added boolean expression reviver