Added orclause support