ENH: Add event handler