Added support for $or operator