Improved support for iOS