Added control to select either OSM or OCM