changes to support multiple osd