Made Changes for Unified iOS.