Added support for 'tap' detection