Added OR operator support