Improved iOS & Android support