Use new events registration
0.8.0