Feature Request: More event types