Add single and double tap support