Added features/steps for Android and iOS