Added support for or conditional