Add missing annotations, convert Event to Lombok class