Will we now need a notion of extending this to support other os types as well?