Added minor support for mobile