Add new event handler mechanism