Updated callbacks with Event
0.12.2