Updated to events v0.1.2