Added AND and OR blocks.