Added touch support