Added support for iOS non-standalone