Better touch support