Adds support for AND and OR