Add better touch support