Core: Updated touch support (2)