Updated api to support multiple OZ selections
Merged with other changes.