Added some mobile support