Improve touch support