Added AND and OR