Added semantics for and/or