Updated with iOS Unified and Mac support

Updated with iOS Unified and Mac support