Add support for AND and OR operators