Core: Updated touch support