Updated with support for iOS app