Simplified event handling
v1.5.0