Better support for handhelds