Added handheld device support