Added tap event detection