Improve touch input support