Update for iOS support