Added mobile device support