Core: Updated touch support (3)