Adding mobile switch functionality