Added event listing and handling