Add delegate option so tap can be handled anywhere