Convert event to use generic delegate