Added touch/mouse support