Added missing attributes for multi os support