Added touch handling