Improve mobile support