Added touch screen support