Add new event, and use more lombok