Adding support for tap events