Improving iOS support