Use new events registration method
0.18.0