Added wheel & touch support support