Switch to new event handler
0.4.0