Added touch device support