Same question here... do we need to be able to extend to support multiple os types?