Simplified event handling (#92)